diff --git a/.editorconfig b/.editorconfig
index 60827f04baf..3a537d01b28 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -4,39 +4,39 @@
 root = true
 
 [*]
+end_of_line = lf
 indent_style = space
 indent_size = 4
-
-# We recommend you to keep these unchanged
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
 
+[{*.yaml,*.yml}] # To match GitHub Actions formatting
+indent_size = 2
+
 [*.md]
 trim_trailing_whitespace = false
-indent_size = 4
 
-[{qmk,*.py}]
-charset = utf-8
-max_line_length = 200
-
-# Make these match what we have in .gitattributes
-[*.mk]
-end_of_line = lf
+[{Makefile,*.mk}]
 indent_style = tab
 
-[Makefile]
-end_of_line = lf
-indent_style = tab
-
-[*.sh]
-end_of_line = lf
-
-# The gitattributes file will handle the line endings conversion properly according to the operating system settings for other files
-
-
-# We don't have gitattributes properly for these
-# So if the user have for example core.autocrlf set to true
-# the line endings would be wrong.
+# Don't override anything in `lib/`...
 [lib/**]
+indent_style = unset
+indent_size = unset
+tab_width = unset
 end_of_line = unset
+charset = unset
+spelling_language = unset
+trim_trailing_whitespace = unset
+insert_final_newline = unset
+
+# ...except QMK's `lib/python`.
+[{*.py,lib/python/**.py}]
+end_of_line = lf
+indent_style = space
+indent_size = 4
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+max_line_length = 200
diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
index 81da72046c8..df080cfe8ce 100644
--- a/.github/workflows/format.yml
+++ b/.github/workflows/format.yml
@@ -36,6 +36,8 @@ jobs:
     - name: Get changed files
       id: file_changes
       uses: tj-actions/changed-files@v42
+      with:
+        use_rest_api: true
 
     - name: Run qmk formatters
       shell: 'bash {0}'
diff --git a/.github/workflows/format_push.yml b/.github/workflows/format_push.yml
index 61b4caf422d..ea60fc95b45 100644
--- a/.github/workflows/format_push.yml
+++ b/.github/workflows/format_push.yml
@@ -47,7 +47,7 @@ jobs:
         git config user.email 'hello@qmk.fm'
 
     - name: Create Pull Request
-      uses: peter-evans/create-pull-request@v5
+      uses: peter-evans/create-pull-request@v6
       if: ${{ github.repository == 'qmk/qmk_firmware'}}
       with:
         token: ${{ secrets.QMK_BOT_TOKEN }}
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 67823103f1b..a008ebb829f 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -28,6 +28,8 @@ jobs:
     - name: Get changed files
       id: file_changes
       uses: tj-actions/changed-files@v42
+      with:
+        use_rest_api: true
 
     - name: Print info
       run: |
@@ -62,10 +64,12 @@ jobs:
 
         qmk format-text ${{ steps.file_changes.outputs.all_changed_files}} || true
         for file in ${{ steps.file_changes.outputs.all_changed_files}}; do
-          if ! git diff --quiet $file; then
-            echo "File '${file}' Requires Formatting"
-            echo "::error file=${file}::Requires Formatting"
-            exit_code=$(($exit_code + 1))
+          if [[ -f $file ]]; then
+            if ! git diff --quiet $file; then
+              echo "File '${file}' Requires Formatting"
+              echo "::error file=${file}::Requires Formatting"
+              exit_code=$(($exit_code + 1))
+            fi
           fi
         done
 
diff --git a/.github/workflows/regen_push.yml b/.github/workflows/regen_push.yml
index f1b78129376..0f014111413 100644
--- a/.github/workflows/regen_push.yml
+++ b/.github/workflows/regen_push.yml
@@ -34,7 +34,7 @@ jobs:
         git config user.email 'hello@qmk.fm'
 
     - name: Create Pull Request
-      uses: peter-evans/create-pull-request@v5
+      uses: peter-evans/create-pull-request@v6
       if: ${{ github.repository == 'qmk/qmk_firmware'}}
       with:
         token: ${{ secrets.QMK_BOT_TOKEN }}
diff --git a/.github/workflows/unit_test.yml b/.github/workflows/unit_test.yml
index eec8c8b5fc2..a834053a76c 100644
--- a/.github/workflows/unit_test.yml
+++ b/.github/workflows/unit_test.yml
@@ -32,4 +32,4 @@ jobs:
     - name: Install dependencies
       run: pip3 install -r requirements-dev.txt
     - name: Run tests
-      run: make test:all
+      run: qmk test-c
diff --git a/.gitignore b/.gitignore
index ca9f00a7330..35b128606d7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,6 +37,7 @@ quantum/version.h
 
 # DD config at wrong location
 /keyboards/**/keymaps/*/info.json
+/keyboards/**/keymaps/*/keyboard.json
 
 # Old-style QMK Makefiles
 /keyboards/**/Makefile
diff --git a/builddefs/build_keyboard.mk b/builddefs/build_keyboard.mk
index f17171fe209..0b9ab8849f7 100644
--- a/builddefs/build_keyboard.mk
+++ b/builddefs/build_keyboard.mk
@@ -119,7 +119,7 @@ MAIN_KEYMAP_PATH_3 := $(KEYBOARD_PATH_3)/keymaps/$(KEYMAP)
 MAIN_KEYMAP_PATH_4 := $(KEYBOARD_PATH_4)/keymaps/$(KEYMAP)
 MAIN_KEYMAP_PATH_5 := $(KEYBOARD_PATH_5)/keymaps/$(KEYMAP)
 
-# Pull in rules from info.json
+# Pull in rules from DD keyboard config
 INFO_RULES_MK = $(shell $(QMK_BIN) generate-rules-mk --quiet --escape --keyboard $(KEYBOARD) --output $(INTERMEDIATE_OUTPUT)/src/info_rules.mk)
 include $(INFO_RULES_MK)
 
@@ -221,7 +221,7 @@ include $(BUILDDEFS_PATH)/converters.mk
 MCU_ORIG := $(MCU)
 include $(wildcard $(PLATFORM_PATH)/*/mcu_selection.mk)
 
-# PLATFORM_KEY should be detected in info.json via key 'processor' (or rules.mk 'MCU')
+# PLATFORM_KEY should be detected in DD keyboard config via key 'processor' (or rules.mk 'MCU')
 ifeq ($(PLATFORM_KEY),)
     $(call CATASTROPHIC_ERROR,Platform not defined)
 endif
@@ -335,38 +335,54 @@ ifneq ("$(wildcard $(KEYBOARD_PATH_5)/post_config.h)","")
     POST_CONFIG_H += $(KEYBOARD_PATH_5)/post_config.h
 endif
 
-# Pull in stuff from info.json
-INFO_JSON_FILES :=
+# Create dependencies on DD keyboard config - structure validated elsewhere
+DD_CONFIG_FILES :=
 ifneq ("$(wildcard $(KEYBOARD_PATH_1)/info.json)","")
-    INFO_JSON_FILES += $(KEYBOARD_PATH_1)/info.json
+    DD_CONFIG_FILES += $(KEYBOARD_PATH_1)/info.json
 endif
 ifneq ("$(wildcard $(KEYBOARD_PATH_2)/info.json)","")
-    INFO_JSON_FILES += $(KEYBOARD_PATH_2)/info.json
+    DD_CONFIG_FILES += $(KEYBOARD_PATH_2)/info.json
 endif
 ifneq ("$(wildcard $(KEYBOARD_PATH_3)/info.json)","")
-    INFO_JSON_FILES += $(KEYBOARD_PATH_3)/info.json
+    DD_CONFIG_FILES += $(KEYBOARD_PATH_3)/info.json
 endif
 ifneq ("$(wildcard $(KEYBOARD_PATH_4)/info.json)","")
-    INFO_JSON_FILES += $(KEYBOARD_PATH_4)/info.json
+    DD_CONFIG_FILES += $(KEYBOARD_PATH_4)/info.json
 endif
 ifneq ("$(wildcard $(KEYBOARD_PATH_5)/info.json)","")
-    INFO_JSON_FILES += $(KEYBOARD_PATH_5)/info.json
+    DD_CONFIG_FILES += $(KEYBOARD_PATH_5)/info.json
+endif
+
+ifneq ("$(wildcard $(KEYBOARD_PATH_1)/keyboard.json)","")
+    DD_CONFIG_FILES += $(KEYBOARD_PATH_1)/keyboard.json
+endif
+ifneq ("$(wildcard $(KEYBOARD_PATH_2)/keyboard.json)","")
+    DD_CONFIG_FILES += $(KEYBOARD_PATH_2)/keyboard.json
+endif
+ifneq ("$(wildcard $(KEYBOARD_PATH_3)/keyboard.json)","")
+    DD_CONFIG_FILES += $(KEYBOARD_PATH_3)/keyboard.json
+endif
+ifneq ("$(wildcard $(KEYBOARD_PATH_4)/keyboard.json)","")
+    DD_CONFIG_FILES += $(KEYBOARD_PATH_4)/keyboard.json
+endif
+ifneq ("$(wildcard $(KEYBOARD_PATH_5)/keyboard.json)","")
+    DD_CONFIG_FILES += $(KEYBOARD_PATH_5)/keyboard.json
 endif
 
 CONFIG_H += $(INTERMEDIATE_OUTPUT)/src/info_config.h
 KEYBOARD_SRC += $(INTERMEDIATE_OUTPUT)/src/default_keyboard.c
 
-$(INTERMEDIATE_OUTPUT)/src/info_config.h: $(INFO_JSON_FILES)
+$(INTERMEDIATE_OUTPUT)/src/info_config.h: $(DD_CONFIG_FILES)
 	@$(SILENT) || printf "$(MSG_GENERATING) $@" | $(AWK_CMD)
 	$(eval CMD=$(QMK_BIN) generate-config-h --quiet --keyboard $(KEYBOARD) --output $(INTERMEDIATE_OUTPUT)/src/info_config.h)
 	@$(BUILD_CMD)
 
-$(INTERMEDIATE_OUTPUT)/src/default_keyboard.c: $(INFO_JSON_FILES)
+$(INTERMEDIATE_OUTPUT)/src/default_keyboard.c: $(DD_CONFIG_FILES)
 	@$(SILENT) || printf "$(MSG_GENERATING) $@" | $(AWK_CMD)
 	$(eval CMD=$(QMK_BIN) generate-keyboard-c --quiet --keyboard $(KEYBOARD) --output $(INTERMEDIATE_OUTPUT)/src/default_keyboard.c)
 	@$(BUILD_CMD)
 
-$(INTERMEDIATE_OUTPUT)/src/default_keyboard.h: $(INFO_JSON_FILES)
+$(INTERMEDIATE_OUTPUT)/src/default_keyboard.h: $(DD_CONFIG_FILES)
 	@$(SILENT) || printf "$(MSG_GENERATING) $@" | $(AWK_CMD)
 	$(eval CMD=$(QMK_BIN) generate-keyboard-h --quiet --keyboard $(KEYBOARD) --include $(FOUND_KEYBOARD_H) --output $(INTERMEDIATE_OUTPUT)/src/default_keyboard.h)
 	@$(BUILD_CMD)
diff --git a/builddefs/common_features.mk b/builddefs/common_features.mk
index 90e0ff827d1..7227a5558e2 100644
--- a/builddefs/common_features.mk
+++ b/builddefs/common_features.mk
@@ -886,9 +886,24 @@ ifeq ($(strip $(BLUETOOTH_ENABLE)), yes)
     endif
 endif
 
+ENCODER_ENABLE ?= no
+ENCODER_DRIVER ?= quadrature
+VALID_ENCODER_DRIVER_TYPES := quadrature custom
 ifeq ($(strip $(ENCODER_ENABLE)), yes)
+    ifeq ($(filter $(ENCODER_DRIVER),$(VALID_ENCODER_DRIVER_TYPES)),)
+        $(call CATASTROPHIC_ERROR,Invalid ENCODER_DRIVER,ENCODER_DRIVER="$(ENCODER_DRIVER)" is not a valid encoder driver)
+    endif
     SRC += $(QUANTUM_DIR)/encoder.c
     OPT_DEFS += -DENCODER_ENABLE
+    OPT_DEFS += -DENCODER_DRIVER_$(strip $(shell echo $(ENCODER_DRIVER) | tr '[:lower:]' '[:upper:]'))
+
+    COMMON_VPATH += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/encoder
+    COMMON_VPATH += $(DRIVER_PATH)/encoder
+
+    ifneq ($(strip $(ENCODER_DRIVER)), custom)
+        SRC += encoder_$(strip $(ENCODER_DRIVER)).c
+    endif
+
     ifeq ($(strip $(ENCODER_MAP_ENABLE)), yes)
         OPT_DEFS += -DENCODER_MAP_ENABLE
     endif
@@ -945,6 +960,15 @@ ifeq ($(strip $(SPI_DRIVER_REQUIRED)), yes)
 endif
 
 ifeq ($(strip $(UART_DRIVER_REQUIRED)), yes)
-    OPT_DEFS += -DHAL_USE_SERIAL=TRUE
-    QUANTUM_LIB_SRC += uart.c
+    ifeq ($(strip $(PLATFORM)), CHIBIOS)
+        ifneq ($(filter $(MCU_SERIES),RP2040),)
+            OPT_DEFS += -DHAL_USE_SIO=TRUE
+            QUANTUM_LIB_SRC += uart_sio.c
+        else
+            OPT_DEFS += -DHAL_USE_SERIAL=TRUE
+            QUANTUM_LIB_SRC += uart_serial.c
+        endif
+    else
+        QUANTUM_LIB_SRC += uart.c
+    endif
 endif
diff --git a/data/mappings/info_config.hjson b/data/mappings/info_config.hjson
index 2c4a75df895..c0417b88396 100644
--- a/data/mappings/info_config.hjson
+++ b/data/mappings/info_config.hjson
@@ -19,6 +19,8 @@
     // Audio
     "AUDIO_DEFAULT_ON": {"info_key": "audio.default.on", "value_type": "bool"},
     "AUDIO_DEFAULT_CLICKY_ON": {"info_key": "audio.default.clicky", "value_type": "bool"},
+    "AUDIO_POWER_CONTROL_PIN": {"info_key": "audio.power_control.pin"},
+    "AUDIO_POWER_CONTROL_PIN_ON_STATE": {"info_key": "audio.power_control.on_state", "value_type": "int" },
     "AUDIO_VOICES": {"info_key": "audio.voices", "value_type": "flag"},
     "SENDSTRING_BELL": {"info_key": "audio.macro_beep", "value_type": "flag"},
 
@@ -36,10 +38,10 @@
     "BACKLIGHT_DEFAULT_LEVEL": {"info_key": "backlight.default.brightness", "value_type": "int"},
 
     // Bootmagic
-    "BOOTMAGIC_LITE_COLUMN": {"info_key": "bootmagic.matrix.1", "value_type": "int"},
-    "BOOTMAGIC_LITE_COLUMN_RIGHT": {"info_key": "split.bootmagic.matrix.1", "value_type": "int"},
-    "BOOTMAGIC_LITE_ROW": {"info_key": "bootmagic.matrix.0", "value_type": "int"},
-    "BOOTMAGIC_LITE_ROW_RIGHT": {"info_key": "split.bootmagic.matrix.0", "value_type": "int"},
+    "BOOTMAGIC_COLUMN": {"info_key": "bootmagic.matrix.1", "value_type": "int"},
+    "BOOTMAGIC_COLUMN_RIGHT": {"info_key": "split.bootmagic.matrix.1", "value_type": "int"},
+    "BOOTMAGIC_ROW": {"info_key": "bootmagic.matrix.0", "value_type": "int"},
+    "BOOTMAGIC_ROW_RIGHT": {"info_key": "split.bootmagic.matrix.0", "value_type": "int"},
 
     // Caps Word
     "BOTH_SHIFTS_TURNS_ON_CAPS_WORD": {"info_key": "caps_word.both_shifts_turns_on", "value_type": "flag"},
diff --git a/data/mappings/info_rules.hjson b/data/mappings/info_rules.hjson
index 02fc2bee9de..fc25eb3328b 100644
--- a/data/mappings/info_rules.hjson
+++ b/data/mappings/info_rules.hjson
@@ -21,6 +21,7 @@
     "DEBOUNCE_TYPE": {"info_key": "build.debounce_type"},
     "EEPROM_DRIVER": {"info_key": "eeprom.driver"},
     "ENCODER_ENABLE": {"info_key": "encoder.enabled", "value_type": "bool"},
+    "ENCODER_DRIVER": {"info_key": "encoder.driver"},
     "FIRMWARE_FORMAT": {"info_key": "build.firmware_format"},
     "KEYBOARD_SHARED_EP": {"info_key": "usb.shared_endpoint.keyboard", "value_type": "bool"},
     "LAYOUTS": {"info_key": "community_layouts", "value_type": "list"},
diff --git a/data/mappings/keyboard_aliases.hjson b/data/mappings/keyboard_aliases.hjson
index af97c39f0ce..29a7a719f38 100644
--- a/data/mappings/keyboard_aliases.hjson
+++ b/data/mappings/keyboard_aliases.hjson
@@ -185,6 +185,9 @@
     "eek": {
         "target": "eek/silk_down"
     },
+    "epoch80": {
+        "target": "kbdfans/epoch80"
+    },
     "era/klein": {
         "target": "era/sirind/klein_sd"
 	},
@@ -311,6 +314,9 @@
     "jj50": {
         "target": "kprepublic/jj50"
     },
+    "jm60": {
+        "target": "kbdfans/jm60"
+    },
     "jones": {
         "target": "jones/v03_1"
     },
diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema
index d953079659c..5c6788913b0 100644
--- a/data/schemas/keyboard.jsonschema
+++ b/data/schemas/keyboard.jsonschema
@@ -6,6 +6,10 @@
         "encoder_config": {
             "type": "object",
             "properties": {
+                "driver": {
+                    "type": "string",
+                    "enum": ["custom", "quadrature"]
+                },
                 "rotary": {
                     "type": "array",
                     "items": {
@@ -24,14 +28,12 @@
         "dip_switch_config": {
             "type": "object",
             "properties": {
-                "pins": {
-                    "$ref": "qmk.definitions.v1#/mcu_pin_array"
-                }
+                "pins": {"$ref": "qmk.definitions.v1#/mcu_pin_array"}
             }
-        },
+        }
     },
     "type": "object",
-    "not": { "required": [ "vendorId", "productId" ] }, // reject via keys...
+    "not": {"required": ["vendorId", "productId"]}, // reject via keys...
     "properties": {
         "keyboard_name": {"$ref": "qmk.definitions.v1#/text_identifier"},
         "keyboard_folder": {"$ref": "qmk.definitions.v1#/keyboard"},
@@ -133,6 +135,14 @@
                 },
                 "macro_beep": {"type": "boolean"},
                 "pins": {"$ref": "qmk.definitions.v1#/mcu_pin_array"},
+                "power_control": {
+                    "type": "object",
+                    "additionalProperties": false,
+                    "properties": {
+                        "on_state": {"$ref": "qmk.definitions.v1#/bit"},
+                        "pin": {"$ref": "qmk.definitions.v1#/mcu_pin"}
+                    }
+                },
                 "voices": {"type": "boolean"}
             }
         },
@@ -142,7 +152,7 @@
             "properties": {
                 "driver": {
                     "type": "string",
-                    "enum": ["pwm", "software", "timer", "custom"]
+                    "enum": ["custom", "pwm", "software", "timer"]
                 },
                 "default": {
                     "type": "object",
@@ -314,8 +324,8 @@
         },
         "features": {
             "$ref": "qmk.definitions.v1#/boolean_array",
-            "propertyNames": { "$ref": "qmk.definitions.v1#/snake_case" },
-            "not": { "required": [ "lto" ] }
+            "propertyNames": {"$ref": "qmk.definitions.v1#/snake_case"},
+            "not": {"required": ["lto"]}
         },
         "indicators": {
             "type": "object",
@@ -340,15 +350,9 @@
                 "type": "object",
                 "additionalProperties": false,
                 "properties": {
-                    "filename": {
-                        "type": "string"
-                    },
-                    "c_macro": {
-                        "type": "boolean"
-                    },
-                    "json_layout": {
-                        "type": "boolean"
-                    },
+                    "filename": {"type": "string"},
+                    "c_macro": {"type": "boolean"},
+                    "json_layout": {"type": "boolean"},
                     "layout": {
                         "type": "array",
                         "items": {
@@ -431,10 +435,8 @@
             "properties": {
                 "animations": {
                     "type": "object",
-                    "propertyNames": { "$ref": "qmk.definitions.v1#/snake_case" }
-                    "additionalProperties": {
-                        "type": "boolean"
-                    }
+                    "propertyNames": {"$ref": "qmk.definitions.v1#/snake_case"},
+                    "additionalProperties": {"type": "boolean"}
                 },
                 "default": {
                     "type": "object",
@@ -446,7 +448,24 @@
                         "speed": {"$ref": "qmk.definitions.v1#/unsigned_int_8"}
                     }
                 },
-                "driver": {"type": "string"},
+                "driver": {
+                    "type": "string",
+                    "enum": [
+                        "custom",
+                        "is31fl3218",
+                        "is31fl3729",
+                        "is31fl3731",
+                        "is31fl3733",
+                        "is31fl3736",
+                        "is31fl3737",
+                        "is31fl3741",
+                        "is31fl3742a",
+                        "is31fl3743a",
+                        "is31fl3745",
+                        "is31fl3746a",
+                        "snled27351"
+                    ]
+                },
                 "center_point": {
                     "type": "array",
                     "minItems": 2,
@@ -495,10 +514,8 @@
             "properties": {
                 "animations": {
                     "type": "object",
-                    "propertyNames": { "$ref": "qmk.definitions.v1#/snake_case" }
-                    "additionalProperties": {
-                        "type": "boolean"
-                    }
+                    "propertyNames": {"$ref": "qmk.definitions.v1#/snake_case"},
+                    "additionalProperties": {"type": "boolean"}
                 },
                 "default": {
                     "type": "object",
@@ -512,7 +529,26 @@
                         "speed": {"$ref": "qmk.definitions.v1#/unsigned_int_8"}
                     }
                 },
-                "driver": {"type": "string"},
+                "driver": {
+                    "type": "string",
+                    "enum": [
+                        "aw20216s",
+                        "custom",
+                        "is31fl3218",
+                        "is31fl3729",
+                        "is31fl3731",
+                        "is31fl3733",
+                        "is31fl3736",
+                        "is31fl3737",
+                        "is31fl3741",
+                        "is31fl3742a",
+                        "is31fl3743a",
+                        "is31fl3745",
+                        "is31fl3746a",
+                        "snled27351",
+                        "ws2812"
+                    ]
+                },
                 "center_point": {
                     "type": "array",
                     "minItems": 2,
@@ -564,10 +600,8 @@
             "properties": {
                 "animations": {
                     "type": "object",
-                    "propertyNames": { "$ref": "qmk.definitions.v1#/snake_case" }
-                    "additionalProperties": {
-                        "type": "boolean"
-                    }
+                    "propertyNames": {"$ref": "qmk.definitions.v1#/snake_case"},
+                    "additionalProperties": {"type": "boolean"}
                 },
                 "brightness_steps": {"$ref": "qmk.definitions.v1#/unsigned_int"},
                 "default": {
@@ -770,7 +804,7 @@
                                 "st7565": {"type": "boolean"},
                                 "wpm": {"type": "boolean"}
                             }
-                        }
+                        },
                         "watchdog": {"type": "boolean"},
                         "watchdog_timeout": {"$ref": "qmk.definitions.v1#/unsigned_int"},
                         "sync_matrix_state": {
diff --git a/data/templates/keyboard/config.h b/data/templates/keyboard/config.h
deleted file mode 100644
index b15c8d31f14..00000000000
--- a/data/templates/keyboard/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright %YEAR% %REAL_NAME% (@%USER_NAME%)
-// 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
diff --git a/data/templates/keyboard/info.json b/data/templates/keyboard/keyboard.json
similarity index 100%
rename from data/templates/keyboard/info.json
rename to data/templates/keyboard/keyboard.json
diff --git a/docs/ChangeLog/20240225.md b/docs/ChangeLog/20240225.md
new file mode 100644
index 00000000000..779b7784900
--- /dev/null
+++ b/docs/ChangeLog/20240225.md
@@ -0,0 +1,367 @@
+# QMK Breaking Changes - 2024 February 25 Changelog
+
+## Notable Features :id=notable-features
+
+_0.24.0_ is mainly a maintenance release of QMK Firmware -- as per last few breaking changes cycles, there have been a lot of behind-the-scenes changes, mainly:
+
+* continued purge of user keymaps
+* migration of RGB matrix configuration into `info.json` files
+* standardisation of `LAYOUT` naming
+* keyboard relocations
+* addressing technical debt
+
+## Changes Requiring User Action :id=changes-requiring-user-action
+
+### Windows Driver Changes ([QMK Toolbox 0.3.0 Release](https://github.com/qmk/qmk_toolbox/releases/tag/0.3.0))
+
+Flashing keyboards that target `atmel-dfu` or `qmk-dfu` on Windows using `qmk flash` or QMK Toolbox have traditionally used _libusb_ for access to the DFU USB device. Since QMK Toolbox 0.3.0, this has changed to WinUSB.
+
+If you update QMK Toolbox or update QMK MSYS, you may find that flashing Atmel DFU keyboards no longer functions as intended. If you strike such issues when flashing new firmware, you will need to replace the _libusb_ driver with _WinUSB_ using Zadig. You can follow the [Recovering from Installation to Wrong Device](driver_installation_zadig.md#recovering-from-installation-to-wrong-device) instructions to replace the driver associated with the Atmel DFU bootloader, skipping the section about removal as Zadig will safely replace the driver instead. Please ensure your keyboard is in bootloader mode and has _libusb_ as the existing driver before attempting to use Zadig to replace the driver. If instead you see _HidUsb_ you're not in bootloader mode and should not continue with driver replacement.
+
+### Updated Keyboard Codebases :id=updated-keyboard-codebases
+
+One note with updated keyboard names -- historical keyboard names are still considered valid when using [External Userspace](newbs_external_userspace.md) for builds. If you're already using External Userspace, you do not need to move your keymap inside your repository.
+
+| Old Keyboard Name       | New Keyboard Name               |
+|-------------------------|---------------------------------|
+| enter67                 | kezewa/enter67                  |
+| enter80                 | kezewa/enter80                  |
+| epoch80                 | kbdfans/epoch80                 |
+| eu_isolation            | p3d/eu_isolation                |
+| flygone60/rev3          | shandoncodes/flygone60/rev3     |
+| hub16                   | joshajohnson/hub16              |
+| hub20                   | joshajohnson/hub20              |
+| jm60                    | kbdfans/jm60                    |
+| kira75                  | kira/kira75                     |
+| kira80                  | kira/kira80                     |
+| kmac                    | kbdmania/kmac                   |
+| kmac_pad                | kbdmania/kmac_pad               |
+| kudox/columner          | kumaokobo/kudox/columner        |
+| kudox/rev1              | kumaokobo/kudox/rev1            |
+| kudox/rev2              | kumaokobo/kudox/rev2            |
+| kudox/rev3              | kumaokobo/kudox/rev3            |
+| kudox_full/rev1         | kumaokobo/kudox_full/rev1       |
+| kudox_game              | kumaokobo/kudox_game            |
+| kudox_game/rev1         | kumaokobo/kudox_game/rev1       |
+| kudox_game/rev2         | kumaokobo/kudox_game/rev2       |
+| laser_ninja/pumpkin_pad | laser_ninja/pumpkinpad          |
+| late9/rev1              | rookiebwoy/late9/rev1           |
+| lefty                   | smoll/lefty                     |
+| lefty/rev1              | smoll/lefty/rev1                |
+| lefty/rev2              | smoll/lefty/rev2                |
+| lpad                    | laneware/lpad                   |
+| lw67                    | laneware/lw67                   |
+| lw75                    | laneware/lw75                   |
+| macro1                  | laneware/macro1                 |
+| macro3                  | handwired/macro3                |
+| miniaxe                 | kagizaraya/miniaxe              |
+| mino/hotswap            | shandoncodes/mino/hotswap       |
+| mino_plus/hotswap       | shandoncodes/mino_plus/hotswap  |
+| mino_plus/soldered      | shandoncodes/mino_plus/soldered |
+| mnk1800s                | monokei/mnk1800s                |
+| mnk50                   | monokei/mnk50                   |
+| mnk75                   | monokei/mnk75                   |
+| moonlander              | zsa/moonlander                  |
+| neopad/rev1             | rookiebwoy/neopad/rev1          |
+| pico/65keys             | kumaokobo/pico/65keys           |
+| pico/70keys             | kumaokobo/pico/70keys           |
+| pw88                    | smoll/pw88                      |
+| q4z                     | p3d/q4z                         |
+| raindrop                | laneware/raindrop               |
+| redox_w                 | redox/wireless                  |
+| riot_pad                | shandoncodes/riot_pad           |
+| spacey                  | p3d/spacey                      |
+| synapse                 | p3d/synapse                     |
+| tw40                    | p3d/tw40                        |
+| w1_at                   | geonworks/w1_at                 |
+| z12                     | zigotica/z12                    |
+| z34                     | zigotica/z34                    |
+
+## Notable core changes :id=notable-core
+
+### Renaming Arduino-style GPIO pin functions ([#23085](https://github.com/qmk/qmk_firmware/pull/23085), [#23093](https://github.com/qmk/qmk_firmware/pull/23093)) :id=gpio-rename
+
+QMK has long used Arduino-style GPIO naming conventions. This has been confusing for users, as over time they've had new variations added, as well as users mistakenly thinking that QMK supports the rest of the Arduino ecosystem.
+
+The decision was made to rename the GPIO manipulation functions with ones matching QMK Firmware's code styling.
+
+| Old                          | New                                   |
+|------------------------------|---------------------------------------|
+| `setPinInput(pin)`           | `gpio_set_pin_input(pin)`             |
+| `setPinInputHigh(pin)`       | `gpio_set_pin_input_high(pin)`        |
+| `setPinInputLow(pin)`        | `gpio_set_pin_input_low(pin)`         |
+| `setPinOutput(pin)`          | `gpio_set_pin_output(pin)`            |
+| `setPinOutputPushPull(pin)`  | `gpio_set_pin_output_push_pull(pin)`  |
+| `setPinOutputOpenDrain(pin)` | `gpio_set_pin_output_open_drain(pin)` |
+| `writePinHigh(pin)`          | `gpio_write_pin_high(pin)`            |
+| `writePinLow(pin)`           | `gpio_write_pin_low(pin)`             |
+| `writePin(pin, level)`       | `gpio_write_pin(pin, level)`          |
+| `readPin(pin)`               | `gpio_read_pin(pin)`                  |
+| `togglePin(pin)`             | `gpio_toggle_pin(pin)`                |
+
+### I2C driver API Changes ([#22905](https://github.com/qmk/qmk_firmware/pull/22905))
+
+Much like the GPIO refactoring, I2C APIs were also updated to conform to QMK naming standards. This is largely irrelevant to people using subsystem abstractions such as touchpads or RGB lighting, and only affects people manually communicating with other peripherals.
+
+| Old API            | New API                  |
+|--------------------|--------------------------|
+| `i2c_readReg()`    | `i2c_read_register()`    |
+| `i2c_readReg16()`  | `i2c_read_register16()`  |
+| `i2c_writeReg()`   | `i2c_write_register()`   |
+| `i2c_writeReg16()` | `i2c_write_register16()` |
+
+### Renaming _Bootmagic Lite_ => _Bootmagic_ ([#22970](https://github.com/qmk/qmk_firmware/pull/22970), [#22979](https://github.com/qmk/qmk_firmware/pull/22979)) :id=bootmagic-rename
+
+Bootmagic "Lite" had no real meaning once the historical Bootmagic "Full" was deprecated and removed. Any references to _Bootmagic Lite_ should now just refer to _Bootmagic_. We hope we got the majority of the code and the documentation, so if you find any more, let us know!
+
+### Threshold for automatic mouse layer activation ([#21398](https://github.com/qmk/qmk_firmware/pull/21398)) :id=auto-mouse-layer
+
+In some cases, accidental automatic activation of the mouse layer made it difficult to continue typing, such as when brushing across a trackball. `AUTO_MOUSE_THRESHOLD` is now a configurable option in `config.h` which allows for specifying what the movement threshold is before automatically activating the mouse layer.
+
+### DIP Switch Mapping ([#22543](https://github.com/qmk/qmk_firmware/pull/22543)) :id=dip-switch-map
+
+Much like Encoder Mapping, DIP Switch Mapping allows for specifying a table of actions to execute when a DIP switch state changes. See the [DIP Switch Documentation](feature_dip_switch.md#dip-switch-map) for more information.
+
+```c
+#if defined(DIP_SWITCH_MAP_ENABLE)
+const uint16_t PROGMEM dip_switch_map[NUM_DIP_SWITCHES][NUM_DIP_STATES] = {
+    DIP_SWITCH_OFF_ON(DF(0), DF(1)),
+    DIP_SWITCH_OFF_ON(EC_NORM, EC_SWAP)
+};
+#endif
+```
+
+### Quantum Painter updates ([#18521](https://github.com/qmk/qmk_firmware/pull/18521), [#20645](https://github.com/qmk/qmk_firmware/pull/20645), [#22358](https://github.com/qmk/qmk_firmware/pull/22358)) :id=qp-updates
+
+Quantum Painter picked up support for the following:
+
+* ILI9486 displays
+* SSD1306 displays, including smaller OLEDs
+* Native panel pixel format support for fonts
+
+Quantum Painter now supports the majority of common OLED panels supported by the basic OLED driver, so if you're using an ARM-based board you may find Quantum Painter a much more feature-rich API in comparison.
+
+## Full changelist :id=full-changelist
+
+Core:
+* [Driver] ILI9486 on Quantum Painter ([#18521](https://github.com/qmk/qmk_firmware/pull/18521))
+* Insert delay between shifted chars in send_string_with_delay ([#19280](https://github.com/qmk/qmk_firmware/pull/19280))
+* [QP] Native palette support for fonts ([#20645](https://github.com/qmk/qmk_firmware/pull/20645))
+* I2C driver cleanup ([#21273](https://github.com/qmk/qmk_firmware/pull/21273))
+* Add option for auto mouse movement threshold ([#21398](https://github.com/qmk/qmk_firmware/pull/21398))
+* Add Canadian French input locale ([#21456](https://github.com/qmk/qmk_firmware/pull/21456))
+* Add encoder abstraction. ([#21548](https://github.com/qmk/qmk_firmware/pull/21548))
+* Converted RGB matrix to use last_input_activity_elapsed(). ([#21687](https://github.com/qmk/qmk_firmware/pull/21687))
+* Ignore space cadet key release when caps word is active ([#21721](https://github.com/qmk/qmk_firmware/pull/21721))
+* Add OS detection callbacks ([#21777](https://github.com/qmk/qmk_firmware/pull/21777))
+* joystick weights ([#21883](https://github.com/qmk/qmk_firmware/pull/21883))
+* Add RGB matrix & LED Matrix support for IS31FL3729 ([#21944](https://github.com/qmk/qmk_firmware/pull/21944))
+* dac_additive: Decouple the buffer length from the waveform length ([#22276](https://github.com/qmk/qmk_firmware/pull/22276))
+* Add missing rgb matrix default parameters ([#22281](https://github.com/qmk/qmk_firmware/pull/22281))
+* Remove console out endpoint ([#22304](https://github.com/qmk/qmk_firmware/pull/22304))
+* Add ADC support STM32L4xx and STM32G4xx series MCUs ([#22341](https://github.com/qmk/qmk_firmware/pull/22341))
+* Add QP support for smaller OLED displays and SSD1306 ([#22358](https://github.com/qmk/qmk_firmware/pull/22358))
+* Add Imera converter ([#22419](https://github.com/qmk/qmk_firmware/pull/22419))
+* LED drivers: refactor page selection ([#22518](https://github.com/qmk/qmk_firmware/pull/22518))
+* Rework RGBLight driver system ([#22529](https://github.com/qmk/qmk_firmware/pull/22529))
+* Add `APA102_LED_COUNT` define ([#22530](https://github.com/qmk/qmk_firmware/pull/22530))
+* Add latam spanish headers ([#22542](https://github.com/qmk/qmk_firmware/pull/22542))
+* Keymap introspection for Dip Switches ([#22543](https://github.com/qmk/qmk_firmware/pull/22543))
+* Add basic presence check for cirque trackpad. ([#22546](https://github.com/qmk/qmk_firmware/pull/22546))
+* Rename `RGBLED_NUM` -> `RGBLIGHT_LED_COUNT` ([#22570](https://github.com/qmk/qmk_firmware/pull/22570))
+* LED drivers: change "TWI" to "I2C" ([#22617](https://github.com/qmk/qmk_firmware/pull/22617))
+* LED drivers: extract IS31FL3742A from IS31COMMON ([#22620](https://github.com/qmk/qmk_firmware/pull/22620))
+* Align Dip Switch feature ([#22625](https://github.com/qmk/qmk_firmware/pull/22625))
+* LED/RGB Matrix: add header for drivers ([#22628](https://github.com/qmk/qmk_firmware/pull/22628))
+* LED drivers: extract IS31FL3743A from IS31COMMON ([#22635](https://github.com/qmk/qmk_firmware/pull/22635))
+* LED drivers: extract IS31FL3745 from IS31COMMON ([#22636](https://github.com/qmk/qmk_firmware/pull/22636))
+* LED drivers: extract IS31FL3746A from IS31COMMON ([#22637](https://github.com/qmk/qmk_firmware/pull/22637))
+* Update keyboard LED driver configs ([#22638](https://github.com/qmk/qmk_firmware/pull/22638))
+* Solid reactive: improve fading effect ([#22656](https://github.com/qmk/qmk_firmware/pull/22656))
+* Remove redundant RGB/LED matrix eeconfig init ([#22673](https://github.com/qmk/qmk_firmware/pull/22673))
+* Remove redundant rgblight eeconfig init ([#22674](https://github.com/qmk/qmk_firmware/pull/22674))
+* Remove redundant steno eeconfig init ([#22680](https://github.com/qmk/qmk_firmware/pull/22680))
+* Rename `LED_DISABLE_WHEN_USB_SUSPENDED` -> `LED_MATRIX_SLEEP` ([#22681](https://github.com/qmk/qmk_firmware/pull/22681))
+* Rename `RGB_DISABLE_WHEN_USB_SUSPENDED` -> `RGB_MATRIX_SLEEP` ([#22682](https://github.com/qmk/qmk_firmware/pull/22682))
+* Align VUSB suspend protocol logic ([#22688](https://github.com/qmk/qmk_firmware/pull/22688))
+* [Audio] Enable Complementary output for PWM Hardware driver ([#22726](https://github.com/qmk/qmk_firmware/pull/22726))
+* Remove redundant audio eeconfig init ([#22736](https://github.com/qmk/qmk_firmware/pull/22736))
+* Align location of tap dance keycode ([#22742](https://github.com/qmk/qmk_firmware/pull/22742))
+* Align `SPLIT_HAND_MATRIX_GRID` left/right logic with `SPLIT_HAND_PIN` ([#22775](https://github.com/qmk/qmk_firmware/pull/22775))
+* [CI] Regenerate Files ([#22795](https://github.com/qmk/qmk_firmware/pull/22795))
+* Remove IS31FLCOMMON code ([#22800](https://github.com/qmk/qmk_firmware/pull/22800))
+* Cirque reachable calibration aide ([#22803](https://github.com/qmk/qmk_firmware/pull/22803))
+* LED drivers: rename "simple" to "mono" ([#22814](https://github.com/qmk/qmk_firmware/pull/22814))
+* is31fl3733: change `write_register()` return type to `void` ([#22824](https://github.com/qmk/qmk_firmware/pull/22824))
+* snled27351: change `write_register()` return type to `void` ([#22825](https://github.com/qmk/qmk_firmware/pull/22825))
+* apa102: cleanups ([#22826](https://github.com/qmk/qmk_firmware/pull/22826))
+* Remove PWM advanced check for WS2812 driver ([#22830](https://github.com/qmk/qmk_firmware/pull/22830))
+* Allow ChibiOS `SIO` driver for `UART` driver ([#22839](https://github.com/qmk/qmk_firmware/pull/22839))
+* LED drivers: more formatting ([#22865](https://github.com/qmk/qmk_firmware/pull/22865))
+* LED drivers: change `write_pwm_buffer()` return type to `void` ([#22869](https://github.com/qmk/qmk_firmware/pull/22869))
+* [CI] Regenerate Files ([#22872](https://github.com/qmk/qmk_firmware/pull/22872))
+* LED drivers: switch to i2c_writeReg() ([#22878](https://github.com/qmk/qmk_firmware/pull/22878))
+* LED drivers: remove `write_pwm_buffer()` from public API ([#22884](https://github.com/qmk/qmk_firmware/pull/22884))
+* i2c: rename read/write register functions ([#22905](https://github.com/qmk/qmk_firmware/pull/22905))
+* LED drivers: update I2C API usage ([#22951](https://github.com/qmk/qmk_firmware/pull/22951))
+* LED drivers: create structs to hold PWM/scaling buffers ([#22955](https://github.com/qmk/qmk_firmware/pull/22955))
+* Migrate and remove deprecated debug utils ([#22961](https://github.com/qmk/qmk_firmware/pull/22961))
+* Remove call to removed i2c function in azoteq driver ([#22966](https://github.com/qmk/qmk_firmware/pull/22966))
+* Tidy up print/debug logging headers ([#22969](https://github.com/qmk/qmk_firmware/pull/22969))
+* Begin removal of bootmagic lite terminology ([#22970](https://github.com/qmk/qmk_firmware/pull/22970))
+* LED drivers: place I2C addresses into an array ([#22975](https://github.com/qmk/qmk_firmware/pull/22975))
+* Removal of bootmagic lite terminology ([#22979](https://github.com/qmk/qmk_firmware/pull/22979))
+* Init pins for Analog Joystick sensor ([#22985](https://github.com/qmk/qmk_firmware/pull/22985))
+* Workaround for G431 eeprom emulation ([#23002](https://github.com/qmk/qmk_firmware/pull/23002))
+* is31fl3741: split PWM and scaling buffers ([#23049](https://github.com/qmk/qmk_firmware/pull/23049))
+* LED drivers: update PWM register defines for `g_<driver>_leds` ([#23052](https://github.com/qmk/qmk_firmware/pull/23052))
+* LED drivers: add support for shutdown pin ([#23058](https://github.com/qmk/qmk_firmware/pull/23058))
+* AW20216S: combine EN pin defines ([#23067](https://github.com/qmk/qmk_firmware/pull/23067))
+* Update naming convention for GPIO control macros ([#23085](https://github.com/qmk/qmk_firmware/pull/23085))
+* Update GPIO macro usages in core ([#23093](https://github.com/qmk/qmk_firmware/pull/23093))
+* OS Detection - Entire file should not be wrapped with ifdef ([#23108](https://github.com/qmk/qmk_firmware/pull/23108))
+* IS31FL3729 updates ([#23109](https://github.com/qmk/qmk_firmware/pull/23109))
+* Nix shell updates (Nixpkgs 2024-02-23, QMK CLI 1.1.5) ([#23143](https://github.com/qmk/qmk_firmware/pull/23143))
+
+CLI:
+* [Refactor] `qmk find` ([#21096](https://github.com/qmk/qmk_firmware/pull/21096))
+* [Refactor] Break `QGFImageFile`'s `_save` function into smaller pieces ([#21124](https://github.com/qmk/qmk_firmware/pull/21124))
+* [Enhancement] Prepare for `SyntaxWarning` ([#22562](https://github.com/qmk/qmk_firmware/pull/22562))
+* Flag invalid keyboard features during lint ([#22832](https://github.com/qmk/qmk_firmware/pull/22832))
+
+Submodule updates:
+* chore(chibios-contrib): sync with chibios-21.11.x ([#22560](https://github.com/qmk/qmk_firmware/pull/22560))
+
+Keyboards:
+* Move `redox_w` into `redox` ([#21448](https://github.com/qmk/qmk_firmware/pull/21448))
+* null ST110R2.1 (SaikouType) basic support with layouts ([#21623](https://github.com/qmk/qmk_firmware/pull/21623))
+* New keyboard addition: Orthograph ([#21770](https://github.com/qmk/qmk_firmware/pull/21770))
+* Add Olly JF Rev.2 ([#21775](https://github.com/qmk/qmk_firmware/pull/21775))
+* Cleanup Satisfaction75 Firmware and add new revisions ([#22082](https://github.com/qmk/qmk_firmware/pull/22082))
+* Migrate dynamic_keymap.layer_count < 4 where requried ([#22091](https://github.com/qmk/qmk_firmware/pull/22091))
+* Bastard Keyboards: Add support for Dilemma v2 (3x5+3) ([#22185](https://github.com/qmk/qmk_firmware/pull/22185))
+* Karn: correct layout data ([#22201](https://github.com/qmk/qmk_firmware/pull/22201))
+* zk3mod : added OLED ([#22303](https://github.com/qmk/qmk_firmware/pull/22303))
+* Adds support for the Iron180 V2 PCBs ([#22314](https://github.com/qmk/qmk_firmware/pull/22314))
+* Add 5x13 and 6x13 ortho community layouts ([#22315](https://github.com/qmk/qmk_firmware/pull/22315))
+* Cipulot refactoring ([#22368](https://github.com/qmk/qmk_firmware/pull/22368))
+* Remove era/klein ([#22384](https://github.com/qmk/qmk_firmware/pull/22384))
+* consolidate firmware folder in smoll parent folder ([#22401](https://github.com/qmk/qmk_firmware/pull/22401))
+* `keycapsss/plaid_pad`: switch to encoder map ([#22474](https://github.com/qmk/qmk_firmware/pull/22474))
+* Add EE-AT and move W1-AT under geonworks ([#22526](https://github.com/qmk/qmk_firmware/pull/22526))
+* refactor: projectcain/vault35 ([#22558](https://github.com/qmk/qmk_firmware/pull/22558))
+* Update Q5 ([#22575](https://github.com/qmk/qmk_firmware/pull/22575))
+* Update Q7 ([#22577](https://github.com/qmk/qmk_firmware/pull/22577))
+* Update Q8 ([#22578](https://github.com/qmk/qmk_firmware/pull/22578))
+* Update Q9 ([#22579](https://github.com/qmk/qmk_firmware/pull/22579))
+* Remove "empty" files ([#22603](https://github.com/qmk/qmk_firmware/pull/22603))
+* Rename Pumpkin Pad to Pumkinpad ([#22651](https://github.com/qmk/qmk_firmware/pull/22651))
+* Noodlepad Additions and Updates ([#22701](https://github.com/qmk/qmk_firmware/pull/22701))
+* Refactor: move miniaxe into kagizaraya ([#22708](https://github.com/qmk/qmk_firmware/pull/22708))
+* Refactor: move keyboards into zigotica folder ([#22709](https://github.com/qmk/qmk_firmware/pull/22709))
+* Refactor: move keyboards into laneware folder ([#22710](https://github.com/qmk/qmk_firmware/pull/22710))
+* Refactor: move keyboards into kezewa ([#22712](https://github.com/qmk/qmk_firmware/pull/22712))
+* Refactor: move keyboards into kbdmania folder ([#22714](https://github.com/qmk/qmk_firmware/pull/22714))
+* Refactor: move keyboards into monokei folder ([#22715](https://github.com/qmk/qmk_firmware/pull/22715))
+* Refactor: move keyboards into kumaokobo ([#22719](https://github.com/qmk/qmk_firmware/pull/22719))
+* Updating NCC1701KB and adding via support ([#22721](https://github.com/qmk/qmk_firmware/pull/22721))
+* Move Moonlander to ZSA folder ([#22740](https://github.com/qmk/qmk_firmware/pull/22740))
+* Refactor: group shandoncodes keyboards ([#22743](https://github.com/qmk/qmk_firmware/pull/22743))
+* Refactor: group rookiebwoy keyboards ([#22745](https://github.com/qmk/qmk_firmware/pull/22745))
+* Default folder correction for kumaokobo ([#22750](https://github.com/qmk/qmk_firmware/pull/22750))
+* Default folder correction for rookiebwoy ([#22753](https://github.com/qmk/qmk_firmware/pull/22753))
+* Refactor: move macro3 into handwired folder ([#22759](https://github.com/qmk/qmk_firmware/pull/22759))
+* Refactor: group kira keyboards ([#22760](https://github.com/qmk/qmk_firmware/pull/22760))
+* Refactor: group hub keyboards ([#22762](https://github.com/qmk/qmk_firmware/pull/22762))
+* Refactor: move p3d keyboards ([#22763](https://github.com/qmk/qmk_firmware/pull/22763))
+* Refactor: group kbdfans keyboards ([#22764](https://github.com/qmk/qmk_firmware/pull/22764))
+* Remove incorrect use of WS2812_PIO_USE_PIO1 ([#22771](https://github.com/qmk/qmk_firmware/pull/22771))
+* Migrate LED Matrix config to info.json ([#22792](https://github.com/qmk/qmk_firmware/pull/22792))
+* Migrate RGB Matrix config to info.json - [0-9] ([#22797](https://github.com/qmk/qmk_firmware/pull/22797))
+* Migrate RGB Matrix config to info.json - A ([#22798](https://github.com/qmk/qmk_firmware/pull/22798))
+* Late9 keymaps update, added VIA support ([#22801](https://github.com/qmk/qmk_firmware/pull/22801))
+* Migrate RGB Matrix config to info.json - B ([#22806](https://github.com/qmk/qmk_firmware/pull/22806))
+* Migrate RGB Matrix config to info.json - C ([#22807](https://github.com/qmk/qmk_firmware/pull/22807))
+* Migrate RGB Matrix config to info.json - EF ([#22808](https://github.com/qmk/qmk_firmware/pull/22808))
+* Migrate RGB Matrix config to info.json - D ([#22811](https://github.com/qmk/qmk_firmware/pull/22811))
+* H87g2 updates ([#22819](https://github.com/qmk/qmk_firmware/pull/22819))
+* WT boards: extract `g_is31fl3736_leds` from wt_mono_backlight ([#22823](https://github.com/qmk/qmk_firmware/pull/22823))
+* Migrate RGB Matrix config to info.json - G ([#22859](https://github.com/qmk/qmk_firmware/pull/22859))
+* Use existing columns for 3x5 layout ([#22860](https://github.com/qmk/qmk_firmware/pull/22860))
+* Migrate RGB Matrix config to info.json - H ([#22861](https://github.com/qmk/qmk_firmware/pull/22861))
+* Migrate RGB Matrix config to info.json - J ([#22862](https://github.com/qmk/qmk_firmware/pull/22862))
+* Migrate RGB Matrix config to info.json - I ([#22863](https://github.com/qmk/qmk_firmware/pull/22863))
+* Migrate RGB Matrix config to info.json - L ([#22864](https://github.com/qmk/qmk_firmware/pull/22864))
+* Migrate RGB Matrix config to info.json - NOPQ ([#22866](https://github.com/qmk/qmk_firmware/pull/22866))
+* Migrate RGB Matrix config to info.json - XZY ([#22879](https://github.com/qmk/qmk_firmware/pull/22879))
+* Zed65/no_backlight/cor65 correct data layout ([#22898](https://github.com/qmk/qmk_firmware/pull/22898))
+* Migrate RGB Matrix config to info.json - M ([#22908](https://github.com/qmk/qmk_firmware/pull/22908))
+* Migrate RGB Matrix config to info.json - RS ([#22909](https://github.com/qmk/qmk_firmware/pull/22909))
+* Migrate RGB Matrix config to info.json - TUVW ([#22910](https://github.com/qmk/qmk_firmware/pull/22910))
+* Migrate RGB Matrix config to info.json - K ([#22911](https://github.com/qmk/qmk_firmware/pull/22911))
+* Remove `LAYOUTS_HAS_RGB` ([#22917](https://github.com/qmk/qmk_firmware/pull/22917))
+* Migrate lighting defaults to info.json ([#22920](https://github.com/qmk/qmk_firmware/pull/22920))
+* Ensure LTO is enabled as a `info.json` build config option ([#22932](https://github.com/qmk/qmk_firmware/pull/22932))
+* refactor(keyboard): quokka ([#22942](https://github.com/qmk/qmk_firmware/pull/22942))
+* Sango Keyboard ([#22971](https://github.com/qmk/qmk_firmware/pull/22971))
+* Add FS streampad ([#22991](https://github.com/qmk/qmk_firmware/pull/22991))
+* Remove always enabled effects from lighting animation list ([#22992](https://github.com/qmk/qmk_firmware/pull/22992))
+* Migrate RGB Matrix config to info.json - keychron ([#22998](https://github.com/qmk/qmk_firmware/pull/22998))
+* Migrate RGB Matrix config to info.json - Misc ([#23000](https://github.com/qmk/qmk_firmware/pull/23000))
+* Remove ee_hands config from ferris/sweep firmware ([#23029](https://github.com/qmk/qmk_firmware/pull/23029))
+* Migrate dip switch config to info.json - keychron ([#23037](https://github.com/qmk/qmk_firmware/pull/23037))
+* [unicorne] Add a layout alias ([#23056](https://github.com/qmk/qmk_firmware/pull/23056))
+* nacly/sodium62: Update vid, pid, and add via keymap ([#23063](https://github.com/qmk/qmk_firmware/pull/23063))
+* LED drivers: update keyboard LED configs ([#23073](https://github.com/qmk/qmk_firmware/pull/23073))
+* Remove invalid keyboard level features ([#23074](https://github.com/qmk/qmk_firmware/pull/23074))
+* Migrate WEAR_LEVELING_* to info.json ([#23077](https://github.com/qmk/qmk_firmware/pull/23077))
+* [Keymap Removal] keyboard with most keymaps ([#23081](https://github.com/qmk/qmk_firmware/pull/23081))
+* Remove obvious user keymaps, keyboards/{v,x,y,z}* edition. ([#23083](https://github.com/qmk/qmk_firmware/pull/23083))
+* Remove obvious user keymaps, keyboards/{s,t}* edition. ([#23084](https://github.com/qmk/qmk_firmware/pull/23084))
+* [Keymap Removal] keyboard with most keymaps ([#23092](https://github.com/qmk/qmk_firmware/pull/23092))
+* Fiuxup takashicompany/heavy_left ([#23094](https://github.com/qmk/qmk_firmware/pull/23094))
+* Remove obvious user keymaps, keyboards/{i,j,k}* edition ([#23102](https://github.com/qmk/qmk_firmware/pull/23102))
+* Manual user keymap removal ([#23104](https://github.com/qmk/qmk_firmware/pull/23104))
+* Manual user keymap removal ([#23119](https://github.com/qmk/qmk_firmware/pull/23119))
+* Migrate `RGBLED_NUM` -> `RGBLIGHT_LED_COUNT` in remaining non-user keymaps ([#23128](https://github.com/qmk/qmk_firmware/pull/23128))
+
+Keyboard fixes:
+* Fix VID and PID for AnnePro2 ([#22263](https://github.com/qmk/qmk_firmware/pull/22263))
+* fix(kikoslab/kl90): Fix firmware to support encoder knobs properly ([#22649](https://github.com/qmk/qmk_firmware/pull/22649))
+* fix: improper usage of keyboard/user-level functions ([#22652](https://github.com/qmk/qmk_firmware/pull/22652))
+* Temporary fix for mechlovin/olly/octagon ([#22796](https://github.com/qmk/qmk_firmware/pull/22796))
+* Keychron Q11 usb poweron fix ([#22799](https://github.com/qmk/qmk_firmware/pull/22799))
+* capsunlocked/cu80/v2: Fix invalid RGB matrix config ([#22873](https://github.com/qmk/qmk_firmware/pull/22873))
+* Fix typo in Redox config ([#22899](https://github.com/qmk/qmk_firmware/pull/22899))
+* Fixup doio/kb16 ([#22921](https://github.com/qmk/qmk_firmware/pull/22921))
+* Fixup takashicompany/minizone ([#22922](https://github.com/qmk/qmk_firmware/pull/22922))
+* Fixup sofle ([#22934](https://github.com/qmk/qmk_firmware/pull/22934))
+* Fix Issue with RGB Matrix not understanding the split keyboard ([#22997](https://github.com/qmk/qmk_firmware/pull/22997))
+* Fixup sawnsprojects/krush60 ([#23095](https://github.com/qmk/qmk_firmware/pull/23095))
+* Fixup kbd67/rev1 ([#23096](https://github.com/qmk/qmk_firmware/pull/23096))
+* Fixup boardsource/equals ([#23106](https://github.com/qmk/qmk_firmware/pull/23106))
+* Fixup inett_studio/sq80 ([#23121](https://github.com/qmk/qmk_firmware/pull/23121))
+* Add LED/RGB Matrix drivers to info.json schema ([#23127](https://github.com/qmk/qmk_firmware/pull/23127))
+* Fix for multiple AMUX usage ([#23155](https://github.com/qmk/qmk_firmware/pull/23155))
+
+Bugs:
+* MIDI sustain effect fix on qmk 0.22.2 ([#22114](https://github.com/qmk/qmk_firmware/pull/22114))
+* Prevent `qmk migrate` processing unparsed info.json values ([#22374](https://github.com/qmk/qmk_firmware/pull/22374))
+* Remove redundant backlight eeconfig init ([#22675](https://github.com/qmk/qmk_firmware/pull/22675))
+* pointing_device ifdef indentation fix ([#22802](https://github.com/qmk/qmk_firmware/pull/22802))
+* Ensure LED config is extracted when feature is disabled ([#22809](https://github.com/qmk/qmk_firmware/pull/22809))
+* Generate true/false for _DEFAULT_ON options ([#22829](https://github.com/qmk/qmk_firmware/pull/22829))
+* is31fl3733: fix driver sync backwards compatibility defines ([#22851](https://github.com/qmk/qmk_firmware/pull/22851))
+* LED drivers: misc formatting and typos ([#22857](https://github.com/qmk/qmk_firmware/pull/22857))
+* Allow generation of both LED and RGB Matrix config ([#22896](https://github.com/qmk/qmk_firmware/pull/22896))
+* LED drivers: remove PWM register offsets ([#22897](https://github.com/qmk/qmk_firmware/pull/22897))
+* `qmk format-json`: Force Unix line endings and ensure LF at EOF ([#22901](https://github.com/qmk/qmk_firmware/pull/22901))
+* Fix cirque connected check ([#22948](https://github.com/qmk/qmk_firmware/pull/22948))
+* Fix joystick initialization ([#22953](https://github.com/qmk/qmk_firmware/pull/22953))
+* Workaround for `make test:all DEBUG=1` ([#23047](https://github.com/qmk/qmk_firmware/pull/23047))
+* Fix unit test execution ([#23048](https://github.com/qmk/qmk_firmware/pull/23048))
+* Fix git-submodule running in wrong location ([#23059](https://github.com/qmk/qmk_firmware/pull/23059))
+* WS2812 bitbang: prefix for `NOP_FUDGE` define ([#23110](https://github.com/qmk/qmk_firmware/pull/23110))
+* Fix make clean test:os_detection ([#23112](https://github.com/qmk/qmk_firmware/pull/23112))
+* Fix pmw33xx sensor corruption on get-cpi call ([#23116](https://github.com/qmk/qmk_firmware/pull/23116))
+* Ensure `qmk generate-compilation-database` copies to userspace as well. ([#23129](https://github.com/qmk/qmk_firmware/pull/23129))
diff --git a/docs/_summary.md b/docs/_summary.md
index bae93da5b6c..fb584955ce1 100644
--- a/docs/_summary.md
+++ b/docs/_summary.md
@@ -138,7 +138,7 @@
   * Breaking Changes
     * [Overview](breaking_changes.md)
     * [My Pull Request Was Flagged](breaking_changes_instructions.md)
-    * [Most Recent ChangeLog](ChangeLog/20231126.md "QMK v0.23.0 - 2023 Nov 26")
+    * [Most Recent ChangeLog](ChangeLog/20240225.md "QMK v0.24.0 - 2024 Feb 25")
     * [Past Breaking Changes](breaking_changes_history.md)
 
   * C Development
diff --git a/docs/breaking_changes.md b/docs/breaking_changes.md
index 70a9044c8c0..b60118cd641 100644
--- a/docs/breaking_changes.md
+++ b/docs/breaking_changes.md
@@ -10,25 +10,25 @@ Practically, this means QMK merges the `develop` branch into the `master` branch
 
 ## What has been included in past Breaking Changes?
 
+* [2024 Feb 25](ChangeLog/20240225.md)
 * [2023 Nov 26](ChangeLog/20231126.md)
 * [2023 Aug 27](ChangeLog/20230827.md)
-* [2023 May 28](ChangeLog/20230528.md)
 * [Older Breaking Changes](breaking_changes_history.md)
 
 ## When is the next Breaking Change?
 
-The next Breaking Change is scheduled for November 26, 2023.
+The next Breaking Change is scheduled for May 26, 2024.
 
 ### Important Dates
 
-* 2023 Nov 26 - `develop` is tagged with a new release version. Each push to `master` is subsequently merged to `develop` by GitHub actions.
-* 2024 Jan 28 - `develop` closed to new PRs.
-* 2024 Jan 28 - Call for testers.
-* 2024 Feb 4 - Last day for merges -- after this point `develop` is locked for testing and accepts only bugfixes
-* 2024 Feb 18 - `develop` is locked, only critical bugfix PRs merged.
-* 2024 Feb 22 - `master` is locked, no PRs merged.
-* 2024 Feb 25 - Merge `develop` to `master`.
-* 2024 Feb 25 - `master` is unlocked. PRs can be merged again.
+* 2024 Feb 25 - `develop` is tagged with a new release version. Each push to `master` is subsequently merged to `develop` by GitHub actions.
+* 2024 Apr 28 - `develop` closed to new PRs.
+* 2024 Apr 28 - Call for testers.
+* 2024 May 5 - Last day for merges -- after this point `develop` is locked for testing and accepts only bugfixes
+* 2024 May 19 - `develop` is locked, only critical bugfix PRs merged.
+* 2024 May 23 - `master` is locked, no PRs merged.
+* 2024 May 26 - Merge `develop` to `master`.
+* 2024 May 26 - `master` is unlocked. PRs can be merged again.
 
 ## What changes will be included?
 
@@ -48,7 +48,7 @@ Criteria for acceptance:
 
 Strongly suggested:
 
-* The PR has a ChangeLog file describing the changes under `<qmk_firmware>/docs/Changelog/20240225`.
+* The PR has a ChangeLog file describing the changes under `<qmk_firmware>/docs/Changelog/20240526`.
     * This should be in Markdown format, with a name in the format `PR12345.md`, substituting the digits for your PRs ID.
     * One strong recommendation that the ChangeLog document matches the PR description on GitHub, so as to ensure traceability.
 
diff --git a/docs/breaking_changes_history.md b/docs/breaking_changes_history.md
index 4ab890294bb..6e304685b52 100644
--- a/docs/breaking_changes_history.md
+++ b/docs/breaking_changes_history.md
@@ -2,6 +2,7 @@
 
 This page links to all previous changelogs from the QMK Breaking Changes process.
 
+* [2024 Feb 25](ChangeLog/20240225.md) - version 0.24.0
 * [2023 Nov 26](ChangeLog/20231126.md) - version 0.23.0
 * [2023 Aug 27](ChangeLog/20230827.md) - version 0.22.0
 * [2023 May 28](ChangeLog/20230528.md) - version 0.21.0
diff --git a/docs/cli_commands.md b/docs/cli_commands.md
index 147888f718c..d707632b568 100644
--- a/docs/cli_commands.md
+++ b/docs/cli_commands.md
@@ -797,3 +797,39 @@ This command converts a TTF font to an intermediate format for editing, before c
 
 This command converts an intermediate font image to the QFF File Format. See the [Quantum Painter](quantum_painter.md?id=quantum-painter-cli) documentation for more information on this command.
 
+## `qmk test-c`
+
+This command runs the C unit test suite. If you make changes to C code you should ensure this runs successfully.
+
+**Usage**:
+
+```
+qmk test-c [-h] [-t TEST] [-l] [-c] [-e ENV] [-j PARALLEL]
+
+options:
+  -h, --help            show this help message and exit
+  -t TEST, --test TEST  Test to run from the available list. Supports wildcard globs. May be passed multiple times.
+  -l, --list            List available tests.
+  -c, --clean           Remove object files before compiling.
+  -e ENV, --env ENV     Set a variable to be passed to make. May be passed multiple times.
+  -j PARALLEL, --parallel PARALLEL
+                        Set the number of parallel make jobs; 0 means unlimited.
+```
+
+**Examples**:
+
+Run entire test suite:
+
+    qmk test-c
+
+List available tests:
+
+    qmk test-c --list
+
+Run matching test:
+
+    qmk test-c --test unicode*
+
+Run single test:
+
+    qmk test-c --test basic
diff --git a/docs/driver_installation_zadig.md b/docs/driver_installation_zadig.md
index 3b2c0b74dc4..0440d6a4aa5 100644
--- a/docs/driver_installation_zadig.md
+++ b/docs/driver_installation_zadig.md
@@ -70,13 +70,13 @@ The device name here is the name that appears in Zadig, and may not be what the
 
 |Bootloader    |Device Name                   |VID/PID       |Driver |
 |--------------|------------------------------|--------------|-------|
-|`atmel-dfu`   |ATmega16u2 DFU                |`03EB:2FEF`   |libusb0|
-|`atmel-dfu`   |ATmega32U2 DFU                |`03EB:2FF0`   |libusb0|
-|`atmel-dfu`   |ATm16U4 DFU V1.0.2            |`03EB:2FF3`   |libusb0|
-|`atmel-dfu`   |ATm32U4DFU                    |`03EB:2FF4`   |libusb0|
-|`atmel-dfu`   |*none* (AT90USB64)            |`03EB:2FF9`   |libusb0|
-|`atmel-dfu`   |AT90USB128 DFU                |`03EB:2FFB`   |libusb0|
-|`qmk-dfu`     |(keyboard name) Bootloader    |As `atmel-dfu`|libusb0|
+|`atmel-dfu`   |ATmega16u2 DFU                |`03EB:2FEF`   |WinUSB |
+|`atmel-dfu`   |ATmega32U2 DFU                |`03EB:2FF0`   |WinUSB |
+|`atmel-dfu`   |ATm16U4 DFU V1.0.2            |`03EB:2FF3`   |WinUSB |
+|`atmel-dfu`   |ATm32U4DFU                    |`03EB:2FF4`   |WinUSB |
+|`atmel-dfu`   |*none* (AT90USB64)            |`03EB:2FF9`   |WinUSB |
+|`atmel-dfu`   |AT90USB128 DFU                |`03EB:2FFB`   |WinUSB |
+|`qmk-dfu`     |(keyboard name) Bootloader    |As `atmel-dfu`|WinUSB |
 |`halfkay`     |*none*                        |`16C0:0478`   |HidUsb |
 |`caterina`    |Pro Micro 3.3V                |`1B4F:9203`   |usbser |
 |`caterina`    |Pro Micro 5V                  |`1B4F:9205`   |usbser |
diff --git a/docs/feature_audio.md b/docs/feature_audio.md
index 5227d063c3a..05f32e98401 100644
--- a/docs/feature_audio.md
+++ b/docs/feature_audio.md
@@ -171,29 +171,31 @@ The available keycodes for audio are:
 
 ## Audio Config
 
-| Settings                        | Default              | Description                                                                   |
-|---------------------------------|----------------------|-------------------------------------------------------------------------------|
-|`AUDIO_PIN`                      | *Not defined*        |Configures the pin that the speaker is connected to.                           |
-|`AUDIO_PIN_ALT`                  | *Not defined*        |Configures the pin for a second speaker or second pin connected to one speaker.|
-|`AUDIO_PIN_ALT_AS_NEGATIVE`      | *Not defined*        |Enables support for one speaker connected to two pins.                         |
-|`AUDIO_INIT_DELAY`               | *Not defined*        |Enables delay during startup song to accomidate for USB startup issues.        |
-|`AUDIO_ENABLE_TONE_MULTIPLEXING` | *Not defined*        |Enables time splicing/multiplexing to create multiple tones simutaneously.     |
-|`STARTUP_SONG`                   | `STARTUP_SOUND`      |Plays when the keyboard starts up (audio.c)                                    |
-|`GOODBYE_SONG`                   | `GOODBYE_SOUND`      |Plays when you press the QK_BOOT key (quantum.c)                               |
-|`AG_NORM_SONG`                   | `AG_NORM_SOUND`      |Plays when you press AG_NORM (process_magic.c)                                 |
-|`AG_SWAP_SONG`                   | `AG_SWAP_SOUND`      |Plays when you press AG_SWAP (process_magic.c)                                 |
-|`CG_NORM_SONG`                   | `AG_NORM_SOUND`      |Plays when you press CG_NORM (process_magic.c)                                 |
-|`CG_SWAP_SONG`                   | `AG_SWAP_SOUND`      |Plays when you press CG_SWAP (process_magic.c)                                 |
-|`MUSIC_ON_SONG`                  | `MUSIC_ON_SOUND`     |Plays when music mode is activated (process_music.c)                           |
-|`MUSIC_OFF_SONG`                 | `MUSIC_OFF_SOUND`    |Plays when music mode is deactivated (process_music.c)                         |
-|`MIDI_ON_SONG`                   | `MUSIC_ON_SOUND`     |Plays when midi mode is activated (process_music.c)                            |
-|`MIDI_OFF_SONG`                  | `MUSIC_OFF_SOUND`    |Plays when midi mode is deactivated (process_music.c)                          |
-|`CHROMATIC_SONG`                 | `CHROMATIC_SOUND`    |Plays when the chromatic music mode is selected (process_music.c)              |
-|`GUITAR_SONG`                    | `GUITAR_SOUND`       |Plays when the guitar music mode is selected (process_music.c)                 |
-|`VIOLIN_SONG`                    | `VIOLIN_SOUND`       |Plays when the violin music mode is selected (process_music.c)                 |
-|`MAJOR_SONG`                     | `MAJOR_SOUND`        |Plays when the major music mode is selected (process_music.c)                  |
-|`DEFAULT_LAYER_SONGS`            | *Not defined*        |Plays song when switched default layers with [`set_single_persistent_default_layer(layer)`](ref_functions.md#setting-the-persistent-default-layer)(quantum.c)       |
-|`SENDSTRING_BELL`                | *Not defined*        |Plays chime when the "enter" ("\a") character is sent (send_string.c)          |
+| Settings                         | Default              | Description                                                                                 |
+|----------------------------------|----------------------|---------------------------------------------------------------------------------------------|
+|`AUDIO_PIN`                       | *Not defined*        |Configures the pin that the speaker is connected to.                                         |
+|`AUDIO_PIN_ALT`                   | *Not defined*        |Configures the pin for a second speaker or second pin connected to one speaker.              |
+|`AUDIO_PIN_ALT_AS_NEGATIVE`       | *Not defined*        |Enables support for one speaker connected to two pins.                                       |
+|`AUDIO_INIT_DELAY`                | *Not defined*        |Enables delay during startup song to accomidate for USB startup issues.                      |
+|`AUDIO_ENABLE_TONE_MULTIPLEXING`  | *Not defined*        |Enables time splicing/multiplexing to create multiple tones simutaneously.                   |
+|`AUDIO_POWER_CONTROL_PIN`         | *Not defined*        |Enables power control code to enable or cut off power to speaker (such as with PAM8302 amp). |
+|`AUDIO_POWER_CONTROL_PIN_ON_STATE`| `1`                  |The state of the audio power control pin when audio is "on" - `1` for high, `0` for low.     |
+|`STARTUP_SONG`                    | `STARTUP_SOUND`      |Plays when the keyboard starts up (audio.c)                                                  |
+|`GOODBYE_SONG`                    | `GOODBYE_SOUND`      |Plays when you press the QK_BOOT key (quantum.c)                                             |
+|`AG_NORM_SONG`                    | `AG_NORM_SOUND`      |Plays when you press AG_NORM (process_magic.c)                                               |
+|`AG_SWAP_SONG`                    | `AG_SWAP_SOUND`      |Plays when you press AG_SWAP (process_magic.c)                                               |
+|`CG_NORM_SONG`                    | `AG_NORM_SOUND`      |Plays when you press CG_NORM (process_magic.c)                                               |
+|`CG_SWAP_SONG`                    | `AG_SWAP_SOUND`      |Plays when you press CG_SWAP (process_magic.c)                                               |
+|`MUSIC_ON_SONG`                   | `MUSIC_ON_SOUND`     |Plays when music mode is activated (process_music.c)                                         |
+|`MUSIC_OFF_SONG`                  | `MUSIC_OFF_SOUND`    |Plays when music mode is deactivated (process_music.c)                                       |
+|`MIDI_ON_SONG`                    | `MUSIC_ON_SOUND`     |Plays when midi mode is activated (process_music.c)                                          |
+|`MIDI_OFF_SONG`                   | `MUSIC_OFF_SOUND`    |Plays when midi mode is deactivated (process_music.c)                                        |
+|`CHROMATIC_SONG`                  | `CHROMATIC_SOUND`    |Plays when the chromatic music mode is selected (process_music.c)                            |
+|`GUITAR_SONG`                     | `GUITAR_SOUND`       |Plays when the guitar music mode is selected (process_music.c)                               |
+|`VIOLIN_SONG`                     | `VIOLIN_SOUND`       |Plays when the violin music mode is selected (process_music.c)                               |
+|`MAJOR_SONG`                      | `MAJOR_SOUND`        |Plays when the major music mode is selected (process_music.c)                                |
+|`DEFAULT_LAYER_SONGS`             | *Not defined*        |Plays song when switched default layers with [`set_single_persistent_default_layer(layer)`](ref_functions.md#setting-the-persistent-default-layer)(quantum.c). |
+|`SENDSTRING_BELL`                 | *Not defined*        |Plays chime when the "enter" ("\a") character is sent (send_string.c)                        |
 
 ## Tempo
 the 'speed' at which SONGs are played is dictated by the set Tempo, which is measured in beats-per-minute. Note lengths are defined relative to that.
diff --git a/docs/feature_bootmagic.md b/docs/feature_bootmagic.md
index 4239cdfd2a2..564760be925 100644
--- a/docs/feature_bootmagic.md
+++ b/docs/feature_bootmagic.md
@@ -1,8 +1,8 @@
-# Bootmagic Lite :id=bootmagic-lite
+# Bootmagic :id=bootmagic
 
-The Bootmagic Lite feature that only handles jumping into the bootloader. This is great for boards that don't have a physical reset button, giving you a way to jump into the bootloader
+The Bootmagic feature that only handles jumping into the bootloader. This is great for boards that don't have a physical reset button, giving you a way to jump into the bootloader
 
-On some keyboards Bootmagic Lite is disabled by default. If this is the case, it must be explicitly enabled in your `rules.mk` with:
+On some keyboards Bootmagic is disabled by default. If this is the case, it must be explicitly enabled in your `rules.mk` with:
 
 ```make
 BOOTMAGIC_ENABLE = yes
@@ -11,15 +11,15 @@ BOOTMAGIC_ENABLE = yes
 Additionally, you may want to specify which key to use. This is especially useful for keyboards that have unusual matrices. To do so, you need to specify the row and column of the key that you want to use. Add these entries to your `config.h` file:
 
 ```c
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 1
+#define BOOTMAGIC_ROW 0
+#define BOOTMAGIC_COLUMN 1
 ```
 
 By default, these are set to 0 and 0, which is usually the "ESC" key on a majority of keyboards.
 
 And to trigger the bootloader, you hold this key down when plugging the keyboard in. Just the single key.
 
-!> Using Bootmagic Lite will **always reset** the EEPROM, so you will lose any settings that have been saved.
+!> Using Bootmagic will **always reset** the EEPROM, so you will lose any settings that have been saved.
 
 ## Split Keyboards
 
@@ -44,35 +44,35 @@ When [handedness](feature_split_keyboard.md#setting-handedness) is predetermined
     }
 ```
 
-If you pick the top right key for the right half, it is `R05` on the top layout. Within the key matrix below, `R05` is located on row 4 columnn 4. To use that key as the right half's Bootmagic Lite trigger, add these entries to your `config.h` file:
+If you pick the top right key for the right half, it is `R05` on the top layout. Within the key matrix below, `R05` is located on row 4 columnn 4. To use that key as the right half's Bootmagic trigger, add these entries to your `config.h` file:
 
 ```c
-#define BOOTMAGIC_LITE_ROW_RIGHT 4
-#define BOOTMAGIC_LITE_COLUMN_RIGHT 4
+#define BOOTMAGIC_ROW_RIGHT 4
+#define BOOTMAGIC_COLUMN_RIGHT 4
 ```
 
 ?> These values are not set by default.
 
-## Advanced Bootmagic Lite
+## Advanced Bootmagic
 
-The `bootmagic_lite` function is defined weakly, so that you can replace this in your code, if you need. A great example of this is the Zeal60 boards that have some additional handling needed.
+The `bootmagic_scan` function is defined weakly, so that you can replace this in your code, if you need. A great example of this is the Zeal60 boards that have some additional handling needed.
 
 To replace the function, all you need to do is add something like this to your code:
 
 ```c
-void bootmagic_lite(void) {
+void bootmagic_scan(void) {
     matrix_scan();
     wait_ms(DEBOUNCE * 2);
     matrix_scan();
 
-    if (matrix_get_row(BOOTMAGIC_LITE_ROW) & (1 << BOOTMAGIC_LITE_COLUMN)) {
+    if (matrix_get_row(BOOTMAGIC_ROW) & (1 << BOOTMAGIC_COLUMN)) {
       // Jump to bootloader.
       bootloader_jump();
     }
 }
 ```
 
-You can define additional logic here. For instance, resetting the EEPROM or requiring additional keys to be pressed to trigger Bootmagic Lite. Keep in mind that `bootmagic_lite` is called before a majority of features are initialized in the firmware.
+You can define additional logic here. For instance, resetting the EEPROM or requiring additional keys to be pressed to trigger Bootmagic. Keep in mind that `bootmagic_scan` is called before a majority of features are initialized in the firmware.
 
 ## Addenda
 
diff --git a/docs/feature_combo.md b/docs/feature_combo.md
index 2e802446b6b..61f8b2ee197 100644
--- a/docs/feature_combo.md
+++ b/docs/feature_combo.md
@@ -333,27 +333,26 @@ will give the _NAV layer as a reference to it's self. All other layers
 will have the default for their combo reference layer. If the default
 is not set, all other layers will reference themselves.
 
-    ```c
-    #define COMBO_REF_DEFAULT _MY_COMBO_LAYER
-    ...
+```c
+#define COMBO_REF_DEFAULT _MY_COMBO_LAYER
 
-    uint8_t combo_ref_from_layer(uint8_t layer){
-        switch (get_highest_layer(layer_state)){
-            case _DVORAK: return _QWERTY;
-            case _NAV: return _NAV;
-            default: return _MY_COMBO_LAYER;
-        }
-        return layer;  // important if default is not in case.
+uint8_t combo_ref_from_layer(uint8_t layer){
+    switch (get_highest_layer(layer_state)){
+        case _DVORAK: return _QWERTY;
+        case _NAV: return _NAV;
+        default: return _MY_COMBO_LAYER;
     }
-    ```
+    return layer;  // important if default is not in case.
+}
+```
 
 The equivalent definition using the combo macros is this:
 
-    ```c
-    COMBO_REF_LAYER(_DVORAK, _QWERTY)
-    COMBO_REF_LAYER(_NAV, _NAV)
-    DEFAULT_REF_LAYER(_MY_COMBO_LAYER).
-    ```
+```c
+COMBO_REF_LAYER(_DVORAK, _QWERTY)
+COMBO_REF_LAYER(_NAV, _NAV)
+DEFAULT_REF_LAYER(_MY_COMBO_LAYER).
+```
     
 
 ## User callbacks
diff --git a/docs/feature_pointing_device.md b/docs/feature_pointing_device.md
index b091dec08b9..f55b3082861 100644
--- a/docs/feature_pointing_device.md
+++ b/docs/feature_pointing_device.md
@@ -780,6 +780,9 @@ There are several functions that allow for more advanced interaction with the au
 | `get_auto_mouse_timeout(void)`                             | Return the current timeout for turing off the layer                                  |                           |      `uint16_t` |
 | `set_auto_mouse_debounce(uint16_t timeout)`                | Change/set the debounce for preventing layer activation                              |                           |    `void`(None) |
 | `get_auto_mouse_debounce(void)`                            | Return the current debounce for preventing layer activation                          |                           |       `uint8_t` |
+| `is_auto_mouse_active(void)`                               | Returns the active state of the auto mouse layer (eg if the layer has been triggered)|                           |          `bool` |
+| `get_auto_mouse_key_tracker(void)`                         | Gets the current count for the auto mouse key tracker.                               |                           |        `int8_t` |
+| `set_auto_mouse_key_tracker(int8_t key_tracker)`           | Sets/Overrides the current count for the auto mouse key tracker.                     |                           |    `void`(None) |
 
 _NOTES:_   
     - _Due to the nature of how some functions work, the `auto_mouse_trigger_reset`, and `auto_mouse_layer_off` functions should never be called in the `layer_state_set_*` stack as this can cause indefinite loops._   
diff --git a/docs/ja/feature_bootmagic.md b/docs/ja/feature_bootmagic.md
index 2ad6fc85313..c146176a7ee 100644
--- a/docs/ja/feature_bootmagic.md
+++ b/docs/ja/feature_bootmagic.md
@@ -139,8 +139,8 @@ BOOTMAGIC_ENABLE = lite
 さらに、どのキーを使うかを指定したほうが良いかもしれません。これは普通ではないマトリックスを持つキーボードで特に便利です。そのためには、使いたいキーの行と列を指定する必要があります。`config.h` ファイルにこれらのエントリを追加します:
 
 ```c
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 1
+#define BOOTMAGIC_ROW 0
+#define BOOTMAGIC_COLUMN 1
 ```
 
 デフォルトでは、これらは 0 と 0 に設定されます。これは通常はほとんどのキーボードで "ESC" キーです。
@@ -154,8 +154,8 @@ BOOTMAGIC_ENABLE = lite
 `SPLIT_HAND_PIN` のようなオプションで、左右の設定があらかじめ決められている場合は、キーボードの左右で別のキーを設定する必要があるかもしれません。これを行うには、`config.h` ファイルに以下のエントリを追加します。
 
 ```c
-#define BOOTMAGIC_LITE_ROW_RIGHT 4
-#define BOOTMAGIC_LITE_COLUMN_RIGHT 1
+#define BOOTMAGIC_ROW_RIGHT 4
+#define BOOTMAGIC_COLUMN_RIGHT 1
 ```
 
 デフォルトでは、これらの値は設定されていません。
@@ -172,7 +172,7 @@ void bootmagic_lite(void) {
     wait_ms(DEBOUNCE * 2);
     matrix_scan();
 
-    if (matrix_get_row(BOOTMAGIC_LITE_ROW) & (1 << BOOTMAGIC_LITE_COLUMN)) {
+    if (matrix_get_row(BOOTMAGIC_ROW) & (1 << BOOTMAGIC_COLUMN)) {
       // ブートローダにジャンプする。
       bootloader_jump();
     }
diff --git a/docs/other_vscode.md b/docs/other_vscode.md
index 49d5035b08e..4c71a0eb1c6 100644
--- a/docs/other_vscode.md
+++ b/docs/other_vscode.md
@@ -117,3 +117,77 @@ Using the [standard `compile_commands.json` database](https://clang.llvm.org/doc
 1. Start typing `clangd: Restart Language Server` and select it when it appears.
 
 Now you're ready to code QMK Firmware in VS Code!
+
+# Debugging ARM MCUs with Visual Studio Code
+
+**...and a Black Magic Probe.**
+
+Visual Studio Code has the ability to debug applications, but requires some configuration in order to get it to be able to do so for ARM targets.
+
+This documentation describes a known-working configuration for setting up the use of a Black Magic Probe to debug using VS Code.
+
+It is assumed that you've correctly set up the electrical connectivity of the Black Magic Probe with your MCU. Wiring up `NRST`, `SWDIO`, `SWCLK`, and `GND` should be enough.
+
+Install the following plugin into VS Code:
+
+* [Cortex-Debug](https://marketplace.visualstudio.com/items?itemName=marus25.cortex-debug) - 
+  This adds debugger support for ARM Cortex targets to VS Code.
+
+A debugging target for the MCU for your board needs to be defined, and can be done so by adding the following to a `.vscode/launch.json` file:
+
+```json
+{
+  // Use IntelliSense to learn about possible attributes.
+  // Hover to view descriptions of existing attributes.
+  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "Black Magic Probe (OneKey Proton-C)",
+      "type": "cortex-debug",
+      "request": "launch",
+      "cwd": "${workspaceRoot}",
+      "executable": "${workspaceRoot}/.build/handwired_onekey_proton_c_default.elf",
+      "servertype": "bmp",
+      "BMPGDBSerialPort": "COM4",
+      "svdFile": "Q:\\svd\\STM32F303.svd",
+      "device": "STM32F303",
+      "v1": false,
+      "windows": {
+        "armToolchainPath": "C:\\QMK_MSYS\\mingw64\\bin"
+      }
+    }
+  ]
+}
+```
+
+You'll need to perform some modifications to the file above in order to target your specific device:
+
+* `"name"`: Can be anything, but if you're debugging multiple targets you'll want something descriptive here.
+* `"cwd"`: The path to the QMK Firmware repository root directory -- _if using the `.vscode` directory existing in the `qmk_firmware` git repository, the default above should be correct_
+* `"executable"`: The path to the `elf` file generated as part of the build for your keyboard -- _exists in `<qmk_firmware>/.build`_
+* `"BMPGDBSerialPort"`: The `COM` port under Windows, or the `/dev/...` path for Linux/macOS. Two serial port devices will be created -- the Black Magic Probe debug port is *usually* the first. If it doesn't work, try the second.
+* `"svdFile"`: _[Optional]_ The path to the SVD file that defines the register layout for the MCU -- the appropriate file can be downloaded from the [cmsis-svd repository](https://github.com/posborne/cmsis-svd/tree/master/data/STMicro)
+* `"device"`: The name of the MCU, which matches the `<name>` tag at the top of the downloaded `svd` file.
+* `"armToolchainPath"`: _[Optional]_ The path to the ARM toolchain installation location on Windows -- under normal circumstances Linux/macOS will auto-detect this correctly and will not need to be specified. 
+
+!> Windows builds of QMK Firmware are generally compiled using QMK MSYS, and the path to gdb's location (`C:\\QMK_MSYS\\mingw64\\bin`) needs to be specified under `armToolchainPath` for it to be detected. You may also need to change the GDB path to point at `C:\\QMK_MSYS\\mingw64\\bin\\gdb-multiarch.exe` in the VSCode Cortex-Debug user settings: ![VSCode Settings](https://i.imgur.com/EGrPM1L.png)
+
+Optionally, the following modifications should also be made to the keyboard's `rules.mk` file to disable optimisations -- not strictly required but will ensure breakpoints and variable viewing works correctly:
+```makefile
+# Disable optimisations for debugging purposes
+LTO_ENABLE = no
+OPT = g
+DEBUG = 3
+```
+
+At this point, you should build and flash your firmware through normal methods (`qmk compile ...` and `qmk flash ...`).
+
+Once completed, you can:
+* Switch to the debug view in VS Code (in the sidebar, the Play button with a bug next to it)
+* Select the newly-created debug target in the dropdown at the top of the sidebar
+* Click the green play button next to the dropdown
+
+VS Code's debugger will then start executing the compiled firmware on the MCU.
+
+At this stage, you should have full debugging set up, with breakpoints and variable listings working!
diff --git a/docs/platformdev_rp2040.md b/docs/platformdev_rp2040.md
index 890dadb6f06..593a8198eb1 100644
--- a/docs/platformdev_rp2040.md
+++ b/docs/platformdev_rp2040.md
@@ -2,7 +2,7 @@
 
 The following table shows the current driver status for peripherals on RP2040 MCUs:
 
-|                              System                              |                    Support                     |
+| System                                                           | Support                                        |
 | ---------------------------------------------------------------- | ---------------------------------------------- |
 | [ADC driver](adc_driver.md)                                      | :heavy_check_mark:                             |
 | [Audio](audio_driver.md#pwm-hardware)                            | :heavy_check_mark:                             |
@@ -13,7 +13,7 @@ The following table shows the current driver status for peripherals on RP2040 MC
 | [External EEPROMs](eeprom_driver.md)                             | :heavy_check_mark: using `I2C` or `SPI` driver |
 | [EEPROM emulation](eeprom_driver.md#wear_leveling-configuration) | :heavy_check_mark:                             |
 | [serial driver](serial_driver.md)                                | :heavy_check_mark: using `SIO` or `PIO` driver |
-| [UART driver](uart_driver.md)                                    | Support planned (no ETA)                       |
+| [UART driver](uart_driver.md)                                    | :heavy_check_mark: using `SIO` driver          |
 
 ## GPIO
 
@@ -52,6 +52,13 @@ To configure the I2C driver please read the [ChibiOS/ARM](i2c_driver.md#arm-conf
 
 To configure the SPI driver please read the [ChibiOS/ARM](spi_driver.md#chibiosarm-configuration) section.
 
+### UART Driver
+
+| RP2040 Peripheral | `mcuconf.h` values | `UART_DRIVER` |
+| ----------------- | ------------------ | ------------- |
+| `UART0`           | `RP_SIO_USE_UART0` | `SIOD0`       |
+| `UART1`           | `RP_SIO_USE_UART1` | `SIOD1`       |
+
 ## Double-tap reset boot-loader entry :id=double-tap
 
 The double-tap reset mechanism is an alternate way in QMK to enter the embedded mass storage UF2 boot-loader of the RP2040. It enables bootloader entry by a fast double-tap of the reset pin on start up, which is similar to the behavior of AVR Pro Micros. This feature activated by default for the Pro Micro RP2040 board, but has to be configured for other boards. To activate it, add the following options to your keyboards `config.h` file:
@@ -87,6 +94,10 @@ This is the default board that is chosen, unless any other RP2040 board is selec
 | `SOFT_SERIAL_PIN`                                                          | undefined, use `SERIAL_USART_TX_PIN` |
 | `SERIAL_USART_TX_PIN`                                                      | `GP0`                                |
 | `SERIAL_USART_RX_PIN`                                                      | `GP1`                                |
+| **UART driver**                                                            |                                      |
+| `UART_DRIVER`                                                              | `SIOD0`                              |
+| `UART_TX_PIN`                                                              | `GP0`                                |
+| `UART_RX_PIN`                                                              | `GP1`                                |
 
 ?> The pin-outs of Adafruit's KB2040 and Boardsource's Blok both deviate from the Sparkfun Pro Micro RP2040. Lookup the pin-out of these boards and adjust your keyboards pin definition accordingly if you want to use these boards.
 
diff --git a/docs/quantum_painter.md b/docs/quantum_painter.md
index a4536714e43..a40daa8abdc 100644
--- a/docs/quantum_painter.md
+++ b/docs/quantum_painter.md
@@ -24,6 +24,7 @@ Supported devices:
 | GC9A01         | RGB LCD (circular) | 240x240          | SPI + D/C + RST | `QUANTUM_PAINTER_DRIVERS += gc9a01_spi`  |
 | ILI9163        | RGB LCD            | 128x128          | SPI + D/C + RST | `QUANTUM_PAINTER_DRIVERS += ili9163_spi` |
 | ILI9341        | RGB LCD            | 240x320          | SPI + D/C + RST | `QUANTUM_PAINTER_DRIVERS += ili9341_spi` |
+| ILI9486        | RGB LCD            | 320x480          | SPI + D/C + RST | `QUANTUM_PAINTER_DRIVERS += ili9486_spi` |
 | ILI9488        | RGB LCD            | 320x480          | SPI + D/C + RST | `QUANTUM_PAINTER_DRIVERS += ili9488_spi` |
 | SSD1351        | RGB OLED           | 128x128          | SPI + D/C + RST | `QUANTUM_PAINTER_DRIVERS += ssd1351_spi` |
 | ST7735         | RGB LCD            | 132x162, 80x160  | SPI + D/C + RST | `QUANTUM_PAINTER_DRIVERS += st7735_spi`  |
@@ -318,6 +319,39 @@ The maximum number of displays can be configured by changing the following in yo
 
 Native color format rgb565 is compatible with ILI9341
 
+#### ** ILI9486 **
+
+Enabling support for the ILI9486 in Quantum Painter is done by adding the following to `rules.mk`:
+
+```make
+QUANTUM_PAINTER_ENABLE = yes
+QUANTUM_PAINTER_DRIVERS += ili9486_spi
+```
+
+Creating a ILI9486 device in firmware can then be done with the following API:
+
+```c
+painter_device_t qp_ili9486_make_spi_device(uint16_t panel_width, uint16_t panel_height, pin_t chip_select_pin, pin_t dc_pin, pin_t reset_pin, uint16_t spi_divisor, int spi_mode);
+```
+
+There's another variant for this [Waveshare module](https://www.waveshare.com/wiki/3.5inch_TFT_Touch_Shield), because it has a quirky SPI->Parallel converter. You can create it with:
+
+```c
+painter_device_t qp_ili9486_make_spi_waveshare_device(uint16_t panel_width, uint16_t panel_height, pin_t chip_select_pin, pin_t dc_pin, pin_t reset_pin, uint16_t spi_divisor, int spi_mode);
+```
+
+The device handle returned from these functions can be used to perform all other drawing operations.
+
+The maximum number of displays can be configured by changing the following in your `config.h` (default is 1):
+
+```c
+// 3 displays:
+#define ILI9486_NUM_DEVICES 3
+```
+
+Native color format rgb888 is compatible with ILI9486
+Native color format rgb565 is compatible with ILI9486 Waveshare
+
 #### ** ILI9488 **
 
 Enabling support for the ILI9488 in Quantum Painter is done by adding the following to `rules.mk`:
diff --git a/docs/reference_info_json.md b/docs/reference_info_json.md
index 796db1f2446..b715c14041c 100644
--- a/docs/reference_info_json.md
+++ b/docs/reference_info_json.md
@@ -123,10 +123,17 @@ Configures the [Audio](feature_audio.md) feature.
         * Default: `false`
     * `pins` (Required)
         * The GPIO pin(s) connected to the speaker(s).
+    * `power_control`
+        * `on_state`
+            * The logical GPIO state required to turn the speaker on.
+            * Default: `1` (on = high)
+        * `pin`
+            * The GPIO pin connected to speaker power circuit.
     * `voices`
         * Use multiple audio voices.
         * Default: `false`
 
+
 ## Backlight :id=backlight
 
 Configures the [Backlight](feature_backlight.md) feature.
diff --git a/docs/uart_driver.md b/docs/uart_driver.md
index a88278d5438..9b0a92d23d1 100644
--- a/docs/uart_driver.md
+++ b/docs/uart_driver.md
@@ -32,13 +32,7 @@ No special setup is required - just connect the `RX` and `TX` pins of your UART
 
 You'll need to determine which pins can be used for UART -- as an example, STM32 parts generally have multiple UART peripherals, labeled USART1, USART2, USART3 etc.
 
-To enable UART, modify your board's `halconf.h` to enable the serial driver:
-
-```c
-#define HAL_USE_SERIAL TRUE
-```
-
-Then, modify your board's `mcuconf.h` to enable the peripheral you've chosen, for example:
+To enable UART, modify your board's `mcuconf.h` to enable the peripheral you've chosen, for example:
 
 ```c
 #undef STM32_SERIAL_USE_USART2
@@ -47,17 +41,17 @@ Then, modify your board's `mcuconf.h` to enable the peripheral you've chosen, fo
 
 Configuration-wise, you'll need to set up the peripheral as per your MCU's datasheet -- the defaults match the pins for a Proton-C, i.e. STM32F303.
 
-|`config.h` override       |Description                                                    |Default Value|
-|--------------------------|---------------------------------------------------------------|-------------|
-|`#define SERIAL_DRIVER`   |USART peripheral to use - USART1 -> `SD1`, USART2 -> `SD2` etc.|`SD1`        |
-|`#define SD1_TX_PIN`      |The pin to use for TX                                          |`A9`         |
-|`#define SD1_TX_PAL_MODE` |The alternate function mode for TX                             |`7`          |
-|`#define SD1_RX_PIN`      |The pin to use for RX                                          |`A10`        |
-|`#define SD1_RX_PAL_MODE` |The alternate function mode for RX                             |`7`          |
-|`#define SD1_CTS_PIN`     |The pin to use for CTS                                         |`A11`        |
-|`#define SD1_CTS_PAL_MODE`|The alternate function mode for CTS                            |`7`          |
-|`#define SD1_RTS_PIN`     |The pin to use for RTS                                         |`A12`        |
-|`#define SD1_RTS_PAL_MODE`|The alternate function mode for RTS                            |`7`          |
+|     `config.h` override     |                           Description                           | Default Value |
+| --------------------------- | --------------------------------------------------------------- | ------------- |
+| `#define UART_DRIVER`       | USART peripheral to use - USART1 -> `SD1`, USART2 -> `SD2` etc. | `SD1`         |
+| `#define UART_TX_PIN`       | The pin to use for TX                                           | `A9`          |
+| `#define UART_TX_PAL_MODE`  | The alternate function mode for TX                              | `7`           |
+| `#define UART_RX_PIN`       | The pin to use for RX                                           | `A10`         |
+| `#define UART_RX_PAL_MODE`  | The alternate function mode for RX                              | `7`           |
+| `#define UART_CTS_PIN`      | The pin to use for CTS                                          | `A11`         |
+| `#define UART_CTS_PAL_MODE` | The alternate function mode for CTS                             | `7`           |
+| `#define UART_RTS_PIN`      | The pin to use for RTS                                          | `A12`         |
+| `#define UART_RTS_PAL_MODE` | The alternate function mode for RTS                             | `7`           |
 
 ## API :id=api
 
diff --git a/docs/ws2812_driver.md b/docs/ws2812_driver.md
index 244d39dbe06..006529cc8ae 100644
--- a/docs/ws2812_driver.md
+++ b/docs/ws2812_driver.md
@@ -208,9 +208,9 @@ The following `#define`s apply only to the `pwm` driver:
 |`WS2812_PWM_DRIVER`              |`PWMD2`             |The PWM driver to use                                                                     |
 |`WS2812_PWM_CHANNEL`             |`2`                 |The PWM channel to use                                                                    |
 |`WS2812_PWM_PAL_MODE`            |`2`                 |The pin alternative function to use                                                       |
-|`WS2812_DMA_STREAM`              |`STM32_DMA1_STREAM2`|The DMA Stream for `TIMx_UP`                                                              |
-|`WS2812_DMA_CHANNEL`             |`2`                 |The DMA Channel for `TIMx_UP`                                                             |
-|`WS2812_DMAMUX_ID`               |*Not defined*       |The DMAMUX configuration for `TIMx_UP` - only required if your MCU has a DMAMUX peripheral|
+|`WS2812_PWM_DMA_STREAM`          |`STM32_DMA1_STREAM2`|The DMA Stream for `TIMx_UP`                                                              |
+|`WS2812_PWM_DMA_CHANNEL`         |`2`                 |The DMA Channel for `TIMx_UP`                                                             |
+|`WS2812_PWM_DMAMUX_ID`           |*Not defined*       |The DMAMUX configuration for `TIMx_UP` - only required if your MCU has a DMAMUX peripheral|
 |`WS2812_PWM_COMPLEMENTARY_OUTPUT`|*Not defined*       |Whether the PWM output is complementary (`TIMx_CHyN`)                                     |
 
 ?> Using a complementary timer output (`TIMx_CHyN`) is possible only for advanced-control timers (1, 8 and 20 on STM32), and the `STM32_PWM_USE_ADVANCED` option in `mcuconf.h` must be set to `TRUE`. Complementary outputs of general-purpose timers are not supported due to ChibiOS limitations.
diff --git a/drivers/bluetooth/bluefruit_le.cpp b/drivers/bluetooth/bluefruit_le.cpp
index 39c14ddd13c..218eca21953 100644
--- a/drivers/bluetooth/bluefruit_le.cpp
+++ b/drivers/bluetooth/bluefruit_le.cpp
@@ -188,7 +188,7 @@ static bool sdep_recv_pkt(struct sdep_msg *msg, uint16_t timeout) {
     bool     ready      = false;
 
     do {
-        ready = readPin(BLUEFRUIT_LE_IRQ_PIN);
+        ready = gpio_read_pin(BLUEFRUIT_LE_IRQ_PIN);
         if (ready) {
             break;
         }
@@ -231,7 +231,7 @@ static void resp_buf_read_one(bool greedy) {
         return;
     }
 
-    if (readPin(BLUEFRUIT_LE_IRQ_PIN)) {
+    if (gpio_read_pin(BLUEFRUIT_LE_IRQ_PIN)) {
         struct sdep_msg msg;
 
     again:
@@ -242,7 +242,7 @@ static void resp_buf_read_one(bool greedy) {
                 dprintf("recv latency %dms\n", TIMER_DIFF_16(timer_read(), last_send));
             }
 
-            if (greedy && resp_buf.peek(last_send) && readPin(BLUEFRUIT_LE_IRQ_PIN)) {
+            if (greedy && resp_buf.peek(last_send) && gpio_read_pin(BLUEFRUIT_LE_IRQ_PIN)) {
                 goto again;
             }
         }
@@ -293,16 +293,16 @@ void bluefruit_le_init(void) {
     state.configured   = false;
     state.is_connected = false;
 
-    setPinInput(BLUEFRUIT_LE_IRQ_PIN);
+    gpio_set_pin_input(BLUEFRUIT_LE_IRQ_PIN);
 
     spi_init();
 
     // Perform a hardware reset
-    setPinOutput(BLUEFRUIT_LE_RST_PIN);
-    writePinHigh(BLUEFRUIT_LE_RST_PIN);
-    writePinLow(BLUEFRUIT_LE_RST_PIN);
+    gpio_set_pin_output(BLUEFRUIT_LE_RST_PIN);
+    gpio_write_pin_high(BLUEFRUIT_LE_RST_PIN);
+    gpio_write_pin_low(BLUEFRUIT_LE_RST_PIN);
     wait_ms(10);
-    writePinHigh(BLUEFRUIT_LE_RST_PIN);
+    gpio_write_pin_high(BLUEFRUIT_LE_RST_PIN);
 
     wait_ms(1000); // Give it a second to initialize
 
@@ -508,7 +508,7 @@ void bluefruit_le_task(void) {
     resp_buf_read_one(true);
     send_buf_send_one(SdepShortTimeout);
 
-    if (resp_buf.empty() && (state.event_flags & UsingEvents) && readPin(BLUEFRUIT_LE_IRQ_PIN)) {
+    if (resp_buf.empty() && (state.event_flags & UsingEvents) && gpio_read_pin(BLUEFRUIT_LE_IRQ_PIN)) {
         // Must be an event update
         if (at_command_P(PSTR("AT+EVENTSTATUS"), resbuf, sizeof(resbuf))) {
             uint32_t mask = strtoul(resbuf, NULL, 16);
diff --git a/drivers/eeprom/eeprom_i2c.c b/drivers/eeprom/eeprom_i2c.c
index a74a0104157..0d3d5ccbe50 100644
--- a/drivers/eeprom/eeprom_i2c.c
+++ b/drivers/eeprom/eeprom_i2c.c
@@ -57,8 +57,8 @@ void eeprom_driver_init(void) {
     i2c_init();
 #if defined(EXTERNAL_EEPROM_WP_PIN)
     /* We are setting the WP pin to high in a way that requires at least two bit-flips to change back to 0 */
-    writePin(EXTERNAL_EEPROM_WP_PIN, 1);
-    setPinInputHigh(EXTERNAL_EEPROM_WP_PIN);
+    gpio_write_pin(EXTERNAL_EEPROM_WP_PIN, 1);
+    gpio_set_pin_input_high(EXTERNAL_EEPROM_WP_PIN);
 #endif
 }
 
@@ -100,8 +100,8 @@ void eeprom_write_block(const void *buf, void *addr, size_t len) {
     uintptr_t target_addr = (uintptr_t)addr;
 
 #if defined(EXTERNAL_EEPROM_WP_PIN)
-    setPinOutput(EXTERNAL_EEPROM_WP_PIN);
-    writePin(EXTERNAL_EEPROM_WP_PIN, 0);
+    gpio_set_pin_output(EXTERNAL_EEPROM_WP_PIN);
+    gpio_write_pin(EXTERNAL_EEPROM_WP_PIN, 0);
 #endif
 
     while (len > 0) {
@@ -134,7 +134,7 @@ void eeprom_write_block(const void *buf, void *addr, size_t len) {
 
 #if defined(EXTERNAL_EEPROM_WP_PIN)
     /* We are setting the WP pin to high in a way that requires at least two bit-flips to change back to 0 */
-    writePin(EXTERNAL_EEPROM_WP_PIN, 1);
-    setPinInputHigh(EXTERNAL_EEPROM_WP_PIN);
+    gpio_write_pin(EXTERNAL_EEPROM_WP_PIN, 1);
+    gpio_set_pin_input_high(EXTERNAL_EEPROM_WP_PIN);
 #endif
 }
diff --git a/drivers/encoder/encoder_quadrature.c b/drivers/encoder/encoder_quadrature.c
new file mode 100644
index 00000000000..cd589bf1e20
--- /dev/null
+++ b/drivers/encoder/encoder_quadrature.c
@@ -0,0 +1,213 @@
+// Copyright 2018 Jack Humbert <jack.humb@gmail.com>
+// Copyright 2018-2023 Nick Brassel (@tzarc)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include <stdint.h>
+#include "encoder.h"
+#include "gpio.h"
+#include "keyboard.h"
+#include "action.h"
+#include "keycodes.h"
+#include "wait.h"
+
+#ifdef SPLIT_KEYBOARD
+#    include "split_util.h"
+#endif
+
+// for memcpy
+#include <string.h>
+
+#if !defined(ENCODER_RESOLUTIONS) && !defined(ENCODER_RESOLUTION)
+#    define ENCODER_RESOLUTION 4
+#endif
+
+#undef ENCODER_DEFAULT_PIN_API_IMPL
+#if defined(ENCODERS_PAD_A) && defined(ENCODERS_PAD_B)
+// Inform the quadrature driver that it needs to implement pin init/read functions
+#    define ENCODER_DEFAULT_PIN_API_IMPL
+#endif
+
+extern volatile bool isLeftHand;
+
+__attribute__((weak)) void    encoder_quadrature_init_pin(uint8_t index, bool pad_b);
+__attribute__((weak)) uint8_t encoder_quadrature_read_pin(uint8_t index, bool pad_b);
+
+#ifdef ENCODER_DEFAULT_PIN_API_IMPL
+
+static pin_t encoders_pad_a[NUM_ENCODERS_MAX_PER_SIDE] = ENCODERS_PAD_A;
+static pin_t encoders_pad_b[NUM_ENCODERS_MAX_PER_SIDE] = ENCODERS_PAD_B;
+
+__attribute__((weak)) void encoder_wait_pullup_charge(void) {
+    wait_us(100);
+}
+
+__attribute__((weak)) void encoder_quadrature_init_pin(uint8_t index, bool pad_b) {
+    pin_t pin = pad_b ? encoders_pad_b[index] : encoders_pad_a[index];
+    if (pin != NO_PIN) {
+        gpio_set_pin_input_high(pin);
+    }
+}
+
+__attribute__((weak)) uint8_t encoder_quadrature_read_pin(uint8_t index, bool pad_b) {
+    pin_t pin = pad_b ? encoders_pad_b[index] : encoders_pad_a[index];
+    if (pin != NO_PIN) {
+        return gpio_read_pin(pin) ? 1 : 0;
+    }
+    return 0;
+}
+
+#endif // ENCODER_DEFAULT_PIN_API_IMPL
+
+#ifdef ENCODER_RESOLUTIONS
+static uint8_t encoder_resolutions[NUM_ENCODERS] = ENCODER_RESOLUTIONS;
+#endif
+
+#ifndef ENCODER_DIRECTION_FLIP
+#    define ENCODER_CLOCKWISE true
+#    define ENCODER_COUNTER_CLOCKWISE false
+#else
+#    define ENCODER_CLOCKWISE false
+#    define ENCODER_COUNTER_CLOCKWISE true
+#endif
+static int8_t encoder_LUT[] = {0, -1, 1, 0, 1, 0, 0, -1, -1, 0, 0, 1, 0, 1, -1, 0};
+
+static uint8_t encoder_state[NUM_ENCODERS]  = {0};
+static int8_t  encoder_pulses[NUM_ENCODERS] = {0};
+
+// encoder counts
+static uint8_t thisCount;
+#ifdef SPLIT_KEYBOARD
+// encoder offsets for each hand
+static uint8_t thisHand, thatHand;
+// encoder counts for each hand
+static uint8_t thatCount;
+#endif
+
+__attribute__((weak)) void encoder_quadrature_post_init_kb(void) {
+    extern void encoder_quadrature_handle_read(uint8_t index, uint8_t pin_a_state, uint8_t pin_b_state);
+    // Unused normally, but can be used for things like setting up pin-change interrupts in keyboard code.
+    // During the interrupt, read the pins then call `encoder_handle_read()` with the pin states and it'll queue up an encoder event if needed.
+}
+
+void encoder_quadrature_post_init(void) {
+#ifdef ENCODER_DEFAULT_PIN_API_IMPL
+    for (uint8_t i = 0; i < thisCount; i++) {
+        encoder_quadrature_init_pin(i, false);
+        encoder_quadrature_init_pin(i, true);
+    }
+    encoder_wait_pullup_charge();
+    for (uint8_t i = 0; i < thisCount; i++) {
+        encoder_state[i] = (encoder_quadrature_read_pin(i, false) << 0) | (encoder_quadrature_read_pin(i, true) << 1);
+    }
+#else
+    memset(encoder_state, 0, sizeof(encoder_state));
+#endif
+
+    encoder_quadrature_post_init_kb();
+}
+
+void encoder_driver_init(void) {
+#ifdef SPLIT_KEYBOARD
+    thisHand  = isLeftHand ? 0 : NUM_ENCODERS_LEFT;
+    thatHand  = NUM_ENCODERS_LEFT - thisHand;
+    thisCount = isLeftHand ? NUM_ENCODERS_LEFT : NUM_ENCODERS_RIGHT;
+    thatCount = isLeftHand ? NUM_ENCODERS_RIGHT : NUM_ENCODERS_LEFT;
+#else // SPLIT_KEYBOARD
+    thisCount                = NUM_ENCODERS;
+#endif
+
+#ifdef ENCODER_TESTS
+    // Annoying that we have to clear out values during initialisation here, but
+    // because all the arrays are static locals, rerunning tests in the same
+    // executable doesn't reset any of these. Kinda crappy having test-only code
+    // here, but it's the simplest solution.
+    memset(encoder_state, 0, sizeof(encoder_state));
+    memset(encoder_pulses, 0, sizeof(encoder_pulses));
+    const pin_t encoders_pad_a_left[] = ENCODERS_PAD_A;
+    const pin_t encoders_pad_b_left[] = ENCODERS_PAD_B;
+    for (uint8_t i = 0; i < thisCount; i++) {
+        encoders_pad_a[i] = encoders_pad_a_left[i];
+        encoders_pad_b[i] = encoders_pad_b_left[i];
+    }
+#endif
+
+#if defined(SPLIT_KEYBOARD) && defined(ENCODERS_PAD_A_RIGHT) && defined(ENCODERS_PAD_B_RIGHT)
+    // Re-initialise the pads if it's the right-hand side
+    if (!isLeftHand) {
+        const pin_t encoders_pad_a_right[] = ENCODERS_PAD_A_RIGHT;
+        const pin_t encoders_pad_b_right[] = ENCODERS_PAD_B_RIGHT;
+        for (uint8_t i = 0; i < thisCount; i++) {
+            encoders_pad_a[i] = encoders_pad_a_right[i];
+            encoders_pad_b[i] = encoders_pad_b_right[i];
+        }
+    }
+#endif // defined(SPLIT_KEYBOARD) && defined(ENCODERS_PAD_A_RIGHT) && defined(ENCODERS_PAD_B_RIGHT)
+
+    // Encoder resolutions is defined differently in config.h, so concatenate
+#if defined(SPLIT_KEYBOARD) && defined(ENCODER_RESOLUTIONS)
+#    if defined(ENCODER_RESOLUTIONS_RIGHT)
+    static const uint8_t encoder_resolutions_right[NUM_ENCODERS_RIGHT] = ENCODER_RESOLUTIONS_RIGHT;
+#    else  // defined(ENCODER_RESOLUTIONS_RIGHT)
+    static const uint8_t encoder_resolutions_right[NUM_ENCODERS_RIGHT] = ENCODER_RESOLUTIONS;
+#    endif // defined(ENCODER_RESOLUTIONS_RIGHT)
+    for (uint8_t i = 0; i < NUM_ENCODERS_RIGHT; i++) {
+        encoder_resolutions[NUM_ENCODERS_LEFT + i] = encoder_resolutions_right[i];
+    }
+#endif // defined(SPLIT_KEYBOARD) && defined(ENCODER_RESOLUTIONS)
+
+    encoder_quadrature_post_init();
+}
+
+static void encoder_handle_state_change(uint8_t index, uint8_t state) {
+    uint8_t i = index;
+
+#ifdef SPLIT_KEYBOARD
+    index += thisHand;
+#endif
+
+#ifdef ENCODER_RESOLUTIONS
+    const uint8_t resolution = encoder_resolutions[index];
+#else
+    const uint8_t resolution = ENCODER_RESOLUTION;
+#endif
+
+    encoder_pulses[i] += encoder_LUT[state & 0xF];
+
+#ifdef ENCODER_DEFAULT_POS
+    if ((encoder_pulses[i] >= resolution) || (encoder_pulses[i] <= -resolution) || ((state & 0x3) == ENCODER_DEFAULT_POS)) {
+        if (encoder_pulses[i] >= 1) {
+#else
+    if (encoder_pulses[i] >= resolution) {
+#endif
+
+            encoder_queue_event(index, ENCODER_COUNTER_CLOCKWISE);
+        }
+
+#ifdef ENCODER_DEFAULT_POS
+        if (encoder_pulses[i] <= -1) {
+#else
+    if (encoder_pulses[i] <= -resolution) { // direction is arbitrary here, but this clockwise
+#endif
+            encoder_queue_event(index, ENCODER_CLOCKWISE);
+        }
+        encoder_pulses[i] %= resolution;
+#ifdef ENCODER_DEFAULT_POS
+        encoder_pulses[i] = 0;
+    }
+#endif
+}
+
+void encoder_quadrature_handle_read(uint8_t index, uint8_t pin_a_state, uint8_t pin_b_state) {
+    uint8_t state = pin_a_state | (pin_b_state << 1);
+    if ((encoder_state[index] & 0x3) != state) {
+        encoder_state[index] <<= 2;
+        encoder_state[index] |= state;
+        encoder_handle_state_change(index, encoder_state[index]);
+    }
+}
+
+__attribute__((weak)) void encoder_driver_task(void) {
+    for (uint8_t i = 0; i < thisCount; i++) {
+        encoder_quadrature_handle_read(i, encoder_quadrature_read_pin(i, false), encoder_quadrature_read_pin(i, true));
+    }
+}
diff --git a/drivers/gpio/sn74x138.c b/drivers/gpio/sn74x138.c
index 222e5db56cb..1cf8e54f562 100644
--- a/drivers/gpio/sn74x138.c
+++ b/drivers/gpio/sn74x138.c
@@ -27,39 +27,39 @@ static const pin_t address_pins[ADDRESS_PIN_COUNT] = SN74X138_ADDRESS_PINS;
 
 void sn74x138_init(void) {
     for (int i = 0; i < ADDRESS_PIN_COUNT; i++) {
-        setPinOutput(address_pins[i]);
-        writePinLow(address_pins[i]);
+        gpio_set_pin_output(address_pins[i]);
+        gpio_write_pin_low(address_pins[i]);
     }
 
 #if defined(SN74X138_E1_PIN)
-    setPinOutput(SN74X138_E1_PIN);
-    writePinHigh(SN74X138_E1_PIN);
+    gpio_set_pin_output(SN74X138_E1_PIN);
+    gpio_write_pin_high(SN74X138_E1_PIN);
 #endif
 
 #if defined(SN74X138_E2_PIN)
-    setPinOutput(SN74X138_E2_PIN);
-    writePinHigh(SN74X138_E2_PIN);
+    gpio_set_pin_output(SN74X138_E2_PIN);
+    gpio_write_pin_high(SN74X138_E2_PIN);
 #endif
 #if defined(SN74X138_E3_PIN)
-    setPinOutput(SN74X138_E3_PIN);
-    writePinLow(SN74X138_E3_PIN);
+    gpio_set_pin_output(SN74X138_E3_PIN);
+    gpio_write_pin_low(SN74X138_E3_PIN);
 #endif
 }
 
 void sn74x138_set_enabled(bool enabled) {
 #if defined(SN74X138_E1_PIN)
-    writePin(SN74X138_E1_PIN, !enabled);
+    gpio_write_pin(SN74X138_E1_PIN, !enabled);
 #endif
 #if defined(SN74X138_E2_PIN)
-    writePin(SN74X138_E2_PIN, !enabled);
+    gpio_write_pin(SN74X138_E2_PIN, !enabled);
 #endif
 #if defined(SN74X138_E3_PIN)
-    writePin(SN74X138_E3_PIN, enabled);
+    gpio_write_pin(SN74X138_E3_PIN, enabled);
 #endif
 }
 
 void sn74x138_set_addr(uint8_t address) {
     for (int i = 0; i < ADDRESS_PIN_COUNT; i++) {
-        writePin(address_pins[i], address & (1 << i));
+        gpio_write_pin(address_pins[i], address & (1 << i));
     }
 }
diff --git a/drivers/gpio/sn74x154.c b/drivers/gpio/sn74x154.c
index 5f21f12b55f..6226adf27e6 100644
--- a/drivers/gpio/sn74x154.c
+++ b/drivers/gpio/sn74x154.c
@@ -27,32 +27,32 @@ static const pin_t address_pins[ADDRESS_PIN_COUNT] = SN74X154_ADDRESS_PINS;
 
 void sn74x154_init(void) {
     for (int i = 0; i < ADDRESS_PIN_COUNT; i++) {
-        setPinOutput(address_pins[i]);
-        writePinLow(address_pins[i]);
+        gpio_set_pin_output(address_pins[i]);
+        gpio_write_pin_low(address_pins[i]);
     }
 
 #if defined(SN74X154_E0_PIN)
-    setPinOutput(SN74X154_E0_PIN);
-    writePinHigh(SN74X154_E0_PIN);
+    gpio_set_pin_output(SN74X154_E0_PIN);
+    gpio_write_pin_high(SN74X154_E0_PIN);
 #endif
 
 #if defined(SN74X154_E1_PIN)
-    setPinOutput(SN74X154_E1_PIN);
-    writePinHigh(SN74X154_E1_PIN);
+    gpio_set_pin_output(SN74X154_E1_PIN);
+    gpio_write_pin_high(SN74X154_E1_PIN);
 #endif
 }
 
 void sn74x154_set_enabled(bool enabled) {
 #if defined(SN74X154_E0_PIN)
-    writePin(SN74X154_E0_PIN, !enabled);
+    gpio_write_pin(SN74X154_E0_PIN, !enabled);
 #endif
 #if defined(SN74X154_E1_PIN)
-    writePin(SN74X154_E1_PIN, !enabled);
+    gpio_write_pin(SN74X154_E1_PIN, !enabled);
 #endif
 }
 
 void sn74x154_set_addr(uint8_t address) {
     for (int i = 0; i < ADDRESS_PIN_COUNT; i++) {
-        writePin(address_pins[i], address & (1 << i));
+        gpio_write_pin(address_pins[i], address & (1 << i));
     }
 }
diff --git a/drivers/haptic/solenoid.c b/drivers/haptic/solenoid.c
index da4095cda4d..346b88bbc47 100644
--- a/drivers/haptic/solenoid.c
+++ b/drivers/haptic/solenoid.c
@@ -61,7 +61,7 @@ void solenoid_set_dwell(uint8_t dwell) {
  * @param index select which solenoid to check/stop
  */
 void solenoid_stop(uint8_t index) {
-    writePin(solenoid_pads[index], !solenoid_active_state[index]);
+    gpio_write_pin(solenoid_pads[index], !solenoid_active_state[index]);
     solenoid_on[index]      = false;
     solenoid_buzzing[index] = false;
 }
@@ -78,7 +78,7 @@ void solenoid_fire(uint8_t index) {
     solenoid_on[index]      = true;
     solenoid_buzzing[index] = true;
     solenoid_start[index]   = timer_read();
-    writePin(solenoid_pads[index], solenoid_active_state[index]);
+    gpio_write_pin(solenoid_pads[index], solenoid_active_state[index]);
 }
 
 /**
@@ -128,12 +128,12 @@ void solenoid_check(void) {
             if ((elapsed[i] % (SOLENOID_BUZZ_ACTUATED + SOLENOID_BUZZ_NONACTUATED)) < SOLENOID_BUZZ_ACTUATED) {
                 if (!solenoid_buzzing[i]) {
                     solenoid_buzzing[i] = true;
-                    writePin(solenoid_pads[i], solenoid_active_state[i]);
+                    gpio_write_pin(solenoid_pads[i], solenoid_active_state[i]);
                 }
             } else {
                 if (solenoid_buzzing[i]) {
                     solenoid_buzzing[i] = false;
-                    writePin(solenoid_pads[i], !solenoid_active_state[i]);
+                    gpio_write_pin(solenoid_pads[i], !solenoid_active_state[i]);
                 }
             }
         }
@@ -156,8 +156,8 @@ void solenoid_setup(void) {
 #else
         solenoid_active_state[i] = high;
 #endif
-        writePin(solenoid_pads[i], !solenoid_active_state[i]);
-        setPinOutput(solenoid_pads[i]);
+        gpio_write_pin(solenoid_pads[i], !solenoid_active_state[i]);
+        gpio_set_pin_output(solenoid_pads[i]);
         if ((!HAPTIC_OFF_IN_LOW_POWER) || (usb_device_state == USB_DEVICE_STATE_CONFIGURED)) {
             solenoid_fire(i);
         }
@@ -170,6 +170,6 @@ void solenoid_setup(void) {
  */
 void solenoid_shutdown(void) {
     for (uint8_t i = 0; i < NUMBER_OF_SOLENOIDS; i++) {
-        writePin(solenoid_pads[i], !solenoid_active_state[i]);
+        gpio_write_pin(solenoid_pads[i], !solenoid_active_state[i]);
     }
 }
diff --git a/drivers/lcd/hd44780.c b/drivers/lcd/hd44780.c
index ccc50117abb..9b4e2f0226f 100644
--- a/drivers/lcd/hd44780.c
+++ b/drivers/lcd/hd44780.c
@@ -57,67 +57,67 @@ static const pin_t data_pins[4] = HD44780_DATA_PINS;
 #define HD44780_ENABLE_DELAY_US 1
 
 static void hd44780_latch(void) {
-    writePinHigh(HD44780_E_PIN);
+    gpio_write_pin_high(HD44780_E_PIN);
     wait_us(HD44780_ENABLE_DELAY_US);
-    writePinLow(HD44780_E_PIN);
+    gpio_write_pin_low(HD44780_E_PIN);
 }
 
 void hd44780_write(uint8_t data, bool isData) {
-    writePin(HD44780_RS_PIN, isData);
-    writePinLow(HD44780_RW_PIN);
+    gpio_write_pin(HD44780_RS_PIN, isData);
+    gpio_write_pin_low(HD44780_RW_PIN);
 
     for (int i = 0; i < 4; i++) {
-        setPinOutput(data_pins[i]);
+        gpio_set_pin_output(data_pins[i]);
     }
 
     // Write high nibble
     for (int i = 0; i < 4; i++) {
-        writePin(data_pins[i], (data >> 4) & (1 << i));
+        gpio_write_pin(data_pins[i], (data >> 4) & (1 << i));
     }
     hd44780_latch();
 
     // Write low nibble
     for (int i = 0; i < 4; i++) {
-        writePin(data_pins[i], data & (1 << i));
+        gpio_write_pin(data_pins[i], data & (1 << i));
     }
     hd44780_latch();
 
     for (int i = 0; i < 4; i++) {
-        writePinHigh(data_pins[i]);
+        gpio_write_pin_high(data_pins[i]);
     }
 }
 
 uint8_t hd44780_read(bool isData) {
     uint8_t data = 0;
 
-    writePin(HD44780_RS_PIN, isData);
-    writePinHigh(HD44780_RW_PIN);
+    gpio_write_pin(HD44780_RS_PIN, isData);
+    gpio_write_pin_high(HD44780_RW_PIN);
 
     for (int i = 0; i < 4; i++) {
-        setPinInput(data_pins[i]);
+        gpio_set_pin_input(data_pins[i]);
     }
 
-    writePinHigh(HD44780_E_PIN);
+    gpio_write_pin_high(HD44780_E_PIN);
     wait_us(HD44780_ENABLE_DELAY_US);
 
     // Read high nibble
     for (int i = 0; i < 4; i++) {
-        data |= (readPin(data_pins[i]) << i);
+        data |= (gpio_read_pin(data_pins[i]) << i);
     }
 
     data <<= 4;
 
-    writePinLow(HD44780_E_PIN);
+    gpio_write_pin_low(HD44780_E_PIN);
     wait_us(HD44780_ENABLE_DELAY_US);
-    writePinHigh(HD44780_E_PIN);
+    gpio_write_pin_high(HD44780_E_PIN);
     wait_us(HD44780_ENABLE_DELAY_US);
 
     // Read low nibble
     for (int i = 0; i < 4; i++) {
-        data |= (readPin(data_pins[i]) << i);
+        data |= (gpio_read_pin(data_pins[i]) << i);
     }
 
-    writePinLow(HD44780_E_PIN);
+    gpio_write_pin_low(HD44780_E_PIN);
 
     return data;
 }
@@ -171,20 +171,20 @@ void hd44780_set_ddram_address(uint8_t address) {
 }
 
 void hd44780_init(bool cursor, bool blink) {
-    setPinOutput(HD44780_RS_PIN);
-    setPinOutput(HD44780_RW_PIN);
-    setPinOutput(HD44780_E_PIN);
+    gpio_set_pin_output(HD44780_RS_PIN);
+    gpio_set_pin_output(HD44780_RW_PIN);
+    gpio_set_pin_output(HD44780_E_PIN);
 
     for (int i = 0; i < 4; i++) {
-        setPinOutput(data_pins[i]);
+        gpio_set_pin_output(data_pins[i]);
     }
 
     wait_ms(HD44780_INIT_DELAY_MS);
 
     // Manually configure for 4-bit mode - can't use hd44780_command() yet
     // HD44780U datasheet, Fig. 24 (p46)
-    writePinHigh(data_pins[0]); // Function set
-    writePinHigh(data_pins[1]); // DL = 1
+    gpio_write_pin_high(data_pins[0]); // Function set
+    gpio_write_pin_high(data_pins[1]); // DL = 1
     hd44780_latch();
     wait_ms(5);
     // Send again
@@ -194,7 +194,7 @@ void hd44780_init(bool cursor, bool blink) {
     hd44780_latch();
     wait_us(64);
 
-    writePinLow(data_pins[0]); // DL = 0
+    gpio_write_pin_low(data_pins[0]); // DL = 0
     hd44780_latch();
     wait_us(64);
 
diff --git a/drivers/lcd/st7565.c b/drivers/lcd/st7565.c
index 47ee02804ba..4fce40edbe0 100644
--- a/drivers/lcd/st7565.c
+++ b/drivers/lcd/st7565.c
@@ -92,10 +92,10 @@ static void InvertCharacter(uint8_t *cursor) {
 }
 
 bool st7565_init(display_rotation_t rotation) {
-    setPinOutput(ST7565_A0_PIN);
-    writePinHigh(ST7565_A0_PIN);
-    setPinOutput(ST7565_RST_PIN);
-    writePinHigh(ST7565_RST_PIN);
+    gpio_set_pin_output(ST7565_A0_PIN);
+    gpio_write_pin_high(ST7565_A0_PIN);
+    gpio_set_pin_output(ST7565_RST_PIN);
+    gpio_write_pin_high(ST7565_RST_PIN);
 
     st7565_rotation = st7565_init_user(rotation);
 
@@ -488,18 +488,18 @@ void st7565_task(void) {
 __attribute__((weak)) void st7565_task_user(void) {}
 
 void st7565_reset(void) {
-    writePinLow(ST7565_RST_PIN);
+    gpio_write_pin_low(ST7565_RST_PIN);
     wait_ms(20);
-    writePinHigh(ST7565_RST_PIN);
+    gpio_write_pin_high(ST7565_RST_PIN);
     wait_ms(20);
 }
 
 spi_status_t st7565_send_cmd(uint8_t cmd) {
-    writePinLow(ST7565_A0_PIN);
+    gpio_write_pin_low(ST7565_A0_PIN);
     return spi_write(cmd);
 }
 
 spi_status_t st7565_send_data(uint8_t *data, uint16_t length) {
-    writePinHigh(ST7565_A0_PIN);
+    gpio_write_pin_high(ST7565_A0_PIN);
     return spi_transmit(data, length);
 }
diff --git a/drivers/led/apa102.c b/drivers/led/apa102.c
index 548b8f094e4..d6d4327495f 100644
--- a/drivers/led/apa102.c
+++ b/drivers/led/apa102.c
@@ -43,14 +43,14 @@
         }                                       \
     } while (0)
 
-#define APA102_SEND_BIT(byte, bit)                  \
-    do {                                            \
-        writePin(APA102_DI_PIN, (byte >> bit) & 1); \
-        io_wait;                                    \
-        writePinHigh(APA102_CI_PIN);                \
-        io_wait;                                    \
-        writePinLow(APA102_CI_PIN);                 \
-        io_wait;                                    \
+#define APA102_SEND_BIT(byte, bit)                        \
+    do {                                                  \
+        gpio_write_pin(APA102_DI_PIN, (byte >> bit) & 1); \
+        io_wait;                                          \
+        gpio_write_pin_high(APA102_CI_PIN);               \
+        io_wait;                                          \
+        gpio_write_pin_low(APA102_CI_PIN);                \
+        io_wait;                                          \
     } while (0)
 
 uint8_t apa102_led_brightness = APA102_DEFAULT_BRIGHTNESS;
@@ -114,11 +114,11 @@ static void apa102_send_frame(uint8_t red, uint8_t green, uint8_t blue, uint8_t
 }
 
 void apa102_init(void) {
-    setPinOutput(APA102_DI_PIN);
-    setPinOutput(APA102_CI_PIN);
+    gpio_set_pin_output(APA102_DI_PIN);
+    gpio_set_pin_output(APA102_CI_PIN);
 
-    writePinLow(APA102_DI_PIN);
-    writePinLow(APA102_CI_PIN);
+    gpio_write_pin_low(APA102_DI_PIN);
+    gpio_write_pin_low(APA102_CI_PIN);
 }
 
 void apa102_setleds(rgb_led_t *start_led, uint16_t num_leds) {
diff --git a/drivers/led/aw20216s.c b/drivers/led/aw20216s.c
index fa4454b6b1d..704794f5b5a 100644
--- a/drivers/led/aw20216s.c
+++ b/drivers/led/aw20216s.c
@@ -114,8 +114,8 @@ void aw20216s_init_drivers(void) {
     spi_init();
 
 #if defined(AW20216S_EN_PIN)
-    setPinOutput(AW20216S_EN_PIN);
-    writePinHigh(AW20216S_EN_PIN);
+    gpio_set_pin_output(AW20216S_EN_PIN);
+    gpio_write_pin_high(AW20216S_EN_PIN);
 #endif
 
     aw20216s_init(AW20216S_CS_PIN_1);
diff --git a/drivers/led/issi/is31fl3218-mono.c b/drivers/led/issi/is31fl3218-mono.c
index cb5a0691600..0174da7ab3b 100644
--- a/drivers/led/issi/is31fl3218-mono.c
+++ b/drivers/led/issi/is31fl3218-mono.c
@@ -68,8 +68,8 @@ void is31fl3218_init(void) {
     i2c_init();
 
 #if defined(IS31FL3218_SDB_PIN)
-    setPinOutput(IS31FL3218_SDB_PIN);
-    writePinHigh(IS31FL3218_SDB_PIN);
+    gpio_set_pin_output(IS31FL3218_SDB_PIN);
+    gpio_write_pin_high(IS31FL3218_SDB_PIN);
 #endif
 
     // In case we ever want to reinitialize (?)
diff --git a/drivers/led/issi/is31fl3218.c b/drivers/led/issi/is31fl3218.c
index c3a0946e83c..dd97d236f7b 100644
--- a/drivers/led/issi/is31fl3218.c
+++ b/drivers/led/issi/is31fl3218.c
@@ -68,8 +68,8 @@ void is31fl3218_init(void) {
     i2c_init();
 
 #if defined(IS31FL3218_SDB_PIN)
-    setPinOutput(IS31FL3218_SDB_PIN);
-    writePinHigh(IS31FL3218_SDB_PIN);
+    gpio_set_pin_output(IS31FL3218_SDB_PIN);
+    gpio_write_pin_high(IS31FL3218_SDB_PIN);
 #endif
 
     // In case we ever want to reinitialize (?)
diff --git a/drivers/led/issi/is31fl3729-mono.c b/drivers/led/issi/is31fl3729-mono.c
index 1617dd40a7a..13d5146877f 100644
--- a/drivers/led/issi/is31fl3729-mono.c
+++ b/drivers/led/issi/is31fl3729-mono.c
@@ -18,6 +18,7 @@
 
 #include "is31fl3729-mono.h"
 #include "i2c_master.h"
+#include "gpio.h"
 #include "wait.h"
 
 #define IS31FL3729_PWM_REGISTER_COUNT 143
@@ -39,26 +40,43 @@
 #    define IS31FL3729_GLOBAL_CURRENT 0x40
 #endif
 
-#ifndef IS31FL3729_PULLDOWNUP
-#    define IS31FL3729_PULLDOWNUP 0x33
+#ifndef IS31FL3729_SW_PULLDOWN
+#    define IS31FL3729_SW_PULLDOWN IS31FL3729_SW_PULLDOWN_2K_OHM_SW_OFF
+#endif
+
+#ifndef IS31FL3729_CS_PULLUP
+#    define IS31FL3729_CS_PULLUP IS31FL3729_CS_PULLUP_2K_OHM_CS_OFF
 #endif
 
 #ifndef IS31FL3729_SPREAD_SPECTRUM
-#    define IS31FL3729_SPREAD_SPECTRUM IS31FL3729_SSP_DISABLE
+#    define IS31FL3729_SPREAD_SPECTRUM IS31FL3729_SPREAD_SPECTRUM_DISABLE
 #endif
 
 #ifndef IS31FL3729_SPREAD_SPECTRUM_RANGE
-#    define IS31FL3729_SPREAD_SPECTRUM_RANGE IS31FL3729_RNG_5_PERCENT
+#    define IS31FL3729_SPREAD_SPECTRUM_RANGE IS31FL3729_SPREAD_SPECTRUM_RANGE_5_PERCENT
 #endif
 
 #ifndef IS31FL3729_SPREAD_SPECTRUM_CYCLE_TIME
-#    define IS31FL3729_SPREAD_SPECTRUM_CYCLE_TIME IS31FL3729_CLT_1980_US
+#    define IS31FL3729_SPREAD_SPECTRUM_CYCLE_TIME IS31FL3729_SPREAD_SPECTRUM_CYCLE_TIME_1980_US
 #endif
 
 #ifndef IS31FL3729_PWM_FREQUENCY
 #    define IS31FL3729_PWM_FREQUENCY IS31FL3729_PWM_FREQUENCY_32K_HZ
 #endif
 
+const uint8_t i2c_addresses[IS31FL3729_DRIVER_COUNT] = {
+    IS31FL3729_I2C_ADDRESS_1,
+#ifdef IS31FL3729_I2C_ADDRESS_2
+    IS31FL3729_I2C_ADDRESS_2,
+#    ifdef IS31FL3729_I2C_ADDRESS_3
+    IS31FL3729_I2C_ADDRESS_3,
+#        ifdef IS31FL3729_I2C_ADDRESS_4
+    IS31FL3729_I2C_ADDRESS_4,
+#        endif
+#    endif
+#endif
+};
+
 // These buffers match the PWM & scaling registers.
 // Storing them like this is optimal for I2C transfers to the registers.
 typedef struct is31fl3729_driver_t {
@@ -75,27 +93,27 @@ is31fl3729_driver_t driver_buffers[IS31FL3729_DRIVER_COUNT] = {{
     .scaling_buffer_dirty = false,
 }};
 
-void is31fl3729_write_register(uint8_t addr, uint8_t reg, uint8_t data) {
+void is31fl3729_write_register(uint8_t index, uint8_t reg, uint8_t data) {
 #if IS31FL3729_I2C_PERSISTENCE > 0
     for (uint8_t i = 0; i < IS31FL3729_I2C_PERSISTENCE; i++) {
-        if (i2c_write_register(addr << 1, reg, &data, 1, IS31FL3729_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break;
+        if (i2c_write_register(i2c_addresses[index] << 1, reg, &data, 1, IS31FL3729_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break;
     }
 #else
-    i2c_write_register(addr << 1, reg, &data, 1, IS31FL3729_I2C_TIMEOUT);
+    i2c_write_register(i2c_addresses[index] << 1, reg, &data, 1, IS31FL3729_I2C_TIMEOUT);
 #endif
 }
 
-void is31fl3729_write_pwm_buffer(uint8_t addr, uint8_t index) {
-    // Transmit PWM registers in 9 transfers of 16 bytes.
+void is31fl3729_write_pwm_buffer(uint8_t index) {
+    // Transmit PWM registers in 11 transfers of 13 bytes.
 
-    // Iterate over the pwm_buffer contents at 16 byte intervals.
-    for (uint8_t i = 0; i <= IS31FL3729_PWM_REGISTER_COUNT; i += 16) {
+    // Iterate over the pwm_buffer contents at 13 byte intervals.
+    for (uint8_t i = 0; i <= IS31FL3729_PWM_REGISTER_COUNT; i += 13) {
 #if IS31FL3729_I2C_PERSISTENCE > 0
         for (uint8_t j = 0; j < IS31FL3729_I2C_PERSISTENCE; j++) {
-            if (i2c_write_register(addr << 1, i, driver_buffers[index].pwm_buffer + i, 16, IS31FL3729_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break;
+            if (i2c_write_register(i2c_addresses[index] << 1, IS31FL3729_REG_PWM + i, driver_buffers[index].pwm_buffer + i, 13, IS31FL3729_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break;
         }
 #else
-        i2c_write_register(addr << 1, i, driver_buffers[index].pwm_buffer + i, 16, IS31FL3729_I2C_TIMEOUT);
+        i2c_write_register(i2c_addresses[index] << 1, IS31FL3729_REG_PWM + i, driver_buffers[index].pwm_buffer + i, 13, IS31FL3729_I2C_TIMEOUT);
 #endif
     }
 }
@@ -103,53 +121,35 @@ void is31fl3729_write_pwm_buffer(uint8_t addr, uint8_t index) {
 void is31fl3729_init_drivers(void) {
     i2c_init();
 
-    is31fl3729_init(IS31FL3729_I2C_ADDRESS_1);
-#if defined(IS31FL3729_I2C_ADDRESS_2)
-    is31fl3729_init(IS31FL3729_I2C_ADDRESS_2);
-#    if defined(IS31FL3729_I2C_ADDRESS_3)
-    is31fl3729_init(IS31FL3729_I2C_ADDRESS_3);
-#        if defined(IS31FL3729_I2C_ADDRESS_4)
-    is31fl3729_init(IS31FL3729_I2C_ADDRESS_4);
-#        endif
-#    endif
+#if defined(IS31FL3729_SDB_PIN)
+    gpio_set_pin_output(IS31FL3729_SDB_PIN);
+    gpio_write_pin_high(IS31FL3729_SDB_PIN);
 #endif
 
+    for (uint8_t i = 0; i < IS31FL3729_DRIVER_COUNT; i++) {
+        is31fl3729_init(i);
+    }
+
     for (int i = 0; i < IS31FL3729_LED_COUNT; i++) {
         is31fl3729_set_scaling_register(i, 0xFF);
     }
 
-    is31fl3729_update_scaling_registers(IS31FL3729_I2C_ADDRESS_1, 0);
-#if defined(IS31FL3729_I2C_ADDRESS_2)
-    is31fl3729_update_scaling_registers(IS31FL3729_I2C_ADDRESS_2, 1);
-#    if defined(IS31FL3729_I2C_ADDRESS_3)
-    is31fl3729_update_scaling_registers(IS31FL3729_I2C_ADDRESS_3, 2);
-#        if defined(IS31FL3729_I2C_ADDRESS_4)
-    is31fl3729_update_scaling_registers(IS31FL3729_I2C_ADDRESS_4, 3);
-#        endif
-#    endif
-#endif
+    for (uint8_t i = 0; i < IS31FL3729_DRIVER_COUNT; i++) {
+        is31fl3729_update_scaling_registers(i);
+    }
 }
 
-void is31fl3729_init(uint8_t addr) {
+void is31fl3729_init(uint8_t index) {
     // In order to avoid the LEDs being driven with garbage data
     // in the LED driver's PWM registers, shutdown is enabled last.
     // Set up the mode and other settings, clear the PWM registers,
     // then disable software shutdown.
 
-    // Set Pull up & Down for SWx CSy
-    is31fl3729_write_register(addr, IS31FL3729_REG_PULLDOWNUP, IS31FL3729_PULLDOWNUP);
-
-    // Set Spread Spectrum Register if applicable
-    is31fl3729_write_register(addr, IS31FL3729_REG_SPREAD_SPECTRUM, ((IS31FL3729_SPREAD_SPECTRUM & 0b1) << 4) | ((IS31FL3729_SPREAD_SPECTRUM_RANGE & 0b11) << 2) | (IS31FL3729_SPREAD_SPECTRUM_CYCLE_TIME & 0b11));
-
-    // Set PWM Frequency Register if applicable
-    is31fl3729_write_register(addr, IS31FL3729_REG_PWM_FREQUENCY, IS31FL3729_PWM_FREQUENCY);
-
-    // Set Golbal Current Control Register
-    is31fl3729_write_register(addr, IS31FL3729_REG_GLOBAL_CURRENT, IS31FL3729_GLOBAL_CURRENT);
-
-    // Set to Normal operation
-    is31fl3729_write_register(addr, IS31FL3729_REG_CONFIGURATION, IS31FL3729_CONFIGURATION);
+    is31fl3729_write_register(index, IS31FL3729_REG_PULLDOWNUP, ((IS31FL3729_SW_PULLDOWN & 0b111) << 4) | (IS31FL3729_CS_PULLUP & 0b111));
+    is31fl3729_write_register(index, IS31FL3729_REG_SPREAD_SPECTRUM, ((IS31FL3729_SPREAD_SPECTRUM & 0b1) << 4) | ((IS31FL3729_SPREAD_SPECTRUM_RANGE & 0b11) << 2) | (IS31FL3729_SPREAD_SPECTRUM_CYCLE_TIME & 0b11));
+    is31fl3729_write_register(index, IS31FL3729_REG_PWM_FREQUENCY, IS31FL3729_PWM_FREQUENCY);
+    is31fl3729_write_register(index, IS31FL3729_REG_GLOBAL_CURRENT, IS31FL3729_GLOBAL_CURRENT);
+    is31fl3729_write_register(index, IS31FL3729_REG_CONFIGURATION, IS31FL3729_CONFIGURATION);
 
     // Wait 10ms to ensure the device has woken up.
     wait_ms(10);
@@ -188,18 +188,18 @@ void is31fl3729_set_scaling_register(uint8_t index, uint8_t value) {
     driver_buffers[led.driver].scaling_buffer_dirty     = true;
 }
 
-void is31fl3729_update_pwm_buffers(uint8_t addr, uint8_t index) {
+void is31fl3729_update_pwm_buffers(uint8_t index) {
     if (driver_buffers[index].pwm_buffer_dirty) {
-        is31fl3729_write_pwm_buffer(addr, index);
+        is31fl3729_write_pwm_buffer(index);
 
         driver_buffers[index].pwm_buffer_dirty = false;
     }
 }
 
-void is31fl3729_update_scaling_registers(uint8_t addr, uint8_t index) {
+void is31fl3729_update_scaling_registers(uint8_t index) {
     if (driver_buffers[index].scaling_buffer_dirty) {
         for (uint8_t i = 0; i < IS31FL3729_SCALING_REGISTER_COUNT; i++) {
-            is31fl3729_write_register(addr, IS31FL3729_REG_SCALING + i, driver_buffers[index].scaling_buffer[i]);
+            is31fl3729_write_register(index, IS31FL3729_REG_SCALING + i, driver_buffers[index].scaling_buffer[i]);
         }
 
         driver_buffers[index].scaling_buffer_dirty = false;
@@ -207,14 +207,7 @@ void is31fl3729_update_scaling_registers(uint8_t addr, uint8_t index) {
 }
 
 void is31fl3729_flush(void) {
-    is31fl3729_update_pwm_buffers(IS31FL3729_I2C_ADDRESS_1, 0);
-#if defined(IS31FL3729_I2C_ADDRESS_2)
-    is31fl3729_update_pwm_buffers(IS31FL3729_I2C_ADDRESS_2, 1);
-#    if defined(IS31FL3729_I2C_ADDRESS_3)
-    is31fl3729_update_pwm_buffers(IS31FL3729_I2C_ADDRESS_3, 2);
-#        if defined(IS31FL3729_I2C_ADDRESS_4)
-    is31fl3729_update_pwm_buffers(IS31FL3729_I2C_ADDRESS_4, 3);
-#        endif
-#    endif
-#endif
+    for (uint8_t i = 0; i < IS31FL3729_DRIVER_COUNT; i++) {
+        is31fl3729_update_pwm_buffers(i);
+    }
 }
diff --git a/drivers/led/issi/is31fl3729-mono.h b/drivers/led/issi/is31fl3729-mono.h
index 815c200fd93..9afcde84b37 100644
--- a/drivers/led/issi/is31fl3729-mono.h
+++ b/drivers/led/issi/is31fl3729-mono.h
@@ -23,6 +23,7 @@
 #include "progmem.h"
 #include "util.h"
 
+#define IS31FL3729_REG_PWM 0x01
 #define IS31FL3729_REG_SCALING 0x90
 #define IS31FL3729_REG_CONFIGURATION 0xA0
 #define IS31FL3729_REG_GLOBAL_CURRENT 0xA1
@@ -58,8 +59,8 @@ typedef struct is31fl3729_led_t {
 extern const is31fl3729_led_t PROGMEM g_is31fl3729_leds[IS31FL3729_LED_COUNT];
 
 void is31fl3729_init_drivers(void);
-void is31fl3729_init(uint8_t addr);
-void is31fl3729_write_register(uint8_t addr, uint8_t reg, uint8_t data);
+void is31fl3729_init(uint8_t index);
+void is31fl3729_write_register(uint8_t index, uint8_t reg, uint8_t data);
 
 void is31fl3729_set_value(int index, uint8_t value);
 void is31fl3729_set_value_all(uint8_t value);
@@ -70,26 +71,42 @@ void is31fl3729_set_scaling_register(uint8_t index, uint8_t value);
 // (eg. from a timer interrupt).
 // Call this while idle (in between matrix scans).
 // If the buffer is dirty, it will update the driver with the buffer.
-void is31fl3729_update_pwm_buffers(uint8_t addr, uint8_t index);
-void is31fl3729_update_scaling_registers(uint8_t addr, uint8_t index);
+void is31fl3729_update_pwm_buffers(uint8_t index);
+void is31fl3729_update_scaling_registers(uint8_t index);
 
 void is31fl3729_flush(void);
 
-// Noise reduction using Spread Spectrum register
-#define IS31FL3729_SSP_DISABLE 0b0
-#define IS31FL3729_SSP_ENABLE 0b1
+#define IS31FL3729_SW_PULLDOWN_0_OHM 0b000
+#define IS31FL3729_SW_PULLDOWN_0K5_OHM_SW_OFF 0b001
+#define IS31FL3729_SW_PULLDOWN_1K_OHM_SW_OFF 0b010
+#define IS31FL3729_SW_PULLDOWN_2K_OHM_SW_OFF 0b011
+#define IS31FL3729_SW_PULLDOWN_1K_OHM 0b100
+#define IS31FL3729_SW_PULLDOWN_2K_OHM 0b101
+#define IS31FL3729_SW_PULLDOWN_4K_OHM 0b110
+#define IS31FL3729_SW_PULLDOWN_8K_OHM 0b111
 
-#define IS31FL3729_RNG_5_PERCENT 0b00
-#define IS31FL3729_RNG_15_PERCENT 0b01
-#define IS31FL3729_RNG_24_PERCENT 0b10
-#define IS31FL3729_RNG_34_PERCENT 0b11
+#define IS31FL3729_CS_PULLUP_0_OHM 0b000
+#define IS31FL3729_CS_PULLUP_0K5_OHM_CS_OFF 0b001
+#define IS31FL3729_CS_PULLUP_1K_OHM_CS_OFF 0b010
+#define IS31FL3729_CS_PULLUP_2K_OHM_CS_OFF 0b011
+#define IS31FL3729_CS_PULLUP_1K_OHM 0b100
+#define IS31FL3729_CS_PULLUP_2K_OHM 0b101
+#define IS31FL3729_CS_PULLUP_4K_OHM 0b110
+#define IS31FL3729_CS_PULLUP_8K_OHM 0b111
 
-#define IS31FL3729_CLT_1980_US 0b00
-#define IS31FL3729_CLT_1200_US 0b01
-#define IS31FL3729_CLT_820_US 0b10
-#define IS31FL3729_CLT_660_US 0b11
+#define IS31FL3729_SPREAD_SPECTRUM_DISABLE 0b0
+#define IS31FL3729_SPREAD_SPECTRUM_ENABLE 0b1
+
+#define IS31FL3729_SPREAD_SPECTRUM_RANGE_5_PERCENT 0b00
+#define IS31FL3729_SPREAD_SPECTRUM_RANGE_15_PERCENT 0b01
+#define IS31FL3729_SPREAD_SPECTRUM_RANGE_24_PERCENT 0b10
+#define IS31FL3729_SPREAD_SPECTRUM_RANGE_34_PERCENT 0b11
+
+#define IS31FL3729_SPREAD_SPECTRUM_CYCLE_TIME_1980_US 0b00
+#define IS31FL3729_SPREAD_SPECTRUM_CYCLE_TIME_1200_US 0b01
+#define IS31FL3729_SPREAD_SPECTRUM_CYCLE_TIME_820_US 0b10
+#define IS31FL3729_SPREAD_SPECTRUM_CYCLE_TIME_660_US 0b11
 
-// Noise reduction using PWM Frequency register
 #define IS31FL3729_PWM_FREQUENCY_55K_HZ 0b000
 #define IS31FL3729_PWM_FREQUENCY_32K_HZ 0b001
 #define IS31FL3729_PWM_FREQUENCY_4K_HZ 0b010
@@ -99,7 +116,6 @@ void is31fl3729_flush(void);
 #define IS31FL3729_PWM_FREQUENCY_250_HZ 0b110
 #define IS31FL3729_PWM_FREQUENCY_80K_HZ 0b111
 
-// Change SWx Setting using Configuration register
 #define IS31FL3729_CONFIG_SWS_15_9 0x01 // 15 CS x 9 SW matrix
 #define IS31FL3729_CONFIG_SWS_16_8 0x11 // 16 CS x 8 SW matrix
 #define IS31FL3729_CONFIG_SWS_16_7 0x21 // 16 CS x 7 SW matrix
@@ -109,157 +125,154 @@ void is31fl3729_flush(void);
 #define IS31FL3729_CONFIG_SWS_16_3 0x61 // 16 CS x 3 SW matrix
 #define IS31FL3729_CONFIG_SWS_16_2 0x71 // 16 CS x 2 SW matrix
 
-// Map CS SW locations to order in PWM / Scaling buffers
-// This matches the ORDER in the Datasheet Register not the POSITION
-// It will always count from 0x01 to (ISSI_MAX_LEDS - 1)
-#define SW1_CS1 0x01
-#define SW1_CS2 0x02
-#define SW1_CS3 0x03
-#define SW1_CS4 0x04
-#define SW1_CS5 0x05
-#define SW1_CS6 0x06
-#define SW1_CS7 0x07
-#define SW1_CS8 0x08
-#define SW1_CS9 0x09
-#define SW1_CS10 0x0A
-#define SW1_CS11 0x0B
-#define SW1_CS12 0x0C
-#define SW1_CS13 0x0D
-#define SW1_CS14 0x0E
-#define SW1_CS15 0x0F
-#define SW1_CS16 0x10
+#define SW1_CS1 0x00
+#define SW1_CS2 0x01
+#define SW1_CS3 0x02
+#define SW1_CS4 0x03
+#define SW1_CS5 0x04
+#define SW1_CS6 0x05
+#define SW1_CS7 0x06
+#define SW1_CS8 0x07
+#define SW1_CS9 0x08
+#define SW1_CS10 0x09
+#define SW1_CS11 0x0A
+#define SW1_CS12 0x0B
+#define SW1_CS13 0x0C
+#define SW1_CS14 0x0D
+#define SW1_CS15 0x0E
+#define SW1_CS16 0x0F
 
-#define SW2_CS1 0x11
-#define SW2_CS2 0x12
-#define SW2_CS3 0x13
-#define SW2_CS4 0x14
-#define SW2_CS5 0x15
-#define SW2_CS6 0x16
-#define SW2_CS7 0x17
-#define SW2_CS8 0x18
-#define SW2_CS9 0x19
-#define SW2_CS10 0x1A
-#define SW2_CS11 0x1B
-#define SW2_CS12 0x1C
-#define SW2_CS13 0x1D
-#define SW2_CS14 0x1E
-#define SW2_CS15 0x1F
-#define SW2_CS16 0x20
+#define SW2_CS1 0x10
+#define SW2_CS2 0x11
+#define SW2_CS3 0x12
+#define SW2_CS4 0x13
+#define SW2_CS5 0x14
+#define SW2_CS6 0x15
+#define SW2_CS7 0x16
+#define SW2_CS8 0x17
+#define SW2_CS9 0x18
+#define SW2_CS10 0x19
+#define SW2_CS11 0x1A
+#define SW2_CS12 0x1B
+#define SW2_CS13 0x1C
+#define SW2_CS14 0x1D
+#define SW2_CS15 0x1E
+#define SW2_CS16 0x1F
 
-#define SW3_CS1 0x21
-#define SW3_CS2 0x22
-#define SW3_CS3 0x23
-#define SW3_CS4 0x24
-#define SW3_CS5 0x25
-#define SW3_CS6 0x26
-#define SW3_CS7 0x27
-#define SW3_CS8 0x28
-#define SW3_CS9 0x29
-#define SW3_CS10 0x2A
-#define SW3_CS11 0x2B
-#define SW3_CS12 0x2C
-#define SW3_CS13 0x2D
-#define SW3_CS14 0x2E
-#define SW3_CS15 0x2F
-#define SW3_CS16 0x30
+#define SW3_CS1 0x20
+#define SW3_CS2 0x21
+#define SW3_CS3 0x22
+#define SW3_CS4 0x23
+#define SW3_CS5 0x24
+#define SW3_CS6 0x25
+#define SW3_CS7 0x26
+#define SW3_CS8 0x27
+#define SW3_CS9 0x28
+#define SW3_CS10 0x29
+#define SW3_CS11 0x2A
+#define SW3_CS12 0x2B
+#define SW3_CS13 0x2C
+#define SW3_CS14 0x2D
+#define SW3_CS15 0x2E
+#define SW3_CS16 0x2F
 
-#define SW4_CS1 0x31
-#define SW4_CS2 0x32
-#define SW4_CS3 0x33
-#define SW4_CS4 0x34
-#define SW4_CS5 0x35
-#define SW4_CS6 0x36
-#define SW4_CS7 0x37
-#define SW4_CS8 0x38
-#define SW4_CS9 0x39
-#define SW4_CS10 0x3A
-#define SW4_CS11 0x3B
-#define SW4_CS12 0x3C
-#define SW4_CS13 0x3D
-#define SW4_CS14 0x3E
-#define SW4_CS15 0x3F
-#define SW4_CS16 0x40
+#define SW4_CS1 0x30
+#define SW4_CS2 0x31
+#define SW4_CS3 0x32
+#define SW4_CS4 0x33
+#define SW4_CS5 0x34
+#define SW4_CS6 0x35
+#define SW4_CS7 0x36
+#define SW4_CS8 0x37
+#define SW4_CS9 0x38
+#define SW4_CS10 0x39
+#define SW4_CS11 0x3A
+#define SW4_CS12 0x3B
+#define SW4_CS13 0x3C
+#define SW4_CS14 0x3D
+#define SW4_CS15 0x3E
+#define SW4_CS16 0x3F
 
-#define SW5_CS1 0x41
-#define SW5_CS2 0x42
-#define SW5_CS3 0x43
-#define SW5_CS4 0x44
-#define SW5_CS5 0x45
-#define SW5_CS6 0x46
-#define SW5_CS7 0x47
-#define SW5_CS8 0x48
-#define SW5_CS9 0x49
-#define SW5_CS10 0x4A
-#define SW5_CS11 0x4B
-#define SW5_CS12 0x4C
-#define SW5_CS13 0x4D
-#define SW5_CS14 0x4E
-#define SW5_CS15 0x4F
-#define SW5_CS16 0x50
+#define SW5_CS1 0x40
+#define SW5_CS2 0x41
+#define SW5_CS3 0x42
+#define SW5_CS4 0x43
+#define SW5_CS5 0x44
+#define SW5_CS6 0x45
+#define SW5_CS7 0x46
+#define SW5_CS8 0x47
+#define SW5_CS9 0x48
+#define SW5_CS10 0x49
+#define SW5_CS11 0x4A
+#define SW5_CS12 0x4B
+#define SW5_CS13 0x4C
+#define SW5_CS14 0x4D
+#define SW5_CS15 0x4E
+#define SW5_CS16 0x4F
 
-#define SW6_CS1 0x51
-#define SW6_CS2 0x52
-#define SW6_CS3 0x53
-#define SW6_CS4 0x54
-#define SW6_CS5 0x55
-#define SW6_CS6 0x56
-#define SW6_CS7 0x57
-#define SW6_CS8 0x58
-#define SW6_CS9 0x59
-#define SW6_CS10 0x5A
-#define SW6_CS11 0x5B
-#define SW6_CS12 0x5C
-#define SW6_CS13 0x5D
-#define SW6_CS14 0x5E
-#define SW6_CS15 0x5F
-#define SW6_CS16 0x60
+#define SW6_CS1 0x50
+#define SW6_CS2 0x51
+#define SW6_CS3 0x52
+#define SW6_CS4 0x53
+#define SW6_CS5 0x54
+#define SW6_CS6 0x55
+#define SW6_CS7 0x56
+#define SW6_CS8 0x57
+#define SW6_CS9 0x58
+#define SW6_CS10 0x59
+#define SW6_CS11 0x5A
+#define SW6_CS12 0x5B
+#define SW6_CS13 0x5C
+#define SW6_CS14 0x5D
+#define SW6_CS15 0x5E
+#define SW6_CS16 0x5F
 
-#define SW7_CS1 0x61
-#define SW7_CS2 0x62
-#define SW7_CS3 0x63
-#define SW7_CS4 0x64
-#define SW7_CS5 0x65
-#define SW7_CS6 0x66
-#define SW7_CS7 0x67
-#define SW7_CS8 0x68
-#define SW7_CS9 0x69
-#define SW7_CS10 0x6A
-#define SW7_CS11 0x6B
-#define SW7_CS12 0x6C
-#define SW7_CS13 0x6D
-#define SW7_CS14 0x6E
-#define SW7_CS15 0x6F
-#define SW7_CS16 0x70
+#define SW7_CS1 0x60
+#define SW7_CS2 0x61
+#define SW7_CS3 0x62
+#define SW7_CS4 0x63
+#define SW7_CS5 0x64
+#define SW7_CS6 0x65
+#define SW7_CS7 0x66
+#define SW7_CS8 0x67
+#define SW7_CS9 0x68
+#define SW7_CS10 0x69
+#define SW7_CS11 0x6A
+#define SW7_CS12 0x6B
+#define SW7_CS13 0x6C
+#define SW7_CS14 0x6D
+#define SW7_CS15 0x6E
+#define SW7_CS16 0x6F
 
-#define SW8_CS1 0x71
-#define SW8_CS2 0x72
-#define SW8_CS3 0x73
-#define SW8_CS4 0x74
-#define SW8_CS5 0x75
-#define SW8_CS6 0x76
-#define SW8_CS7 0x77
-#define SW8_CS8 0x78
-#define SW8_CS9 0x79
-#define SW8_CS10 0x7A
-#define SW8_CS11 0x7B
-#define SW8_CS12 0x7C
-#define SW8_CS13 0x7D
-#define SW8_CS14 0x7E
-#define SW8_CS15 0x7F
-#define SW8_CS16 0x80
+#define SW8_CS1 0x70
+#define SW8_CS2 0x71
+#define SW8_CS3 0x72
+#define SW8_CS4 0x73
+#define SW8_CS5 0x74
+#define SW8_CS6 0x75
+#define SW8_CS7 0x76
+#define SW8_CS8 0x77
+#define SW8_CS9 0x78
+#define SW8_CS10 0x79
+#define SW8_CS11 0x7A
+#define SW8_CS12 0x7B
+#define SW8_CS13 0x7C
+#define SW8_CS14 0x7D
+#define SW8_CS15 0x7E
+#define SW8_CS16 0x7F
 
-#define SW9_CS1 0x81
-#define SW9_CS2 0x82
-#define SW9_CS3 0x83
-#define SW9_CS4 0x84
-#define SW9_CS5 0x85
-#define SW9_CS6 0x86
-#define SW9_CS7 0x87
-#define SW9_CS8 0x88
-#define SW9_CS9 0x89
-#define SW9_CS10 0x8A
-#define SW9_CS11 0x8B
-#define SW9_CS12 0x8C
-#define SW9_CS13 0x8D
-#define SW9_CS14 0x8E
-#define SW9_CS15 0x8F
+#define SW9_CS1 0x80
+#define SW9_CS2 0x81
+#define SW9_CS3 0x82
+#define SW9_CS4 0x83
+#define SW9_CS5 0x84
+#define SW9_CS6 0x85
+#define SW9_CS7 0x86
+#define SW9_CS8 0x87
+#define SW9_CS9 0x88
+#define SW9_CS10 0x89
+#define SW9_CS11 0x8A
+#define SW9_CS12 0x8B
+#define SW9_CS13 0x8C
+#define SW9_CS14 0x8D
+#define SW9_CS15 0x8E
diff --git a/drivers/led/issi/is31fl3729.c b/drivers/led/issi/is31fl3729.c
index 06f2d168d0b..80acb22fa28 100644
--- a/drivers/led/issi/is31fl3729.c
+++ b/drivers/led/issi/is31fl3729.c
@@ -18,6 +18,7 @@
 
 #include "is31fl3729.h"
 #include "i2c_master.h"
+#include "gpio.h"
 #include "wait.h"
 
 #define IS31FL3729_PWM_REGISTER_COUNT 143
@@ -39,26 +40,43 @@
 #    define IS31FL3729_GLOBAL_CURRENT 0x40
 #endif
 
-#ifndef IS31FL3729_PULLDOWNUP
-#    define IS31FL3729_PULLDOWNUP 0x33
+#ifndef IS31FL3729_SW_PULLDOWN
+#    define IS31FL3729_SW_PULLDOWN IS31FL3729_SW_PULLDOWN_2K_OHM_SW_OFF
+#endif
+
+#ifndef IS31FL3729_CS_PULLUP
+#    define IS31FL3729_CS_PULLUP IS31FL3729_CS_PULLUP_2K_OHM_CS_OFF
 #endif
 
 #ifndef IS31FL3729_SPREAD_SPECTRUM
-#    define IS31FL3729_SPREAD_SPECTRUM IS31FL3729_SSP_DISABLE
+#    define IS31FL3729_SPREAD_SPECTRUM IS31FL3729_SPREAD_SPECTRUM_DISABLE
 #endif
 
 #ifndef IS31FL3729_SPREAD_SPECTRUM_RANGE
-#    define IS31FL3729_SPREAD_SPECTRUM_RANGE IS31FL3729_RNG_5_PERCENT
+#    define IS31FL3729_SPREAD_SPECTRUM_RANGE IS31FL3729_SPREAD_SPECTRUM_RANGE_5_PERCENT
 #endif
 
 #ifndef IS31FL3729_SPREAD_SPECTRUM_CYCLE_TIME
-#    define IS31FL3729_SPREAD_SPECTRUM_CYCLE_TIME IS31FL3729_CLT_1980_US
+#    define IS31FL3729_SPREAD_SPECTRUM_CYCLE_TIME IS31FL3729_SPREAD_SPECTRUM_CYCLE_TIME_1980_US
 #endif
 
 #ifndef IS31FL3729_PWM_FREQUENCY
 #    define IS31FL3729_PWM_FREQUENCY IS31FL3729_PWM_FREQUENCY_32K_HZ
 #endif
 
+const uint8_t i2c_addresses[IS31FL3729_DRIVER_COUNT] = {
+    IS31FL3729_I2C_ADDRESS_1,
+#ifdef IS31FL3729_I2C_ADDRESS_2
+    IS31FL3729_I2C_ADDRESS_2,
+#    ifdef IS31FL3729_I2C_ADDRESS_3
+    IS31FL3729_I2C_ADDRESS_3,
+#        ifdef IS31FL3729_I2C_ADDRESS_4
+    IS31FL3729_I2C_ADDRESS_4,
+#        endif
+#    endif
+#endif
+};
+
 // These buffers match the PWM & scaling registers.
 // Storing them like this is optimal for I2C transfers to the registers.
 typedef struct is31fl3729_driver_t {
@@ -75,27 +93,27 @@ is31fl3729_driver_t driver_buffers[IS31FL3729_DRIVER_COUNT] = {{
     .scaling_buffer_dirty = false,
 }};
 
-void is31fl3729_write_register(uint8_t addr, uint8_t reg, uint8_t data) {
+void is31fl3729_write_register(uint8_t index, uint8_t reg, uint8_t data) {
 #if IS31FL3729_I2C_PERSISTENCE > 0
     for (uint8_t i = 0; i < IS31FL3729_I2C_PERSISTENCE; i++) {
-        if (i2c_write_register(addr << 1, reg, &data, 1, IS31FL3729_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break;
+        if (i2c_write_register(i2c_addresses[index] << 1, reg, &data, 1, IS31FL3729_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break;
     }
 #else
-    i2c_write_register(addr << 1, reg, &data, 1, IS31FL3729_I2C_TIMEOUT);
+    i2c_write_register(i2c_addresses[index] << 1, reg, &data, 1, IS31FL3729_I2C_TIMEOUT);
 #endif
 }
 
-void is31fl3729_write_pwm_buffer(uint8_t addr, uint8_t index) {
-    // Transmit PWM registers in 9 transfers of 16 bytes.
+void is31fl3729_write_pwm_buffer(uint8_t index) {
+    // Transmit PWM registers in 11 transfers of 13 bytes.
 
-    // Iterate over the pwm_buffer contents at 16 byte intervals.
-    for (uint8_t i = 0; i <= IS31FL3729_PWM_REGISTER_COUNT; i += 16) {
+    // Iterate over the pwm_buffer contents at 13 byte intervals.
+    for (uint8_t i = 0; i <= IS31FL3729_PWM_REGISTER_COUNT; i += 13) {
 #if IS31FL3729_I2C_PERSISTENCE > 0
         for (uint8_t j = 0; j < IS31FL3729_I2C_PERSISTENCE; j++) {
-            if (i2c_write_register(addr << 1, i, driver_buffers[index].pwm_buffer + i, 16, IS31FL3729_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break;
+            if (i2c_write_register(i2c_addresses[index] << 1, IS31FL3729_REG_PWM + i, driver_buffers[index].pwm_buffer + i, 13, IS31FL3729_I2C_TIMEOUT) == I2C_STATUS_SUCCESS) break;
         }
 #else
-        i2c_write_register(addr << 1, i, driver_buffers[index].pwm_buffer + i, 16, IS31FL3729_I2C_TIMEOUT);
+        i2c_write_register(i2c_addresses[index] << 1, IS31FL3729_REG_PWM + i, driver_buffers[index].pwm_buffer + i, 13, IS31FL3729_I2C_TIMEOUT);
 #endif
     }
 }
@@ -103,53 +121,35 @@ void is31fl3729_write_pwm_buffer(uint8_t addr, uint8_t index) {
 void is31fl3729_init_drivers(void) {
     i2c_init();
 
-    is31fl3729_init(IS31FL3729_I2C_ADDRESS_1);
-#if defined(IS31FL3729_I2C_ADDRESS_2)
-    is31fl3729_init(IS31FL3729_I2C_ADDRESS_2);
-#    if defined(IS31FL3729_I2C_ADDRESS_3)
-    is31fl3729_init(IS31FL3729_I2C_ADDRESS_3);
-#        if defined(IS31FL3729_I2C_ADDRESS_4)
-    is31fl3729_init(IS31FL3729_I2C_ADDRESS_4);
-#        endif
-#    endif
+#if defined(IS31FL3729_SDB_PIN)
+    gpio_set_pin_output(IS31FL3729_SDB_PIN);
+    gpio_write_pin_high(IS31FL3729_SDB_PIN);
 #endif
 
+    for (uint8_t i = 0; i < IS31FL3729_DRIVER_COUNT; i++) {
+        is31fl3729_init(i);
+    }
+
     for (int i = 0; i < IS31FL3729_LED_COUNT; i++) {
         is31fl3729_set_scaling_register(i, 0xFF, 0xFF, 0xFF);
     }
 
-    is31fl3729_update_scaling_registers(IS31FL3729_I2C_ADDRESS_1, 0);
-#if defined(IS31FL3729_I2C_ADDRESS_2)
-    is31fl3729_update_scaling_registers(IS31FL3729_I2C_ADDRESS_2, 1);
-#    if defined(IS31FL3729_I2C_ADDRESS_3)
-    is31fl3729_update_scaling_registers(IS31FL3729_I2C_ADDRESS_3, 2);
-#        if defined(IS31FL3729_I2C_ADDRESS_4)
-    is31fl3729_update_scaling_registers(IS31FL3729_I2C_ADDRESS_4, 3);
-#        endif
-#    endif
-#endif
+    for (uint8_t i = 0; i < IS31FL3729_DRIVER_COUNT; i++) {
+        is31fl3729_update_scaling_registers(i);
+    }
 }
 
-void is31fl3729_init(uint8_t addr) {
+void is31fl3729_init(uint8_t index) {
     // In order to avoid the LEDs being driven with garbage data
     // in the LED driver's PWM registers, shutdown is enabled last.
     // Set up the mode and other settings, clear the PWM registers,
     // then disable software shutdown.
 
-    // Set Pull up & Down for SWx CSy
-    is31fl3729_write_register(addr, IS31FL3729_REG_PULLDOWNUP, IS31FL3729_PULLDOWNUP);
-
-    // Set Spread Spectrum Register if applicable
-    is31fl3729_write_register(addr, IS31FL3729_REG_SPREAD_SPECTRUM, ((IS31FL3729_SPREAD_SPECTRUM & 0b1) << 4) | ((IS31FL3729_SPREAD_SPECTRUM_RANGE & 0b11) << 2) | (IS31FL3729_SPREAD_SPECTRUM_CYCLE_TIME & 0b11));
-
-    // Set PWM Frequency Register if applicable
-    is31fl3729_write_register(addr, IS31FL3729_REG_PWM_FREQUENCY, IS31FL3729_PWM_FREQUENCY);
-
-    // Set Golbal Current Control Register
-    is31fl3729_write_register(addr, IS31FL3729_REG_GLOBAL_CURRENT, IS31FL3729_GLOBAL_CURRENT);
-
-    // Set to Normal operation
-    is31fl3729_write_register(addr, IS31FL3729_REG_CONFIGURATION, IS31FL3729_CONFIGURATION);
+    is31fl3729_write_register(index, IS31FL3729_REG_PULLDOWNUP, ((IS31FL3729_SW_PULLDOWN & 0b111) << 4) | (IS31FL3729_CS_PULLUP & 0b111));
+    is31fl3729_write_register(index, IS31FL3729_REG_SPREAD_SPECTRUM, ((IS31FL3729_SPREAD_SPECTRUM & 0b1) << 4) | ((IS31FL3729_SPREAD_SPECTRUM_RANGE & 0b11) << 2) | (IS31FL3729_SPREAD_SPECTRUM_CYCLE_TIME & 0b11));
+    is31fl3729_write_register(index, IS31FL3729_REG_PWM_FREQUENCY, IS31FL3729_PWM_FREQUENCY);
+    is31fl3729_write_register(index, IS31FL3729_REG_GLOBAL_CURRENT, IS31FL3729_GLOBAL_CURRENT);
+    is31fl3729_write_register(index, IS31FL3729_REG_CONFIGURATION, IS31FL3729_CONFIGURATION);
 
     // Wait 10ms to ensure the device has woken up.
     wait_ms(10);
@@ -194,18 +194,18 @@ void is31fl3729_set_scaling_register(uint8_t index, uint8_t red, uint8_t green,
     driver_buffers[led.driver].scaling_buffer_dirty     = true;
 }
 
-void is31fl3729_update_pwm_buffers(uint8_t addr, uint8_t index) {
+void is31fl3729_update_pwm_buffers(uint8_t index) {
     if (driver_buffers[index].pwm_buffer_dirty) {
-        is31fl3729_write_pwm_buffer(addr, index);
+        is31fl3729_write_pwm_buffer(index);
 
         driver_buffers[index].pwm_buffer_dirty = false;
     }
 }
 
-void is31fl3729_update_scaling_registers(uint8_t addr, uint8_t index) {
+void is31fl3729_update_scaling_registers(uint8_t index) {
     if (driver_buffers[index].scaling_buffer_dirty) {
         for (uint8_t i = 0; i < IS31FL3729_SCALING_REGISTER_COUNT; i++) {
-            is31fl3729_write_register(addr, IS31FL3729_REG_SCALING + i, driver_buffers[index].scaling_buffer[i]);
+            is31fl3729_write_register(index, IS31FL3729_REG_SCALING + i, driver_buffers[index].scaling_buffer[i]);
         }
 
         driver_buffers[index].scaling_buffer_dirty = false;
@@ -213,14 +213,7 @@ void is31fl3729_update_scaling_registers(uint8_t addr, uint8_t index) {
 }
 
 void is31fl3729_flush(void) {
-    is31fl3729_update_pwm_buffers(IS31FL3729_I2C_ADDRESS_1, 0);
-#if defined(IS31FL3729_I2C_ADDRESS_2)
-    is31fl3729_update_pwm_buffers(IS31FL3729_I2C_ADDRESS_2, 1);
-#    if defined(IS31FL3729_I2C_ADDRESS_3)
-    is31fl3729_update_pwm_buffers(IS31FL3729_I2C_ADDRESS_3, 2);
-#        if defined(IS31FL3729_I2C_ADDRESS_4)
-    is31fl3729_update_pwm_buffers(IS31FL3729_I2C_ADDRESS_4, 3);
-#        endif
-#    endif
-#endif
+    for (uint8_t i = 0; i < IS31FL3729_DRIVER_COUNT; i++) {
+        is31fl3729_update_pwm_buffers(i);
+    }
 }
diff --git a/drivers/led/issi/is31fl3729.h b/drivers/led/issi/is31fl3729.h
index 6f2672b6a32..865c462f05e 100644
--- a/drivers/led/issi/is31fl3729.h
+++ b/drivers/led/issi/is31fl3729.h
@@ -23,6 +23,7 @@
 #include "progmem.h"
 #include "util.h"
 
+#define IS31FL3729_REG_PWM 0x01
 #define IS31FL3729_REG_SCALING 0x90
 #define IS31FL3729_REG_CONFIGURATION 0xA0
 #define IS31FL3729_REG_GLOBAL_CURRENT 0xA1
@@ -60,8 +61,8 @@ typedef struct is31fl3729_led_t {
 extern const is31fl3729_led_t PROGMEM g_is31fl3729_leds[IS31FL3729_LED_COUNT];
 
 void is31fl3729_init_drivers(void);
-void is31fl3729_init(uint8_t addr);
-void is31fl3729_write_register(uint8_t addr, uint8_t reg, uint8_t data);
+void is31fl3729_init(uint8_t index);
+void is31fl3729_write_register(uint8_t index, uint8_t reg, uint8_t data);
 
 void is31fl3729_set_color(int index, uint8_t red, uint8_t green, uint8_t blue);
 void is31fl3729_set_color_all(uint8_t red, uint8_t green, uint8_t blue);
@@ -72,26 +73,42 @@ void is31fl3729_set_scaling_register(uint8_t index, uint8_t red, uint8_t green,
 // (eg. from a timer interrupt).
 // Call this while idle (in between matrix scans).
 // If the buffer is dirty, it will update the driver with the buffer.
-void is31fl3729_update_pwm_buffers(uint8_t addr, uint8_t index);
-void is31fl3729_update_scaling_registers(uint8_t addr, uint8_t index);
+void is31fl3729_update_pwm_buffers(uint8_t index);
+void is31fl3729_update_scaling_registers(uint8_t index);
 
 void is31fl3729_flush(void);
 
-// Noise reduction using Spread Spectrum register
-#define IS31FL3729_SSP_DISABLE 0b0
-#define IS31FL3729_SSP_ENABLE 0b1
+#define IS31FL3729_SW_PULLDOWN_0_OHM 0b000
+#define IS31FL3729_SW_PULLDOWN_0K5_OHM_SW_OFF 0b001
+#define IS31FL3729_SW_PULLDOWN_1K_OHM_SW_OFF 0b010
+#define IS31FL3729_SW_PULLDOWN_2K_OHM_SW_OFF 0b011
+#define IS31FL3729_SW_PULLDOWN_1K_OHM 0b100
+#define IS31FL3729_SW_PULLDOWN_2K_OHM 0b101
+#define IS31FL3729_SW_PULLDOWN_4K_OHM 0b110
+#define IS31FL3729_SW_PULLDOWN_8K_OHM 0b111
 
-#define IS31FL3729_RNG_5_PERCENT 0b00
-#define IS31FL3729_RNG_15_PERCENT 0b01
-#define IS31FL3729_RNG_24_PERCENT 0b10
-#define IS31FL3729_RNG_34_PERCENT 0b11
+#define IS31FL3729_CS_PULLUP_0_OHM 0b000
+#define IS31FL3729_CS_PULLUP_0K5_OHM_CS_OFF 0b001
+#define IS31FL3729_CS_PULLUP_1K_OHM_CS_OFF 0b010
+#define IS31FL3729_CS_PULLUP_2K_OHM_CS_OFF 0b011
+#define IS31FL3729_CS_PULLUP_1K_OHM 0b100
+#define IS31FL3729_CS_PULLUP_2K_OHM 0b101
+#define IS31FL3729_CS_PULLUP_4K_OHM 0b110
+#define IS31FL3729_CS_PULLUP_8K_OHM 0b111
 
-#define IS31FL3729_CLT_1980_US 0b00
-#define IS31FL3729_CLT_1200_US 0b01
-#define IS31FL3729_CLT_820_US 0b10
-#define IS31FL3729_CLT_660_US 0b11
+#define IS31FL3729_SPREAD_SPECTRUM_DISABLE 0b0
+#define IS31FL3729_SPREAD_SPECTRUM_ENABLE 0b1
+
+#define IS31FL3729_SPREAD_SPECTRUM_RANGE_5_PERCENT 0b00
+#define IS31FL3729_SPREAD_SPECTRUM_RANGE_15_PERCENT 0b01
+#define IS31FL3729_SPREAD_SPECTRUM_RANGE_24_PERCENT 0b10
+#define IS31FL3729_SPREAD_SPECTRUM_RANGE_34_PERCENT 0b11
+
+#define IS31FL3729_SPREAD_SPECTRUM_CYCLE_TIME_1980_US 0b00
+#define IS31FL3729_SPREAD_SPECTRUM_CYCLE_TIME_1200_US 0b01
+#define IS31FL3729_SPREAD_SPECTRUM_CYCLE_TIME_820_US 0b10
+#define IS31FL3729_SPREAD_SPECTRUM_CYCLE_TIME_660_US 0b11
 
-// Noise reduction using PWM Frequency register
 #define IS31FL3729_PWM_FREQUENCY_55K_HZ 0b000
 #define IS31FL3729_PWM_FREQUENCY_32K_HZ 0b001
 #define IS31FL3729_PWM_FREQUENCY_4K_HZ 0b010
@@ -101,7 +118,6 @@ void is31fl3729_flush(void);
 #define IS31FL3729_PWM_FREQUENCY_250_HZ 0b110
 #define IS31FL3729_PWM_FREQUENCY_80K_HZ 0b111
 
-// Change SWx Setting using Configuration register
 #define IS31FL3729_CONFIG_SWS_15_9 0x01 // 15 CS x 9 SW matrix
 #define IS31FL3729_CONFIG_SWS_16_8 0x11 // 16 CS x 8 SW matrix
 #define IS31FL3729_CONFIG_SWS_16_7 0x21 // 16 CS x 7 SW matrix
@@ -111,157 +127,154 @@ void is31fl3729_flush(void);
 #define IS31FL3729_CONFIG_SWS_16_3 0x61 // 16 CS x 3 SW matrix
 #define IS31FL3729_CONFIG_SWS_16_2 0x71 // 16 CS x 2 SW matrix
 
-// Map CS SW locations to order in PWM / Scaling buffers
-// This matches the ORDER in the Datasheet Register not the POSITION
-// It will always count from 0x01 to (ISSI_MAX_LEDS - 1)
-#define SW1_CS1 0x01
-#define SW1_CS2 0x02
-#define SW1_CS3 0x03
-#define SW1_CS4 0x04
-#define SW1_CS5 0x05
-#define SW1_CS6 0x06
-#define SW1_CS7 0x07
-#define SW1_CS8 0x08
-#define SW1_CS9 0x09
-#define SW1_CS10 0x0A
-#define SW1_CS11 0x0B
-#define SW1_CS12 0x0C
-#define SW1_CS13 0x0D
-#define SW1_CS14 0x0E
-#define SW1_CS15 0x0F
-#define SW1_CS16 0x10
+#define SW1_CS1 0x00
+#define SW1_CS2 0x01
+#define SW1_CS3 0x02
+#define SW1_CS4 0x03
+#define SW1_CS5 0x04
+#define SW1_CS6 0x05
+#define SW1_CS7 0x06
+#define SW1_CS8 0x07
+#define SW1_CS9 0x08
+#define SW1_CS10 0x09
+#define SW1_CS11 0x0A
+#define SW1_CS12 0x0B
+#define SW1_CS13 0x0C
+#define SW1_CS14 0x0D
+#define SW1_CS15 0x0E
+#define SW1_CS16 0x0F
 
-#define SW2_CS1 0x11
-#define SW2_CS2 0x12
-#define SW2_CS3 0x13
-#define SW2_CS4 0x14
-#define SW2_CS5 0x15
-#define SW2_CS6 0x16
-#define SW2_CS7 0x17
-#define SW2_CS8 0x18
-#define SW2_CS9 0x19
-#define SW2_CS10 0x1A
-#define SW2_CS11 0x1B
-#define SW2_CS12 0x1C
-#define SW2_CS13 0x1D
-#define SW2_CS14 0x1E
-#define SW2_CS15 0x1F
-#define SW2_CS16 0x20
+#define SW2_CS1 0x10
+#define SW2_CS2 0x11
+#define SW2_CS3 0x12
+#define SW2_CS4 0x13
+#define SW2_CS5 0x14
+#define SW2_CS6 0x15
+#define SW2_CS7 0x16
+#define SW2_CS8 0x17
+#define SW2_CS9 0x18
+#define SW2_CS10 0x19
+#define SW2_CS11 0x1A
+#define SW2_CS12 0x1B
+#define SW2_CS13 0x1C
+#define SW2_CS14 0x1D
+#define SW2_CS15 0x1E
+#define SW2_CS16 0x1F
 
-#define SW3_CS1 0x21
-#define SW3_CS2 0x22
-#define SW3_CS3 0x23
-#define SW3_CS4 0x24
-#define SW3_CS5 0x25
-#define SW3_CS6 0x26
-#define SW3_CS7 0x27
-#define SW3_CS8 0x28
-#define SW3_CS9 0x29
-#define SW3_CS10 0x2A
-#define SW3_CS11 0x2B
-#define SW3_CS12 0x2C
-#define SW3_CS13 0x2D
-#define SW3_CS14 0x2E
-#define SW3_CS15 0x2F
-#define SW3_CS16 0x30
+#define SW3_CS1 0x20
+#define SW3_CS2 0x21
+#define SW3_CS3 0x22
+#define SW3_CS4 0x23
+#define SW3_CS5 0x24
+#define SW3_CS6 0x25
+#define SW3_CS7 0x26
+#define SW3_CS8 0x27
+#define SW3_CS9 0x28
+#define SW3_CS10 0x29
+#define SW3_CS11 0x2A
+#define SW3_CS12 0x2B
+#define SW3_CS13 0x2C
+#define SW3_CS14 0x2D
+#define SW3_CS15 0x2E
+#define SW3_CS16 0x2F
 
-#define SW4_CS1 0x31
-#define SW4_CS2 0x32
-#define SW4_CS3 0x33
-#define SW4_CS4 0x34
-#define SW4_CS5 0x35
-#define SW4_CS6 0x36
-#define SW4_CS7 0x37
-#define SW4_CS8 0x38
-#define SW4_CS9 0x39
-#define SW4_CS10 0x3A
-#define SW4_CS11 0x3B
-#define SW4_CS12 0x3C
-#define SW4_CS13 0x3D
-#define SW4_CS14 0x3E
-#define SW4_CS15 0x3F
-#define SW4_CS16 0x40
+#define SW4_CS1 0x30
+#define SW4_CS2 0x31
+#define SW4_CS3 0x32
+#define SW4_CS4 0x33
+#define SW4_CS5 0x34
+#define SW4_CS6 0x35
+#define SW4_CS7 0x36
+#define SW4_CS8 0x37
+#define SW4_CS9 0x38
+#define SW4_CS10 0x39
+#define SW4_CS11 0x3A
+#define SW4_CS12 0x3B
+#define SW4_CS13 0x3C
+#define SW4_CS14 0x3D
+#define SW4_CS15 0x3E
+#define SW4_CS16 0x3F
 
-#define SW5_CS1 0x41
-#define SW5_CS2 0x42
-#define SW5_CS3 0x43
-#define SW5_CS4 0x44
-#define SW5_CS5 0x45
-#define SW5_CS6 0x46
-#define SW5_CS7 0x47
-#define SW5_CS8 0x48
-#define SW5_CS9 0x49
-#define SW5_CS10 0x4A
-#define SW5_CS11 0x4B
-#define SW5_CS12 0x4C
-#define SW5_CS13 0x4D
-#define SW5_CS14 0x4E
-#define SW5_CS15 0x4F
-#define SW5_CS16 0x50
+#define SW5_CS1 0x40
+#define SW5_CS2 0x41
+#define SW5_CS3 0x42
+#define SW5_CS4 0x43
+#define SW5_CS5 0x44
+#define SW5_CS6 0x45
+#define SW5_CS7 0x46
+#define SW5_CS8 0x47
+#define SW5_CS9 0x48
+#define SW5_CS10 0x49
+#define SW5_CS11 0x4A
+#define SW5_CS12 0x4B
+#define SW5_CS13 0x4C
+#define SW5_CS14 0x4D
+#define SW5_CS15 0x4E
+#define SW5_CS16 0x4F
 
-#define SW6_CS1 0x51
-#define SW6_CS2 0x52
-#define SW6_CS3 0x53
-#define SW6_CS4 0x54
-#define SW6_CS5 0x55
-#define SW6_CS6 0x56
-#define SW6_CS7 0x57
-#define SW6_CS8 0x58
-#define SW6_CS9 0x59
-#define SW6_CS10 0x5A
-#define SW6_CS11 0x5B
-#define SW6_CS12 0x5C
-#define SW6_CS13 0x5D
-#define SW6_CS14 0x5E
-#define SW6_CS15 0x5F
-#define SW6_CS16 0x60
+#define SW6_CS1 0x50
+#define SW6_CS2 0x51
+#define SW6_CS3 0x52
+#define SW6_CS4 0x53
+#define SW6_CS5 0x54
+#define SW6_CS6 0x55
+#define SW6_CS7 0x56
+#define SW6_CS8 0x57
+#define SW6_CS9 0x58
+#define SW6_CS10 0x59
+#define SW6_CS11 0x5A
+#define SW6_CS12 0x5B
+#define SW6_CS13 0x5C
+#define SW6_CS14 0x5D
+#define SW6_CS15 0x5E
+#define SW6_CS16 0x5F
 
-#define SW7_CS1 0x61
-#define SW7_CS2 0x62
-#define SW7_CS3 0x63
-#define SW7_CS4 0x64
-#define SW7_CS5 0x65
-#define SW7_CS6 0x66
-#define SW7_CS7 0x67
-#define SW7_CS8 0x68
-#define SW7_CS9 0x69
-#define SW7_CS10 0x6A
-#define SW7_CS11 0x6B
-#define SW7_CS12 0x6C
-#define SW7_CS13 0x6D
-#define SW7_CS14 0x6E
-#define SW7_CS15 0x6F
-#define SW7_CS16 0x70
+#define SW7_CS1 0x60
+#define SW7_CS2 0x61
+#define SW7_CS3 0x62
+#define SW7_CS4 0x63
+#define SW7_CS5 0x64
+#define SW7_CS6 0x65
+#define SW7_CS7 0x66
+#define SW7_CS8 0x67
+#define SW7_CS9 0x68
+#define SW7_CS10 0x69
+#define SW7_CS11 0x6A
+#define SW7_CS12 0x6B
+#define SW7_CS13 0x6C
+#define SW7_CS14 0x6D
+#define SW7_CS15 0x6E
+#define SW7_CS16 0x6F
 
-#define SW8_CS1 0x71
-#define SW8_CS2 0x72
-#define SW8_CS3 0x73
-#define SW8_CS4 0x74
-#define SW8_CS5 0x75
-#define SW8_CS6 0x76
-#define SW8_CS7 0x77
-#define SW8_CS8 0x78
-#define SW8_CS9 0x79
-#define SW8_CS10 0x7A
-#define SW8_CS11 0x7B
-#define SW8_CS12 0x7C
-#define SW8_CS13 0x7D
-#define SW8_CS14 0x7E
-#define SW8_CS15 0x7F
-#define SW8_CS16 0x80
+#define SW8_CS1 0x70
+#define SW8_CS2 0x71
+#define SW8_CS3 0x72
+#define SW8_CS4 0x73
+#define SW8_CS5 0x74
+#define SW8_CS6 0x75
+#define SW8_CS7 0x76
+#define SW8_CS8 0x77
+#define SW8_CS9 0x78
+#define SW8_CS10 0x79
+#define SW8_CS11 0x7A
+#define SW8_CS12 0x7B
+#define SW8_CS13 0x7C
+#define SW8_CS14 0x7D
+#define SW8_CS15 0x7E
+#define SW8_CS16 0x7F
 
-#define SW9_CS1 0x81
-#define SW9_CS2 0x82
-#define SW9_CS3 0x83
-#define SW9_CS4 0x84
-#define SW9_CS5 0x85
-#define SW9_CS6 0x86
-#define SW9_CS7 0x87
-#define SW9_CS8 0x88
-#define SW9_CS9 0x89
-#define SW9_CS10 0x8A
-#define SW9_CS11 0x8B
-#define SW9_CS12 0x8C
-#define SW9_CS13 0x8D
-#define SW9_CS14 0x8E
-#define SW9_CS15 0x8F
+#define SW9_CS1 0x80
+#define SW9_CS2 0x81
+#define SW9_CS3 0x82
+#define SW9_CS4 0x83
+#define SW9_CS5 0x84
+#define SW9_CS6 0x85
+#define SW9_CS7 0x86
+#define SW9_CS8 0x87
+#define SW9_CS9 0x88
+#define SW9_CS10 0x89
+#define SW9_CS11 0x8A
+#define SW9_CS12 0x8B
+#define SW9_CS13 0x8C
+#define SW9_CS14 0x8D
+#define SW9_CS15 0x8E
diff --git a/drivers/led/issi/is31fl3731-mono.c b/drivers/led/issi/is31fl3731-mono.c
index 5ff8f8b7c5d..33a863b982f 100644
--- a/drivers/led/issi/is31fl3731-mono.c
+++ b/drivers/led/issi/is31fl3731-mono.c
@@ -99,8 +99,8 @@ void is31fl3731_init_drivers(void) {
     i2c_init();
 
 #if defined(IS31FL3731_SDB_PIN)
-    setPinOutput(IS31FL3731_SDB_PIN);
-    writePinHigh(IS31FL3731_SDB_PIN);
+    gpio_set_pin_output(IS31FL3731_SDB_PIN);
+    gpio_write_pin_high(IS31FL3731_SDB_PIN);
 #endif
 
     for (uint8_t i = 0; i < IS31FL3731_DRIVER_COUNT; i++) {
diff --git a/drivers/led/issi/is31fl3731.c b/drivers/led/issi/is31fl3731.c
index 380861d5b8c..86d953ef25d 100644
--- a/drivers/led/issi/is31fl3731.c
+++ b/drivers/led/issi/is31fl3731.c
@@ -98,8 +98,8 @@ void is31fl3731_init_drivers(void) {
     i2c_init();
 
 #if defined(IS31FL3731_SDB_PIN)
-    setPinOutput(IS31FL3731_SDB_PIN);
-    writePinHigh(IS31FL3731_SDB_PIN);
+    gpio_set_pin_output(IS31FL3731_SDB_PIN);
+    gpio_write_pin_high(IS31FL3731_SDB_PIN);
 #endif
 
     for (uint8_t i = 0; i < IS31FL3731_DRIVER_COUNT; i++) {
diff --git a/drivers/led/issi/is31fl3733-mono.c b/drivers/led/issi/is31fl3733-mono.c
index 13f2d9b9831..740fe060970 100644
--- a/drivers/led/issi/is31fl3733-mono.c
+++ b/drivers/led/issi/is31fl3733-mono.c
@@ -144,8 +144,8 @@ void is31fl3733_init_drivers(void) {
     i2c_init();
 
 #if defined(IS31FL3733_SDB_PIN)
-    setPinOutput(IS31FL3733_SDB_PIN);
-    writePinHigh(IS31FL3733_SDB_PIN);
+    gpio_set_pin_output(IS31FL3733_SDB_PIN);
+    gpio_write_pin_high(IS31FL3733_SDB_PIN);
 #endif
 
     for (uint8_t i = 0; i < IS31FL3733_DRIVER_COUNT; i++) {
diff --git a/drivers/led/issi/is31fl3733.c b/drivers/led/issi/is31fl3733.c
index ac6f4b4c890..a1d68991149 100644
--- a/drivers/led/issi/is31fl3733.c
+++ b/drivers/led/issi/is31fl3733.c
@@ -143,8 +143,8 @@ void is31fl3733_init_drivers(void) {
     i2c_init();
 
 #if defined(IS31FL3733_SDB_PIN)
-    setPinOutput(IS31FL3733_SDB_PIN);
-    writePinHigh(IS31FL3733_SDB_PIN);
+    gpio_set_pin_output(IS31FL3733_SDB_PIN);
+    gpio_write_pin_high(IS31FL3733_SDB_PIN);
 #endif
 
     for (uint8_t i = 0; i < IS31FL3733_DRIVER_COUNT; i++) {
diff --git a/drivers/led/issi/is31fl3736-mono.c b/drivers/led/issi/is31fl3736-mono.c
index 0d3b5db4e4c..7a5415c7259 100644
--- a/drivers/led/issi/is31fl3736-mono.c
+++ b/drivers/led/issi/is31fl3736-mono.c
@@ -115,8 +115,8 @@ void is31fl3736_init_drivers(void) {
     i2c_init();
 
 #if defined(IS31FL3736_SDB_PIN)
-    setPinOutput(IS31FL3736_SDB_PIN);
-    writePinHigh(IS31FL3736_SDB_PIN);
+    gpio_set_pin_output(IS31FL3736_SDB_PIN);
+    gpio_write_pin_high(IS31FL3736_SDB_PIN);
 #endif
 
     for (uint8_t i = 0; i < IS31FL3736_DRIVER_COUNT; i++) {
diff --git a/drivers/led/issi/is31fl3736.c b/drivers/led/issi/is31fl3736.c
index 990e6c89054..3ab42e2f7c3 100644
--- a/drivers/led/issi/is31fl3736.c
+++ b/drivers/led/issi/is31fl3736.c
@@ -115,8 +115,8 @@ void is31fl3736_init_drivers(void) {
     i2c_init();
 
 #if defined(IS31FL3736_SDB_PIN)
-    setPinOutput(IS31FL3736_SDB_PIN);
-    writePinHigh(IS31FL3736_SDB_PIN);
+    gpio_set_pin_output(IS31FL3736_SDB_PIN);
+    gpio_write_pin_high(IS31FL3736_SDB_PIN);
 #endif
 
     for (uint8_t i = 0; i < IS31FL3736_DRIVER_COUNT; i++) {
diff --git a/drivers/led/issi/is31fl3737-mono.c b/drivers/led/issi/is31fl3737-mono.c
index 37d684cff0e..7b2e5a35763 100644
--- a/drivers/led/issi/is31fl3737-mono.c
+++ b/drivers/led/issi/is31fl3737-mono.c
@@ -117,8 +117,8 @@ void is31fl3737_init_drivers(void) {
     i2c_init();
 
 #if defined(IS31FL3737_SDB_PIN)
-    setPinOutput(IS31FL3737_SDB_PIN);
-    writePinHigh(IS31FL3737_SDB_PIN);
+    gpio_set_pin_output(IS31FL3737_SDB_PIN);
+    gpio_write_pin_high(IS31FL3737_SDB_PIN);
 #endif
 
     for (uint8_t i = 0; i < IS31FL3737_DRIVER_COUNT; i++) {
diff --git a/drivers/led/issi/is31fl3737.c b/drivers/led/issi/is31fl3737.c
index fb760cda5ee..b27a4cbb0f2 100644
--- a/drivers/led/issi/is31fl3737.c
+++ b/drivers/led/issi/is31fl3737.c
@@ -117,8 +117,8 @@ void is31fl3737_init_drivers(void) {
     i2c_init();
 
 #if defined(IS31FL3737_SDB_PIN)
-    setPinOutput(IS31FL3737_SDB_PIN);
-    writePinHigh(IS31FL3737_SDB_PIN);
+    gpio_set_pin_output(IS31FL3737_SDB_PIN);
+    gpio_write_pin_high(IS31FL3737_SDB_PIN);
 #endif
 
     for (uint8_t i = 0; i < IS31FL3737_DRIVER_COUNT; i++) {
diff --git a/drivers/led/issi/is31fl3741-mono.c b/drivers/led/issi/is31fl3741-mono.c
index e4857b72d48..dbccba0fc8d 100644
--- a/drivers/led/issi/is31fl3741-mono.c
+++ b/drivers/led/issi/is31fl3741-mono.c
@@ -143,8 +143,8 @@ void is31fl3741_init_drivers(void) {
     i2c_init();
 
 #if defined(IS31FL3741_SDB_PIN)
-    setPinOutput(IS31FL3741_SDB_PIN);
-    writePinHigh(IS31FL3741_SDB_PIN);
+    gpio_set_pin_output(IS31FL3741_SDB_PIN);
+    gpio_write_pin_high(IS31FL3741_SDB_PIN);
 #endif
 
     for (uint8_t i = 0; i < IS31FL3741_DRIVER_COUNT; i++) {
diff --git a/drivers/led/issi/is31fl3741.c b/drivers/led/issi/is31fl3741.c
index a6cb661d912..3614d1c104c 100644
--- a/drivers/led/issi/is31fl3741.c
+++ b/drivers/led/issi/is31fl3741.c
@@ -143,8 +143,8 @@ void is31fl3741_init_drivers(void) {
     i2c_init();
 
 #if defined(IS31FL3741_SDB_PIN)
-    setPinOutput(IS31FL3741_SDB_PIN);
-    writePinHigh(IS31FL3741_SDB_PIN);
+    gpio_set_pin_output(IS31FL3741_SDB_PIN);
+    gpio_write_pin_high(IS31FL3741_SDB_PIN);
 #endif
 
     for (uint8_t i = 0; i < IS31FL3741_DRIVER_COUNT; i++) {
diff --git a/drivers/led/issi/is31fl3742a-mono.c b/drivers/led/issi/is31fl3742a-mono.c
index a33865260c8..c63db1a7fc9 100644
--- a/drivers/led/issi/is31fl3742a-mono.c
+++ b/drivers/led/issi/is31fl3742a-mono.c
@@ -116,8 +116,8 @@ void is31fl3742a_init_drivers(void) {
     i2c_init();
 
 #if defined(IS31FL3742A_SDB_PIN)
-    setPinOutput(IS31FL3742A_SDB_PIN);
-    writePinHigh(IS31FL3742A_SDB_PIN);
+    gpio_set_pin_output(IS31FL3742A_SDB_PIN);
+    gpio_write_pin_high(IS31FL3742A_SDB_PIN);
 #endif
 
     for (uint8_t i = 0; i < IS31FL3742A_DRIVER_COUNT; i++) {
diff --git a/drivers/led/issi/is31fl3742a.c b/drivers/led/issi/is31fl3742a.c
index 8900ae666fd..b8e9a587590 100644
--- a/drivers/led/issi/is31fl3742a.c
+++ b/drivers/led/issi/is31fl3742a.c
@@ -116,8 +116,8 @@ void is31fl3742a_init_drivers(void) {
     i2c_init();
 
 #if defined(IS31FL3742A_SDB_PIN)
-    setPinOutput(IS31FL3742A_SDB_PIN);
-    writePinHigh(IS31FL3742A_SDB_PIN);
+    gpio_set_pin_output(IS31FL3742A_SDB_PIN);
+    gpio_write_pin_high(IS31FL3742A_SDB_PIN);
 #endif
 
     for (uint8_t i = 0; i < IS31FL3742A_DRIVER_COUNT; i++) {
diff --git a/drivers/led/issi/is31fl3743a-mono.c b/drivers/led/issi/is31fl3743a-mono.c
index 99b1af160e4..6413dbef04a 100644
--- a/drivers/led/issi/is31fl3743a-mono.c
+++ b/drivers/led/issi/is31fl3743a-mono.c
@@ -138,8 +138,8 @@ void is31fl3743a_init_drivers(void) {
     i2c_init();
 
 #if defined(IS31FL3743A_SDB_PIN)
-    setPinOutput(IS31FL3743A_SDB_PIN);
-    writePinHigh(IS31FL3743A_SDB_PIN);
+    gpio_set_pin_output(IS31FL3743A_SDB_PIN);
+    gpio_write_pin_high(IS31FL3743A_SDB_PIN);
 #endif
 
     for (uint8_t i = 0; i < IS31FL3743A_DRIVER_COUNT; i++) {
diff --git a/drivers/led/issi/is31fl3743a.c b/drivers/led/issi/is31fl3743a.c
index 135e20710d4..6f13925f27a 100644
--- a/drivers/led/issi/is31fl3743a.c
+++ b/drivers/led/issi/is31fl3743a.c
@@ -138,8 +138,8 @@ void is31fl3743a_init_drivers(void) {
     i2c_init();
 
 #if defined(IS31FL3743A_SDB_PIN)
-    setPinOutput(IS31FL3743A_SDB_PIN);
-    writePinHigh(IS31FL3743A_SDB_PIN);
+    gpio_set_pin_output(IS31FL3743A_SDB_PIN);
+    gpio_write_pin_high(IS31FL3743A_SDB_PIN);
 #endif
 
     for (uint8_t i = 0; i < IS31FL3743A_DRIVER_COUNT; i++) {
diff --git a/drivers/led/issi/is31fl3745-mono.c b/drivers/led/issi/is31fl3745-mono.c
index c5d083b272f..a6ab6992457 100644
--- a/drivers/led/issi/is31fl3745-mono.c
+++ b/drivers/led/issi/is31fl3745-mono.c
@@ -138,8 +138,8 @@ void is31fl3745_init_drivers(void) {
     i2c_init();
 
 #if defined(IS31FL3745_SDB_PIN)
-    setPinOutput(IS31FL3745_SDB_PIN);
-    writePinHigh(IS31FL3745_SDB_PIN);
+    gpio_set_pin_output(IS31FL3745_SDB_PIN);
+    gpio_write_pin_high(IS31FL3745_SDB_PIN);
 #endif
 
     for (uint8_t i = 0; i < IS31FL3745_DRIVER_COUNT; i++) {
diff --git a/drivers/led/issi/is31fl3745.c b/drivers/led/issi/is31fl3745.c
index 273fddf1d4c..1e3b437e02a 100644
--- a/drivers/led/issi/is31fl3745.c
+++ b/drivers/led/issi/is31fl3745.c
@@ -138,8 +138,8 @@ void is31fl3745_init_drivers(void) {
     i2c_init();
 
 #if defined(IS31FL3745_SDB_PIN)
-    setPinOutput(IS31FL3745_SDB_PIN);
-    writePinHigh(IS31FL3745_SDB_PIN);
+    gpio_set_pin_output(IS31FL3745_SDB_PIN);
+    gpio_write_pin_high(IS31FL3745_SDB_PIN);
 #endif
 
     for (uint8_t i = 0; i < IS31FL3745_DRIVER_COUNT; i++) {
diff --git a/drivers/led/issi/is31fl3746a-mono.c b/drivers/led/issi/is31fl3746a-mono.c
index 69d50799294..6bff10723fd 100644
--- a/drivers/led/issi/is31fl3746a-mono.c
+++ b/drivers/led/issi/is31fl3746a-mono.c
@@ -116,8 +116,8 @@ void is31fl3746a_init_drivers(void) {
     i2c_init();
 
 #if defined(IS31FL3746A_SDB_PIN)
-    setPinOutput(IS31FL3746A_SDB_PIN);
-    writePinHigh(IS31FL3746A_SDB_PIN);
+    gpio_set_pin_output(IS31FL3746A_SDB_PIN);
+    gpio_write_pin_high(IS31FL3746A_SDB_PIN);
 #endif
 
     for (uint8_t i = 0; i < IS31FL3746A_DRIVER_COUNT; i++) {
diff --git a/drivers/led/issi/is31fl3746a.c b/drivers/led/issi/is31fl3746a.c
index c9dfbc5c40f..1ef0b2d6322 100644
--- a/drivers/led/issi/is31fl3746a.c
+++ b/drivers/led/issi/is31fl3746a.c
@@ -116,8 +116,8 @@ void is31fl3746a_init_drivers(void) {
     i2c_init();
 
 #if defined(IS31FL3746A_SDB_PIN)
-    setPinOutput(IS31FL3746A_SDB_PIN);
-    writePinHigh(IS31FL3746A_SDB_PIN);
+    gpio_set_pin_output(IS31FL3746A_SDB_PIN);
+    gpio_write_pin_high(IS31FL3746A_SDB_PIN);
 #endif
 
     for (uint8_t i = 0; i < IS31FL3746A_DRIVER_COUNT; i++) {
diff --git a/drivers/led/snled27351-mono.c b/drivers/led/snled27351-mono.c
index e13fd8a3433..d87b856db69 100644
--- a/drivers/led/snled27351-mono.c
+++ b/drivers/led/snled27351-mono.c
@@ -105,8 +105,8 @@ void snled27351_init_drivers(void) {
     i2c_init();
 
 #if defined(SNLED27351_SDB_PIN)
-    setPinOutput(SNLED27351_SDB_PIN);
-    writePinHigh(SNLED27351_SDB_PIN);
+    gpio_set_pin_output(SNLED27351_SDB_PIN);
+    gpio_write_pin_high(SNLED27351_SDB_PIN);
 #endif
 
     for (uint8_t i = 0; i < SNLED27351_DRIVER_COUNT; i++) {
diff --git a/drivers/led/snled27351.c b/drivers/led/snled27351.c
index 293685b01b5..8ebf681bdb6 100644
--- a/drivers/led/snled27351.c
+++ b/drivers/led/snled27351.c
@@ -105,8 +105,8 @@ void snled27351_init_drivers(void) {
     i2c_init();
 
 #if defined(SNLED27351_SDB_PIN)
-    setPinOutput(SNLED27351_SDB_PIN);
-    writePinHigh(SNLED27351_SDB_PIN);
+    gpio_set_pin_output(SNLED27351_SDB_PIN);
+    gpio_write_pin_high(SNLED27351_SDB_PIN);
 #endif
 
     for (uint8_t i = 0; i < SNLED27351_DRIVER_COUNT; i++) {
diff --git a/drivers/oled/oled_driver.c b/drivers/oled/oled_driver.c
index 8cca41394f0..1d1c2a90c4c 100644
--- a/drivers/oled/oled_driver.c
+++ b/drivers/oled/oled_driver.c
@@ -192,7 +192,7 @@ __attribute__((weak)) bool oled_send_cmd(const uint8_t *data, uint16_t size) {
         return false;
     }
     // Command Mode
-    writePinLow(OLED_DC_PIN);
+    gpio_write_pin_low(OLED_DC_PIN);
     // Send the commands
     if (spi_transmit(&data[1], size - 1) != SPI_STATUS_SUCCESS) {
         spi_stop();
@@ -215,7 +215,7 @@ __attribute__((weak)) bool oled_send_cmd_P(const uint8_t *data, uint16_t size) {
     }
     spi_status_t status = SPI_STATUS_SUCCESS;
     // Command Mode
-    writePinLow(OLED_DC_PIN);
+    gpio_write_pin_low(OLED_DC_PIN);
     // Send the commands
     for (uint16_t i = 1; i < size && status >= 0; i++) {
         status = spi_write(pgm_read_byte((const char *)&data[i]));
@@ -239,7 +239,7 @@ __attribute__((weak)) bool oled_send_data(const uint8_t *data, uint16_t size) {
         return false;
     }
     // Data Mode
-    writePinHigh(OLED_DC_PIN);
+    gpio_write_pin_high(OLED_DC_PIN);
     // Send the commands
     if (spi_transmit(data, size) != SPI_STATUS_SUCCESS) {
         spi_stop();
@@ -256,17 +256,17 @@ __attribute__((weak)) bool oled_send_data(const uint8_t *data, uint16_t size) {
 __attribute__((weak)) void oled_driver_init(void) {
 #if defined(OLED_TRANSPORT_SPI)
     spi_init();
-    setPinOutput(OLED_CS_PIN);
-    writePinHigh(OLED_CS_PIN);
+    gpio_set_pin_output(OLED_CS_PIN);
+    gpio_write_pin_high(OLED_CS_PIN);
 
-    setPinOutput(OLED_DC_PIN);
-    writePinLow(OLED_DC_PIN);
+    gpio_set_pin_output(OLED_DC_PIN);
+    gpio_write_pin_low(OLED_DC_PIN);
 #    ifdef OLED_RST_PIN
     /* Reset device */
-    setPinOutput(OLED_RST_PIN);
-    writePinLow(OLED_RST_PIN);
+    gpio_set_pin_output(OLED_RST_PIN);
+    gpio_write_pin_low(OLED_RST_PIN);
     wait_ms(20);
-    writePinHigh(OLED_RST_PIN);
+    gpio_write_pin_high(OLED_RST_PIN);
     wait_ms(20);
 #    endif
 #elif defined(OLED_TRANSPORT_I2C)
diff --git a/drivers/painter/comms/qp_comms_spi.c b/drivers/painter/comms/qp_comms_spi.c
index 9f52bc7d1f3..4e6067394b3 100644
--- a/drivers/painter/comms/qp_comms_spi.c
+++ b/drivers/painter/comms/qp_comms_spi.c
@@ -17,8 +17,8 @@ bool qp_comms_spi_init(painter_device_t device) {
     spi_init();
 
     // Set up CS as output high
-    setPinOutput(comms_config->chip_select_pin);
-    writePinHigh(comms_config->chip_select_pin);
+    gpio_set_pin_output(comms_config->chip_select_pin);
+    gpio_write_pin_high(comms_config->chip_select_pin);
 
     return true;
 }
@@ -49,7 +49,7 @@ void qp_comms_spi_stop(painter_device_t device) {
     painter_driver_t *     driver       = (painter_driver_t *)device;
     qp_comms_spi_config_t *comms_config = (qp_comms_spi_config_t *)driver->comms_config;
     spi_stop();
-    writePinHigh(comms_config->chip_select_pin);
+    gpio_write_pin_high(comms_config->chip_select_pin);
 }
 
 const painter_comms_vtable_t spi_comms_vtable = {
@@ -74,16 +74,16 @@ bool qp_comms_spi_dc_reset_init(painter_device_t device) {
 
     // Set up D/C as output low, if specified
     if (comms_config->dc_pin != NO_PIN) {
-        setPinOutput(comms_config->dc_pin);
-        writePinLow(comms_config->dc_pin);
+        gpio_set_pin_output(comms_config->dc_pin);
+        gpio_write_pin_low(comms_config->dc_pin);
     }
 
     // Set up RST as output, if specified, performing a reset in the process
     if (comms_config->reset_pin != NO_PIN) {
-        setPinOutput(comms_config->reset_pin);
-        writePinLow(comms_config->reset_pin);
+        gpio_set_pin_output(comms_config->reset_pin);
+        gpio_write_pin_low(comms_config->reset_pin);
         wait_ms(20);
-        writePinHigh(comms_config->reset_pin);
+        gpio_write_pin_high(comms_config->reset_pin);
         wait_ms(20);
     }
 
@@ -93,14 +93,14 @@ bool qp_comms_spi_dc_reset_init(painter_device_t device) {
 uint32_t qp_comms_spi_dc_reset_send_data(painter_device_t device, const void *data, uint32_t byte_count) {
     painter_driver_t *              driver       = (painter_driver_t *)device;
     qp_comms_spi_dc_reset_config_t *comms_config = (qp_comms_spi_dc_reset_config_t *)driver->comms_config;
-    writePinHigh(comms_config->dc_pin);
+    gpio_write_pin_high(comms_config->dc_pin);
     return qp_comms_spi_send_data(device, data, byte_count);
 }
 
 void qp_comms_spi_dc_reset_send_command(painter_device_t device, uint8_t cmd) {
     painter_driver_t *              driver       = (painter_driver_t *)device;
     qp_comms_spi_dc_reset_config_t *comms_config = (qp_comms_spi_dc_reset_config_t *)driver->comms_config;
-    writePinLow(comms_config->dc_pin);
+    gpio_write_pin_low(comms_config->dc_pin);
     spi_write(cmd);
 }
 
diff --git a/drivers/painter/comms/qp_comms_spi.h b/drivers/painter/comms/qp_comms_spi.h
index ff323c3c10e..c39ea95f726 100644
--- a/drivers/painter/comms/qp_comms_spi.h
+++ b/drivers/painter/comms/qp_comms_spi.h
@@ -38,6 +38,7 @@ typedef struct qp_comms_spi_dc_reset_config_t {
     bool                  command_params_uses_command_pin; // keep D/C held low when sending command sequences for data bytes
 } qp_comms_spi_dc_reset_config_t;
 
+bool     qp_comms_spi_dc_reset_init(painter_device_t device);
 void     qp_comms_spi_dc_reset_send_command(painter_device_t device, uint8_t cmd);
 uint32_t qp_comms_spi_dc_reset_send_data(painter_device_t device, const void* data, uint32_t byte_count);
 void     qp_comms_spi_dc_reset_bulk_command_sequence(painter_device_t device, const uint8_t* sequence, size_t sequence_len);
diff --git a/drivers/painter/ili9xxx/qp_ili9486.c b/drivers/painter/ili9xxx/qp_ili9486.c
new file mode 100644
index 00000000000..c4f3c15cecf
--- /dev/null
+++ b/drivers/painter/ili9xxx/qp_ili9486.c
@@ -0,0 +1,298 @@
+// Copyright 2021 Nick Brassel (@tzarc)
+// Copyright 2023 Pablo Martinez (@elpekenin) <elpekenin@elpekenin.dev>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "qp_internal.h"
+#include "qp_comms.h"
+#include "qp_ili9486.h"
+#include "qp_ili9xxx_opcodes.h"
+#include "qp_tft_panel.h"
+
+#ifdef QUANTUM_PAINTER_ILI9486_SPI_ENABLE
+#    include "spi_master.h"
+#    include <qp_comms_spi.h>
+#endif // QUANTUM_PAINTER_ILI9486_SPI_ENABLE
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// Common
+
+// Driver storage
+tft_panel_dc_reset_painter_device_t ili9486_drivers[ILI9486_NUM_DEVICES] = {0};
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// Initialization
+
+bool qp_ili9486_init(painter_device_t device, painter_rotation_t rotation) {
+    // clang-format off
+    const uint8_t ili9486_init_sequence[] = {
+        // Command,                 Delay,  N, Data[N]
+        ILI9XXX_CMD_RESET,            120,  0,
+        ILI9XXX_SET_PIX_FMT,            0,  1, 0x55,
+        ILI9XXX_SET_PGAMMA,             0, 15, 0x0F, 0x1F, 0x1C, 0x0C, 0x0F, 0x08, 0x48, 0x98, 0x37, 0x0A, 0x13, 0x04, 0x11, 0x0D, 0x00,
+        ILI9XXX_SET_NGAMMA,             0, 15, 0x0F, 0x32, 0x2E, 0x0B, 0x0D, 0x05, 0x47, 0x75, 0x37, 0x06, 0x10, 0x03, 0x24, 0x20, 0x00,
+        ILI9XXX_SET_POWER_CTL_1,        0,  2, 0x0D, 0x0D,
+        ILI9XXX_SET_POWER_CTL_2,        0,  2, 0x43, 0x00,
+        ILI9XXX_SET_POWER_CTL_3,        0,  1, 0x00,
+        ILI9XXX_SET_VCOM_CTL_1,         0,  4, 0x00, 0x48, 0x00, 0x48,
+        ILI9XXX_SET_INVERSION_CTL,      0,  1, 0x02,
+    };
+    // clang-format on
+    qp_comms_bulk_command_sequence(device, ili9486_init_sequence, sizeof(ili9486_init_sequence));
+
+    // Configure the rotation (i.e. the ordering and direction of memory writes in GRAM)
+    const uint8_t madctl[] = {
+        [QP_ROTATION_0]   = ILI9XXX_MADCTL_BGR,
+        [QP_ROTATION_90]  = ILI9XXX_MADCTL_BGR | ILI9XXX_MADCTL_MV,
+        [QP_ROTATION_180] = ILI9XXX_MADCTL_BGR,
+        [QP_ROTATION_270] = ILI9XXX_MADCTL_BGR | ILI9XXX_MADCTL_MV,
+    };
+    const uint8_t functl[] = {
+        [QP_ROTATION_0]   = 0x42,
+        [QP_ROTATION_90]  = 0x62,
+        [QP_ROTATION_180] = 0x22,
+        [QP_ROTATION_270] = 0x02,
+    };
+
+    // clang-format off
+    uint8_t rotation_sequence[] = {
+        // Command,                 Delay,  N, Data[N]
+        ILI9XXX_SET_MEM_ACS_CTL,        0,  1, madctl[rotation],
+        ILI9XXX_SET_FUNCTION_CTL,       0,  2, 0x00, functl[rotation],
+        ILI9XXX_CMD_SLEEP_OFF,          5,  0,
+        ILI9XXX_CMD_DISPLAY_ON,         5,  0,
+    };
+    // clang-format on
+    qp_comms_bulk_command_sequence(device, rotation_sequence, sizeof(rotation_sequence));
+
+    return true;
+}
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// Driver vtable
+
+// waveshare variant needs some tweaks due to shift registers
+static void qp_comms_spi_dc_reset_send_command_odd_cs_pulse(painter_device_t device, uint8_t cmd) {
+    painter_driver_t *              driver       = (painter_driver_t *)device;
+    qp_comms_spi_dc_reset_config_t *comms_config = (qp_comms_spi_dc_reset_config_t *)driver->comms_config;
+
+    writePinLow(comms_config->spi_config.chip_select_pin);
+    qp_comms_spi_dc_reset_send_command(device, cmd);
+    writePinHigh(comms_config->spi_config.chip_select_pin);
+}
+
+static uint32_t qp_comms_spi_send_data_odd_cs_pulse(painter_device_t device, const void *data, uint32_t byte_count) {
+    painter_driver_t *              driver       = (painter_driver_t *)device;
+    qp_comms_spi_dc_reset_config_t *comms_config = (qp_comms_spi_dc_reset_config_t *)driver->comms_config;
+
+    uint32_t       bytes_remaining = byte_count;
+    const uint8_t *p               = (const uint8_t *)data;
+    uint32_t       max_msg_length  = 1024;
+
+    writePinHigh(comms_config->dc_pin);
+    while (bytes_remaining > 0) {
+        uint32_t bytes_this_loop = QP_MIN(bytes_remaining, max_msg_length);
+        bool     odd_bytes       = bytes_this_loop & 1;
+
+        // send data
+        writePinLow(comms_config->spi_config.chip_select_pin);
+        spi_transmit(p, bytes_this_loop);
+        p += bytes_this_loop;
+
+        // extra CS toggle, for alignment
+        if (odd_bytes) {
+            writePinHigh(comms_config->spi_config.chip_select_pin);
+            writePinLow(comms_config->spi_config.chip_select_pin);
+        }
+
+        bytes_remaining -= bytes_this_loop;
+    }
+
+    return byte_count - bytes_remaining;
+}
+
+static uint32_t qp_ili9486_send_data_toggling(painter_device_t device, const uint8_t *data, uint32_t byte_count) {
+    painter_driver_t *              driver       = (painter_driver_t *)device;
+    qp_comms_spi_dc_reset_config_t *comms_config = (qp_comms_spi_dc_reset_config_t *)driver->comms_config;
+
+    uint32_t ret;
+    for (uint8_t j = 0; j < byte_count; ++j) {
+        writePinLow(comms_config->spi_config.chip_select_pin);
+        ret = qp_comms_spi_dc_reset_send_data(device, &data[j], 1);
+        writePinHigh(comms_config->spi_config.chip_select_pin);
+    }
+
+    return ret;
+}
+
+static void qp_comms_spi_send_command_sequence_odd_cs_pulse(painter_device_t device, const uint8_t *sequence, size_t sequence_len) {
+    for (size_t i = 0; i < sequence_len;) {
+        uint8_t command   = sequence[i];
+        uint8_t delay     = sequence[i + 1];
+        uint8_t num_bytes = sequence[i + 2];
+
+        qp_comms_spi_dc_reset_send_command_odd_cs_pulse(device, command);
+        if (num_bytes > 0) {
+            qp_ili9486_send_data_toggling(device, &sequence[i + 3], num_bytes);
+        }
+
+        if (delay > 0) {
+            wait_ms(delay);
+        }
+        i += (3 + num_bytes);
+    }
+}
+
+static bool qp_ili9486_viewport(painter_device_t device, uint16_t left, uint16_t top, uint16_t right, uint16_t bottom) {
+    painter_driver_t *                          driver = (painter_driver_t *)device;
+    tft_panel_dc_reset_painter_driver_vtable_t *vtable = (tft_panel_dc_reset_painter_driver_vtable_t *)driver->driver_vtable;
+
+    // Fix up the drawing location if required
+    left += driver->offset_x;
+    right += driver->offset_x;
+    top += driver->offset_y;
+    bottom += driver->offset_y;
+
+    // Check if we need to manually swap the window coordinates based on whether or not we're in a sideways rotation
+    if (vtable->swap_window_coords && (driver->rotation == QP_ROTATION_90 || driver->rotation == QP_ROTATION_270)) {
+        uint16_t temp;
+
+        temp = left;
+        left = top;
+        top  = temp;
+
+        temp   = right;
+        right  = bottom;
+        bottom = temp;
+    }
+
+    // Set up the x-window
+    uint8_t xbuf[4] = {left >> 8, left & 0xFF, right >> 8, right & 0xFF};
+    qp_comms_spi_dc_reset_send_command_odd_cs_pulse(device, vtable->opcodes.set_column_address);
+    qp_ili9486_send_data_toggling(device, xbuf, 4);
+
+    // Set up the y-window
+    uint8_t ybuf[4] = {top >> 8, top & 0xFF, bottom >> 8, bottom & 0xFF};
+    qp_comms_spi_dc_reset_send_command_odd_cs_pulse(device, vtable->opcodes.set_row_address);
+    qp_ili9486_send_data_toggling(device, ybuf, 4);
+
+    // Lock in the window
+    qp_comms_spi_dc_reset_send_command_odd_cs_pulse(device, vtable->opcodes.enable_writes);
+    return true;
+}
+
+// Regular
+const tft_panel_dc_reset_painter_driver_vtable_t ili9486_driver_vtable = {
+    .base =
+        {
+            .init            = qp_ili9486_init,
+            .power           = qp_tft_panel_power,
+            .clear           = qp_tft_panel_clear,
+            .flush           = qp_tft_panel_flush,
+            .pixdata         = qp_tft_panel_pixdata,
+            .viewport        = qp_tft_panel_viewport,
+            .palette_convert = qp_tft_panel_palette_convert_rgb565_swapped,
+            .append_pixels   = qp_tft_panel_append_pixels_rgb565,
+            .append_pixdata  = qp_tft_panel_append_pixdata,
+        },
+    .num_window_bytes   = 2,
+    .swap_window_coords = false,
+    .opcodes =
+        {
+            .display_on         = ILI9XXX_CMD_DISPLAY_ON,
+            .display_off        = ILI9XXX_CMD_DISPLAY_OFF,
+            .set_column_address = ILI9XXX_SET_COL_ADDR,
+            .set_row_address    = ILI9XXX_SET_PAGE_ADDR,
+            .enable_writes      = ILI9XXX_SET_MEM,
+        },
+};
+
+// Waveshare tweaks
+const tft_panel_dc_reset_painter_driver_vtable_t ili9486_waveshare_driver_vtable = {
+    .base =
+        {
+            .init            = qp_ili9486_init,
+            .power           = qp_tft_panel_power,
+            .clear           = qp_tft_panel_clear,
+            .flush           = qp_tft_panel_flush,
+            .pixdata         = qp_tft_panel_pixdata,
+            .viewport        = qp_ili9486_viewport,
+            .palette_convert = qp_tft_panel_palette_convert_rgb565_swapped,
+            .append_pixels   = qp_tft_panel_append_pixels_rgb565,
+            .append_pixdata  = qp_tft_panel_append_pixdata,
+        },
+    .num_window_bytes   = 2,
+    .swap_window_coords = false,
+    .opcodes =
+        {
+            .display_on         = ILI9XXX_CMD_DISPLAY_ON,
+            .display_off        = ILI9XXX_CMD_DISPLAY_OFF,
+            .set_column_address = ILI9XXX_SET_COL_ADDR,
+            .set_row_address    = ILI9XXX_SET_PAGE_ADDR,
+            .enable_writes      = ILI9XXX_SET_MEM,
+        },
+};
+
+static const painter_comms_with_command_vtable_t spi_comms_odd_cs_pulse_vtable = {
+    .base =
+        {
+            .comms_init  = qp_comms_spi_dc_reset_init,
+            .comms_start = qp_comms_spi_start,
+            .comms_send  = qp_comms_spi_send_data_odd_cs_pulse,
+            .comms_stop  = qp_comms_spi_stop,
+        },
+    .send_command          = qp_comms_spi_dc_reset_send_command_odd_cs_pulse,
+    .bulk_command_sequence = qp_comms_spi_send_command_sequence_odd_cs_pulse,
+};
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// SPI
+
+#ifdef QUANTUM_PAINTER_ILI9486_SPI_ENABLE
+
+// Factory function for creating a handle to the ILI9486 device
+painter_device_t qp_ili9486_make_spi_device(uint16_t panel_width, uint16_t panel_height, pin_t chip_select_pin, pin_t dc_pin, pin_t reset_pin, uint16_t spi_divisor, int spi_mode) {
+    for (uint32_t i = 0; i < ILI9486_NUM_DEVICES; ++i) {
+        tft_panel_dc_reset_painter_device_t *driver = &ili9486_drivers[i];
+        if (!driver->base.driver_vtable) {
+            driver->base.driver_vtable         = (const painter_driver_vtable_t *)&ili9486_driver_vtable;
+            driver->base.comms_vtable          = (const painter_comms_vtable_t *)&spi_comms_with_dc_vtable;
+            driver->base.native_bits_per_pixel = 16; // RGB565
+            driver->base.panel_width           = panel_width;
+            driver->base.panel_height          = panel_height;
+            driver->base.rotation              = QP_ROTATION_0;
+            driver->base.offset_x              = 0;
+            driver->base.offset_y              = 0;
+
+            // SPI and other pin configuration
+            driver->base.comms_config                              = &driver->spi_dc_reset_config;
+            driver->spi_dc_reset_config.spi_config.chip_select_pin = chip_select_pin;
+            driver->spi_dc_reset_config.spi_config.divisor         = spi_divisor;
+            driver->spi_dc_reset_config.spi_config.lsb_first       = false;
+            driver->spi_dc_reset_config.spi_config.mode            = spi_mode;
+            driver->spi_dc_reset_config.dc_pin                     = dc_pin;
+            driver->spi_dc_reset_config.reset_pin                  = reset_pin;
+
+            if (!qp_internal_register_device((painter_device_t)driver)) {
+                memset(driver, 0, sizeof(tft_panel_dc_reset_painter_device_t));
+                return NULL;
+            }
+
+            return (painter_device_t)driver;
+        }
+    }
+    return NULL;
+}
+
+painter_device_t qp_ili9486_make_spi_waveshare_device(uint16_t panel_width, uint16_t panel_height, pin_t chip_select_pin, pin_t dc_pin, pin_t reset_pin, uint16_t spi_divisor, int spi_mode) {
+    painter_device_t device = qp_ili9486_make_spi_device(panel_width, panel_height, chip_select_pin, dc_pin, reset_pin, spi_divisor, spi_mode);
+    if (device) {
+        tft_panel_dc_reset_painter_device_t *driver = (tft_panel_dc_reset_painter_device_t *)device;
+        driver->base.driver_vtable                  = (const painter_driver_vtable_t *)&ili9486_waveshare_driver_vtable;
+        driver->base.comms_vtable                   = (const painter_comms_vtable_t *)&spi_comms_odd_cs_pulse_vtable;
+    }
+    return device;
+}
+
+#endif // QUANTUM_PAINTER_ILI9486_SPI_ENABLE
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/drivers/painter/ili9xxx/qp_ili9486.h b/drivers/painter/ili9xxx/qp_ili9486.h
new file mode 100644
index 00000000000..9976a78da49
--- /dev/null
+++ b/drivers/painter/ili9xxx/qp_ili9486.h
@@ -0,0 +1,52 @@
+// Copyright 2021 Nick Brassel (@tzarc)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "gpio.h"
+#include "qp_internal.h"
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// Quantum Painter ILI9486 configurables (add to your keyboard's config.h)
+
+#ifndef ILI9486_NUM_DEVICES
+/**
+ * @def This controls the maximum number of ILI9486 devices that Quantum Painter can communicate with at any one time.
+ *      Increasing this number allows for multiple displays to be used.
+ */
+#    define ILI9486_NUM_DEVICES 1
+#endif
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// Quantum Painter ILI9486 device factories
+
+#ifdef QUANTUM_PAINTER_ILI9486_SPI_ENABLE
+/**
+ * Factory method for an ILI9486 SPI LCD device.
+ *
+ * @param panel_width[in] the width of the display panel
+ * @param panel_height[in] the height of the display panel
+ * @param chip_select_pin[in] the GPIO pin used for SPI chip select
+ * @param dc_pin[in] the GPIO pin used for D/C control
+ * @param reset_pin[in] the GPIO pin used for RST
+ * @param spi_divisor[in] the SPI divisor to use when communicating with the display
+ * @param spi_mode[in] the SPI mode to use when communicating with the display
+ * @return the device handle used with all drawing routines in Quantum Painter
+ */
+painter_device_t qp_ili9486_make_spi_device(uint16_t panel_width, uint16_t panel_height, pin_t chip_select_pin, pin_t dc_pin, pin_t reset_pin, uint16_t spi_divisor, int spi_mode);
+
+/**
+ * Factory method for an ILI9486 SPI LCD device.
+ *
+ * @param panel_width[in] the width of the display panel
+ * @param panel_height[in] the height of the display panel
+ * @param chip_select_pin[in] the GPIO pin used for SPI chip select
+ * @param dc_pin[in] the GPIO pin used for D/C control
+ * @param reset_pin[in] the GPIO pin used for RST
+ * @param spi_divisor[in] the SPI divisor to use when communicating with the display
+ * @param spi_mode[in] the SPI mode to use when communicating with the display
+ * @return the device handle used with all drawing routines in Quantum Painter
+ */
+painter_device_t qp_ili9486_make_spi_waveshare_device(uint16_t panel_width, uint16_t panel_height, pin_t chip_select_pin, pin_t dc_pin, pin_t reset_pin, uint16_t spi_divisor, int spi_mode);
+
+#endif // QUANTUM_PAINTER_ILI9486_SPI_ENABLE
diff --git a/drivers/painter/ili9xxx/qp_ili9xxx_opcodes.h b/drivers/painter/ili9xxx/qp_ili9xxx_opcodes.h
index f57e638e034..906f6cd7729 100644
--- a/drivers/painter/ili9xxx/qp_ili9xxx_opcodes.h
+++ b/drivers/painter/ili9xxx/qp_ili9xxx_opcodes.h
@@ -70,6 +70,7 @@
 #define ILI9XXX_SET_LIGHT_CTL_8 0xBF        // Set backlight ctl 8
 #define ILI9XXX_SET_POWER_CTL_1 0xC0        // Set power ctl 1
 #define ILI9XXX_SET_POWER_CTL_2 0xC1        // Set power ctl 2
+#define ILI9XXX_SET_POWER_CTL_3 0xC2        // Set power ctl 3
 #define ILI9XXX_SET_VCOM_CTL_1 0xC5         // Set VCOM ctl 1
 #define ILI9XXX_SET_VCOM_CTL_2 0xC7         // Set VCOM ctl 2
 #define ILI9XXX_POWER_CTL_A 0xCB            // Set power control A
diff --git a/drivers/sensors/adns5050.c b/drivers/sensors/adns5050.c
index b76268fba26..97daa8db099 100644
--- a/drivers/sensors/adns5050.c
+++ b/drivers/sensors/adns5050.c
@@ -47,9 +47,9 @@
 
 void adns5050_init(void) {
     // Initialize the ADNS serial pins.
-    setPinOutput(ADNS5050_SCLK_PIN);
-    setPinOutput(ADNS5050_SDIO_PIN);
-    setPinOutput(ADNS5050_CS_PIN);
+    gpio_set_pin_output(ADNS5050_SCLK_PIN);
+    gpio_set_pin_output(ADNS5050_SDIO_PIN);
+    gpio_set_pin_output(ADNS5050_CS_PIN);
 
     // reboot the adns.
     // if the adns hasn't initialized yet, this is harmless.
@@ -69,30 +69,30 @@ void adns5050_init(void) {
 // Just as with the serial protocol, this is used by the slave to send a
 // synchronization signal to the master.
 void adns5050_sync(void) {
-    writePinLow(ADNS5050_CS_PIN);
+    gpio_write_pin_low(ADNS5050_CS_PIN);
     wait_us(1);
-    writePinHigh(ADNS5050_CS_PIN);
+    gpio_write_pin_high(ADNS5050_CS_PIN);
 }
 
 void adns5050_cs_select(void) {
-    writePinLow(ADNS5050_CS_PIN);
+    gpio_write_pin_low(ADNS5050_CS_PIN);
 }
 
 void adns5050_cs_deselect(void) {
-    writePinHigh(ADNS5050_CS_PIN);
+    gpio_write_pin_high(ADNS5050_CS_PIN);
 }
 
 uint8_t adns5050_serial_read(void) {
-    setPinInput(ADNS5050_SDIO_PIN);
+    gpio_set_pin_input(ADNS5050_SDIO_PIN);
     uint8_t byte = 0;
 
     for (uint8_t i = 0; i < 8; ++i) {
-        writePinLow(ADNS5050_SCLK_PIN);
+        gpio_write_pin_low(ADNS5050_SCLK_PIN);
         wait_us(1);
 
-        byte = (byte << 1) | readPin(ADNS5050_SDIO_PIN);
+        byte = (byte << 1) | gpio_read_pin(ADNS5050_SDIO_PIN);
 
-        writePinHigh(ADNS5050_SCLK_PIN);
+        gpio_write_pin_high(ADNS5050_SCLK_PIN);
         wait_us(1);
     }
 
@@ -100,19 +100,19 @@ uint8_t adns5050_serial_read(void) {
 }
 
 void adns5050_serial_write(uint8_t data) {
-    setPinOutput(ADNS5050_SDIO_PIN);
+    gpio_set_pin_output(ADNS5050_SDIO_PIN);
 
     for (int8_t b = 7; b >= 0; b--) {
-        writePinLow(ADNS5050_SCLK_PIN);
+        gpio_write_pin_low(ADNS5050_SCLK_PIN);
 
         if (data & (1 << b))
-            writePinHigh(ADNS5050_SDIO_PIN);
+            gpio_write_pin_high(ADNS5050_SDIO_PIN);
         else
-            writePinLow(ADNS5050_SDIO_PIN);
+            gpio_write_pin_low(ADNS5050_SDIO_PIN);
 
         wait_us(2);
 
-        writePinHigh(ADNS5050_SCLK_PIN);
+        gpio_write_pin_high(ADNS5050_SCLK_PIN);
     }
 
     // tSWR. See page 15 of the ADNS spec sheet.
diff --git a/drivers/sensors/adns9800.c b/drivers/sensors/adns9800.c
index 083ab34d9fc..f34529ee90d 100644
--- a/drivers/sensors/adns9800.c
+++ b/drivers/sensors/adns9800.c
@@ -100,7 +100,7 @@ uint8_t adns9800_read(uint8_t reg_addr) {
 }
 
 void adns9800_init(void) {
-    setPinOutput(ADNS9800_CS_PIN);
+    gpio_set_pin_output(ADNS9800_CS_PIN);
 
     spi_init();
 
diff --git a/drivers/sensors/analog_joystick.c b/drivers/sensors/analog_joystick.c
index 221625075c5..15b35a45f25 100644
--- a/drivers/sensors/analog_joystick.c
+++ b/drivers/sensors/analog_joystick.c
@@ -122,17 +122,17 @@ report_analog_joystick_t analog_joystick_read(void) {
         report.y   = axisToMouseComponent(ANALOG_JOYSTICK_Y_AXIS_PIN, yOrigin, maxCursorSpeed, 1);
     }
 #ifdef ANALOG_JOYSTICK_CLICK_PIN
-    report.button = !readPin(ANALOG_JOYSTICK_CLICK_PIN);
+    report.button = !gpio_read_pin(ANALOG_JOYSTICK_CLICK_PIN);
 #endif
     return report;
 }
 
 void analog_joystick_init(void) {
-    setPinInputHigh(ANALOG_JOYSTICK_X_AXIS_PIN);
-    setPinInputHigh(ANALOG_JOYSTICK_Y_AXIS_PIN);
+    gpio_set_pin_input_high(ANALOG_JOYSTICK_X_AXIS_PIN);
+    gpio_set_pin_input_high(ANALOG_JOYSTICK_Y_AXIS_PIN);
 
 #ifdef ANALOG_JOYSTICK_CLICK_PIN
-    setPinInputHigh(ANALOG_JOYSTICK_CLICK_PIN);
+    gpio_set_pin_input_high(ANALOG_JOYSTICK_CLICK_PIN);
 #endif
     // Account for drift
     xOrigin = analogReadPin(ANALOG_JOYSTICK_X_AXIS_PIN);
diff --git a/drivers/sensors/paw3204.c b/drivers/sensors/paw3204.c
index a13753dd6f1..28c47522ed5 100644
--- a/drivers/sensors/paw3204.c
+++ b/drivers/sensors/paw3204.c
@@ -51,8 +51,8 @@ uint8_t paw3204_read_reg(uint8_t reg_addr);
 void    paw3204_write_reg(uint8_t reg_addr, uint8_t data);
 
 void paw3204_init(void) {
-    setPinOutput(PAW3204_SCLK_PIN);    // setclockpin to output
-    setPinInputHigh(PAW3204_SDIO_PIN); // set datapin input high
+    gpio_set_pin_output(PAW3204_SCLK_PIN);     // setclockpin to output
+    gpio_set_pin_input_high(PAW3204_SDIO_PIN); // set datapin input high
 
     paw3204_write_reg(REG_SETUP, 0x86); // reset sensor and set 1600cpi
     wait_us(5);
@@ -64,16 +64,16 @@ void paw3204_init(void) {
 }
 
 uint8_t paw3204_serial_read(void) {
-    setPinInput(PAW3204_SDIO_PIN);
+    gpio_set_pin_input(PAW3204_SDIO_PIN);
     uint8_t byte = 0;
 
     for (uint8_t i = 0; i < 8; ++i) {
-        writePinLow(PAW3204_SCLK_PIN);
+        gpio_write_pin_low(PAW3204_SCLK_PIN);
         wait_us(1);
 
-        byte = (byte << 1) | readPin(PAW3204_SDIO_PIN);
+        byte = (byte << 1) | gpio_read_pin(PAW3204_SDIO_PIN);
 
-        writePinHigh(PAW3204_SCLK_PIN);
+        gpio_write_pin_high(PAW3204_SCLK_PIN);
         wait_us(1);
     }
 
@@ -81,17 +81,17 @@ uint8_t paw3204_serial_read(void) {
 }
 
 void paw3204_serial_write(uint8_t data) {
-    writePinLow(PAW3204_SDIO_PIN);
-    setPinOutput(PAW3204_SDIO_PIN);
+    gpio_write_pin_low(PAW3204_SDIO_PIN);
+    gpio_set_pin_output(PAW3204_SDIO_PIN);
 
     for (int8_t b = 7; b >= 0; b--) {
-        writePinLow(PAW3204_SCLK_PIN);
+        gpio_write_pin_low(PAW3204_SCLK_PIN);
         if (data & (1 << b)) {
-            writePinHigh(PAW3204_SDIO_PIN);
+            gpio_write_pin_high(PAW3204_SDIO_PIN);
         } else {
-            writePinLow(PAW3204_SDIO_PIN);
+            gpio_write_pin_low(PAW3204_SDIO_PIN);
         }
-        writePinHigh(PAW3204_SCLK_PIN);
+        gpio_write_pin_high(PAW3204_SCLK_PIN);
     }
 
     wait_us(4);
diff --git a/drivers/sensors/pmw3320.c b/drivers/sensors/pmw3320.c
index 69a584f4e14..f19fbfd1ab4 100644
--- a/drivers/sensors/pmw3320.c
+++ b/drivers/sensors/pmw3320.c
@@ -24,9 +24,9 @@
 
 void pmw3320_init(void) {
     // Initialize sensor serial pins.
-    setPinOutput(PMW3320_SCLK_PIN);
-    setPinOutput(PMW3320_SDIO_PIN);
-    setPinOutput(PMW3320_CS_PIN);
+    gpio_set_pin_output(PMW3320_SCLK_PIN);
+    gpio_set_pin_output(PMW3320_SDIO_PIN);
+    gpio_set_pin_output(PMW3320_CS_PIN);
 
     // reboot the sensor.
     pmw3320_write_reg(REG_Power_Up_Reset, 0x5a);
@@ -54,30 +54,30 @@ void pmw3320_init(void) {
 // Just as with the serial protocol, this is used by the slave to send a
 // synchronization signal to the master.
 void pmw3320_sync(void) {
-    writePinLow(PMW3320_CS_PIN);
+    gpio_write_pin_low(PMW3320_CS_PIN);
     wait_us(1);
-    writePinHigh(PMW3320_CS_PIN);
+    gpio_write_pin_high(PMW3320_CS_PIN);
 }
 
 void pmw3320_cs_select(void) {
-    writePinLow(PMW3320_CS_PIN);
+    gpio_write_pin_low(PMW3320_CS_PIN);
 }
 
 void pmw3320_cs_deselect(void) {
-    writePinHigh(PMW3320_CS_PIN);
+    gpio_write_pin_high(PMW3320_CS_PIN);
 }
 
 uint8_t pmw3320_serial_read(void) {
-    setPinInput(PMW3320_SDIO_PIN);
+    gpio_set_pin_input(PMW3320_SDIO_PIN);
     uint8_t byte = 0;
 
     for (uint8_t i = 0; i < 8; ++i) {
-        writePinLow(PMW3320_SCLK_PIN);
+        gpio_write_pin_low(PMW3320_SCLK_PIN);
         wait_us(1);
 
-        byte = (byte << 1) | readPin(PMW3320_SDIO_PIN);
+        byte = (byte << 1) | gpio_read_pin(PMW3320_SDIO_PIN);
 
-        writePinHigh(PMW3320_SCLK_PIN);
+        gpio_write_pin_high(PMW3320_SCLK_PIN);
         wait_us(1);
     }
 
@@ -85,19 +85,19 @@ uint8_t pmw3320_serial_read(void) {
 }
 
 void pmw3320_serial_write(uint8_t data) {
-    setPinOutput(PMW3320_SDIO_PIN);
+    gpio_set_pin_output(PMW3320_SDIO_PIN);
 
     for (int8_t b = 7; b >= 0; b--) {
-        writePinLow(PMW3320_SCLK_PIN);
+        gpio_write_pin_low(PMW3320_SCLK_PIN);
 
         if (data & (1 << b))
-            writePinHigh(PMW3320_SDIO_PIN);
+            gpio_write_pin_high(PMW3320_SDIO_PIN);
         else
-            writePinLow(PMW3320_SDIO_PIN);
+            gpio_write_pin_low(PMW3320_SDIO_PIN);
 
         wait_us(2);
 
-        writePinHigh(PMW3320_SCLK_PIN);
+        gpio_write_pin_high(PMW3320_SCLK_PIN);
     }
 
     // This was taken from ADNS5050 driver.
diff --git a/drivers/sensors/pmw3360.c b/drivers/sensors/pmw3360.c
index a7dc687f50d..8408daa9451 100644
--- a/drivers/sensors/pmw3360.c
+++ b/drivers/sensors/pmw3360.c
@@ -15,6 +15,9 @@ uint16_t pmw33xx_get_cpi(uint8_t sensor) {
     }
 
     uint8_t cpival = pmw33xx_read(sensor, REG_Config1);
+    // In some cases (100, 900, 1700, 2500), reading the CPI corrupts the firmware and the sensor stops responding.
+    // To avoid this, we write the value back to the sensor, which seems to prevent the corruption.
+    pmw33xx_write(sensor, REG_Config1, cpival);
     return (uint16_t)((cpival + 1) & 0xFF) * PMW33XX_CPI_STEP;
 }
 
diff --git a/drivers/usb2422.c b/drivers/usb2422.c
index 1d33b5acf80..de0e399f872 100644
--- a/drivers/usb2422.c
+++ b/drivers/usb2422.c
@@ -346,10 +346,10 @@ static void USB2422_write_block(void) {
 
 void USB2422_init(void) {
 #ifdef USB2422_RESET_PIN
-    setPinOutput(USB2422_RESET_PIN);
+    gpio_set_pin_output(USB2422_RESET_PIN);
 #endif
 #ifdef USB2422_ACTIVE_PIN
-    setPinInput(USB2422_ACTIVE_PIN);
+    gpio_set_pin_input(USB2422_ACTIVE_PIN);
 #endif
 
     i2c_init(); // IC2 clk must be high at USB2422 reset release time to signal SMB configuration
@@ -387,15 +387,15 @@ void USB2422_configure(void) {
 
 void USB2422_reset(void) {
 #ifdef USB2422_RESET_PIN
-    writePinLow(USB2422_RESET_PIN);
+    gpio_write_pin_low(USB2422_RESET_PIN);
     wait_us(2);
-    writePinHigh(USB2422_RESET_PIN);
+    gpio_write_pin_high(USB2422_RESET_PIN);
 #endif
 }
 
 bool USB2422_active(void) {
 #ifdef USB2422_ACTIVE_PIN
-    return readPin(USB2422_ACTIVE_PIN);
+    return gpio_read_pin(USB2422_ACTIVE_PIN);
 #else
     return 1;
 #endif
diff --git a/keyboards/1upkeyboards/pi40/grid_v1_1/info.json b/keyboards/1upkeyboards/pi40/grid_v1_1/info.json
index c7028f4a4e3..3512838186a 100644
--- a/keyboards/1upkeyboards/pi40/grid_v1_1/info.json
+++ b/keyboards/1upkeyboards/pi40/grid_v1_1/info.json
@@ -18,16 +18,13 @@
         "driver": "vendor"
     },
     "features": {
-        "audio": false,
-        "backlight": false,
         "bootmagic": true,
         "command": false,
         "console": false,
         "extrakey": true,
         "mousekey": true,
         "nkro": false,
-        "rgb_matrix": true,
-        "rgblight": false
+        "rgb_matrix": true
     },
     "matrix_pins": {
         "rows": ["GP21", "GP20", "GP19", "GP18"],
diff --git a/keyboards/1upkeyboards/pi40/mit_v1_0/info.json b/keyboards/1upkeyboards/pi40/mit_v1_0/info.json
index 6b89f2c2ab4..230ce3d8574 100644
--- a/keyboards/1upkeyboards/pi40/mit_v1_0/info.json
+++ b/keyboards/1upkeyboards/pi40/mit_v1_0/info.json
@@ -18,16 +18,13 @@
         "driver": "vendor"
     },
     "features": {
-        "audio": false,
-        "backlight": false,
         "bootmagic": true,
         "command": false,
         "console": false,
         "extrakey": true,
         "mousekey": true,
         "nkro": false,
-        "rgb_matrix": true,
-        "rgblight": false
+        "rgb_matrix": true
     },
     "matrix_pins": {
         "rows": ["GP21", "GP20", "GP19", "GP18"],
diff --git a/keyboards/1upkeyboards/pi40/mit_v1_1/info.json b/keyboards/1upkeyboards/pi40/mit_v1_1/info.json
index f19ef235d51..47625ecc4dd 100644
--- a/keyboards/1upkeyboards/pi40/mit_v1_1/info.json
+++ b/keyboards/1upkeyboards/pi40/mit_v1_1/info.json
@@ -18,16 +18,13 @@
         "driver": "vendor"
     },
     "features": {
-        "audio": false,
-        "backlight": false,
         "bootmagic": true,
         "command": false,
         "console": false,
         "extrakey": true,
         "mousekey": true,
         "nkro": false,
-        "rgb_matrix": true,
-        "rgblight": false
+        "rgb_matrix": true
     },
     "matrix_pins": {
         "rows": ["GP21", "GP20", "GP19", "GP18"],
diff --git a/keyboards/1upkeyboards/pi50/info.json b/keyboards/1upkeyboards/pi50/info.json
index 2a4fdef3844..2ee1aed4ccf 100644
--- a/keyboards/1upkeyboards/pi50/info.json
+++ b/keyboards/1upkeyboards/pi50/info.json
@@ -15,8 +15,6 @@
         "layer_count": 10
     },
     "features": {
-        "audio": false,
-        "backlight": false,
         "bootmagic": true,
         "command": false,
         "console": false,
@@ -24,7 +22,6 @@
         "mousekey": true,
         "nkro": false,
         "rgb_matrix": true,
-        "rgblight": false,
         "oled": true
     },
     "matrix_pins": {
diff --git a/keyboards/1upkeyboards/pi60/info.json b/keyboards/1upkeyboards/pi60/info.json
index 06abb1a4a64..71619db3605 100644
--- a/keyboards/1upkeyboards/pi60/info.json
+++ b/keyboards/1upkeyboards/pi60/info.json
@@ -15,8 +15,6 @@
         "layer_count": 10
     },
     "features": {
-        "audio": false,
-        "backlight": false,
         "bootmagic": true,
         "command": false,
         "console": false,
@@ -24,8 +22,7 @@
         "extrakey": true,
         "mousekey": true,
         "nkro": false,
-        "rgb_matrix": true,
-        "rgblight": false
+        "rgb_matrix": true
     },
     "ws2812": {
         "pin": "GP17",
diff --git a/keyboards/1upkeyboards/pi60_hse/info.json b/keyboards/1upkeyboards/pi60_hse/info.json
index 6b1fcdda411..204e42f48c7 100644
--- a/keyboards/1upkeyboards/pi60_hse/info.json
+++ b/keyboards/1upkeyboards/pi60_hse/info.json
@@ -15,16 +15,13 @@
         "layer_count": 10
     },
     "features": {
-        "audio": false,
-        "backlight": false,
         "bootmagic": true,
         "command": false,
         "console": false,
         "extrakey": true,
         "mousekey": true,
         "nkro": false,
-        "rgb_matrix": true,
-        "rgblight": false
+        "rgb_matrix": true
     },
     "ws2812": {
         "pin": "GP15",
diff --git a/keyboards/1upkeyboards/pi60_rgb/info.json b/keyboards/1upkeyboards/pi60_rgb/info.json
index 044e0e3b4b7..b6580e616a4 100644
--- a/keyboards/1upkeyboards/pi60_rgb/info.json
+++ b/keyboards/1upkeyboards/pi60_rgb/info.json
@@ -15,16 +15,13 @@
         "layer_count": 10
     },
     "features": {
-        "audio": false,
-        "backlight": false,
         "bootmagic": true,
         "command": false,
         "console": false,
         "extrakey": true,
         "mousekey": true,
         "nkro": false,
-        "rgb_matrix": true,
-        "rgblight": false
+        "rgb_matrix": true
     },
     "ws2812": {
         "pin": "GP19",
diff --git a/keyboards/1upkeyboards/sweet16v2/kb2040/info.json b/keyboards/1upkeyboards/sweet16v2/kb2040/info.json
index 40f96fb736b..0d09632a995 100644
--- a/keyboards/1upkeyboards/sweet16v2/kb2040/info.json
+++ b/keyboards/1upkeyboards/sweet16v2/kb2040/info.json
@@ -12,8 +12,6 @@
         "vid": "0x6F75"
     },
     "features": {
-        "audio": false,
-        "backlight": false,
         "bootmagic": true,
         "command": false,
         "console": false,
@@ -21,8 +19,7 @@
         "extrakey": true,
         "mousekey": true,
         "nkro": false,
-        "rgb_matrix": true,
-        "rgblight": false
+        "rgb_matrix": true
     },
     "ws2812": {
         "pin": "GP6",
diff --git a/keyboards/1upkeyboards/sweet16v2/pro_micro/info.json b/keyboards/1upkeyboards/sweet16v2/pro_micro/info.json
index 31805fc9678..d23bc6633d2 100644
--- a/keyboards/1upkeyboards/sweet16v2/pro_micro/info.json
+++ b/keyboards/1upkeyboards/sweet16v2/pro_micro/info.json
@@ -11,8 +11,6 @@
         "vid": "0x6F75"
     },
     "features": {
-        "audio": false,
-        "backlight": false,
         "bootmagic": true,
         "command": false,
         "console": false,
@@ -20,8 +18,7 @@
         "extrakey": true,
         "mousekey": true,
         "nkro": false,
-        "rgb_matrix": true,
-        "rgblight": false
+        "rgb_matrix": true
     },
     "ws2812": {
         "pin": "D7"
diff --git a/keyboards/40percentclub/ut47/keymaps/rgb/config.h b/keyboards/40percentclub/ut47/keymaps/rgb/config.h
index 8dc267380ae..d48ee2bf3f8 100644
--- a/keyboards/40percentclub/ut47/keymaps/rgb/config.h
+++ b/keyboards/40percentclub/ut47/keymaps/rgb/config.h
@@ -29,4 +29,4 @@
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
 #define WS2812_DI_PIN D3    // The pin the LED strip is connected to
-#define RGBLED_NUM 7     // Number of LEDs in your strip
+#define RGBLIGHT_LED_COUNT 7     // Number of LEDs in your strip
diff --git a/keyboards/4pplet/perk60_iso/rev_a/rev_a.c b/keyboards/4pplet/perk60_iso/rev_a/rev_a.c
index 3baf8c720b1..2de3acc60d7 100644
--- a/keyboards/4pplet/perk60_iso/rev_a/rev_a.c
+++ b/keyboards/4pplet/perk60_iso/rev_a/rev_a.c
@@ -18,68 +18,68 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifdef RGB_MATRIX_ENABLE
 const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
-    { 0, K_2,  J_2,  L_2 }, //D402
-    { 0, K_3,  J_3,  L_3 }, //D403
-    { 0, K_4,  J_4,  L_4 }, //D404
-    { 0, K_5,  J_5,  L_5 }, //D405
-    { 0, K_6,  J_6,  L_6 }, //D406
-    { 0, K_7,  J_7,  L_7 }, //D407
-    { 0, K_8,  J_8,  L_8 }, //D408
-    { 0, K_9,  J_9,  L_9 }, //D409
-    { 0, K_10, J_10, L_10 }, //D410
-    { 0, K_11, J_11, L_11 }, //D411
-    { 0, K_12, J_12, L_12 }, //D412
-    { 0, K_13, J_13, L_13 }, //D413
-    { 0, K_14, J_14, L_14 }, //D414
-    { 0, K_15, J_15, L_15 }, //D415
-    { 0, K_1,  J_1,  L_1 }, //D401
-    { 0, H_4,  G_4,  I_4 }, //D420
-    { 0, H_5,  G_5,  I_5 }, //D421
-    { 0, H_6,  G_6,  I_6 }, //D422
-    { 0, H_7,  G_7,  I_7 }, //D423
-    { 0, H_8,  G_8,  I_8 }, //D424
-    { 0, H_9,  G_9,  I_9 }, //D425
-    { 0, H_10, G_10, I_10 }, //D426
-    { 0, H_11, G_11, I_11 }, //D427
-    { 0, H_12, G_12, I_12 }, //D428
-    { 0, H_13, G_13, I_13 }, //D429
-    { 0, H_14, G_14, I_14 }, //D430
-    { 0, H_15, G_15, I_15 }, //D431
-    { 0, K_16, J_16, L_16 }, //D416
-    { 0, H_2,  G_2,  I_2 }, //D418
-    { 0, H_3,  G_3,  I_3 }, //D419
-    { 0, E_5,  D_5,  F_5 }, //D437
-    { 0, E_6,  D_6,  F_6 }, //D438
-    { 0, E_7,  D_7,  F_7 }, //D439
-    { 0, E_8,  D_8,  F_8 }, //D440
-    { 0, E_9,  D_9,  F_9 }, //D441
-    { 0, E_10, D_10, F_10 }, //D442
-    { 0, E_11, D_11, F_11 }, //D443
-    { 0, E_12, D_12, F_12 }, //D444
-    { 0, E_13, D_13, F_13 }, //D445
-    { 0, E_14, D_14, F_14 }, //D446
-    { 0, H_16, G_16, I_16 }, //D432
-    { 0, H_1,  G_1,  I_1 }, //D417
-    { 0, E_3,  D_3,  F_3 }, //D435
-    { 0, E_4,  D_4,  F_4 }, //D436
-    { 0, B_2,  A_2,  C_2 }, //D450
-    { 0, B_3,  A_3,  C_3 }, //D451
-    { 0, B_4,  A_4,  C_4 }, //D452
-    { 0, B_6,  A_6,  C_6 }, //D454
-    { 0, B_8,  A_8,  C_8 }, //D456
-    { 0, B_9,  A_9,  C_9 }, //D457
-    { 0, B_10, A_10, C_10 }, //D458
-    { 0, B_12, A_12, C_12 }, //D460
-    { 0, B_13, A_13, C_13 }, //D461
-    { 0, E_15, D_15, F_15 }, //D447
-    { 0, E_1,  D_1,  F_1 }, //D433
-    { 0, E_2,  D_2,  F_2 }, //D434
-    { 0, B_1,  A_1,  C_1 }, //D449
-    { 0, B_7,  A_7,  C_7 }, //D455
-    { 0, B_11, A_11, C_11 }, //D459
-    { 0, B_14, A_14, C_14 }, //D462
-    { 0, B_15,  A_15,  C_15 }, //D463
-    { 0, B_16,  A_16,  C_16 } //D464
+    { 0, SW11_CS2,  SW10_CS2,  SW12_CS2 }, //D402
+    { 0, SW11_CS3,  SW10_CS3,  SW12_CS3 }, //D403
+    { 0, SW11_CS4,  SW10_CS4,  SW12_CS4 }, //D404
+    { 0, SW11_CS5,  SW10_CS5,  SW12_CS5 }, //D405
+    { 0, SW11_CS6,  SW10_CS6,  SW12_CS6 }, //D406
+    { 0, SW11_CS7,  SW10_CS7,  SW12_CS7 }, //D407
+    { 0, SW11_CS8,  SW10_CS8,  SW12_CS8 }, //D408
+    { 0, SW11_CS9,  SW10_CS9,  SW12_CS9 }, //D409
+    { 0, SW11_CS10, SW10_CS10, SW12_CS10 }, //D410
+    { 0, SW11_CS11, SW10_CS11, SW12_CS11 }, //D411
+    { 0, SW11_CS12, SW10_CS12, SW12_CS12 }, //D412
+    { 0, SW11_CS13, SW10_CS13, SW12_CS13 }, //D413
+    { 0, SW11_CS14, SW10_CS14, SW12_CS14 }, //D414
+    { 0, SW11_CS15, SW10_CS15, SW12_CS15 }, //D415
+    { 0, SW11_CS1,  SW10_CS1,  SW12_CS1 }, //D401
+    { 0, SW8_CS4,  SW7_CS4,  SW9_CS4 }, //D420
+    { 0, SW8_CS5,  SW7_CS5,  SW9_CS5 }, //D421
+    { 0, SW8_CS6,  SW7_CS6,  SW9_CS6 }, //D422
+    { 0, SW8_CS7,  SW7_CS7,  SW9_CS7 }, //D423
+    { 0, SW8_CS8,  SW7_CS8,  SW9_CS8 }, //D424
+    { 0, SW8_CS9,  SW7_CS9,  SW9_CS9 }, //D425
+    { 0, SW8_CS10, SW7_CS10, SW9_CS10 }, //D426
+    { 0, SW8_CS11, SW7_CS11, SW9_CS11 }, //D427
+    { 0, SW8_CS12, SW7_CS12, SW9_CS12 }, //D428
+    { 0, SW8_CS13, SW7_CS13, SW9_CS13 }, //D429
+    { 0, SW8_CS14, SW7_CS14, SW9_CS14 }, //D430
+    { 0, SW8_CS15, SW7_CS15, SW9_CS15 }, //D431
+    { 0, SW11_CS16, SW10_CS16, SW12_CS16 }, //D416
+    { 0, SW8_CS2,  SW7_CS2,  SW9_CS2 }, //D418
+    { 0, SW8_CS3,  SW7_CS3,  SW9_CS3 }, //D419
+    { 0, SW5_CS5,  SW4_CS5,  SW6_CS5 }, //D437
+    { 0, SW5_CS6,  SW4_CS6,  SW6_CS6 }, //D438
+    { 0, SW5_CS7,  SW4_CS7,  SW6_CS7 }, //D439
+    { 0, SW5_CS8,  SW4_CS8,  SW6_CS8 }, //D440
+    { 0, SW5_CS9,  SW4_CS9,  SW6_CS9 }, //D441
+    { 0, SW5_CS10, SW4_CS10, SW6_CS10 }, //D442
+    { 0, SW5_CS11, SW4_CS11, SW6_CS11 }, //D443
+    { 0, SW5_CS12, SW4_CS12, SW6_CS12 }, //D444
+    { 0, SW5_CS13, SW4_CS13, SW6_CS13 }, //D445
+    { 0, SW5_CS14, SW4_CS14, SW6_CS14 }, //D446
+    { 0, SW8_CS16, SW7_CS16, SW9_CS16 }, //D432
+    { 0, SW8_CS1,  SW7_CS1,  SW9_CS1 }, //D417
+    { 0, SW5_CS3,  SW4_CS3,  SW6_CS3 }, //D435
+    { 0, SW5_CS4,  SW4_CS4,  SW6_CS4 }, //D436
+    { 0, SW2_CS2,  SW1_CS2,  SW3_CS2 }, //D450
+    { 0, SW2_CS3,  SW1_CS3,  SW3_CS3 }, //D451
+    { 0, SW2_CS4,  SW1_CS4,  SW3_CS4 }, //D452
+    { 0, SW2_CS6,  SW1_CS6,  SW3_CS6 }, //D454
+    { 0, SW2_CS8,  SW1_CS8,  SW3_CS8 }, //D456
+    { 0, SW2_CS9,  SW1_CS9,  SW3_CS9 }, //D457
+    { 0, SW2_CS10, SW1_CS10, SW3_CS10 }, //D458
+    { 0, SW2_CS12, SW1_CS12, SW3_CS12 }, //D460
+    { 0, SW2_CS13, SW1_CS13, SW3_CS13 }, //D461
+    { 0, SW5_CS15, SW4_CS15, SW6_CS15 }, //D447
+    { 0, SW5_CS1,  SW4_CS1,  SW6_CS1 }, //D433
+    { 0, SW5_CS2,  SW4_CS2,  SW6_CS2 }, //D434
+    { 0, SW2_CS1,  SW1_CS1,  SW3_CS1 }, //D449
+    { 0, SW2_CS7,  SW1_CS7,  SW3_CS7 }, //D455
+    { 0, SW2_CS11, SW1_CS11, SW3_CS11 }, //D459
+    { 0, SW2_CS14, SW1_CS14, SW3_CS14 }, //D462
+    { 0, SW2_CS15,  SW1_CS15,  SW3_CS15 }, //D463
+    { 0, SW2_CS16,  SW1_CS16,  SW3_CS16 } //D464
 };
 
 #define XXX NO_LED
diff --git a/keyboards/4pplet/steezy60/rev_a/info.json b/keyboards/4pplet/steezy60/rev_a/info.json
index 0e00abd2155..d64779bec3f 100644
--- a/keyboards/4pplet/steezy60/rev_a/info.json
+++ b/keyboards/4pplet/steezy60/rev_a/info.json
@@ -30,8 +30,6 @@
         "rows": ["C2", "D0", "B0", "C7", "C5"]
     },
     "features": {
-        "audio": false,
-        "backlight": false,
         "bootmagic": true,
         "command": false,
         "console": false,
diff --git a/keyboards/4pplet/steezy60/rev_b/info.json b/keyboards/4pplet/steezy60/rev_b/info.json
index 77302d5a1ab..e087ff8d1bb 100644
--- a/keyboards/4pplet/steezy60/rev_b/info.json
+++ b/keyboards/4pplet/steezy60/rev_b/info.json
@@ -26,8 +26,6 @@
         "rows": ["B8", "A15", "C13", "A2", "A6"]
     },
     "features": {
-        "audio": false,
-        "backlight": false,
         "bootmagic": true,
         "command": false,
         "console": false,
diff --git a/keyboards/4pplet/unextended_std/rev_a/info.json b/keyboards/4pplet/unextended_std/rev_a/info.json
index 4362ab761da..5aba94b50ab 100644
--- a/keyboards/4pplet/unextended_std/rev_a/info.json
+++ b/keyboards/4pplet/unextended_std/rev_a/info.json
@@ -22,9 +22,7 @@
         "console": false,
         "command": false,
         "nkro": true,
-        "backlight": false,
-        "rgblight": true,
-        "audio": false
+        "rgblight": true
     },
     "ws2812": {
         "pin": "A8"
diff --git a/keyboards/abko/ak84bt/ak84bt.c b/keyboards/abko/ak84bt/ak84bt.c
index 86f28a1bb29..6b87e9bab35 100644
--- a/keyboards/abko/ak84bt/ak84bt.c
+++ b/keyboards/abko/ak84bt/ak84bt.c
@@ -17,94 +17,94 @@
 #include QMK_KEYBOARD_H
 
 const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_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}
+    {0, SW7_CS1,    SW9_CS1,    SW8_CS1},
+    {0, SW7_CS3,    SW9_CS3,    SW8_CS3},
+    {0, SW7_CS4,    SW9_CS4,    SW8_CS4},
+    {0, SW7_CS5,    SW9_CS5,    SW8_CS5},
+    {0, SW7_CS6,    SW9_CS6,    SW8_CS6},
+    {0, SW7_CS7,    SW9_CS7,    SW8_CS7},
+    {0, SW7_CS8,    SW9_CS8,    SW8_CS8},
+    {0, SW7_CS9,    SW9_CS9,    SW8_CS9},
+    {0, SW7_CS10,   SW9_CS10,   SW8_CS10},
+    {0, SW7_CS11,   SW9_CS11,   SW8_CS11},
+    {0, SW7_CS12,   SW9_CS12,   SW8_CS12},
+    {0, SW7_CS13,   SW9_CS13,   SW8_CS13},
+    {0, SW7_CS14,   SW9_CS14,   SW8_CS14},
+    {0, SW7_CS15,   SW9_CS15,   SW8_CS15},
+    {0, SW4_CS1,    SW6_CS1,    SW5_CS1},
+    {0, SW4_CS2,    SW6_CS2,    SW5_CS2},
+    {0, SW4_CS3,    SW6_CS3,    SW5_CS3},
+    {0, SW4_CS4,    SW6_CS4,    SW5_CS4},
+    {0, SW4_CS5,    SW6_CS5,    SW5_CS5},
+    {0, SW4_CS6,    SW6_CS6,    SW5_CS6},
+    {0, SW4_CS7,    SW6_CS7,    SW5_CS7},
+    {0, SW4_CS8,    SW6_CS8,    SW5_CS8},
+    {0, SW4_CS9,    SW6_CS9,    SW5_CS9},
+    {0, SW4_CS10,   SW6_CS10,   SW5_CS10},
+    {0, SW4_CS11,   SW6_CS11,   SW5_CS11},
+    {0, SW4_CS12,   SW6_CS12,   SW5_CS12},
+    {0, SW4_CS13,   SW6_CS13,   SW5_CS13},
+    {0, SW4_CS14,   SW6_CS14,   SW5_CS14},
+    {0, SW4_CS15,   SW6_CS15,   SW5_CS15},
+    {0, SW1_CS1,    SW3_CS1,    SW2_CS1},
+    {0, SW1_CS2,    SW3_CS2,    SW2_CS2},
+    {0, SW1_CS3,    SW3_CS3,    SW2_CS3},
+    {0, SW1_CS4,    SW3_CS4,    SW2_CS4},
+    {0, SW1_CS5,    SW3_CS5,    SW2_CS5},
+    {0, SW1_CS6,    SW3_CS6,    SW2_CS6},
+    {0, SW1_CS7,    SW3_CS7,    SW2_CS7},
+    {0, SW1_CS8,    SW3_CS8,    SW2_CS8},
+    {0, SW1_CS9,    SW3_CS9,    SW2_CS9},
+    {0, SW1_CS10,   SW3_CS10,   SW2_CS10},
+    {0, SW1_CS11,   SW3_CS11,   SW2_CS11},
+    {0, SW1_CS12,   SW3_CS12,   SW2_CS12},
+    {0, SW1_CS13,   SW3_CS13,   SW2_CS13},
+    {0, SW1_CS14,   SW3_CS14,   SW2_CS14},
+    {0, SW1_CS15,   SW3_CS15,   SW2_CS15},
+    {1, SW7_CS1,    SW9_CS1,    SW8_CS1},
+    {1, SW7_CS2,    SW9_CS2,    SW8_CS2},
+    {1, SW7_CS3,    SW9_CS3,    SW8_CS3},
+    {1, SW7_CS4,    SW9_CS4,    SW8_CS4},
+    {1, SW7_CS5,    SW9_CS5,    SW8_CS5},
+    {1, SW7_CS6,    SW9_CS6,    SW8_CS6},
+    {1, SW7_CS7,    SW9_CS7,    SW8_CS7},
+    {1, SW7_CS8,    SW9_CS8,    SW8_CS8},
+    {1, SW7_CS9,    SW9_CS9,    SW8_CS9},
+    {1, SW7_CS10,   SW9_CS10,   SW8_CS10},
+    {1, SW7_CS11,   SW9_CS11,   SW8_CS11},
+    {1, SW7_CS12,   SW9_CS12,   SW8_CS12},
+    {1, SW7_CS13,   SW9_CS13,   SW8_CS13},
+    {1, SW7_CS14,   SW9_CS14,   SW8_CS14},
+    {1, SW7_CS15,   SW9_CS15,   SW8_CS15},
+    {1, SW4_CS1,    SW6_CS1,    SW5_CS1},
+    {1, SW4_CS2,    SW6_CS2,    SW5_CS2},
+    {1, SW4_CS3,    SW6_CS3,    SW5_CS3},
+    {1, SW4_CS4,    SW6_CS4,    SW5_CS4},
+    {1, SW4_CS5,    SW6_CS5,    SW5_CS5},
+    {1, SW4_CS6,    SW6_CS6,    SW5_CS6},
+    {1, SW4_CS7,    SW6_CS7,    SW5_CS7},
+    {1, SW4_CS8,    SW6_CS8,    SW5_CS8},
+    {1, SW4_CS9,    SW6_CS9,    SW5_CS9},
+    {1, SW4_CS10,   SW6_CS10,   SW5_CS10},
+    {1, SW4_CS11,   SW6_CS11,   SW5_CS11},
+    {1, SW4_CS12,   SW6_CS12,   SW5_CS12},
+    {1, SW4_CS13,   SW6_CS13,   SW5_CS13},
+    {1, SW4_CS14,   SW6_CS14,   SW5_CS14},
+    {1, SW4_CS15,   SW6_CS15,   SW5_CS15},
+    {1, SW1_CS1,    SW3_CS1,    SW2_CS1},
+    {1, SW1_CS2,    SW3_CS2,    SW2_CS2},
+    {1, SW1_CS3,    SW3_CS3,    SW2_CS3},
+    {1, SW1_CS5,    SW3_CS5,    SW2_CS5},
+    {1, SW1_CS6,    SW3_CS6,    SW2_CS6},
+    {1, SW1_CS7,    SW3_CS7,    SW2_CS7},
+    {1, SW1_CS8,    SW3_CS8,    SW2_CS8},
+    {1, SW1_CS9,    SW3_CS9,    SW2_CS9},
+    {1, SW1_CS10,   SW3_CS10,   SW2_CS10},
+    {1, SW1_CS11,   SW3_CS11,   SW2_CS11},
+    {1, SW1_CS12,   SW3_CS12,   SW2_CS12},
+    {1, SW1_CS13,   SW3_CS13,   SW2_CS13},
+    {1, SW1_CS14,   SW3_CS14,   SW2_CS14},
+    {1, SW1_CS15,   SW3_CS15,   SW2_CS15},
+    {0, SW7_CS2,    SW9_CS2,    SW8_CS2},
+    {1, SW1_CS4,    SW3_CS4,    SW2_CS4}
 };
diff --git a/keyboards/acheron/apollo/87h/delta/config.h b/keyboards/acheron/apollo/87h/delta/config.h
index 578a443e882..17c09f0f576 100644
--- a/keyboards/acheron/apollo/87h/delta/config.h
+++ b/keyboards/acheron/apollo/87h/delta/config.h
@@ -28,5 +28,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define WS2812_PWM_DRIVER PWMD1
 #define WS2812_PWM_CHANNEL 3
 #define WS2812_PWM_PAL_MODE 1
-#define WS2812_DMA_STREAM STM32_DMA2_STREAM5
-#define WS2812_DMA_CHANNEL 6
+#define WS2812_PWM_DMA_STREAM STM32_DMA2_STREAM5
+#define WS2812_PWM_DMA_CHANNEL 6
diff --git a/keyboards/acheron/apollo/87h/gamma/gamma.c b/keyboards/acheron/apollo/87h/gamma/gamma.c
index 43802bb4ad8..f047db0feaa 100644
--- a/keyboards/acheron/apollo/87h/gamma/gamma.c
+++ b/keyboards/acheron/apollo/87h/gamma/gamma.c
@@ -26,98 +26,98 @@ const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
  *   |  |         |         B location
  *   |  |         |         | */
 // First row
-    {0, CS7_SW9 , CS9_SW9 , CS8_SW9  }, //ESC    0
-    {0, CS7_SW8 , CS9_SW8 , CS8_SW8  }, //F1     1
-    {0, CS7_SW7 , CS9_SW7 , CS8_SW7  }, //F2     2
-    {0, CS7_SW6 , CS9_SW6 , CS8_SW6  }, //F3     3
-    {0, CS7_SW5 , CS9_SW5 , CS8_SW5  }, //F4     4
-    {0, CS7_SW4 , CS9_SW4 , CS8_SW4  }, //F5     5
-    {0, CS7_SW3 , CS9_SW3 , CS8_SW3  }, //F6     6
-    {0, CS7_SW2 , CS9_SW2 , CS8_SW2  }, //F7     7
-    {0, CS7_SW1 , CS9_SW1 , CS8_SW1  }, //F8     8
-    {0, CS18_SW2, CS16_SW2, CS17_SW2 }, //F9     9
-    {0, CS18_SW3, CS16_SW3, CS17_SW3 }, //F10    10
-    {0, CS18_SW4, CS16_SW4, CS17_SW4 }, //F11    11
-    {0, CS18_SW6, CS16_SW6, CS17_SW6 }, //F12    12
-    {0, CS18_SW7, CS16_SW7, CS17_SW7 }, //PRI    13
-    {0, CS18_SW8, CS16_SW8, CS17_SW8 }, //SCR    14
-    {0, CS18_SW9, CS16_SW9, CS17_SW9 }, //PAUS   15
+    {0, SW9_CS7 , SW9_CS9 , SW9_CS8  }, //ESC    0
+    {0, SW8_CS7 , SW8_CS9 , SW8_CS8  }, //F1     1
+    {0, SW7_CS7 , SW7_CS9 , SW7_CS8  }, //F2     2
+    {0, SW6_CS7 , SW6_CS9 , SW6_CS8  }, //F3     3
+    {0, SW5_CS7 , SW5_CS9 , SW5_CS8  }, //F4     4
+    {0, SW4_CS7 , SW4_CS9 , SW4_CS8  }, //F5     5
+    {0, SW3_CS7 , SW3_CS9 , SW3_CS8  }, //F6     6
+    {0, SW2_CS7 , SW2_CS9 , SW2_CS8  }, //F7     7
+    {0, SW1_CS7 , SW1_CS9 , SW1_CS8  }, //F8     8
+    {0, SW2_CS18, SW2_CS16, SW2_CS17 }, //F9     9
+    {0, SW3_CS18, SW3_CS16, SW3_CS17 }, //F10    10
+    {0, SW4_CS18, SW4_CS16, SW4_CS17 }, //F11    11
+    {0, SW6_CS18, SW6_CS16, SW6_CS17 }, //F12    12
+    {0, SW7_CS18, SW7_CS16, SW7_CS17 }, //PRI    13
+    {0, SW8_CS18, SW8_CS16, SW8_CS17 }, //SCR    14
+    {0, SW9_CS18, SW9_CS16, SW9_CS17 }, //PAUS   15
 //Second row
-    {0, CS12_SW9, CS11_SW9, CS10_SW9 }, //GRAVE  16
-    {0, CS12_SW8, CS11_SW8, CS10_SW8 }, //1      17
-    {0, CS12_SW7, CS11_SW7, CS10_SW7 }, //2      18
-    {0, CS12_SW6, CS11_SW6, CS10_SW6 }, //3      19
-    {0, CS12_SW5, CS11_SW5, CS10_SW5 }, //4      20
-    {0, CS12_SW4, CS11_SW4, CS10_SW4 }, //5      21
-    {0, CS12_SW3, CS11_SW3, CS10_SW3 }, //6      22
-    {0, CS12_SW2, CS11_SW2, CS10_SW2 }, //7      23
-    {0, CS12_SW1, CS11_SW1, CS10_SW1 }, //8      24
-    {0, CS15_SW1, CS13_SW1, CS14_SW1 }, //9      25
-    {0, CS15_SW2, CS13_SW2, CS14_SW2 }, //0      26
-    {0, CS15_SW3, CS13_SW3, CS14_SW3 }, //MINUS  27
-    {0, CS15_SW4, CS13_SW4, CS14_SW4 }, //PLUS   28
-    {0, CS15_SW5, CS13_SW5, CS14_SW5 }, //BKSP   29
-    {0, CS15_SW7, CS13_SW7, CS14_SW7 }, //INS    30
-    {0, CS15_SW8, CS13_SW8, CS14_SW8 }, //HOME   31
-    {0, CS15_SW9, CS13_SW9, CS14_SW9 }, //PGUP   32
+    {0, SW9_CS12, SW9_CS11, SW9_CS10 }, //GRAVE  16
+    {0, SW8_CS12, SW8_CS11, SW8_CS10 }, //1      17
+    {0, SW7_CS12, SW7_CS11, SW7_CS10 }, //2      18
+    {0, SW6_CS12, SW6_CS11, SW6_CS10 }, //3      19
+    {0, SW5_CS12, SW5_CS11, SW5_CS10 }, //4      20
+    {0, SW4_CS12, SW4_CS11, SW4_CS10 }, //5      21
+    {0, SW3_CS12, SW3_CS11, SW3_CS10 }, //6      22
+    {0, SW2_CS12, SW2_CS11, SW2_CS10 }, //7      23
+    {0, SW1_CS12, SW1_CS11, SW1_CS10 }, //8      24
+    {0, SW1_CS15, SW1_CS13, SW1_CS14 }, //9      25
+    {0, SW2_CS15, SW2_CS13, SW2_CS14 }, //0      26
+    {0, SW3_CS15, SW3_CS13, SW3_CS14 }, //MINUS  27
+    {0, SW4_CS15, SW4_CS13, SW4_CS14 }, //PLUS   28
+    {0, SW5_CS15, SW5_CS13, SW5_CS14 }, //BKSP   29
+    {0, SW7_CS15, SW7_CS13, SW7_CS14 }, //INS    30
+    {0, SW8_CS15, SW8_CS13, SW8_CS14 }, //HOME   31
+    {0, SW9_CS15, SW9_CS13, SW9_CS14 }, //PGUP   32
 //Third row
-    {0, CS4_SW9 , CS6_SW9 , CS5_SW9  }, //TAB    33
-    {0, CS4_SW8 , CS6_SW8 , CS5_SW8  }, //Q      34
-    {0, CS4_SW7 , CS6_SW7 , CS5_SW7  }, //W      35
-    {0, CS4_SW6 , CS6_SW6 , CS5_SW6  }, //E      36
-    {0, CS4_SW5 , CS6_SW5 , CS5_SW5  }, //R      37
-    {0, CS4_SW4 , CS6_SW4 , CS5_SW4  }, //T      38
-    {0, CS4_SW3 , CS6_SW3 , CS5_SW3  }, //Y      39
-    {0, CS4_SW2 , CS6_SW2 , CS5_SW2  }, //U      40
-    {0, CS4_SW1 , CS6_SW1 , CS5_SW1  }, //I      41
-    {0, CS3_SW2 , CS1_SW2 , CS2_SW2  }, //O      42
-    {0, CS3_SW3 , CS1_SW3 , CS2_SW3  }, //P      43
-    {0, CS3_SW4 , CS1_SW4 , CS2_SW4  }, //LBRKT  44
-    {0, CS3_SW5 , CS1_SW5 , CS2_SW5  }, //RBRKT  45
-    {0, CS3_SW6 , CS1_SW6 , CS2_SW6  }, //BSLS   46
-    {0, CS3_SW7 , CS1_SW7 , CS2_SW7  }, //DEL    47
-    {0, CS3_SW8 , CS1_SW8 , CS2_SW8  }, //END    48
-    {0, CS3_SW9 , CS1_SW9 , CS2_SW9  }, //PGDN   49
+    {0, SW9_CS4 , SW9_CS6 , SW9_CS5  }, //TAB    33
+    {0, SW8_CS4 , SW8_CS6 , SW8_CS5  }, //Q      34
+    {0, SW7_CS4 , SW7_CS6 , SW7_CS5  }, //W      35
+    {0, SW6_CS4 , SW6_CS6 , SW6_CS5  }, //E      36
+    {0, SW5_CS4 , SW5_CS6 , SW5_CS5  }, //R      37
+    {0, SW4_CS4 , SW4_CS6 , SW4_CS5  }, //T      38
+    {0, SW3_CS4 , SW3_CS6 , SW3_CS5  }, //Y      39
+    {0, SW2_CS4 , SW2_CS6 , SW2_CS5  }, //U      40
+    {0, SW1_CS4 , SW1_CS6 , SW1_CS5  }, //I      41
+    {0, SW2_CS3 , SW2_CS1 , SW2_CS2  }, //O      42
+    {0, SW3_CS3 , SW3_CS1 , SW3_CS2  }, //P      43
+    {0, SW4_CS3 , SW4_CS1 , SW4_CS2  }, //LBRKT  44
+    {0, SW5_CS3 , SW5_CS1 , SW5_CS2  }, //RBRKT  45
+    {0, SW6_CS3 , SW6_CS1 , SW6_CS2  }, //BSLS   46
+    {0, SW7_CS3 , SW7_CS1 , SW7_CS2  }, //DEL    47
+    {0, SW8_CS3 , SW8_CS1 , SW8_CS2  }, //END    48
+    {0, SW9_CS3 , SW9_CS1 , SW9_CS2  }, //PGDN   49
 //Fourth row
-    {0, CS33_SW9, CS32_SW9, CS31_SW9  }, //CAPS  50
-    {0, CS33_SW8, CS32_SW8, CS31_SW8  }, //A     51
-    {0, CS33_SW7, CS32_SW7, CS31_SW7  }, //S     52
-    {0, CS33_SW6, CS32_SW6, CS31_SW6  }, //D     53
-    {0, CS33_SW5, CS32_SW5, CS31_SW5  }, //F     54
-    {0, CS33_SW4, CS32_SW4, CS31_SW4  }, //G     55
-    {0, CS33_SW3, CS32_SW3, CS31_SW3  }, //H     56
-    {0, CS33_SW2, CS32_SW2, CS31_SW2  }, //J     57
-    {0, CS33_SW1, CS32_SW1, CS31_SW1  }, //K     58
-    {0, CS39_SW2, CS38_SW2, CS37_SW2  }, //L     59
-    {0, CS39_SW3, CS38_SW3, CS37_SW3  }, //COLON 60
-    {0, CS39_SW4, CS38_SW4, CS37_SW4  }, //QUOTE 61
-    {0, CS39_SW6, CS38_SW6, CS37_SW6  }, //ENTER 62
+    {0, SW9_CS33, SW9_CS32, SW9_CS31  }, //CAPS  50
+    {0, SW8_CS33, SW8_CS32, SW8_CS31  }, //A     51
+    {0, SW7_CS33, SW7_CS32, SW7_CS31  }, //S     52
+    {0, SW6_CS33, SW6_CS32, SW6_CS31  }, //D     53
+    {0, SW5_CS33, SW5_CS32, SW5_CS31  }, //F     54
+    {0, SW4_CS33, SW4_CS32, SW4_CS31  }, //G     55
+    {0, SW3_CS33, SW3_CS32, SW3_CS31  }, //H     56
+    {0, SW2_CS33, SW2_CS32, SW2_CS31  }, //J     57
+    {0, SW1_CS33, SW1_CS32, SW1_CS31  }, //K     58
+    {0, SW2_CS39, SW2_CS38, SW2_CS37  }, //L     59
+    {0, SW3_CS39, SW3_CS38, SW3_CS37  }, //COLON 60
+    {0, SW4_CS39, SW4_CS38, SW4_CS37  }, //QUOTE 61
+    {0, SW6_CS39, SW6_CS38, SW6_CS37  }, //ENTER 62
 //Fifth row
-    {0, CS30_SW9, CS28_SW9, CS29_SW9  }, //LSFT  63
-    {0, CS30_SW7, CS28_SW7, CS29_SW7  }, //Z     64
-    {0, CS30_SW6, CS28_SW6, CS29_SW6  }, //X     65
-    {0, CS30_SW5, CS28_SW5, CS29_SW5  }, //C     66
-    {0, CS30_SW4, CS28_SW4, CS29_SW4  }, //V     67
-    {0, CS30_SW3, CS28_SW3, CS29_SW3  }, //B     68
-    {0, CS30_SW2, CS28_SW2, CS29_SW2  }, //N     69
-    {0, CS30_SW1, CS28_SW1, CS29_SW1  }, //M     70
-    {0, CS36_SW1, CS35_SW1, CS34_SW1  }, //COMMA 71
-    {0, CS36_SW3, CS35_SW3, CS34_SW3  }, //DOT   72
-    {0, CS36_SW4, CS35_SW4, CS34_SW4  }, //SLASH 73
-    {0, CS36_SW6, CS35_SW6, CS34_SW6  }, //RSFT  74
-    {0, CS36_SW7, CS35_SW7, CS34_SW7  }, //UP    75
+    {0, SW9_CS30, SW9_CS28, SW9_CS29  }, //LSFT  63
+    {0, SW7_CS30, SW7_CS28, SW7_CS29  }, //Z     64
+    {0, SW6_CS30, SW6_CS28, SW6_CS29  }, //X     65
+    {0, SW5_CS30, SW5_CS28, SW5_CS29  }, //C     66
+    {0, SW4_CS30, SW4_CS28, SW4_CS29  }, //V     67
+    {0, SW3_CS30, SW3_CS28, SW3_CS29  }, //B     68
+    {0, SW2_CS30, SW2_CS28, SW2_CS29  }, //N     69
+    {0, SW1_CS30, SW1_CS28, SW1_CS29  }, //M     70
+    {0, SW1_CS36, SW1_CS35, SW1_CS34  }, //COMMA 71
+    {0, SW3_CS36, SW3_CS35, SW3_CS34  }, //DOT   72
+    {0, SW4_CS36, SW4_CS35, SW4_CS34  }, //SLASH 73
+    {0, SW6_CS36, SW6_CS35, SW6_CS34  }, //RSFT  74
+    {0, SW7_CS36, SW7_CS35, SW7_CS34  }, //UP    75
 //Sixth row
-    {0, CS27_SW9, CS25_SW9, CS26_SW9  }, //LCTRL 76
-    {0, CS27_SW7, CS25_SW7, CS26_SW7  }, //LWIN  77
-    {0, CS27_SW6, CS25_SW6, CS26_SW6  }, //LALT  78
-    {0, CS27_SW5, CS25_SW5, CS26_SW5  }, //SPACE 79
-    {0, CS27_SW3, CS25_SW3, CS26_SW3  }, //RALT  80
-    {0, CS24_SW4, CS23_SW4, CS22_SW4  }, //RGUI  81
-    {0, CS24_SW5, CS23_SW5, CS22_SW5  }, //MENU  82
-    {0, CS24_SW6, CS23_SW6, CS22_SW6  }, //RCTRL 83
-    {0, CS24_SW1, CS23_SW1, CS22_SW1  }, //LEFT  84
-    {0, CS24_SW2, CS23_SW2, CS22_SW2  }, //DOWN  85
-    {0, CS24_SW3, CS23_SW3, CS22_SW3  }, //RIGHT 86
+    {0, SW9_CS27, SW9_CS25, SW9_CS26  }, //LCTRL 76
+    {0, SW7_CS27, SW7_CS25, SW7_CS26  }, //LWIN  77
+    {0, SW6_CS27, SW6_CS25, SW6_CS26  }, //LALT  78
+    {0, SW5_CS27, SW5_CS25, SW5_CS26  }, //SPACE 79
+    {0, SW3_CS27, SW3_CS25, SW3_CS26  }, //RALT  80
+    {0, SW4_CS24, SW4_CS23, SW4_CS22  }, //RGUI  81
+    {0, SW5_CS24, SW5_CS23, SW5_CS22  }, //MENU  82
+    {0, SW6_CS24, SW6_CS23, SW6_CS22  }, //RCTRL 83
+    {0, SW1_CS24, SW1_CS23, SW1_CS22  }, //LEFT  84
+    {0, SW2_CS24, SW2_CS23, SW2_CS22  }, //DOWN  85
+    {0, SW3_CS24, SW3_CS23, SW3_CS22  }, //RIGHT 86
 
 };
 
diff --git a/keyboards/acheron/apollo/87htsc/config.h b/keyboards/acheron/apollo/87htsc/config.h
index 578a443e882..17c09f0f576 100644
--- a/keyboards/acheron/apollo/87htsc/config.h
+++ b/keyboards/acheron/apollo/87htsc/config.h
@@ -28,5 +28,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define WS2812_PWM_DRIVER PWMD1
 #define WS2812_PWM_CHANNEL 3
 #define WS2812_PWM_PAL_MODE 1
-#define WS2812_DMA_STREAM STM32_DMA2_STREAM5
-#define WS2812_DMA_CHANNEL 6
+#define WS2812_PWM_DMA_STREAM STM32_DMA2_STREAM5
+#define WS2812_PWM_DMA_CHANNEL 6
diff --git a/keyboards/acheron/apollo/88htsc/config.h b/keyboards/acheron/apollo/88htsc/config.h
index 578a443e882..17c09f0f576 100644
--- a/keyboards/acheron/apollo/88htsc/config.h
+++ b/keyboards/acheron/apollo/88htsc/config.h
@@ -28,5 +28,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define WS2812_PWM_DRIVER PWMD1
 #define WS2812_PWM_CHANNEL 3
 #define WS2812_PWM_PAL_MODE 1
-#define WS2812_DMA_STREAM STM32_DMA2_STREAM5
-#define WS2812_DMA_CHANNEL 6
+#define WS2812_PWM_DMA_STREAM STM32_DMA2_STREAM5
+#define WS2812_PWM_DMA_CHANNEL 6
diff --git a/keyboards/acheron/athena/alpha/config.h b/keyboards/acheron/athena/alpha/config.h
index ba5c2dedf2c..c9f1d29f24b 100644
--- a/keyboards/acheron/athena/alpha/config.h
+++ b/keyboards/acheron/athena/alpha/config.h
@@ -27,8 +27,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define WS2812_PWM_DRIVER PWMD1
 #define WS2812_PWM_CHANNEL 3
 #define WS2812_PWM_PAL_MODE 1
-#define WS2812_DMA_STREAM STM32_DMA2_STREAM5
-#define WS2812_DMA_CHANNEL 6
+#define WS2812_PWM_DMA_STREAM STM32_DMA2_STREAM5
+#define WS2812_PWM_DMA_CHANNEL 6
 
 // If this is defined, the caps lock LED will turn on and off according to the state of caps lock. If not, the LED will shine like all other LEDs despite the caps lock state.
 #define CAPSLOCK_INDICATOR
diff --git a/keyboards/acheron/athena/beta/config.h b/keyboards/acheron/athena/beta/config.h
index 30c29fa6862..b2a8d2edf89 100644
--- a/keyboards/acheron/athena/beta/config.h
+++ b/keyboards/acheron/athena/beta/config.h
@@ -28,8 +28,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define WS2812_PWM_DRIVER PWMD1
 #define WS2812_PWM_CHANNEL 3
 #define WS2812_PWM_PAL_MODE 1
-#define WS2812_DMA_STREAM STM32_DMA2_STREAM5
-#define WS2812_DMA_CHANNEL 6
+#define WS2812_PWM_DMA_STREAM STM32_DMA2_STREAM5
+#define WS2812_PWM_DMA_CHANNEL 6
 
 // If this is defined, the caps lock LED will turn on and off according to the state of caps lock. If not, the LED will shine like all other LEDs despite the caps lock state.
 #define CAPSLOCK_INDICATOR
diff --git a/keyboards/acheron/shark/beta/config.h b/keyboards/acheron/shark/beta/config.h
index d862fd016de..1182d39d3b5 100644
--- a/keyboards/acheron/shark/beta/config.h
+++ b/keyboards/acheron/shark/beta/config.h
@@ -27,7 +27,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define WS2812_PWM_DRIVER PWMD1
 #define WS2812_PWM_CHANNEL 3
 #define WS2812_PWM_PAL_MODE 1
-#define WS2812_DMA_STREAM STM32_DMA2_STREAM5
-#define WS2812_DMA_CHANNEL 6
+#define WS2812_PWM_DMA_STREAM STM32_DMA2_STREAM5
+#define WS2812_PWM_DMA_CHANNEL 6
 
 #define EEPROM_I2C_24LC256
diff --git a/keyboards/acheron/themis/87h/config.h b/keyboards/acheron/themis/87h/config.h
index ed1229c7793..fb2a5e1ed7f 100644
--- a/keyboards/acheron/themis/87h/config.h
+++ b/keyboards/acheron/themis/87h/config.h
@@ -24,5 +24,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define WS2812_PWM_DRIVER PWMD1
 #define WS2812_PWM_CHANNEL 3
 #define WS2812_PWM_PAL_MODE 1
-#define WS2812_DMA_STREAM STM32_DMA2_STREAM5
-#define WS2812_DMA_CHANNEL 6
+#define WS2812_PWM_DMA_STREAM STM32_DMA2_STREAM5
+#define WS2812_PWM_DMA_CHANNEL 6
diff --git a/keyboards/acheron/themis/87h/info.json b/keyboards/acheron/themis/87h/info.json
index a7bfb899978..ce2037bfade 100644
--- a/keyboards/acheron/themis/87h/info.json
+++ b/keyboards/acheron/themis/87h/info.json
@@ -16,10 +16,7 @@
         "mousekey":  true,
         "extrakey":  true,
         "console":   false,
-        "backlight": false,
         "rgblight":  true,
-        "audio":     false,
-        "encoder":   false,
         "nkro":      true
     },
     "diode_direction": "COL2ROW",
diff --git a/keyboards/acheron/themis/87htsc/config.h b/keyboards/acheron/themis/87htsc/config.h
index ed1229c7793..fb2a5e1ed7f 100644
--- a/keyboards/acheron/themis/87htsc/config.h
+++ b/keyboards/acheron/themis/87htsc/config.h
@@ -24,5 +24,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define WS2812_PWM_DRIVER PWMD1
 #define WS2812_PWM_CHANNEL 3
 #define WS2812_PWM_PAL_MODE 1
-#define WS2812_DMA_STREAM STM32_DMA2_STREAM5
-#define WS2812_DMA_CHANNEL 6
+#define WS2812_PWM_DMA_STREAM STM32_DMA2_STREAM5
+#define WS2812_PWM_DMA_CHANNEL 6
diff --git a/keyboards/acheron/themis/87htsc/info.json b/keyboards/acheron/themis/87htsc/info.json
index 5f388147892..eaf8a323abb 100644
--- a/keyboards/acheron/themis/87htsc/info.json
+++ b/keyboards/acheron/themis/87htsc/info.json
@@ -16,10 +16,7 @@
         "mousekey":  true,
         "extrakey":  true,
         "console":   false,
-        "backlight": false,
         "rgblight":  true,
-        "audio":     false,
-        "encoder":   false,
         "nkro":      true
     },
     "diode_direction": "COL2ROW",
diff --git a/keyboards/acheron/themis/88htsc/config.h b/keyboards/acheron/themis/88htsc/config.h
index ed1229c7793..fb2a5e1ed7f 100644
--- a/keyboards/acheron/themis/88htsc/config.h
+++ b/keyboards/acheron/themis/88htsc/config.h
@@ -24,5 +24,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define WS2812_PWM_DRIVER PWMD1
 #define WS2812_PWM_CHANNEL 3
 #define WS2812_PWM_PAL_MODE 1
-#define WS2812_DMA_STREAM STM32_DMA2_STREAM5
-#define WS2812_DMA_CHANNEL 6
+#define WS2812_PWM_DMA_STREAM STM32_DMA2_STREAM5
+#define WS2812_PWM_DMA_CHANNEL 6
diff --git a/keyboards/acheron/themis/88htsc/info.json b/keyboards/acheron/themis/88htsc/info.json
index 20b3d38828a..f8e65afbade 100644
--- a/keyboards/acheron/themis/88htsc/info.json
+++ b/keyboards/acheron/themis/88htsc/info.json
@@ -16,10 +16,7 @@
         "mousekey":  true,
         "extrakey":  true,
         "console":   false,
-        "backlight": false,
         "rgblight":  true,
-        "audio":     false,
-        "encoder":   false,
         "nkro":      true
     },
     "diode_direction": "COL2ROW",
diff --git a/keyboards/adafruit/macropad/config.h b/keyboards/adafruit/macropad/config.h
index 7f2e9ab6f96..725530a512b 100644
--- a/keyboards/adafruit/macropad/config.h
+++ b/keyboards/adafruit/macropad/config.h
@@ -48,5 +48,3 @@
 #define AUDIO_PWM_CHANNEL RP2040_PWM_CHANNEL_A
 #define AUDIO_INIT_DELAY
 #define AUDIO_CLICKY
-
-#define SPEAKER_SHUTDOWN GP14
diff --git a/keyboards/adafruit/macropad/info.json b/keyboards/adafruit/macropad/info.json
index 0facf7e0f66..295af783398 100644
--- a/keyboards/adafruit/macropad/info.json
+++ b/keyboards/adafruit/macropad/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0108",
         "device_version": "0.0.1"
     },
+    "audio": {
+        "power_control": {
+            "pin": "GP14"
+        }
+    },
     "encoder": {
         "rotary": [
             {"pin_a": "GP18", "pin_b": "GP17"}
diff --git a/keyboards/adafruit/macropad/macropad.c b/keyboards/adafruit/macropad/macropad.c
deleted file mode 100644
index 5c1d2ba5930..00000000000
--- a/keyboards/adafruit/macropad/macropad.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Copyright 2022 Jose Pablo Ramirez <jp.ramangulo@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "quantum.h"
-
-#ifdef AUDIO_ENABLE
-void keyboard_pre_init_kb(void) {
-    // ensure pin is set and enabled pre-audio init
-    setPinOutput(SPEAKER_SHUTDOWN);
-    writePinHigh(SPEAKER_SHUTDOWN);
-    keyboard_pre_init_user();
-}
-
-void keyboard_post_init_kb(void) {
-    // set pin based on active status
-    writePin(SPEAKER_SHUTDOWN, audio_is_on());
-    keyboard_post_init_user();
-}
-
-void audio_on_user(void) {
-    writePinHigh(SPEAKER_SHUTDOWN);
-}
-
-void audio_off_user(void) {
-    // needs a delay or it runs right after play note.
-    wait_ms(200);
-    writePinLow(SPEAKER_SHUTDOWN);
-}
-#endif
diff --git a/keyboards/akko/5087/5087.c b/keyboards/akko/5087/5087.c
index 6374adc301e..7dd614b4565 100644
--- a/keyboards/akko/5087/5087.c
+++ b/keyboards/akko/5087/5087.c
@@ -25,103 +25,103 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       |       B location
  *   |  |       |       | */
     /*row0*/
-    {1, A_1,   B_1,   C_1},
-    {1, A_2,   B_2,   C_2},
-    {1, A_3,   B_3,   C_3},
-    {1, A_4,   B_4,   C_4},
-    {1, A_5,   B_5,   C_5},
-    {1, A_6,   B_6,   C_6},
-    {1, A_7,   B_7,   C_7},
-    {1, A_8,   B_8,   C_8},
-    {1, A_9,   B_9,   C_9},
-    {1, A_10,  B_10,  C_10},
-    {1, A_11,  B_11,  C_11},
-    {1, A_12,  B_12,  C_12},
-    {1, A_13,  B_13,  C_13},
-    {1, A_14,  B_14,  C_14},
-    {1, A_15,  B_15,  C_15},
-    {1, A_16,  B_16,  C_16},
+    {1, CB1_CA1,   CB2_CA1,   CB3_CA1},
+    {1, CB1_CA2,   CB2_CA2,   CB3_CA2},
+    {1, CB1_CA3,   CB2_CA3,   CB3_CA3},
+    {1, CB1_CA4,   CB2_CA4,   CB3_CA4},
+    {1, CB1_CA5,   CB2_CA5,   CB3_CA5},
+    {1, CB1_CA6,   CB2_CA6,   CB3_CA6},
+    {1, CB1_CA7,   CB2_CA7,   CB3_CA7},
+    {1, CB1_CA8,   CB2_CA8,   CB3_CA8},
+    {1, CB1_CA9,   CB2_CA9,   CB3_CA9},
+    {1, CB1_CA10,  CB2_CA10,  CB3_CA10},
+    {1, CB1_CA11,  CB2_CA11,  CB3_CA11},
+    {1, CB1_CA12,  CB2_CA12,  CB3_CA12},
+    {1, CB1_CA13,  CB2_CA13,  CB3_CA13},
+    {1, CB1_CA14,  CB2_CA14,  CB3_CA14},
+    {1, CB1_CA15,  CB2_CA15,  CB3_CA15},
+    {1, CB1_CA16,  CB2_CA16,  CB3_CA16},
 
     /*row1*/
-    {0, A_1,   B_1,   C_1},
-    {0, A_2,   B_2,   C_2},
-    {0, A_3,   B_3,   C_3},
-    {0, A_4,   B_4,   C_4},
-    {0, A_5,   B_5,   C_5},
-    {0, A_6,   B_6,   C_6},
-    {0, A_7,   B_7,   C_7},
-    {0, A_8,   B_8,   C_8},
-    {0, A_9,   B_9,   C_9},
-    {0, A_10,  B_10,  C_10},
-    {0, A_11,  B_11,  C_11},
-    {0, A_12,  B_12,  C_12},
-    {0, A_13,  B_13,  C_13},
-    {0, A_14,  B_14,  C_14},
-    {1, D_1,    E_1,   F_1},
-    {1, D_2,    E_2,   F_2},
-    {1, D_3,    E_3,   F_3},
+    {0, CB1_CA1,   CB2_CA1,   CB3_CA1},
+    {0, CB1_CA2,   CB2_CA2,   CB3_CA2},
+    {0, CB1_CA3,   CB2_CA3,   CB3_CA3},
+    {0, CB1_CA4,   CB2_CA4,   CB3_CA4},
+    {0, CB1_CA5,   CB2_CA5,   CB3_CA5},
+    {0, CB1_CA6,   CB2_CA6,   CB3_CA6},
+    {0, CB1_CA7,   CB2_CA7,   CB3_CA7},
+    {0, CB1_CA8,   CB2_CA8,   CB3_CA8},
+    {0, CB1_CA9,   CB2_CA9,   CB3_CA9},
+    {0, CB1_CA10,  CB2_CA10,  CB3_CA10},
+    {0, CB1_CA11,  CB2_CA11,  CB3_CA11},
+    {0, CB1_CA12,  CB2_CA12,  CB3_CA12},
+    {0, CB1_CA13,  CB2_CA13,  CB3_CA13},
+    {0, CB1_CA14,  CB2_CA14,  CB3_CA14},
+    {1, CB4_CA1,    CB5_CA1,   CB6_CA1},
+    {1, CB4_CA2,    CB5_CA2,   CB6_CA2},
+    {1, CB4_CA3,    CB5_CA3,   CB6_CA3},
 
     /*row2*/
-    {0, D_1,   E_1,   F_1},
-    {0, D_2,   E_2,   F_2},
-    {0, D_3,   E_3,   F_3},
-    {0, D_4,   E_4,   F_4},
-    {0, D_5,   E_5,   F_5},
-    {0, D_6,   E_6,   F_6},
-    {0, D_7,   E_7,   F_7},
-    {0, D_8,   E_8,   F_8},
-    {0, D_9,   E_9,   F_9},
-    {0, D_10,  E_10,  F_10},
-    {0, D_11,  E_11,  F_11},
-    {0, D_12,  E_12,  F_12},
-    {0, D_13,  E_13,  F_13},
-    {0, D_14,  E_14,  F_14},
-    {1, G_1,   H_1,   I_1},
-    {1, G_2,   H_2,   I_2},
-    {1, G_3,   H_3,   I_3},
+    {0, CB4_CA1,   CB5_CA1,   CB6_CA1},
+    {0, CB4_CA2,   CB5_CA2,   CB6_CA2},
+    {0, CB4_CA3,   CB5_CA3,   CB6_CA3},
+    {0, CB4_CA4,   CB5_CA4,   CB6_CA4},
+    {0, CB4_CA5,   CB5_CA5,   CB6_CA5},
+    {0, CB4_CA6,   CB5_CA6,   CB6_CA6},
+    {0, CB4_CA7,   CB5_CA7,   CB6_CA7},
+    {0, CB4_CA8,   CB5_CA8,   CB6_CA8},
+    {0, CB4_CA9,   CB5_CA9,   CB6_CA9},
+    {0, CB4_CA10,  CB5_CA10,  CB6_CA10},
+    {0, CB4_CA11,  CB5_CA11,  CB6_CA11},
+    {0, CB4_CA12,  CB5_CA12,  CB6_CA12},
+    {0, CB4_CA13,  CB5_CA13,  CB6_CA13},
+    {0, CB4_CA14,  CB5_CA14,  CB6_CA14},
+    {1, CB7_CA1,   CB8_CA1,   CB9_CA1},
+    {1, CB7_CA2,   CB8_CA2,   CB9_CA2},
+    {1, CB7_CA3,   CB8_CA3,   CB9_CA3},
 
     /*row3*/
-    {0, G_1,   H_1,   I_1},
-    {0, G_2,   H_2,   I_2},
-    {0, G_3,   H_3,   I_3},
-    {0, G_4,   H_4,   I_4},
-    {0, G_5,   H_5,   I_5},
-    {0, G_6,   H_6,   I_6},
-    {0, G_7,   H_7,   I_7},
-    {0, G_8,   H_8,   I_8},
-    {0, G_9,   H_9,   I_9},
-    {0, G_10,  H_10,  I_10},
-    {0, G_11,  H_11,  I_11},
-    {0, G_12,  H_12,  I_12},
-    {0, G_13,  H_13,  I_13},
+    {0, CB7_CA1,   CB8_CA1,   CB9_CA1},
+    {0, CB7_CA2,   CB8_CA2,   CB9_CA2},
+    {0, CB7_CA3,   CB8_CA3,   CB9_CA3},
+    {0, CB7_CA4,   CB8_CA4,   CB9_CA4},
+    {0, CB7_CA5,   CB8_CA5,   CB9_CA5},
+    {0, CB7_CA6,   CB8_CA6,   CB9_CA6},
+    {0, CB7_CA7,   CB8_CA7,   CB9_CA7},
+    {0, CB7_CA8,   CB8_CA8,   CB9_CA8},
+    {0, CB7_CA9,   CB8_CA9,   CB9_CA9},
+    {0, CB7_CA10,  CB8_CA10,  CB9_CA10},
+    {0, CB7_CA11,  CB8_CA11,  CB9_CA11},
+    {0, CB7_CA12,  CB8_CA12,  CB9_CA12},
+    {0, CB7_CA13,  CB8_CA13,  CB9_CA13},
 
     /*row4*/
-    {0, J_1,   K_1,   L_1},
-    {0, J_2,   K_2,   L_2},
-    {0, J_3,   K_3,   L_3},
-    {0, J_4,   K_4,   L_4},
-    {0, J_5,   K_5,   L_5},
-    {0, J_6,   K_6,   L_6},
-    {0, J_7,   K_7,   L_7},
-    {0, J_8,   K_8,   L_8},
-    {0, J_9,   K_9,   L_9},
-    {0, J_10,  K_10,  L_10},
-    {0, J_11,  K_11,  L_11},
-    {0, J_12,  K_12,  L_12},
-    {1,  J_4,   K_4,  L_4},
+    {0, CB10_CA1,   CB11_CA1,   CB12_CA1},
+    {0, CB10_CA2,   CB11_CA2,   CB12_CA2},
+    {0, CB10_CA3,   CB11_CA3,   CB12_CA3},
+    {0, CB10_CA4,   CB11_CA4,   CB12_CA4},
+    {0, CB10_CA5,   CB11_CA5,   CB12_CA5},
+    {0, CB10_CA6,   CB11_CA6,   CB12_CA6},
+    {0, CB10_CA7,   CB11_CA7,   CB12_CA7},
+    {0, CB10_CA8,   CB11_CA8,   CB12_CA8},
+    {0, CB10_CA9,   CB11_CA9,   CB12_CA9},
+    {0, CB10_CA10,  CB11_CA10,  CB12_CA10},
+    {0, CB10_CA11,  CB11_CA11,  CB12_CA11},
+    {0, CB10_CA12,  CB11_CA12,  CB12_CA12},
+    {1,  CB10_CA4,   CB11_CA4,  CB12_CA4},
 
     /*row5*/
-    {0, J_13,  K_13,  L_13},
-    {0, J_14,  K_14,  L_14},
-    {0, J_15,  K_15,  L_15},
-    {0, J_16,  K_16,  L_16},
-    {0, G_14,  H_14,  I_14},
-    {0, G_15,  H_15,  I_15},
-    {0, G_16,  H_16,  I_16},
-    {0, D_15,  E_15,  F_15},
-    {1,  J_1,   K_1,  L_1},
-    {1,  J_2,   K_2,  L_2},
-    {1,  J_3,   K_3,  L_3},
+    {0, CB10_CA13,  CB11_CA13,  CB12_CA13},
+    {0, CB10_CA14,  CB11_CA14,  CB12_CA14},
+    {0, CB10_CA15,  CB11_CA15,  CB12_CA15},
+    {0, CB10_CA16,  CB11_CA16,  CB12_CA16},
+    {0, CB7_CA14,  CB8_CA14,  CB9_CA14},
+    {0, CB7_CA15,  CB8_CA15,  CB9_CA15},
+    {0, CB7_CA16,  CB8_CA16,  CB9_CA16},
+    {0, CB4_CA15,  CB5_CA15,  CB6_CA15},
+    {1,  CB10_CA1,   CB11_CA1,  CB12_CA1},
+    {1,  CB10_CA2,   CB11_CA2,  CB12_CA2},
+    {1,  CB10_CA3,   CB11_CA3,  CB12_CA3},
 };
 #endif // RGB_MATRIX_ENABLE
 
diff --git a/keyboards/akko/5108/5108.c b/keyboards/akko/5108/5108.c
index 0fd71834d19..91526289b67 100644
--- a/keyboards/akko/5108/5108.c
+++ b/keyboards/akko/5108/5108.c
@@ -25,124 +25,124 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       |       B location
  *   |  |       |       | */
     /*row0*/
-    {1, A_1,   B_1,   C_1},
-    {1, A_2,   B_2,   C_2},
-    {1, A_3,   B_3,   C_3},
-    {1, A_4,   B_4,   C_4},
-    {1, A_5,   B_5,   C_5},
-    {1, A_6,   B_6,   C_6},
-    {1, A_7,   B_7,   C_7},
-    {1, A_8,   B_8,   C_8},
-    {1, A_9,   B_9,   C_9},
-    {1, A_10,  B_10,  C_10},
-    {1, A_11,  B_11,  C_11},
-    {1, A_12,  B_12,  C_12},
-    {1, A_13,  B_13,  C_13},
-    {1, A_14,  B_14,  C_14},
-    {1, A_15,  B_15,  C_15},
-    {1, A_16,  B_16,  C_16},
-    {1, D_11,  E_11,  F_11},
-    {1, D_12,  E_12,  F_12},
-    {1, D_13,  E_13,  F_13},
-    {1, D_14,  E_14,  F_14},
+    {1, CB1_CA1,   CB2_CA1,   CB3_CA1},
+    {1, CB1_CA2,   CB2_CA2,   CB3_CA2},
+    {1, CB1_CA3,   CB2_CA3,   CB3_CA3},
+    {1, CB1_CA4,   CB2_CA4,   CB3_CA4},
+    {1, CB1_CA5,   CB2_CA5,   CB3_CA5},
+    {1, CB1_CA6,   CB2_CA6,   CB3_CA6},
+    {1, CB1_CA7,   CB2_CA7,   CB3_CA7},
+    {1, CB1_CA8,   CB2_CA8,   CB3_CA8},
+    {1, CB1_CA9,   CB2_CA9,   CB3_CA9},
+    {1, CB1_CA10,  CB2_CA10,  CB3_CA10},
+    {1, CB1_CA11,  CB2_CA11,  CB3_CA11},
+    {1, CB1_CA12,  CB2_CA12,  CB3_CA12},
+    {1, CB1_CA13,  CB2_CA13,  CB3_CA13},
+    {1, CB1_CA14,  CB2_CA14,  CB3_CA14},
+    {1, CB1_CA15,  CB2_CA15,  CB3_CA15},
+    {1, CB1_CA16,  CB2_CA16,  CB3_CA16},
+    {1, CB4_CA11,  CB5_CA11,  CB6_CA11},
+    {1, CB4_CA12,  CB5_CA12,  CB6_CA12},
+    {1, CB4_CA13,  CB5_CA13,  CB6_CA13},
+    {1, CB4_CA14,  CB5_CA14,  CB6_CA14},
 
     /*row1*/
-    {0, A_1,   B_1,   C_1},
-    {0, A_2,   B_2,   C_2},
-    {0, A_3,   B_3,   C_3},
-    {0, A_4,   B_4,   C_4},
-    {0, A_5,   B_5,   C_5},
-    {0, A_6,   B_6,   C_6},
-    {0, A_7,   B_7,   C_7},
-    {0, A_8,   B_8,   C_8},
-    {0, A_9,   B_9,   C_9},
-    {0, A_10,  B_10,  C_10},
-    {0, A_11,  B_11,  C_11},
-    {0, A_12,  B_12,  C_12},
-    {0, A_13,  B_13,  C_13},
-    {0, A_14,  B_14,  C_14},
-    {1, D_1,   E_1,   F_1 },
-    {1, D_2,   E_2,   F_2},
-    {1, D_3,   E_3,   F_3},
-    {1, D_4,   E_4,   F_4},
-    {1, D_5,   E_5,   F_5},
-    {1, D_6,   E_6,   F_6},
-    {1, D_7,   E_7,   F_7},
+    {0, CB1_CA1,   CB2_CA1,   CB3_CA1},
+    {0, CB1_CA2,   CB2_CA2,   CB3_CA2},
+    {0, CB1_CA3,   CB2_CA3,   CB3_CA3},
+    {0, CB1_CA4,   CB2_CA4,   CB3_CA4},
+    {0, CB1_CA5,   CB2_CA5,   CB3_CA5},
+    {0, CB1_CA6,   CB2_CA6,   CB3_CA6},
+    {0, CB1_CA7,   CB2_CA7,   CB3_CA7},
+    {0, CB1_CA8,   CB2_CA8,   CB3_CA8},
+    {0, CB1_CA9,   CB2_CA9,   CB3_CA9},
+    {0, CB1_CA10,  CB2_CA10,  CB3_CA10},
+    {0, CB1_CA11,  CB2_CA11,  CB3_CA11},
+    {0, CB1_CA12,  CB2_CA12,  CB3_CA12},
+    {0, CB1_CA13,  CB2_CA13,  CB3_CA13},
+    {0, CB1_CA14,  CB2_CA14,  CB3_CA14},
+    {1, CB4_CA1,   CB5_CA1,   CB6_CA1 },
+    {1, CB4_CA2,   CB5_CA2,   CB6_CA2},
+    {1, CB4_CA3,   CB5_CA3,   CB6_CA3},
+    {1, CB4_CA4,   CB5_CA4,   CB6_CA4},
+    {1, CB4_CA5,   CB5_CA5,   CB6_CA5},
+    {1, CB4_CA6,   CB5_CA6,   CB6_CA6},
+    {1, CB4_CA7,   CB5_CA7,   CB6_CA7},
 
     /*row2*/
-    {0, D_1,   E_1,   F_1},
-    {0, D_2,   E_2,   F_2},
-    {0, D_3,   E_3,   F_3},
-    {0, D_4,   E_4,   F_4},
-    {0, D_5,   E_5,   F_5},
-    {0, D_6,   E_6,   F_6},
-    {0, D_7,   E_7,   F_7},
-    {0, D_8,   E_8,   F_8},
-    {0, D_9,   E_9,   F_9},
-    {0, D_10,  E_10,  F_10},
-    {0, D_11,  E_11,  F_11},
-    {0, D_12,  E_12,  F_12},
-    {0, D_13,  E_13,  F_13},
-    {0, D_14,  E_14,  F_14},
-    {1, G_1,   H_1,   I_1},
-    {1, G_2,   H_2,   I_2},
-    {1, G_3,   H_3,   I_3},
-    {1, D_8,   E_8,   F_8},
-    {1, D_9,   E_9,   F_9},
-    {1, D_10,  E_10,  F_10},
-    {1, G_7,   H_7,   I_7},
+    {0, CB4_CA1,   CB5_CA1,   CB6_CA1},
+    {0, CB4_CA2,   CB5_CA2,   CB6_CA2},
+    {0, CB4_CA3,   CB5_CA3,   CB6_CA3},
+    {0, CB4_CA4,   CB5_CA4,   CB6_CA4},
+    {0, CB4_CA5,   CB5_CA5,   CB6_CA5},
+    {0, CB4_CA6,   CB5_CA6,   CB6_CA6},
+    {0, CB4_CA7,   CB5_CA7,   CB6_CA7},
+    {0, CB4_CA8,   CB5_CA8,   CB6_CA8},
+    {0, CB4_CA9,   CB5_CA9,   CB6_CA9},
+    {0, CB4_CA10,  CB5_CA10,  CB6_CA10},
+    {0, CB4_CA11,  CB5_CA11,  CB6_CA11},
+    {0, CB4_CA12,  CB5_CA12,  CB6_CA12},
+    {0, CB4_CA13,  CB5_CA13,  CB6_CA13},
+    {0, CB4_CA14,  CB5_CA14,  CB6_CA14},
+    {1, CB7_CA1,   CB8_CA1,   CB9_CA1},
+    {1, CB7_CA2,   CB8_CA2,   CB9_CA2},
+    {1, CB7_CA3,   CB8_CA3,   CB9_CA3},
+    {1, CB4_CA8,   CB5_CA8,   CB6_CA8},
+    {1, CB4_CA9,   CB5_CA9,   CB6_CA9},
+    {1, CB4_CA10,  CB5_CA10,  CB6_CA10},
+    {1, CB7_CA7,   CB8_CA7,   CB9_CA7},
 
     /*row3*/
-    {0, G_1,   H_1,   I_1},
-    {0, G_2,   H_2,   I_2},
-    {0, G_3,   H_3,   I_3},
-    {0, G_4,   H_4,   I_4},
-    {0, G_5,   H_5,   I_5},
-    {0, G_6,   H_6,   I_6},
-    {0, G_7,   H_7,   I_7},
-    {0, G_8,   H_8,   I_8},
-    {0, G_9,   H_9,   I_9},
-    {0, G_10,  H_10,  I_10},
-    {0, G_11,  H_11,  I_11},
-    {0, G_12,  H_12,  I_12},
-    {0, G_13,  H_13,  I_13},
-    {1, G_4,   H_4,   I_4},
-    {1, G_5,   H_5,   I_5},
-    {1, G_6,   H_6,   I_6},
+    {0, CB7_CA1,   CB8_CA1,   CB9_CA1},
+    {0, CB7_CA2,   CB8_CA2,   CB9_CA2},
+    {0, CB7_CA3,   CB8_CA3,   CB9_CA3},
+    {0, CB7_CA4,   CB8_CA4,   CB9_CA4},
+    {0, CB7_CA5,   CB8_CA5,   CB9_CA5},
+    {0, CB7_CA6,   CB8_CA6,   CB9_CA6},
+    {0, CB7_CA7,   CB8_CA7,   CB9_CA7},
+    {0, CB7_CA8,   CB8_CA8,   CB9_CA8},
+    {0, CB7_CA9,   CB8_CA9,   CB9_CA9},
+    {0, CB7_CA10,  CB8_CA10,  CB9_CA10},
+    {0, CB7_CA11,  CB8_CA11,  CB9_CA11},
+    {0, CB7_CA12,  CB8_CA12,  CB9_CA12},
+    {0, CB7_CA13,  CB8_CA13,  CB9_CA13},
+    {1, CB7_CA4,   CB8_CA4,   CB9_CA4},
+    {1, CB7_CA5,   CB8_CA5,   CB9_CA5},
+    {1, CB7_CA6,   CB8_CA6,   CB9_CA6},
 
     /*row4*/
-    {0, J_1,   K_1,   L_1},
-    {0, J_2,   K_2,   L_2},
-    {0, J_3,   K_3,   L_3},
-    {0, J_4,   K_4,   L_4},
-    {0, J_5,   K_5,   L_5},
-    {0, J_6,   K_6,   L_6},
-    {0, J_7,   K_7,   L_7},
-    {0, J_8,   K_8,   L_8},
-    {0, J_9,   K_9,   L_9},
-    {0, J_10,  K_10,  L_10},
-    {0, J_11,  K_11,  L_11},
-    {0, J_12,  K_12,  L_12},
-    {1,  J_4,   K_4,  L_4},
-    {1,  J_7,   K_7,  L_7},
-    {1,  J_8,   K_8,  L_8},
-    {1,  J_9,   K_9,  L_9},
-    {1,  J_10,  K_10, L_10},
+    {0, CB10_CA1,   CB11_CA1,   CB12_CA1},
+    {0, CB10_CA2,   CB11_CA2,   CB12_CA2},
+    {0, CB10_CA3,   CB11_CA3,   CB12_CA3},
+    {0, CB10_CA4,   CB11_CA4,   CB12_CA4},
+    {0, CB10_CA5,   CB11_CA5,   CB12_CA5},
+    {0, CB10_CA6,   CB11_CA6,   CB12_CA6},
+    {0, CB10_CA7,   CB11_CA7,   CB12_CA7},
+    {0, CB10_CA8,   CB11_CA8,   CB12_CA8},
+    {0, CB10_CA9,   CB11_CA9,   CB12_CA9},
+    {0, CB10_CA10,  CB11_CA10,  CB12_CA10},
+    {0, CB10_CA11,  CB11_CA11,  CB12_CA11},
+    {0, CB10_CA12,  CB11_CA12,  CB12_CA12},
+    {1,  CB10_CA4,   CB11_CA4,  CB12_CA4},
+    {1,  CB10_CA7,   CB11_CA7,  CB12_CA7},
+    {1,  CB10_CA8,   CB11_CA8,  CB12_CA8},
+    {1,  CB10_CA9,   CB11_CA9,  CB12_CA9},
+    {1,  CB10_CA10,  CB11_CA10, CB12_CA10},
 
     /*row5*/
-    {0, J_13,  K_13,  L_13},
-    {0, J_14,  K_14,  L_14},
-    {0, J_15,  K_15,  L_15},
-    {0, J_16,  K_16,  L_16},
-    {0, G_14,  H_14,  I_14},
-    {0, G_15,  H_15,  I_15},
-    {0, G_16,  H_16,  I_16},
-    {0, D_15,  E_15,  F_15},
-    {1,  J_1,   K_1,  L_1},
-    {1,  J_2,   K_2,  L_2},
-    {1,  J_3,   K_3,  L_3},
-    {1,  J_5,   K_5,  L_5},
-    {1,  J_6,   K_6,  L_6},
+    {0, CB10_CA13,  CB11_CA13,  CB12_CA13},
+    {0, CB10_CA14,  CB11_CA14,  CB12_CA14},
+    {0, CB10_CA15,  CB11_CA15,  CB12_CA15},
+    {0, CB10_CA16,  CB11_CA16,  CB12_CA16},
+    {0, CB7_CA14,  CB8_CA14,  CB9_CA14},
+    {0, CB7_CA15,  CB8_CA15,  CB9_CA15},
+    {0, CB7_CA16,  CB8_CA16,  CB9_CA16},
+    {0, CB4_CA15,  CB5_CA15,  CB6_CA15},
+    {1,  CB10_CA1,   CB11_CA1,  CB12_CA1},
+    {1,  CB10_CA2,   CB11_CA2,  CB12_CA2},
+    {1,  CB10_CA3,   CB11_CA3,  CB12_CA3},
+    {1,  CB10_CA5,   CB11_CA5,  CB12_CA5},
+    {1,  CB10_CA6,   CB11_CA6,  CB12_CA6},
 
 };
 #endif
diff --git a/keyboards/akko/acr87/acr87.c b/keyboards/akko/acr87/acr87.c
index 3e7f6034741..e2ed06a0e89 100644
--- a/keyboards/akko/acr87/acr87.c
+++ b/keyboards/akko/acr87/acr87.c
@@ -25,160 +25,160 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       |       B location
  *   |  |       |       | */
     /*row0*/
-    {1, A_1,   B_1,   C_1},
-    {1, A_2,   B_2,   C_2},
-    {1, A_3,   B_3,   C_3},
-    {1, A_4,   B_4,   C_4},
-    {1, A_5,   B_5,   C_5},
-    {1, A_6,   B_6,   C_6},
-    {1, A_7,   B_7,   C_7},
-    {1, A_8,   B_8,   C_8},
-    {1, A_9,   B_9,   C_9},
-    {1, A_10,  B_10,  C_10},
-    {1, A_11,  B_11,  C_11},
-    {1, A_12,  B_12,  C_12},
-    {1, A_13,  B_13,  C_13},
-    {1, A_14,  B_14,  C_14},
-    {1, A_15,  B_15,  C_15},
-    {1, A_16,  B_16,  C_16},
+    {1, CB1_CA1,   CB2_CA1,   CB3_CA1},
+    {1, CB1_CA2,   CB2_CA2,   CB3_CA2},
+    {1, CB1_CA3,   CB2_CA3,   CB3_CA3},
+    {1, CB1_CA4,   CB2_CA4,   CB3_CA4},
+    {1, CB1_CA5,   CB2_CA5,   CB3_CA5},
+    {1, CB1_CA6,   CB2_CA6,   CB3_CA6},
+    {1, CB1_CA7,   CB2_CA7,   CB3_CA7},
+    {1, CB1_CA8,   CB2_CA8,   CB3_CA8},
+    {1, CB1_CA9,   CB2_CA9,   CB3_CA9},
+    {1, CB1_CA10,  CB2_CA10,  CB3_CA10},
+    {1, CB1_CA11,  CB2_CA11,  CB3_CA11},
+    {1, CB1_CA12,  CB2_CA12,  CB3_CA12},
+    {1, CB1_CA13,  CB2_CA13,  CB3_CA13},
+    {1, CB1_CA14,  CB2_CA14,  CB3_CA14},
+    {1, CB1_CA15,  CB2_CA15,  CB3_CA15},
+    {1, CB1_CA16,  CB2_CA16,  CB3_CA16},
 
     /*row1*/
-    {0, A_1,   B_1,   C_1},
-    {0, A_2,   B_2,   C_2},
-    {0, A_3,   B_3,   C_3},
-    {0, A_4,   B_4,   C_4},
-    {0, A_5,   B_5,   C_5},
-    {0, A_6,   B_6,   C_6},
-    {0, A_7,   B_7,   C_7},
-    {0, A_8,   B_8,   C_8},
-    {0, A_9,   B_9,   C_9},
-    {0, A_10,  B_10,  C_10},
-    {0, A_11,  B_11,  C_11},
-    {0, A_12,  B_12,  C_12},
-    {0, A_13,  B_13,  C_13},
-    {0, A_14,  B_14,  C_14},
-    {1, D_1,    E_1,   F_1},
-    {1, D_2,    E_2,   F_2},
-    {1, D_3,    E_3,   F_3},
+    {0, CB1_CA1,   CB2_CA1,   CB3_CA1},
+    {0, CB1_CA2,   CB2_CA2,   CB3_CA2},
+    {0, CB1_CA3,   CB2_CA3,   CB3_CA3},
+    {0, CB1_CA4,   CB2_CA4,   CB3_CA4},
+    {0, CB1_CA5,   CB2_CA5,   CB3_CA5},
+    {0, CB1_CA6,   CB2_CA6,   CB3_CA6},
+    {0, CB1_CA7,   CB2_CA7,   CB3_CA7},
+    {0, CB1_CA8,   CB2_CA8,   CB3_CA8},
+    {0, CB1_CA9,   CB2_CA9,   CB3_CA9},
+    {0, CB1_CA10,  CB2_CA10,  CB3_CA10},
+    {0, CB1_CA11,  CB2_CA11,  CB3_CA11},
+    {0, CB1_CA12,  CB2_CA12,  CB3_CA12},
+    {0, CB1_CA13,  CB2_CA13,  CB3_CA13},
+    {0, CB1_CA14,  CB2_CA14,  CB3_CA14},
+    {1, CB4_CA1,    CB5_CA1,   CB6_CA1},
+    {1, CB4_CA2,    CB5_CA2,   CB6_CA2},
+    {1, CB4_CA3,    CB5_CA3,   CB6_CA3},
 
     /*row2*/
-    {0, D_1,   E_1,   F_1},
-    {0, D_2,   E_2,   F_2},
-    {0, D_3,   E_3,   F_3},
-    {0, D_4,   E_4,   F_4},
-    {0, D_5,   E_5,   F_5},
-    {0, D_6,   E_6,   F_6},
-    {0, D_7,   E_7,   F_7},
-    {0, D_8,   E_8,   F_8},
-    {0, D_9,   E_9,   F_9},
-    {0, D_10,  E_10,  F_10},
-    {0, D_11,  E_11,  F_11},
-    {0, D_12,  E_12,  F_12},
-    {0, D_13,  E_13,  F_13},
-    {0, D_14,  E_14,  F_14},
-    {1, G_1,   H_1,   I_1},
-    {1, G_2,   H_2,   I_2},
-    {1, G_3,   H_3,   I_3},
+    {0, CB4_CA1,   CB5_CA1,   CB6_CA1},
+    {0, CB4_CA2,   CB5_CA2,   CB6_CA2},
+    {0, CB4_CA3,   CB5_CA3,   CB6_CA3},
+    {0, CB4_CA4,   CB5_CA4,   CB6_CA4},
+    {0, CB4_CA5,   CB5_CA5,   CB6_CA5},
+    {0, CB4_CA6,   CB5_CA6,   CB6_CA6},
+    {0, CB4_CA7,   CB5_CA7,   CB6_CA7},
+    {0, CB4_CA8,   CB5_CA8,   CB6_CA8},
+    {0, CB4_CA9,   CB5_CA9,   CB6_CA9},
+    {0, CB4_CA10,  CB5_CA10,  CB6_CA10},
+    {0, CB4_CA11,  CB5_CA11,  CB6_CA11},
+    {0, CB4_CA12,  CB5_CA12,  CB6_CA12},
+    {0, CB4_CA13,  CB5_CA13,  CB6_CA13},
+    {0, CB4_CA14,  CB5_CA14,  CB6_CA14},
+    {1, CB7_CA1,   CB8_CA1,   CB9_CA1},
+    {1, CB7_CA2,   CB8_CA2,   CB9_CA2},
+    {1, CB7_CA3,   CB8_CA3,   CB9_CA3},
 
     /*row3*/
-    {0, G_1,   H_1,   I_1},
-    {0, G_2,   H_2,   I_2},
-    {0, G_3,   H_3,   I_3},
-    {0, G_4,   H_4,   I_4},
-    {0, G_5,   H_5,   I_5},
-    {0, G_6,   H_6,   I_6},
-    {0, G_7,   H_7,   I_7},
-    {0, G_8,   H_8,   I_8},
-    {0, G_9,   H_9,   I_9},
-    {0, G_10,  H_10,  I_10},
-    {0, G_11,  H_11,  I_11},
-    {0, G_12,  H_12,  I_12},
-    {0, G_13,  H_13,  I_13},
+    {0, CB7_CA1,   CB8_CA1,   CB9_CA1},
+    {0, CB7_CA2,   CB8_CA2,   CB9_CA2},
+    {0, CB7_CA3,   CB8_CA3,   CB9_CA3},
+    {0, CB7_CA4,   CB8_CA4,   CB9_CA4},
+    {0, CB7_CA5,   CB8_CA5,   CB9_CA5},
+    {0, CB7_CA6,   CB8_CA6,   CB9_CA6},
+    {0, CB7_CA7,   CB8_CA7,   CB9_CA7},
+    {0, CB7_CA8,   CB8_CA8,   CB9_CA8},
+    {0, CB7_CA9,   CB8_CA9,   CB9_CA9},
+    {0, CB7_CA10,  CB8_CA10,  CB9_CA10},
+    {0, CB7_CA11,  CB8_CA11,  CB9_CA11},
+    {0, CB7_CA12,  CB8_CA12,  CB9_CA12},
+    {0, CB7_CA13,  CB8_CA13,  CB9_CA13},
 
     /*row4*/
-    {0, J_1,   K_1,   L_1},
-    {0, J_2,   K_2,   L_2},
-    {0, J_3,   K_3,   L_3},
-    {0, J_4,   K_4,   L_4},
-    {0, J_5,   K_5,   L_5},
-    {0, J_6,   K_6,   L_6},
-    {0, J_7,   K_7,   L_7},
-    {0, J_8,   K_8,   L_8},
-    {0, J_9,   K_9,   L_9},
-    {0, J_10,  K_10,  L_10},
-    {0, J_11,  K_11,  L_11},
-    {0, J_12,  K_12,  L_12},
-    {1,  J_4,   K_4,  L_4},
+    {0, CB10_CA1,   CB11_CA1,   CB12_CA1},
+    {0, CB10_CA2,   CB11_CA2,   CB12_CA2},
+    {0, CB10_CA3,   CB11_CA3,   CB12_CA3},
+    {0, CB10_CA4,   CB11_CA4,   CB12_CA4},
+    {0, CB10_CA5,   CB11_CA5,   CB12_CA5},
+    {0, CB10_CA6,   CB11_CA6,   CB12_CA6},
+    {0, CB10_CA7,   CB11_CA7,   CB12_CA7},
+    {0, CB10_CA8,   CB11_CA8,   CB12_CA8},
+    {0, CB10_CA9,   CB11_CA9,   CB12_CA9},
+    {0, CB10_CA10,  CB11_CA10,  CB12_CA10},
+    {0, CB10_CA11,  CB11_CA11,  CB12_CA11},
+    {0, CB10_CA12,  CB11_CA12,  CB12_CA12},
+    {1,  CB10_CA4,   CB11_CA4,  CB12_CA4},
 
     /*row5*/
-    {0, J_13,  K_13,  L_13},
-    {0, J_14,  K_14,  L_14},
-    {0, J_15,  K_15,  L_15},
-    {0, J_16,  K_16,  L_16},
-    {0, G_14,  H_14,  I_14},
-    {0, G_15,  H_15,  I_15},
-    {0, G_16,  H_16,  I_16},
-    {0, D_15,  E_15,  F_15},
-    {1,  J_1,   K_1,  L_1},
-    {1,  J_2,   K_2,  L_2},
-    {1,  J_3,   K_3,  L_3},
+    {0, CB10_CA13,  CB11_CA13,  CB12_CA13},
+    {0, CB10_CA14,  CB11_CA14,  CB12_CA14},
+    {0, CB10_CA15,  CB11_CA15,  CB12_CA15},
+    {0, CB10_CA16,  CB11_CA16,  CB12_CA16},
+    {0, CB7_CA14,  CB8_CA14,  CB9_CA14},
+    {0, CB7_CA15,  CB8_CA15,  CB9_CA15},
+    {0, CB7_CA16,  CB8_CA16,  CB9_CA16},
+    {0, CB4_CA15,  CB5_CA15,  CB6_CA15},
+    {1,  CB10_CA1,   CB11_CA1,  CB12_CA1},
+    {1,  CB10_CA2,   CB11_CA2,  CB12_CA2},
+    {1,  CB10_CA3,   CB11_CA3,  CB12_CA3},
 
-    {2, J_12,  K_12,  L_12},
-    {2, J_11,  K_11,  L_11},
-    {2, J_10,  K_10,  L_10},
-    {2, J_9,   K_9,   L_9},
-    {2, J_8,   K_8,   L_8},
-    {2, J_7,   K_7,   L_7},
-    {2, J_6,   K_6,   L_6},
-    {2, J_5,   K_5,   L_5},
-    {2, J_4,   K_4,   L_4},
-    {2, J_3,   K_3,   L_3},
-    {2, J_2,   K_2,   L_2},
-    {2, J_1,   K_1,   L_1},
-    {2, G_12,  H_12,  I_12},
-    {2, G_11,  H_11,  I_11},
-    {2, G_10,  H_10,  I_10},
-    {2, G_9,   H_9,   I_9},
+    {2, CB10_CA12,  CB11_CA12,  CB12_CA12},
+    {2, CB10_CA11,  CB11_CA11,  CB12_CA11},
+    {2, CB10_CA10,  CB11_CA10,  CB12_CA10},
+    {2, CB10_CA9,   CB11_CA9,   CB12_CA9},
+    {2, CB10_CA8,   CB11_CA8,   CB12_CA8},
+    {2, CB10_CA7,   CB11_CA7,   CB12_CA7},
+    {2, CB10_CA6,   CB11_CA6,   CB12_CA6},
+    {2, CB10_CA5,   CB11_CA5,   CB12_CA5},
+    {2, CB10_CA4,   CB11_CA4,   CB12_CA4},
+    {2, CB10_CA3,   CB11_CA3,   CB12_CA3},
+    {2, CB10_CA2,   CB11_CA2,   CB12_CA2},
+    {2, CB10_CA1,   CB11_CA1,   CB12_CA1},
+    {2, CB7_CA12,  CB8_CA12,  CB9_CA12},
+    {2, CB7_CA11,  CB8_CA11,  CB9_CA11},
+    {2, CB7_CA10,  CB8_CA10,  CB9_CA10},
+    {2, CB7_CA9,   CB8_CA9,   CB9_CA9},
 
-    {2, A_1,   B_1,   C_1},
-    {2, G_8,   H_8,   I_8},
+    {2, CB1_CA1,   CB2_CA1,   CB3_CA1},
+    {2, CB7_CA8,   CB8_CA8,   CB9_CA8},
 
-    {2, A_2,   B_2,   C_2},
-    {2, G_7,   H_7,   I_7},
+    {2, CB1_CA2,   CB2_CA2,   CB3_CA2},
+    {2, CB7_CA7,   CB8_CA7,   CB9_CA7},
 
-    {2, A_3,   B_3,   C_3},
-    {2, G_6,   H_6,   I_6},
+    {2, CB1_CA3,   CB2_CA3,   CB3_CA3},
+    {2, CB7_CA6,   CB8_CA6,   CB9_CA6},
 
-    {2, A_4,   B_4,   C_4},
-    {2, G_5,   H_5,   I_5},
+    {2, CB1_CA4,   CB2_CA4,   CB3_CA4},
+    {2, CB7_CA5,   CB8_CA5,   CB9_CA5},
 
-    {2, A_5,   B_5,   C_5},
-    {2, G_4,   H_4,   I_4},
+    {2, CB1_CA5,   CB2_CA5,   CB3_CA5},
+    {2, CB7_CA4,   CB8_CA4,   CB9_CA4},
 
-    {2, A_6,   B_6,   C_6},
-    {2, G_3,   H_3,   I_3},
+    {2, CB1_CA6,   CB2_CA6,   CB3_CA6},
+    {2, CB7_CA3,   CB8_CA3,   CB9_CA3},
 
-    {2, A_7,   B_7,   C_7},
-    {2, G_2,   H_2,   I_2},
+    {2, CB1_CA7,   CB2_CA7,   CB3_CA7},
+    {2, CB7_CA2,   CB8_CA2,   CB9_CA2},
 
-    {2, A_8,   B_8,   C_8},
-    {2, A_9,   B_9,   C_9},
-    {2, A_10,  B_10,  C_10},
-    {2, A_11,  B_11,  C_11},
-    {2, A_12,  B_12,  C_12},
-    {2, D_1,   E_1,   F_1},
-    {2, D_2,   E_2,   F_2},
-    {2, D_3,   E_3,   F_3},
-    {2, D_4,   E_4,   F_4},
-    {2, D_5,   E_5,   F_5},
-    {2, D_6,   E_6,   F_6},
-    {2, D_7,   E_7,   F_7},
-    {2, D_8,   E_8,   F_8},
-    {2, D_9,   E_9,   F_9},
-    {2, D_10,  E_10,  F_10},
-    {2, D_11,  E_11,  F_11},
-    {2, D_12,  E_12,  F_12},
-    {2, G_1,   H_1,   I_1},
+    {2, CB1_CA8,   CB2_CA8,   CB3_CA8},
+    {2, CB1_CA9,   CB2_CA9,   CB3_CA9},
+    {2, CB1_CA10,  CB2_CA10,  CB3_CA10},
+    {2, CB1_CA11,  CB2_CA11,  CB3_CA11},
+    {2, CB1_CA12,  CB2_CA12,  CB3_CA12},
+    {2, CB4_CA1,   CB5_CA1,   CB6_CA1},
+    {2, CB4_CA2,   CB5_CA2,   CB6_CA2},
+    {2, CB4_CA3,   CB5_CA3,   CB6_CA3},
+    {2, CB4_CA4,   CB5_CA4,   CB6_CA4},
+    {2, CB4_CA5,   CB5_CA5,   CB6_CA5},
+    {2, CB4_CA6,   CB5_CA6,   CB6_CA6},
+    {2, CB4_CA7,   CB5_CA7,   CB6_CA7},
+    {2, CB4_CA8,   CB5_CA8,   CB6_CA8},
+    {2, CB4_CA9,   CB5_CA9,   CB6_CA9},
+    {2, CB4_CA10,  CB5_CA10,  CB6_CA10},
+    {2, CB4_CA11,  CB5_CA11,  CB6_CA11},
+    {2, CB4_CA12,  CB5_CA12,  CB6_CA12},
+    {2, CB7_CA1,   CB8_CA1,   CB9_CA1},
 };
 
 // clang-format on
diff --git a/keyboards/akko/top40/top40.c b/keyboards/akko/top40/top40.c
index 2d75b774972..565dfb77c63 100644
--- a/keyboards/akko/top40/top40.c
+++ b/keyboards/akko/top40/top40.c
@@ -24,90 +24,90 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, A_1,   B_1,   C_1},
-    {0, A_2,   B_2,   C_2},
-    {0, A_3,   B_3,   C_3},
-    {0, A_4,   B_4,   C_4},
-    {0, A_5,   B_5,   C_5},
-    {0, A_6,   B_6,   C_6},
-    {0, A_7,   B_7,   C_7},
-    {0, A_8,   B_8,   C_8},
-    {0, A_9,   B_9,   C_9},
-    {0, A_10,  B_10,  C_10},
-    {0, A_11,  B_11,  C_11},
-    {0, A_12,  B_12,  C_12},
+    {0, CB1_CA1,   CB2_CA1,   CB3_CA1},
+    {0, CB1_CA2,   CB2_CA2,   CB3_CA2},
+    {0, CB1_CA3,   CB2_CA3,   CB3_CA3},
+    {0, CB1_CA4,   CB2_CA4,   CB3_CA4},
+    {0, CB1_CA5,   CB2_CA5,   CB3_CA5},
+    {0, CB1_CA6,   CB2_CA6,   CB3_CA6},
+    {0, CB1_CA7,   CB2_CA7,   CB3_CA7},
+    {0, CB1_CA8,   CB2_CA8,   CB3_CA8},
+    {0, CB1_CA9,   CB2_CA9,   CB3_CA9},
+    {0, CB1_CA10,  CB2_CA10,  CB3_CA10},
+    {0, CB1_CA11,  CB2_CA11,  CB3_CA11},
+    {0, CB1_CA12,  CB2_CA12,  CB3_CA12},
 
-    {0, D_1,   E_1,   F_1},
-    {0, D_2,   E_2,   F_2},
-    {0, D_3,   E_3,   F_3},
-    {0, D_4,   E_4,   F_4},
-    {0, D_5,   E_5,   F_5},
-    {0, D_6,   E_6,   F_6},
-    {0, D_7,   E_7,   F_7},
-    {0, D_8,   E_8,   F_8},
-    {0, D_9,   E_9,   F_9},
-    {0, D_10,  E_10,  F_10},
-    {0, D_11,  E_11,  F_11},
-    {0, D_12,  E_12,  F_12},
+    {0, CB4_CA1,   CB5_CA1,   CB6_CA1},
+    {0, CB4_CA2,   CB5_CA2,   CB6_CA2},
+    {0, CB4_CA3,   CB5_CA3,   CB6_CA3},
+    {0, CB4_CA4,   CB5_CA4,   CB6_CA4},
+    {0, CB4_CA5,   CB5_CA5,   CB6_CA5},
+    {0, CB4_CA6,   CB5_CA6,   CB6_CA6},
+    {0, CB4_CA7,   CB5_CA7,   CB6_CA7},
+    {0, CB4_CA8,   CB5_CA8,   CB6_CA8},
+    {0, CB4_CA9,   CB5_CA9,   CB6_CA9},
+    {0, CB4_CA10,  CB5_CA10,  CB6_CA10},
+    {0, CB4_CA11,  CB5_CA11,  CB6_CA11},
+    {0, CB4_CA12,  CB5_CA12,  CB6_CA12},
 
-    {0, G_1,   H_1,   I_1},
-    {0, G_2,   H_2,   I_2},
-    {0, G_3,   H_3,   I_3},
-    {0, G_4,   H_4,   I_4},
-    {0, G_5,   H_5,   I_5},
-    {0, G_6,   H_6,   I_6},
-    {0, G_7,   H_7,   I_7},
-    {0, G_8,   H_8,   I_8},
-    {0, G_9,   H_9,   I_9},
-    {0, G_10,  H_10,  I_10},
-    {0, G_11,  H_11,  I_11},
-    {0, G_12,  H_12,  I_12},
+    {0, CB7_CA1,   CB8_CA1,   CB9_CA1},
+    {0, CB7_CA2,   CB8_CA2,   CB9_CA2},
+    {0, CB7_CA3,   CB8_CA3,   CB9_CA3},
+    {0, CB7_CA4,   CB8_CA4,   CB9_CA4},
+    {0, CB7_CA5,   CB8_CA5,   CB9_CA5},
+    {0, CB7_CA6,   CB8_CA6,   CB9_CA6},
+    {0, CB7_CA7,   CB8_CA7,   CB9_CA7},
+    {0, CB7_CA8,   CB8_CA8,   CB9_CA8},
+    {0, CB7_CA9,   CB8_CA9,   CB9_CA9},
+    {0, CB7_CA10,  CB8_CA10,  CB9_CA10},
+    {0, CB7_CA11,  CB8_CA11,  CB9_CA11},
+    {0, CB7_CA12,  CB8_CA12,  CB9_CA12},
 
-    {0, J_1,   K_1,   L_1},
-    {0, J_2,   K_2,   L_2},
-    {0, J_3,   K_3,   L_3},
-    {0, J_5,   K_5,   L_5},
-    {0, J_7,   K_7,   L_7},
-    {0, J_9,   K_9,   L_9},
-    {0, J_10,  K_10,  L_10},
-    {0, J_11,  K_11,  L_11},
-    {0, J_12,  K_12,  L_12},
+    {0, CB10_CA1,   CB11_CA1,   CB12_CA1},
+    {0, CB10_CA2,   CB11_CA2,   CB12_CA2},
+    {0, CB10_CA3,   CB11_CA3,   CB12_CA3},
+    {0, CB10_CA5,   CB11_CA5,   CB12_CA5},
+    {0, CB10_CA7,   CB11_CA7,   CB12_CA7},
+    {0, CB10_CA9,   CB11_CA9,   CB12_CA9},
+    {0, CB10_CA10,  CB11_CA10,  CB12_CA10},
+    {0, CB10_CA11,  CB11_CA11,  CB12_CA11},
+    {0, CB10_CA12,  CB11_CA12,  CB12_CA12},
 
-    {1, A_1,   B_1,   C_1},
-    {1, A_2,   B_2,   C_2},
-    {1, A_3,   B_3,   C_3},
-    {1, J_7,   K_7,   L_7},
-    {1, J_6,   K_6,   L_6},
-    {1, J_5,   K_5,   L_5},
-    {1, J_4,   K_4,   L_4},
-    {1, J_3,   K_3,   L_3},
-    {1, J_2,   K_2,   L_2},
-    {1, J_1,   K_1,   L_1},
-    {1, G_8,   H_8,   I_8},
-    {1, G_7,   H_7,   I_7},
-    {1, G_6,   H_6,   I_6},
+    {1, CB1_CA1,   CB2_CA1,   CB3_CA1},
+    {1, CB1_CA2,   CB2_CA2,   CB3_CA2},
+    {1, CB1_CA3,   CB2_CA3,   CB3_CA3},
+    {1, CB10_CA7,   CB11_CA7,   CB12_CA7},
+    {1, CB10_CA6,   CB11_CA6,   CB12_CA6},
+    {1, CB10_CA5,   CB11_CA5,   CB12_CA5},
+    {1, CB10_CA4,   CB11_CA4,   CB12_CA4},
+    {1, CB10_CA3,   CB11_CA3,   CB12_CA3},
+    {1, CB10_CA2,   CB11_CA2,   CB12_CA2},
+    {1, CB10_CA1,   CB11_CA1,   CB12_CA1},
+    {1, CB7_CA8,   CB8_CA8,   CB9_CA8},
+    {1, CB7_CA7,   CB8_CA7,   CB9_CA7},
+    {1, CB7_CA6,   CB8_CA6,   CB9_CA6},
 
-    {1, A_4,   B_4,   C_4},
-    {1, G_5,   H_5,   I_5},
+    {1, CB1_CA4,   CB2_CA4,   CB3_CA4},
+    {1, CB7_CA5,   CB8_CA5,   CB9_CA5},
 
-    {1, A_5,   B_5,   C_5},
-    {1, G_4,   H_4,   I_4},
+    {1, CB1_CA5,   CB2_CA5,   CB3_CA5},
+    {1, CB7_CA4,   CB8_CA4,   CB9_CA4},
 
-    {1, A_6,   B_6,   C_6},
-    {1, G_3,   H_3,   I_3},
+    {1, CB1_CA6,   CB2_CA6,   CB3_CA6},
+    {1, CB7_CA3,   CB8_CA3,   CB9_CA3},
 
-    {1, A_7,   B_7,   C_7},
-    {1, A_8,   B_8,   C_8},
-    {1, D_1,   E_1,   F_1},
-    {1, D_2,   E_2,   F_2},
-    {1, D_3,   E_3,   F_3},
-    {1, D_4,   E_4,   F_4},
-    {1, D_5,   E_5,   F_5},
-    {1, D_6,   E_6,   F_6},
-    {1, D_7,   E_7,   F_7},
-    {1, D_8,   E_8,   F_8},
-    {1, G_2,   H_2,   I_2},
-    {1, G_1,   H_1,   I_1},
+    {1, CB1_CA7,   CB2_CA7,   CB3_CA7},
+    {1, CB1_CA8,   CB2_CA8,   CB3_CA8},
+    {1, CB4_CA1,   CB5_CA1,   CB6_CA1},
+    {1, CB4_CA2,   CB5_CA2,   CB6_CA2},
+    {1, CB4_CA3,   CB5_CA3,   CB6_CA3},
+    {1, CB4_CA4,   CB5_CA4,   CB6_CA4},
+    {1, CB4_CA5,   CB5_CA5,   CB6_CA5},
+    {1, CB4_CA6,   CB5_CA6,   CB6_CA6},
+    {1, CB4_CA7,   CB5_CA7,   CB6_CA7},
+    {1, CB4_CA8,   CB5_CA8,   CB6_CA8},
+    {1, CB7_CA2,   CB8_CA2,   CB9_CA2},
+    {1, CB7_CA1,   CB8_CA1,   CB9_CA1},
 
 };
 
diff --git a/keyboards/an_achronism/tetromino/info.json b/keyboards/an_achronism/tetromino/info.json
index 8087c6489c4..98cb9faf3e6 100644
--- a/keyboards/an_achronism/tetromino/info.json
+++ b/keyboards/an_achronism/tetromino/info.json
@@ -17,7 +17,6 @@
         "extrakey": true,
         "mousekey": true,
         "nkro": true,
-        "rgblight": false,
         "rgb_matrix": true
     },
     "ws2812": {
diff --git a/keyboards/annepro2/c15/config.h b/keyboards/annepro2/c15/config.h
index 9ffce919579..9745cf50cce 100644
--- a/keyboards/annepro2/c15/config.h
+++ b/keyboards/annepro2/c15/config.h
@@ -19,27 +19,12 @@
 
 #include "pin_defs.h"
 
-// key matrix size
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 14
-// layer size: MATRIX_ROWS * MATRIX_COLS * sizeof(uint16_t) = 140 bytes
-
 #define LINE_UART_TX B0  // Master TX, LED RX
 #define LINE_UART_RX B1  // Master RX, LED TX
 
 #define LINE_BT_UART_TX A4  // Master TX, BLE RX
 #define LINE_BT_UART_RX A5  // Master RX, BLE TX
 
-// outputs (rows are pulled low)
-#define MATRIX_ROW_PINS \
-    { C2, C1, B5, B4, C3 }
-
-// inputs (columns are sampled)
-// PORTA 12,13 conflict with SWD
-
-#define MATRIX_COL_PINS \
-    { C4, C5, B10, B11, C0, A15, A8, A10, A11, A12, A13, A14, B2, B3 }
-
 // Obins stock firmware has something similar to this already enabled, but disabled by default in QMK
 #define PERMISSIVE_HOLD
 
diff --git a/keyboards/annepro2/c15/info.json b/keyboards/annepro2/c15/info.json
index b92b446e4e9..0f738c0999e 100644
--- a/keyboards/annepro2/c15/info.json
+++ b/keyboards/annepro2/c15/info.json
@@ -3,124 +3,9 @@
     "usb": {
         "pid": "0x8008"
     },
-    "eeprom": {
-        "driver": "wear_leveling",
-        "wear_leveling": {
-            "driver": "spi_flash",
-            "backing_size": 2048
-        }
-    },
-    "rgb_matrix": {
-        "animations":{
-           "alphas_mods": true,
-           "gradient_up_down": true,
-           "gradient_left_right": true,
-           "breathing": true,
-           "band_sat": true,
-           "band_val": true,
-           "band_pinwheel_sat": true,
-           "band_pinwheel_val": true,
-           "band_spiral_sat": true,
-           "band_spiral_val": true,
-           "cycle_all": true,
-           "cycle_left_right": true,
-           "cycle_up_down": true,
-           "rainbow_moving_chevron": true,
-           "cycle_out_in": true,
-           "cycle_out_in_dual": true,
-           "cycle_pinwheel": true,
-           "cycle_spiral": true,
-           "dual_beacon": true,
-           "rainbow_beacon": true,
-           "rainbow_pinwheels": true,
-           "raindrops": true,
-           "jellybean_raindrops": true,
-           "hue_breathing": true,
-           "hue_pendulum": true,
-           "hue_wave": true,
-           "pixel_fractal": true,
-           "pixel_flow": true,
-           "pixel_rain": true,
-           "typing_heatmap": true,
-           "digital_rain": true,
-           "solid_reactive_simple": true,
-           "solid_reactive": true,
-           "solid_reactive_wide": true,
-           "solid_reactive_multiwide": true,
-           "solid_reactive_cross": true,
-           "solid_reactive_multicross": true,
-           "solid_reactive_nexus": true,
-           "solid_reactive_multinexus": true,
-           "splash": true,
-           "multisplash": true,
-           "solid_splash": true,
-           "solid_multisplash": true
-        },
-        "driver": "custom",
-        "layout": [
-            {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4},
-            {"matrix": [0, 1], "x": 16, "y": 0, "flags": 4},
-            {"matrix": [0, 2], "x": 32, "y": 0, "flags": 4},
-            {"matrix": [0, 3], "x": 48, "y": 0, "flags": 4},
-            {"matrix": [0, 4], "x": 65, "y": 0, "flags": 4},
-            {"matrix": [0, 5], "x": 81, "y": 0, "flags": 4},
-            {"matrix": [0, 6], "x": 97, "y": 0, "flags": 4},
-            {"matrix": [0, 7], "x": 113, "y": 0, "flags": 4},
-            {"matrix": [0, 8], "x": 129, "y": 0, "flags": 4},
-            {"matrix": [0, 9], "x": 145, "y": 0, "flags": 4},
-            {"matrix": [0, 10], "x": 161, "y": 0, "flags": 4},
-            {"matrix": [0, 11], "x": 178, "y": 0, "flags": 4},
-            {"matrix": [0, 12], "x": 194, "y": 0, "flags": 4},
-            {"matrix": [0, 13], "x": 218, "y": 0, "flags": 4},
-            {"matrix": [1, 0], "x": 4, "y": 16, "flags": 4},
-            {"matrix": [1, 1], "x": 24, "y": 16, "flags": 4},
-            {"matrix": [1, 2], "x": 40, "y": 16, "flags": 4},
-            {"matrix": [1, 3], "x": 57, "y": 16, "flags": 4},
-            {"matrix": [1, 4], "x": 73, "y": 16, "flags": 4},
-            {"matrix": [1, 5], "x": 89, "y": 16, "flags": 4},
-            {"matrix": [1, 6], "x": 105, "y": 16, "flags": 4},
-            {"matrix": [1, 7], "x": 121, "y": 16, "flags": 4},
-            {"matrix": [1, 8], "x": 137, "y": 16, "flags": 4},
-            {"matrix": [1, 9], "x": 153, "y": 16, "flags": 4},
-            {"matrix": [1, 10], "x": 170, "y": 16, "flags": 4},
-            {"matrix": [1, 11], "x": 186, "y": 16, "flags": 4},
-            {"matrix": [1, 12], "x": 202, "y": 16, "flags": 4},
-            {"matrix": [1, 13], "x": 222, "y": 16, "flags": 4},
-            {"matrix": [2, 0], "x": 6, "y": 32, "flags": 4},
-            {"matrix": [2, 1], "x": 28, "y": 32, "flags": 4},
-            {"matrix": [2, 2], "x": 44, "y": 32, "flags": 4},
-            {"matrix": [2, 3], "x": 61, "y": 32, "flags": 4},
-            {"matrix": [2, 4], "x": 77, "y": 32, "flags": 4},
-            {"matrix": [2, 5], "x": 93, "y": 32, "flags": 4},
-            {"matrix": [2, 6], "x": 109, "y": 32, "flags": 4},
-            {"matrix": [2, 7], "x": 125, "y": 32, "flags": 4},
-            {"matrix": [2, 8], "x": 141, "y": 32, "flags": 4},
-            {"matrix": [2, 9], "x": 157, "y": 32, "flags": 4},
-            {"matrix": [2, 10], "x": 174, "y": 32, "flags": 4},
-            {"matrix": [2, 11], "x": 190, "y": 32, "flags": 4},
-            {"matrix": [2, 12], "x": 216, "y": 32, "flags": 4},
-            {"matrix": [3, 0], "x": 10, "y": 48, "flags": 1},
-            {"matrix": [3, 2], "x": 36, "y": 48, "flags": 4},
-            {"matrix": [3, 3], "x": 52, "y": 48, "flags": 4},
-            {"matrix": [3, 4], "x": 69, "y": 48, "flags": 4},
-            {"matrix": [3, 5], "x": 85, "y": 48, "flags": 4},
-            {"matrix": [3, 6], "x": 101, "y": 48, "flags": 4},
-            {"matrix": [3, 7], "x": 117, "y": 48, "flags": 4},
-            {"matrix": [3, 8], "x": 133, "y": 48, "flags": 4},
-            {"matrix": [3, 9], "x": 149, "y": 48, "flags": 4},
-            {"matrix": [3, 10], "x": 165, "y": 48, "flags": 4},
-            {"matrix": [3, 11], "x": 182, "y": 48, "flags": 4},
-            {"matrix": [3, 12], "x": 212, "y": 48, "flags": 1},
-            {"matrix": [4, 0], "x": 2, "y": 64, "flags": 1},
-            {"matrix": [4, 2], "x": 22, "y": 64, "flags": 1},
-            {"matrix": [4, 3], "x": 42, "y": 64, "flags": 1},
-            {"matrix": [4, 6], "x": 103, "y": 64, "flags": 4},
-            {"matrix": [4, 9], "x": 163, "y": 64, "flags": 1},
-            {"matrix": [4, 10], "x": 184, "y": 64, "flags": 1},
-            {"matrix": [4, 11], "x": 204, "y": 64, "flags": 1},
-            {"matrix": [4, 12], "x": 224, "y": 64, "flags": 1}
-        ],
-        "led_flush_limit": 40
-    },
-    "community_layouts": ["60_ansi"]
+    "diode_direction": "COL2ROW",
+    "matrix_pins": {
+        "cols": ["C4", "C5", "B10", "B11", "C0", "A15", "A8", "A10", "A11", "A12", "A13", "A14", "B2", "B3"],
+        "rows": ["C2", "C1", "B5", "B4", "C3"]
+    }
 }
diff --git a/keyboards/annepro2/c15/rules.mk b/keyboards/annepro2/c15/rules.mk
index 374d8443385..f35d9002ef5 100644
--- a/keyboards/annepro2/c15/rules.mk
+++ b/keyboards/annepro2/c15/rules.mk
@@ -13,25 +13,8 @@ BOARD = ANNEPRO2_C15
 BOOTLOADER = custom
 PROGRAM_CMD = annepro2_tools --boot $(BUILD_DIR)/$(TARGET).bin
 
-# 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
-
-# Custom RGB matrix handling
-RGB_MATRIX_ENABLE = yes
-
-# Keys
-CUSTOM_MATRIX = lite
-
 # Anne Pro 2
 SRC = \
-	matrix.c \
 	annepro2_ble.c \
 	ap2_led.c \
 	protocol.c \
diff --git a/keyboards/annepro2/c18/config.h b/keyboards/annepro2/c18/config.h
index 7010f19a3fc..dfc550160c3 100644
--- a/keyboards/annepro2/c18/config.h
+++ b/keyboards/annepro2/c18/config.h
@@ -19,25 +19,12 @@
 
 #include "pin_defs.h"
 
-// key matrix size
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 14
-// layer size: MATRIX_ROWS * MATRIX_COLS * sizeof(uint16_t) = 140 bytes
-
 #define LINE_UART_TX B0
 #define LINE_UART_RX B1
 
 #define LINE_BT_UART_TX A4  // Master TX, BLE RX
 #define LINE_BT_UART_RX A5  // Master RX, BLE TX
 
-// outputs (rows are pulled low)
-#define MATRIX_ROW_PINS \
-    { B5, B4, B3, B2, D1 }
-
-// inputs (columns are sampled)
-#define MATRIX_COL_PINS \
-    { C4, C5, D0, B15, C11, A15, C12, C13, A8, A10, A11, A14, D2, D3 }
-
 // Obins stock firmware has something similar to this already enabled, but disabled by default in QMK
 #define PERMISSIVE_HOLD
 
diff --git a/keyboards/annepro2/c18/info.json b/keyboards/annepro2/c18/info.json
index 390dd819416..b3f3d367fef 100644
--- a/keyboards/annepro2/c18/info.json
+++ b/keyboards/annepro2/c18/info.json
@@ -3,124 +3,9 @@
     "usb": {
         "pid": "0x8009"
     },
-    "eeprom": {
-        "driver": "wear_leveling",
-        "wear_leveling": {
-            "driver": "spi_flash",
-            "backing_size": 2048
-        }
-    },
-    "rgb_matrix": {
-        "animations":{
-           "alphas_mods": true,
-           "gradient_up_down": true,
-           "gradient_left_right": true,
-           "breathing": true,
-           "band_sat": true,
-           "band_val": true,
-           "band_pinwheel_sat": true,
-           "band_pinwheel_val": true,
-           "band_spiral_sat": true,
-           "band_spiral_val": true,
-           "cycle_all": true,
-           "cycle_left_right": true,
-           "cycle_up_down": true,
-           "rainbow_moving_chevron": true,
-           "cycle_out_in": true,
-           "cycle_out_in_dual": true,
-           "cycle_pinwheel": true,
-           "cycle_spiral": true,
-           "dual_beacon": true,
-           "rainbow_beacon": true,
-           "rainbow_pinwheels": true,
-           "raindrops": true,
-           "jellybean_raindrops": true,
-           "hue_breathing": true,
-           "hue_pendulum": true,
-           "hue_wave": true,
-           "pixel_fractal": true,
-           "pixel_flow": true,
-           "pixel_rain": true,
-           "typing_heatmap": true,
-           "digital_rain": true,
-           "solid_reactive_simple": true,
-           "solid_reactive": true,
-           "solid_reactive_wide": true,
-           "solid_reactive_multiwide": true,
-           "solid_reactive_cross": true,
-           "solid_reactive_multicross": true,
-           "solid_reactive_nexus": true,
-           "solid_reactive_multinexus": true,
-           "splash": true,
-           "multisplash": true,
-           "solid_splash": true,
-           "solid_multisplash": true
-        },
-        "driver": "custom",
-        "layout": [
-            {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4},
-            {"matrix": [0, 1], "x": 16, "y": 0, "flags": 4},
-            {"matrix": [0, 2], "x": 32, "y": 0, "flags": 4},
-            {"matrix": [0, 3], "x": 48, "y": 0, "flags": 4},
-            {"matrix": [0, 4], "x": 65, "y": 0, "flags": 4},
-            {"matrix": [0, 5], "x": 81, "y": 0, "flags": 4},
-            {"matrix": [0, 6], "x": 97, "y": 0, "flags": 4},
-            {"matrix": [0, 7], "x": 113, "y": 0, "flags": 4},
-            {"matrix": [0, 8], "x": 129, "y": 0, "flags": 4},
-            {"matrix": [0, 9], "x": 145, "y": 0, "flags": 4},
-            {"matrix": [0, 10], "x": 161, "y": 0, "flags": 4},
-            {"matrix": [0, 11], "x": 178, "y": 0, "flags": 4},
-            {"matrix": [0, 12], "x": 194, "y": 0, "flags": 4},
-            {"matrix": [0, 13], "x": 218, "y": 0, "flags": 4},
-            {"matrix": [1, 0], "x": 4, "y": 16, "flags": 4},
-            {"matrix": [1, 1], "x": 24, "y": 16, "flags": 4},
-            {"matrix": [1, 2], "x": 40, "y": 16, "flags": 4},
-            {"matrix": [1, 3], "x": 57, "y": 16, "flags": 4},
-            {"matrix": [1, 4], "x": 73, "y": 16, "flags": 4},
-            {"matrix": [1, 5], "x": 89, "y": 16, "flags": 4},
-            {"matrix": [1, 6], "x": 105, "y": 16, "flags": 4},
-            {"matrix": [1, 7], "x": 121, "y": 16, "flags": 4},
-            {"matrix": [1, 8], "x": 137, "y": 16, "flags": 4},
-            {"matrix": [1, 9], "x": 153, "y": 16, "flags": 4},
-            {"matrix": [1, 10], "x": 170, "y": 16, "flags": 4},
-            {"matrix": [1, 11], "x": 186, "y": 16, "flags": 4},
-            {"matrix": [1, 12], "x": 202, "y": 16, "flags": 4},
-            {"matrix": [1, 13], "x": 222, "y": 16, "flags": 4},
-            {"matrix": [2, 0], "x": 6, "y": 32, "flags": 4},
-            {"matrix": [2, 1], "x": 28, "y": 32, "flags": 4},
-            {"matrix": [2, 2], "x": 44, "y": 32, "flags": 4},
-            {"matrix": [2, 3], "x": 61, "y": 32, "flags": 4},
-            {"matrix": [2, 4], "x": 77, "y": 32, "flags": 4},
-            {"matrix": [2, 5], "x": 93, "y": 32, "flags": 4},
-            {"matrix": [2, 6], "x": 109, "y": 32, "flags": 4},
-            {"matrix": [2, 7], "x": 125, "y": 32, "flags": 4},
-            {"matrix": [2, 8], "x": 141, "y": 32, "flags": 4},
-            {"matrix": [2, 9], "x": 157, "y": 32, "flags": 4},
-            {"matrix": [2, 10], "x": 174, "y": 32, "flags": 4},
-            {"matrix": [2, 11], "x": 190, "y": 32, "flags": 4},
-            {"matrix": [2, 12], "x": 216, "y": 32, "flags": 4},
-            {"matrix": [3, 0], "x": 10, "y": 48, "flags": 1},
-            {"matrix": [3, 2], "x": 36, "y": 48, "flags": 4},
-            {"matrix": [3, 3], "x": 52, "y": 48, "flags": 4},
-            {"matrix": [3, 4], "x": 69, "y": 48, "flags": 4},
-            {"matrix": [3, 5], "x": 85, "y": 48, "flags": 4},
-            {"matrix": [3, 6], "x": 101, "y": 48, "flags": 4},
-            {"matrix": [3, 7], "x": 117, "y": 48, "flags": 4},
-            {"matrix": [3, 8], "x": 133, "y": 48, "flags": 4},
-            {"matrix": [3, 9], "x": 149, "y": 48, "flags": 4},
-            {"matrix": [3, 10], "x": 165, "y": 48, "flags": 4},
-            {"matrix": [3, 11], "x": 182, "y": 48, "flags": 4},
-            {"matrix": [3, 12], "x": 212, "y": 48, "flags": 1},
-            {"matrix": [4, 0], "x": 2, "y": 64, "flags": 1},
-            {"matrix": [4, 2], "x": 22, "y": 64, "flags": 1},
-            {"matrix": [4, 3], "x": 42, "y": 64, "flags": 1},
-            {"matrix": [4, 6], "x": 103, "y": 64, "flags": 4},
-            {"matrix": [4, 9], "x": 163, "y": 64, "flags": 1},
-            {"matrix": [4, 10], "x": 184, "y": 64, "flags": 1},
-            {"matrix": [4, 11], "x": 204, "y": 64, "flags": 1},
-            {"matrix": [4, 12], "x": 224, "y": 64, "flags": 1}
-        ],
-        "led_flush_limit": 40
-    },
-    "community_layouts": ["60_ansi", "60_iso"]
+    "diode_direction": "COL2ROW",
+    "matrix_pins": {
+        "cols": ["C4", "C5", "D0", "B15", "C11", "A15", "C12", "C13", "A8", "A10", "A11", "A14", "D2", "D3"],
+        "rows": ["B5", "B4", "B3", "B2", "D1"]
+    }
 }
diff --git a/keyboards/annepro2/c18/rules.mk b/keyboards/annepro2/c18/rules.mk
index 2c9a9077da5..b310454c5d0 100644
--- a/keyboards/annepro2/c18/rules.mk
+++ b/keyboards/annepro2/c18/rules.mk
@@ -13,25 +13,8 @@ BOARD = ANNEPRO2_C18
 BOOTLOADER = custom
 PROGRAM_CMD = annepro2_tools --boot $(BUILD_DIR)/$(TARGET).bin
 
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-
-# Custom RGB matrix handling
-RGB_MATRIX_ENABLE = yes
-
-# Keys
-CUSTOM_MATRIX = lite
-
 # Anne Pro 2
 SRC = \
-	matrix.c \
 	annepro2_ble.c \
 	ap2_led.c \
 	protocol.c \
diff --git a/keyboards/annepro2/info.json b/keyboards/annepro2/info.json
index d06fe5bed49..8c7041005fb 100644
--- a/keyboards/annepro2/info.json
+++ b/keyboards/annepro2/info.json
@@ -6,6 +6,135 @@
         "vid": "0xAC20",
         "device_version": "13.3.7"
     },
+    "build": {
+        "lto": true
+    },
+    "eeprom": {
+        "driver": "wear_leveling",
+        "wear_leveling": {
+            "driver": "spi_flash",
+            "backing_size": 2048
+        }
+    },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "rgb_matrix": true
+    },
+    "rgb_matrix": {
+        "animations":{
+           "alphas_mods": true,
+           "gradient_up_down": true,
+           "gradient_left_right": true,
+           "breathing": true,
+           "band_sat": true,
+           "band_val": true,
+           "band_pinwheel_sat": true,
+           "band_pinwheel_val": true,
+           "band_spiral_sat": true,
+           "band_spiral_val": true,
+           "cycle_all": true,
+           "cycle_left_right": true,
+           "cycle_up_down": true,
+           "rainbow_moving_chevron": true,
+           "cycle_out_in": true,
+           "cycle_out_in_dual": true,
+           "cycle_pinwheel": true,
+           "cycle_spiral": true,
+           "dual_beacon": true,
+           "rainbow_beacon": true,
+           "rainbow_pinwheels": true,
+           "raindrops": true,
+           "jellybean_raindrops": true,
+           "hue_breathing": true,
+           "hue_pendulum": true,
+           "hue_wave": true,
+           "pixel_fractal": true,
+           "pixel_flow": true,
+           "pixel_rain": true,
+           "typing_heatmap": true,
+           "digital_rain": true,
+           "solid_reactive_simple": true,
+           "solid_reactive": true,
+           "solid_reactive_wide": true,
+           "solid_reactive_multiwide": true,
+           "solid_reactive_cross": true,
+           "solid_reactive_multicross": true,
+           "solid_reactive_nexus": true,
+           "solid_reactive_multinexus": true,
+           "splash": true,
+           "multisplash": true,
+           "solid_splash": true,
+           "solid_multisplash": true
+        },
+        "driver": "custom",
+        "layout": [
+            {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4},
+            {"matrix": [0, 1], "x": 16, "y": 0, "flags": 4},
+            {"matrix": [0, 2], "x": 32, "y": 0, "flags": 4},
+            {"matrix": [0, 3], "x": 48, "y": 0, "flags": 4},
+            {"matrix": [0, 4], "x": 65, "y": 0, "flags": 4},
+            {"matrix": [0, 5], "x": 81, "y": 0, "flags": 4},
+            {"matrix": [0, 6], "x": 97, "y": 0, "flags": 4},
+            {"matrix": [0, 7], "x": 113, "y": 0, "flags": 4},
+            {"matrix": [0, 8], "x": 129, "y": 0, "flags": 4},
+            {"matrix": [0, 9], "x": 145, "y": 0, "flags": 4},
+            {"matrix": [0, 10], "x": 161, "y": 0, "flags": 4},
+            {"matrix": [0, 11], "x": 178, "y": 0, "flags": 4},
+            {"matrix": [0, 12], "x": 194, "y": 0, "flags": 4},
+            {"matrix": [0, 13], "x": 218, "y": 0, "flags": 4},
+            {"matrix": [1, 0], "x": 4, "y": 16, "flags": 4},
+            {"matrix": [1, 1], "x": 24, "y": 16, "flags": 4},
+            {"matrix": [1, 2], "x": 40, "y": 16, "flags": 4},
+            {"matrix": [1, 3], "x": 57, "y": 16, "flags": 4},
+            {"matrix": [1, 4], "x": 73, "y": 16, "flags": 4},
+            {"matrix": [1, 5], "x": 89, "y": 16, "flags": 4},
+            {"matrix": [1, 6], "x": 105, "y": 16, "flags": 4},
+            {"matrix": [1, 7], "x": 121, "y": 16, "flags": 4},
+            {"matrix": [1, 8], "x": 137, "y": 16, "flags": 4},
+            {"matrix": [1, 9], "x": 153, "y": 16, "flags": 4},
+            {"matrix": [1, 10], "x": 170, "y": 16, "flags": 4},
+            {"matrix": [1, 11], "x": 186, "y": 16, "flags": 4},
+            {"matrix": [1, 12], "x": 202, "y": 16, "flags": 4},
+            {"matrix": [1, 13], "x": 222, "y": 16, "flags": 4},
+            {"matrix": [2, 0], "x": 6, "y": 32, "flags": 4},
+            {"matrix": [2, 1], "x": 28, "y": 32, "flags": 4},
+            {"matrix": [2, 2], "x": 44, "y": 32, "flags": 4},
+            {"matrix": [2, 3], "x": 61, "y": 32, "flags": 4},
+            {"matrix": [2, 4], "x": 77, "y": 32, "flags": 4},
+            {"matrix": [2, 5], "x": 93, "y": 32, "flags": 4},
+            {"matrix": [2, 6], "x": 109, "y": 32, "flags": 4},
+            {"matrix": [2, 7], "x": 125, "y": 32, "flags": 4},
+            {"matrix": [2, 8], "x": 141, "y": 32, "flags": 4},
+            {"matrix": [2, 9], "x": 157, "y": 32, "flags": 4},
+            {"matrix": [2, 10], "x": 174, "y": 32, "flags": 4},
+            {"matrix": [2, 11], "x": 190, "y": 32, "flags": 4},
+            {"matrix": [2, 12], "x": 216, "y": 32, "flags": 4},
+            {"matrix": [3, 0], "x": 10, "y": 48, "flags": 1},
+            {"matrix": [3, 2], "x": 36, "y": 48, "flags": 4},
+            {"matrix": [3, 3], "x": 52, "y": 48, "flags": 4},
+            {"matrix": [3, 4], "x": 69, "y": 48, "flags": 4},
+            {"matrix": [3, 5], "x": 85, "y": 48, "flags": 4},
+            {"matrix": [3, 6], "x": 101, "y": 48, "flags": 4},
+            {"matrix": [3, 7], "x": 117, "y": 48, "flags": 4},
+            {"matrix": [3, 8], "x": 133, "y": 48, "flags": 4},
+            {"matrix": [3, 9], "x": 149, "y": 48, "flags": 4},
+            {"matrix": [3, 10], "x": 165, "y": 48, "flags": 4},
+            {"matrix": [3, 11], "x": 182, "y": 48, "flags": 4},
+            {"matrix": [3, 12], "x": 212, "y": 48, "flags": 1},
+            {"matrix": [4, 0], "x": 2, "y": 64, "flags": 1},
+            {"matrix": [4, 2], "x": 22, "y": 64, "flags": 1},
+            {"matrix": [4, 3], "x": 42, "y": 64, "flags": 1},
+            {"matrix": [4, 6], "x": 103, "y": 64, "flags": 4},
+            {"matrix": [4, 9], "x": 163, "y": 64, "flags": 1},
+            {"matrix": [4, 10], "x": 184, "y": 64, "flags": 1},
+            {"matrix": [4, 11], "x": 204, "y": 64, "flags": 1},
+            {"matrix": [4, 12], "x": 224, "y": 64, "flags": 1}
+        ],
+        "led_flush_limit": 40
+    },
+    "community_layouts": ["60_ansi", "60_iso"],
     "layouts": {
         "LAYOUT_60_ansi": {
             "layout": [
diff --git a/keyboards/annepro2/keymaps/default-full-caps/keymap.c b/keyboards/annepro2/keymaps/default-full-caps/keymap.c
index cb6147d40a9..7d517a179a7 100644
--- a/keyboards/annepro2/keymaps/default-full-caps/keymap.c
+++ b/keyboards/annepro2/keymaps/default-full-caps/keymap.c
@@ -97,10 +97,10 @@ enum anne_pro_layers {
   */
  [FN2] = LAYOUT_60_ansi( /* FN2 */
     _______, KC_AP2_BT1, KC_AP2_BT2, KC_AP2_BT3, KC_AP2_BT4, _______, _______, _______, _______, KC_AP_RGB_MOD, KC_AP_RGB_TOG, KC_AP_RGB_VAD, KC_AP_RGB_VAI, _______,
-    MO(FN2), _______,    KC_UP,      _______,    _______,    _______, _______, _______, _______,       _______,      KC_PSCR, KC_HOME, KC_END,  _______,
+    _______, _______,    KC_UP,      _______,    _______,    _______, _______, _______, _______,       _______,      KC_PSCR, KC_HOME, KC_END,  _______,
     _______, KC_LEFT,    KC_DOWN,    KC_RGHT,    _______,    _______, _______, _______, _______,       _______,      KC_PGUP, KC_PGDN, _______,
     _______,             _______,    _______,    _______,    _______, _______, _______, _______,       _______,      KC_INS,  KC_DEL,  _______,
-    _______, _______,    _______,                                     _______,                         _______,      MO(FN1), MO(FN2), _______
+    _______, _______,    _______,                                     _______,                         _______,      _______, _______, _______
  ),
 };
 // clang-format on
diff --git a/keyboards/annepro2/keymaps/default-layer-indicators/keymap.c b/keyboards/annepro2/keymaps/default-layer-indicators/keymap.c
index ca042dcd32c..298f44398bb 100644
--- a/keyboards/annepro2/keymaps/default-layer-indicators/keymap.c
+++ b/keyboards/annepro2/keymaps/default-layer-indicators/keymap.c
@@ -97,10 +97,10 @@ enum anne_pro_layers {
   */
  [FN2] = LAYOUT_60_ansi( /* FN2 */
     _______, KC_AP2_BT1, KC_AP2_BT2, KC_AP2_BT3, KC_AP2_BT4, _______, _______, _______, _______, KC_AP_RGB_MOD, KC_AP_RGB_TOG, KC_AP_RGB_VAD, KC_AP_RGB_VAI, _______,
-    MO(FN2), _______,    KC_UP,      _______,    _______,    _______, _______, _______, _______, _______, KC_PSCR, KC_HOME, KC_END,  _______,
+    _______, _______,    KC_UP,      _______,    _______,    _______, _______, _______, _______, _______, KC_PSCR, KC_HOME, KC_END,  _______,
     _______, KC_LEFT,    KC_DOWN,    KC_RGHT,    _______,    _______, _______, _______, _______, _______, KC_PGUP, KC_PGDN, _______,
     _______,             _______,    _______,    _______,    _______, _______, _______, _______, _______, KC_INS,  KC_DEL,  _______,
-    _______, _______,    _______,                                     _______,                   _______, MO(FN1), MO(FN2), _______
+    _______, _______,    _______,                                     _______,                   _______, _______, _______, _______
  ),
 };
 // clang-format on
diff --git a/keyboards/annepro2/keymaps/default/keymap.c b/keyboards/annepro2/keymaps/default/keymap.c
index 8af2d9a32c2..38be6ec54a6 100644
--- a/keyboards/annepro2/keymaps/default/keymap.c
+++ b/keyboards/annepro2/keymaps/default/keymap.c
@@ -97,10 +97,10 @@ enum anne_pro_layers {
   */
  [FN2] = LAYOUT_60_ansi( /* FN2 */
     _______, KC_AP2_BT1, KC_AP2_BT2, KC_AP2_BT3, KC_AP2_BT4, _______, _______, _______, _______, KC_AP_RGB_MOD, KC_AP_RGB_TOG, KC_AP_RGB_VAD, KC_AP_RGB_VAI, _______,
-    MO(FN2), _______,    KC_UP,      _______,    _______,    _______, _______, _______, _______, _______,       KC_PSCR,       KC_HOME,       KC_END,        _______,
+    _______, _______,    KC_UP,      _______,    _______,    _______, _______, _______, _______, _______,       KC_PSCR,       KC_HOME,       KC_END,        _______,
     _______, KC_LEFT,    KC_DOWN,    KC_RGHT,    _______,    _______, _______, _______, _______, _______,       KC_PGUP,       KC_PGDN,       _______,
     _______,             _______,    _______,    _______,    _______, _______, _______, _______, _______,       KC_INS,        KC_DEL,        _______,
-    _______, _______,    _______,                                     _______,                   _______,       MO(FN1),       MO(FN2),       _______
+    _______, _______,    _______,                                     _______,                   _______,       _______,       _______,       _______
  ),
 };
 // clang-format on
diff --git a/keyboards/annepro2/keymaps/iso_default/keymap.c b/keyboards/annepro2/keymaps/iso_default/keymap.c
index 4c1b259504e..a4953906034 100644
--- a/keyboards/annepro2/keymaps/iso_default/keymap.c
+++ b/keyboards/annepro2/keymaps/iso_default/keymap.c
@@ -76,9 +76,9 @@ enum anne_pro_layers {
  [FN1] = LAYOUT_60_iso( /* FN1 */
     KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
     _______, _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_HOME, KC_END,
-    MO(FN1), KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_PGUP, KC_PGDN, _______, _______,
+    _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_PGUP, KC_PGDN, _______, _______,
     _______, _______, KC_VOLU, KC_VOLD, KC_MUTE, _______, _______, _______, _______, _______, KC_INS,  KC_DEL,  _______,
-    _______, _______, _______,                            _______,                   KC_APP,  MO(FN1), MO(FN2), _______
+    _______, _______, _______,                            _______,                   KC_APP,  _______, MO(FN2), _______
 ),
   /*
   * Layer FN2
@@ -98,9 +98,9 @@ enum anne_pro_layers {
  [FN2] = LAYOUT_60_iso( /* FN2 */
     _______, KC_AP2_BT1, KC_AP2_BT2, KC_AP2_BT3, KC_AP2_BT4, _______, _______, _______, _______, KC_AP_RGB_MOD, KC_AP_RGB_TOG, KC_AP_RGB_VAD, KC_AP_RGB_VAI, _______,
     _______, _______,    KC_UP,      _______,    _______,    _______, _______, _______, _______, _______,       KC_PSCR,       KC_HOME,       KC_END,
-    MO(FN1), KC_LEFT,    KC_DOWN,    KC_RGHT,    _______,    _______, _______, _______, _______, _______,       KC_PGUP,       KC_PGDN,       _______,       _______,
+    _______, KC_LEFT,    KC_DOWN,    KC_RGHT,    _______,    _______, _______, _______, _______, _______,       KC_PGUP,       KC_PGDN,       _______,       _______,
     _______, _______,    _______,    _______,    _______,    _______, _______, _______, _______, _______,       KC_INS,        KC_DEL,        _______,
-    _______, _______,    _______,                                     _______,                   KC_APP,        MO(FN1),       MO(FN2),       _______
+    _______, _______,    _______,                                     _______,                   KC_APP,        _______,       _______,       _______
  ),
 };
 // clang-format on
diff --git a/keyboards/annepro2/matrix.c b/keyboards/annepro2/matrix.c
deleted file mode 100644
index a1585e4ddf1..00000000000
--- a/keyboards/annepro2/matrix.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 2018 Charlie Waters
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <stdint.h>
-#include <stdbool.h>
-#include <string.h>
-#include <hal.h>
-#include "timer.h"
-#include "wait.h"
-#include "print.h"
-#include "matrix.h"
-#include "annepro2.h"
-
-pin_t row_list[MATRIX_ROWS] = MATRIX_ROW_PINS;
-pin_t col_list[MATRIX_COLS] = MATRIX_COL_PINS;
-
-bool matrix_scan_custom(matrix_row_t current_matrix[]) {
-    bool matrix_has_changed = false;
-    // cache of input ports for columns
-    static uint16_t port_cache[4];
-    // scan each row
-    for (int row = 0; row < MATRIX_ROWS; row++) {
-        palClearLine(row_list[row]);
-        __NOP();
-        __NOP();
-        __NOP();
-        __NOP();
-        // read i/o ports
-        port_cache[0] = palReadPort(IOPORTA);
-        port_cache[1] = palReadPort(IOPORTB);
-        port_cache[2] = palReadPort(IOPORTC);
-        port_cache[3] = palReadPort(IOPORTD);
-        palSetLine(row_list[row]);
-
-        // get columns from ports
-        matrix_row_t data = 0;
-        for (int col = 0; col < MATRIX_COLS; ++col) {
-            pin_t line = col_list[col];
-            uint16_t port = port_cache[HT32_PAL_IDX(PAL_PORT(line))];
-            data |= (((port & (1 << PAL_PAD(line))) ? 0 : 1) << col);
-        }
-
-        if (current_matrix[row] != data) {
-            current_matrix[row] = data;
-            matrix_has_changed  = true;
-        }
-    }
-    return matrix_has_changed;
-}
\ No newline at end of file
diff --git a/keyboards/argo_works/ishi/80/mk0_avr/info.json b/keyboards/argo_works/ishi/80/mk0_avr/info.json
index 6bee024fed1..47414ee0c4e 100644
--- a/keyboards/argo_works/ishi/80/mk0_avr/info.json
+++ b/keyboards/argo_works/ishi/80/mk0_avr/info.json
@@ -19,8 +19,7 @@
         "console": false,
         "extrakey": true,
         "mousekey": true,
-        "nkro": true,
-        "encoder": false
+        "nkro": true
     },
     "matrix_pins": {
         "cols": ["D3", "F4", "F5", "F6", "F7", "D7", "C6", "D4", "D2"],
diff --git a/keyboards/artifact/lvl/rev_hs01/config.h b/keyboards/artifact/lvl/rev_hs01/config.h
index 674fb1110c8..8dec2b56f22 100755
--- a/keyboards/artifact/lvl/rev_hs01/config.h
+++ b/keyboards/artifact/lvl/rev_hs01/config.h
@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* RGB Light */
 #define WS2812_PWM_DRIVER PWMD1
-#define WS2812_DMA_STREAM STM32_DMA1_STREAM5
-#define WS2812_DMA_CHANNEL 5  
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM5
+#define WS2812_PWM_DMA_CHANNEL 5  
 
 #define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_RGB
diff --git a/keyboards/ask55/info.json b/keyboards/ask55/info.json
index 61013e7f23d..d47d79612d3 100644
--- a/keyboards/ask55/info.json
+++ b/keyboards/ask55/info.json
@@ -5,18 +5,13 @@
     "development_board": "promicro",
     "diode_direction": "COL2ROW",
     "features": {
-        "audio": false,
-        "backlight": false,
-        "bluetooth": false,
         "bootmagic": true,
         "command": false,
         "console": false,
         "extrakey": true,
         "mousekey": true,
         "nkro": true,
-        "rgblight": true,
-        "sleep_led": false,
-        "unicode": false
+        "rgblight": true
     },
     "matrix_pins": {
         "cols": ["E6", "D0", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7"],
diff --git a/keyboards/aurora65/config.h b/keyboards/aurora65/config.h
index ec0853212c9..1b51399c8d1 100644
--- a/keyboards/aurora65/config.h
+++ b/keyboards/aurora65/config.h
@@ -22,6 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define WS2812_PWM_CHANNEL 3
 #define WS2812_PWM_PAL_MODE 2
 #define WS2812_PWM_COMPLEMENTARY_OUTPUT
-#define WS2812_DMA_STREAM STM32_DMA1_STREAM5
-#define WS2812_DMA_CHANNEL 5
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM5
+#define WS2812_PWM_DMA_CHANNEL 5
 #define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_RGB
diff --git a/keyboards/axolstudio/yeti/hotswap/hotswap.c b/keyboards/axolstudio/yeti/hotswap/hotswap.c
index dd65a16a80a..df64c809532 100644
--- a/keyboards/axolstudio/yeti/hotswap/hotswap.c
+++ b/keyboards/axolstudio/yeti/hotswap/hotswap.c
@@ -18,74 +18,74 @@
 
 #ifdef RGB_MATRIX_ENABLE
 const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
-    { 0, B_1,  A_1,  C_1 },
-    { 0, B_2,  A_2,  C_2 },
-    { 0, B_3,  A_3,  C_3 },
-    { 0, B_4,  A_4,  C_4 },
-    { 0, B_5,  A_5,  C_5 },
-    { 0, B_6,  A_6,  C_6 },
-    { 0, B_7,  A_7,  C_7 },
-    { 0, B_8,  A_8,  C_8 },
-    { 0, B_9,  A_9,  C_9 },
-    { 0, B_10, A_10, C_10 },
-    { 0, B_11, A_11, C_11 },
-    { 0, B_12, A_12, C_12 },
-    { 0, B_13, A_13, C_13 },
-    { 0, B_14, A_14, C_14 },
-    { 0, B_15, A_15, C_15 },
+    { 0, SW2_CS1,  SW1_CS1,  SW3_CS1 },
+    { 0, SW2_CS2,  SW1_CS2,  SW3_CS2 },
+    { 0, SW2_CS3,  SW1_CS3,  SW3_CS3 },
+    { 0, SW2_CS4,  SW1_CS4,  SW3_CS4 },
+    { 0, SW2_CS5,  SW1_CS5,  SW3_CS5 },
+    { 0, SW2_CS6,  SW1_CS6,  SW3_CS6 },
+    { 0, SW2_CS7,  SW1_CS7,  SW3_CS7 },
+    { 0, SW2_CS8,  SW1_CS8,  SW3_CS8 },
+    { 0, SW2_CS9,  SW1_CS9,  SW3_CS9 },
+    { 0, SW2_CS10, SW1_CS10, SW3_CS10 },
+    { 0, SW2_CS11, SW1_CS11, SW3_CS11 },
+    { 0, SW2_CS12, SW1_CS12, SW3_CS12 },
+    { 0, SW2_CS13, SW1_CS13, SW3_CS13 },
+    { 0, SW2_CS14, SW1_CS14, SW3_CS14 },
+    { 0, SW2_CS15, SW1_CS15, SW3_CS15 },
 
-    { 0, E_1,  D_1,  F_1 },
-    { 0, E_2,  D_2,  F_2 },
-    { 0, E_3,  D_3,  F_3 },
-    { 0, E_4,  D_4,  F_4 },
-    { 0, E_5,  D_5,  F_5 },
-    { 0, E_6,  D_6,  F_6 },
-    { 0, E_7,  D_7,  F_7 },
-    { 0, E_8,  D_8,  F_8 },
-    { 0, E_9,  D_9,  F_9 },
-    { 0, E_10, D_10, F_10 },
-    { 0, E_11, D_11, F_11 },
-    { 0, E_12, D_12, F_12 },
-    { 0, E_13, D_13, F_13 },
-    { 0, E_14, D_14, F_14 },
-    { 0, E_15, D_15, F_15 },
+    { 0, SW5_CS1,  SW4_CS1,  SW6_CS1 },
+    { 0, SW5_CS2,  SW4_CS2,  SW6_CS2 },
+    { 0, SW5_CS3,  SW4_CS3,  SW6_CS3 },
+    { 0, SW5_CS4,  SW4_CS4,  SW6_CS4 },
+    { 0, SW5_CS5,  SW4_CS5,  SW6_CS5 },
+    { 0, SW5_CS6,  SW4_CS6,  SW6_CS6 },
+    { 0, SW5_CS7,  SW4_CS7,  SW6_CS7 },
+    { 0, SW5_CS8,  SW4_CS8,  SW6_CS8 },
+    { 0, SW5_CS9,  SW4_CS9,  SW6_CS9 },
+    { 0, SW5_CS10, SW4_CS10, SW6_CS10 },
+    { 0, SW5_CS11, SW4_CS11, SW6_CS11 },
+    { 0, SW5_CS12, SW4_CS12, SW6_CS12 },
+    { 0, SW5_CS13, SW4_CS13, SW6_CS13 },
+    { 0, SW5_CS14, SW4_CS14, SW6_CS14 },
+    { 0, SW5_CS15, SW4_CS15, SW6_CS15 },
 
-    { 0, H_1,  G_1,  I_1 },
-    { 0, H_2,  G_2,  I_2 },
-    { 0, H_3,  G_3,  I_3 },
-    { 0, H_4,  G_4,  I_4 },
-    { 0, H_5,  G_5,  I_5 },
-    { 0, H_6,  G_6,  I_6 },
-    { 0, H_7,  G_7,  I_7 },
-    { 0, H_8,  G_8,  I_8 },
-    { 0, H_9,  G_9,  I_9 },
-    { 0, H_10, G_10, I_10 },
-    { 0, H_11, G_11, I_11 },
-    { 0, H_12, G_12, I_12 },
-    { 0, H_13, G_13, I_13 },
-    { 0, H_14, G_14, I_14 },
+    { 0, SW8_CS1,  SW7_CS1,  SW9_CS1 },
+    { 0, SW8_CS2,  SW7_CS2,  SW9_CS2 },
+    { 0, SW8_CS3,  SW7_CS3,  SW9_CS3 },
+    { 0, SW8_CS4,  SW7_CS4,  SW9_CS4 },
+    { 0, SW8_CS5,  SW7_CS5,  SW9_CS5 },
+    { 0, SW8_CS6,  SW7_CS6,  SW9_CS6 },
+    { 0, SW8_CS7,  SW7_CS7,  SW9_CS7 },
+    { 0, SW8_CS8,  SW7_CS8,  SW9_CS8 },
+    { 0, SW8_CS9,  SW7_CS9,  SW9_CS9 },
+    { 0, SW8_CS10, SW7_CS10, SW9_CS10 },
+    { 0, SW8_CS11, SW7_CS11, SW9_CS11 },
+    { 0, SW8_CS12, SW7_CS12, SW9_CS12 },
+    { 0, SW8_CS13, SW7_CS13, SW9_CS13 },
+    { 0, SW8_CS14, SW7_CS14, SW9_CS14 },
 
-    { 0, K_2,  J_2,  L_2 },
-    { 0, K_3,  J_3,  L_3 },
-    { 0, K_4,  J_4,  L_4 },
-    { 0, K_5,  J_5,  L_5 },
-    { 0, K_6,  J_6,  L_6 },
-    { 0, K_7,  J_7,  L_7 },
-    { 0, K_8,  J_8,  L_8 },
-    { 0, K_9,  J_9,  L_9 },
-    { 0, K_10, J_10, L_10 },
-    { 0, K_11, J_11, L_11 },
-    { 0, K_12, J_12, L_12 },
-    { 0, K_13, J_13, L_13 },
-    { 0, K_14, J_14, L_14 },
+    { 0, SW11_CS2,  SW10_CS2,  SW12_CS2 },
+    { 0, SW11_CS3,  SW10_CS3,  SW12_CS3 },
+    { 0, SW11_CS4,  SW10_CS4,  SW12_CS4 },
+    { 0, SW11_CS5,  SW10_CS5,  SW12_CS5 },
+    { 0, SW11_CS6,  SW10_CS6,  SW12_CS6 },
+    { 0, SW11_CS7,  SW10_CS7,  SW12_CS7 },
+    { 0, SW11_CS8,  SW10_CS8,  SW12_CS8 },
+    { 0, SW11_CS9,  SW10_CS9,  SW12_CS9 },
+    { 0, SW11_CS10, SW10_CS10, SW12_CS10 },
+    { 0, SW11_CS11, SW10_CS11, SW12_CS11 },
+    { 0, SW11_CS12, SW10_CS12, SW12_CS12 },
+    { 0, SW11_CS13, SW10_CS13, SW12_CS13 },
+    { 0, SW11_CS14, SW10_CS14, SW12_CS14 },
 
-    { 0, K_1,  J_1,  L_1 },
-    { 0, K_16, J_16, L_16 },
-    { 0, H_16, G_16, I_16 },
-    { 0, E_16, D_16, F_16 },
-    { 0, B_16, A_16, C_16 },
-    { 0, H_15, G_15, I_15 },
-    { 0, K_15, J_15, L_15 },
+    { 0, SW11_CS1,  SW10_CS1,  SW12_CS1 },
+    { 0, SW11_CS16, SW10_CS16, SW12_CS16 },
+    { 0, SW8_CS16, SW7_CS16, SW9_CS16 },
+    { 0, SW5_CS16, SW4_CS16, SW6_CS16 },
+    { 0, SW2_CS16, SW1_CS16, SW3_CS16 },
+    { 0, SW8_CS15, SW7_CS15, SW9_CS15 },
+    { 0, SW11_CS15, SW10_CS15, SW12_CS15 },
 };
 
 led_config_t g_led_config = {
diff --git a/keyboards/bastardkb/charybdis/3x5/blackpill/config.h b/keyboards/bastardkb/charybdis/3x5/blackpill/config.h
index 68901305c47..0467a1261f4 100644
--- a/keyboards/bastardkb/charybdis/3x5/blackpill/config.h
+++ b/keyboards/bastardkb/charybdis/3x5/blackpill/config.h
@@ -27,8 +27,8 @@
 #define WS2812_PWM_CHANNEL 2
 #define WS2812_PWM_PAL_MODE 1
 #define WS2812_EXTERNAL_PULLUP
-#define WS2812_DMA_STREAM STM32_DMA1_STREAM1
-#define WS2812_DMA_CHANNEL 3
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM1
+#define WS2812_PWM_DMA_CHANNEL 3
 #define WS2812_PWM_TARGET_PERIOD 800000
 
 /* Serial configuration for split keyboard. */
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/config.h b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/config.h
index 6aa20712f67..7a2bdd0aa82 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/config.h
+++ b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/config.h
@@ -30,8 +30,8 @@
 #define WS2812_PWM_DRIVER PWMD2
 #define WS2812_PWM_CHANNEL 4
 #define WS2812_PWM_PAL_MODE 1
-#define WS2812_DMA_STREAM STM32_DMA1_STREAM7
-#define WS2812_DMA_CHANNEL 3
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM7
+#define WS2812_PWM_DMA_CHANNEL 3
 
 /* CRC. */
 #define CRC8_USE_TABLE
diff --git a/keyboards/bastardkb/charybdis/3x6/blackpill/config.h b/keyboards/bastardkb/charybdis/3x6/blackpill/config.h
index 985e79fabda..b41a1d3f574 100644
--- a/keyboards/bastardkb/charybdis/3x6/blackpill/config.h
+++ b/keyboards/bastardkb/charybdis/3x6/blackpill/config.h
@@ -25,8 +25,8 @@
 #define WS2812_PWM_CHANNEL 2
 #define WS2812_PWM_PAL_MODE 1
 #define WS2812_EXTERNAL_PULLUP
-#define WS2812_DMA_STREAM STM32_DMA1_STREAM1
-#define WS2812_DMA_CHANNEL 3
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM1
+#define WS2812_PWM_DMA_CHANNEL 3
 #define WS2812_PWM_TARGET_PERIOD 800000
 
 /* Serial configuration for split keyboard. */
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/config.h b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/config.h
index 6aa20712f67..7a2bdd0aa82 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/config.h
+++ b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/config.h
@@ -30,8 +30,8 @@
 #define WS2812_PWM_DRIVER PWMD2
 #define WS2812_PWM_CHANNEL 4
 #define WS2812_PWM_PAL_MODE 1
-#define WS2812_DMA_STREAM STM32_DMA1_STREAM7
-#define WS2812_DMA_CHANNEL 3
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM7
+#define WS2812_PWM_DMA_CHANNEL 3
 
 /* CRC. */
 #define CRC8_USE_TABLE
diff --git a/keyboards/bastardkb/charybdis/4x6/blackpill/config.h b/keyboards/bastardkb/charybdis/4x6/blackpill/config.h
index 68901305c47..0467a1261f4 100644
--- a/keyboards/bastardkb/charybdis/4x6/blackpill/config.h
+++ b/keyboards/bastardkb/charybdis/4x6/blackpill/config.h
@@ -27,8 +27,8 @@
 #define WS2812_PWM_CHANNEL 2
 #define WS2812_PWM_PAL_MODE 1
 #define WS2812_EXTERNAL_PULLUP
-#define WS2812_DMA_STREAM STM32_DMA1_STREAM1
-#define WS2812_DMA_CHANNEL 3
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM1
+#define WS2812_PWM_DMA_CHANNEL 3
 #define WS2812_PWM_TARGET_PERIOD 800000
 
 /* Serial configuration for split keyboard. */
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/config.h b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/config.h
index 6aa20712f67..7a2bdd0aa82 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/config.h
+++ b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/config.h
@@ -30,8 +30,8 @@
 #define WS2812_PWM_DRIVER PWMD2
 #define WS2812_PWM_CHANNEL 4
 #define WS2812_PWM_PAL_MODE 1
-#define WS2812_DMA_STREAM STM32_DMA1_STREAM7
-#define WS2812_DMA_CHANNEL 3
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM7
+#define WS2812_PWM_DMA_CHANNEL 3
 
 /* CRC. */
 #define CRC8_USE_TABLE
diff --git a/keyboards/bastardkb/scylla/blackpill/config.h b/keyboards/bastardkb/scylla/blackpill/config.h
index 0c40ed74bc4..1d86b474ee9 100644
--- a/keyboards/bastardkb/scylla/blackpill/config.h
+++ b/keyboards/bastardkb/scylla/blackpill/config.h
@@ -27,8 +27,8 @@
 #define WS2812_PWM_CHANNEL 2
 #define WS2812_PWM_PAL_MODE 1
 #define WS2812_EXTERNAL_PULLUP
-#define WS2812_DMA_STREAM STM32_DMA1_STREAM1
-#define WS2812_DMA_CHANNEL 3
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM1
+#define WS2812_PWM_DMA_CHANNEL 3
 #define WS2812_PWM_TARGET_PERIOD 800000
 
 /* Serial configuration for split keyboard. */
diff --git a/keyboards/bastardkb/scylla/v2/stemcell/config.h b/keyboards/bastardkb/scylla/v2/stemcell/config.h
index 0bbfd39aeef..ca1cc0f719d 100644
--- a/keyboards/bastardkb/scylla/v2/stemcell/config.h
+++ b/keyboards/bastardkb/scylla/v2/stemcell/config.h
@@ -30,8 +30,8 @@
 #define WS2812_PWM_DRIVER PWMD2
 #define WS2812_PWM_CHANNEL 4
 #define WS2812_PWM_PAL_MODE 1
-#define WS2812_DMA_STREAM STM32_DMA1_STREAM7
-#define WS2812_DMA_CHANNEL 3
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM7
+#define WS2812_PWM_DMA_CHANNEL 3
 
 /* CRC. */
 #define CRC8_USE_TABLE
diff --git a/keyboards/bastardkb/skeletyl/blackpill/config.h b/keyboards/bastardkb/skeletyl/blackpill/config.h
index 0c40ed74bc4..1d86b474ee9 100644
--- a/keyboards/bastardkb/skeletyl/blackpill/config.h
+++ b/keyboards/bastardkb/skeletyl/blackpill/config.h
@@ -27,8 +27,8 @@
 #define WS2812_PWM_CHANNEL 2
 #define WS2812_PWM_PAL_MODE 1
 #define WS2812_EXTERNAL_PULLUP
-#define WS2812_DMA_STREAM STM32_DMA1_STREAM1
-#define WS2812_DMA_CHANNEL 3
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM1
+#define WS2812_PWM_DMA_CHANNEL 3
 #define WS2812_PWM_TARGET_PERIOD 800000
 
 /* Serial configuration for split keyboard. */
diff --git a/keyboards/bastardkb/skeletyl/v2/stemcell/config.h b/keyboards/bastardkb/skeletyl/v2/stemcell/config.h
index 0bbfd39aeef..ca1cc0f719d 100644
--- a/keyboards/bastardkb/skeletyl/v2/stemcell/config.h
+++ b/keyboards/bastardkb/skeletyl/v2/stemcell/config.h
@@ -30,8 +30,8 @@
 #define WS2812_PWM_DRIVER PWMD2
 #define WS2812_PWM_CHANNEL 4
 #define WS2812_PWM_PAL_MODE 1
-#define WS2812_DMA_STREAM STM32_DMA1_STREAM7
-#define WS2812_DMA_CHANNEL 3
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM7
+#define WS2812_PWM_DMA_CHANNEL 3
 
 /* CRC. */
 #define CRC8_USE_TABLE
diff --git a/keyboards/bastardkb/tbkmini/blackpill/config.h b/keyboards/bastardkb/tbkmini/blackpill/config.h
index 0c40ed74bc4..1d86b474ee9 100644
--- a/keyboards/bastardkb/tbkmini/blackpill/config.h
+++ b/keyboards/bastardkb/tbkmini/blackpill/config.h
@@ -27,8 +27,8 @@
 #define WS2812_PWM_CHANNEL 2
 #define WS2812_PWM_PAL_MODE 1
 #define WS2812_EXTERNAL_PULLUP
-#define WS2812_DMA_STREAM STM32_DMA1_STREAM1
-#define WS2812_DMA_CHANNEL 3
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM1
+#define WS2812_PWM_DMA_CHANNEL 3
 #define WS2812_PWM_TARGET_PERIOD 800000
 
 /* Serial configuration for split keyboard. */
diff --git a/keyboards/bastardkb/tbkmini/v2/stemcell/config.h b/keyboards/bastardkb/tbkmini/v2/stemcell/config.h
index 0bbfd39aeef..ca1cc0f719d 100644
--- a/keyboards/bastardkb/tbkmini/v2/stemcell/config.h
+++ b/keyboards/bastardkb/tbkmini/v2/stemcell/config.h
@@ -30,8 +30,8 @@
 #define WS2812_PWM_DRIVER PWMD2
 #define WS2812_PWM_CHANNEL 4
 #define WS2812_PWM_PAL_MODE 1
-#define WS2812_DMA_STREAM STM32_DMA1_STREAM7
-#define WS2812_DMA_CHANNEL 3
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM7
+#define WS2812_PWM_DMA_CHANNEL 3
 
 /* CRC. */
 #define CRC8_USE_TABLE
diff --git a/keyboards/bestway/config.h b/keyboards/bestway/config.h
index c63a25d9a66..1800a114a01 100644
--- a/keyboards/bestway/config.h
+++ b/keyboards/bestway/config.h
@@ -18,5 +18,5 @@
 
 #define WS2812_PWM_DRIVER PWMD2
 #define WS2812_PWM_CHANNEL 4
-#define WS2812_DMA_STREAM STM32_DMA1_STREAM2
-#define WS2812_DMA_CHANNEL 2
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM2
+#define WS2812_PWM_DMA_CHANNEL 2
diff --git a/keyboards/black_hellebore/config.h b/keyboards/black_hellebore/config.h
index 53910fed097..e748b3d1859 100644
--- a/keyboards/black_hellebore/config.h
+++ b/keyboards/black_hellebore/config.h
@@ -20,5 +20,5 @@
 #define WS2812_PWM_CHANNEL 1
 #define WS2812_PWM_PAL_MODE 1						//TIM1_CH1N (AF1)
 #define WS2812_PWM_COMPLEMENTARY_OUTPUT
-#define WS2812_DMA_STREAM STM32_DMA1_STREAM6
-#define WS2812_DMA_CHANNEL 7						//7 works, CxS[3:0] 0111 = TIM1_UP on Channel 6? (RM0394.pdf pg.298)
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM6
+#define WS2812_PWM_DMA_CHANNEL 7						//7 works, CxS[3:0] 0111 = TIM1_UP on Channel 6? (RM0394.pdf pg.298)
diff --git a/keyboards/boardsource/equals/48/info.json b/keyboards/boardsource/equals/48/info.json
index 63561f4c597..054779f6fe1 100644
--- a/keyboards/boardsource/equals/48/info.json
+++ b/keyboards/boardsource/equals/48/info.json
@@ -14,53 +14,6 @@
         "pin": "GP21"
     },
     "rgb_matrix": {
-        "driver": "ws2812",
-        "max_brightness": 150,
-        "animations": {
-            "alphas_mods": true,
-            "band_pinwheel_sat": true,
-            "band_pinwheel_val": true,
-            "band_sat": true,
-            "band_spiral_sat": true,
-            "band_spiral_val": true,
-            "band_val": true,
-            "breathing": true,
-            "cycle_all": true,
-            "cycle_left_right": true,
-            "cycle_out_in": true,
-            "cycle_out_in_dual": true,
-            "cycle_pinwheel": true,
-            "cycle_spiral": true,
-            "cycle_up_down": true,
-            "digital_rain": true,
-            "dual_beacon": true,
-            "gradient_left_right": true,
-            "gradient_up_down": true,
-            "hue_breathing": true,
-            "hue_pendulum": true,
-            "hue_wave": true,
-            "jellybean_raindrops": true,
-            "multisplash": true,
-            "pixel_flow": true,
-            "pixel_fractal": true,
-            "pixel_rain": true,
-            "rainbow_beacon": true,
-            "rainbow_moving_chevron": true,
-            "rainbow_pinwheels": true,
-            "raindrops": true,
-            "solid_multisplash": true,
-            "solid_reactive": true,
-            "solid_reactive_cross": true,
-            "solid_reactive_multicross": true,
-            "solid_reactive_multinexus": true,
-            "solid_reactive_multiwide": true,
-            "solid_reactive_nexus": true,
-            "solid_reactive_simple": true,
-            "solid_reactive_wide": true,
-            "solid_splash": true,
-            "splash": true,
-            "typing_heatmap": true
-        },
         "layout": [
             { "flags": 2, "x": 220, "y": 17 },
             { "flags": 2, "x": 172, "y": 17 },
diff --git a/keyboards/boardsource/equals/60/info.json b/keyboards/boardsource/equals/60/info.json
index 355e434b4e5..da3fc3691a6 100644
--- a/keyboards/boardsource/equals/60/info.json
+++ b/keyboards/boardsource/equals/60/info.json
@@ -14,53 +14,6 @@
         "pin": "GP21"
     },
     "rgb_matrix": {
-        "driver": "ws2812",
-        "max_brightness": 150,
-        "animations": {
-            "alphas_mods": true,
-            "band_pinwheel_sat": true,
-            "band_pinwheel_val": true,
-            "band_sat": true,
-            "band_spiral_sat": true,
-            "band_spiral_val": true,
-            "band_val": true,
-            "breathing": true,
-            "cycle_all": true,
-            "cycle_left_right": true,
-            "cycle_out_in": true,
-            "cycle_out_in_dual": true,
-            "cycle_pinwheel": true,
-            "cycle_spiral": true,
-            "cycle_up_down": true,
-            "digital_rain": true,
-            "dual_beacon": true,
-            "gradient_left_right": true,
-            "gradient_up_down": true,
-            "hue_breathing": true,
-            "hue_pendulum": true,
-            "hue_wave": true,
-            "jellybean_raindrops": true,
-            "multisplash": true,
-            "pixel_flow": true,
-            "pixel_fractal": true,
-            "pixel_rain": true,
-            "rainbow_beacon": true,
-            "rainbow_moving_chevron": true,
-            "rainbow_pinwheels": true,
-            "raindrops": true,
-            "solid_multisplash": true,
-            "solid_reactive": true,
-            "solid_reactive_cross": true,
-            "solid_reactive_multicross": true,
-            "solid_reactive_multinexus": true,
-            "solid_reactive_multiwide": true,
-            "solid_reactive_nexus": true,
-            "solid_reactive_simple": true,
-            "solid_reactive_wide": true,
-            "solid_splash": true,
-            "splash": true,
-            "typing_heatmap": true
-        },
         "layout": [
             { "flags": 2, "x": 220, "y": 17 },
             { "flags": 2, "x": 172, "y": 17 },
diff --git a/keyboards/boardsource/equals/avr/info.json b/keyboards/boardsource/equals/avr/info.json
index bbade34e638..942feba4ecd 100644
--- a/keyboards/boardsource/equals/avr/info.json
+++ b/keyboards/boardsource/equals/avr/info.json
@@ -13,53 +13,6 @@
         "pin": "C6"
      },
     "rgb_matrix": {
-        "driver": "ws2812",
-        "max_brightness": 150,
-        "animations": {
-            "alphas_mods": true,
-            "band_pinwheel_sat": true,
-            "band_pinwheel_val": true,
-            "band_sat": true,
-            "band_spiral_sat": true,
-            "band_spiral_val": true,
-            "band_val": true,
-            "breathing": true,
-            "cycle_all": true,
-            "cycle_left_right": true,
-            "cycle_out_in": true,
-            "cycle_out_in_dual": true,
-            "cycle_pinwheel": true,
-            "cycle_spiral": true,
-            "cycle_up_down": true,
-            "digital_rain": true,
-            "dual_beacon": true,
-            "gradient_left_right": true,
-            "gradient_up_down": true,
-            "hue_breathing": true,
-            "hue_pendulum": true,
-            "hue_wave": true,
-            "jellybean_raindrops": true,
-            "multisplash": true,
-            "pixel_flow": true,
-            "pixel_fractal": true,
-            "pixel_rain": true,
-            "rainbow_beacon": true,
-            "rainbow_moving_chevron": true,
-            "rainbow_pinwheels": true,
-            "raindrops": true,
-            "solid_multisplash": true,
-            "solid_reactive": true,
-            "solid_reactive_cross": true,
-            "solid_reactive_multicross": true,
-            "solid_reactive_multinexus": true,
-            "solid_reactive_multiwide": true,
-            "solid_reactive_nexus": true,
-            "solid_reactive_simple": true,
-            "solid_reactive_wide": true,
-            "solid_splash": true,
-            "splash": true,
-            "typing_heatmap": true
-        },
         "layout": [
             { "flags": 2, "x": 220, "y": 17 },
             { "flags": 2, "x": 172, "y": 17 },
diff --git a/data/templates/keyboard/rules.mk b/keyboards/boardsource/equals/avr/rules.mk
similarity index 100%
rename from data/templates/keyboard/rules.mk
rename to keyboards/boardsource/equals/avr/rules.mk
diff --git a/keyboards/boardsource/equals/equals.c b/keyboards/boardsource/equals/equals.c
index 8eb933e70d2..074fa3df3e2 100644
--- a/keyboards/boardsource/equals/equals.c
+++ b/keyboards/boardsource/equals/equals.c
@@ -1,18 +1,54 @@
 // Copyright 2023 @boardsource
 // SPDX-License-Identifier: GPL-2.0-or-later
+
 #include "quantum.h"
-__attribute__((weak)) void ui_init(void) {};
-__attribute__((weak)) void ui_task(void) {};
 
 #ifdef QUANTUM_PAINTER_ENABLE
+#include "qp.h"
+#include "qp_st7735.h"
+#include "graphics/thintel15.qff.c"
+
+static painter_device_t      oled;
+static painter_font_handle_t font;
+
+__attribute__((weak)) void ui_init(void) {
+    oled = qp_st7735_make_spi_device(128, 160, OLED_CS_PIN, OLED_DC_PIN, OLED_RST_PIN, 8, 0);
+    font = qp_load_font_mem(font_thintel15);
+    qp_init(oled, QP_ROTATION_0);
+    qp_rect(oled, 0, 0, 130, 162, 0, 0, 0, true);
+    qp_rect(oled, 20, 20, 108, 60, 55, 55, 55, true);
+    qp_rect(oled, 20, 80, 108, 120, 55, 55, 55, true);
+    qp_flush(oled);
+}
+
+__attribute__((weak)) void ui_task(void) {
+    static const char *text  = "Layer:";
+    int16_t            width = qp_textwidth(font, text);
+    qp_drawtext(oled, 20, 140, font, text);
+
+    switch (get_highest_layer(layer_state)) {
+        case 0:
+            qp_drawtext(oled, (20 + width), 140, font, "QWERTY");
+            break;
+        case 1:
+            qp_drawtext(oled, (20 + width), 140, font, "SYMBOL");
+            break;
+        case 2:
+            qp_drawtext(oled, (20 + width), 140, font, "NUMBER");
+            break;
+        default:
+            qp_drawtext(oled, (20 + width), 140, font, "_PANIC_");
+            break;
+    }
+}
+
 void keyboard_post_init_kb(void) {
-    // Init the display
     ui_init();
     keyboard_post_init_user();
 }
 
 void housekeeping_task_kb(void) {
-    // Draw the display
     ui_task();
+    housekeeping_task_user();
 }
-#endif //QUANTUM_PAINTER_ENABLE
+#endif // QUANTUM_PAINTER_ENABLE
diff --git a/keyboards/boardsource/equals/info.json b/keyboards/boardsource/equals/info.json
index bed8ec2640c..c6d6245dbfc 100644
--- a/keyboards/boardsource/equals/info.json
+++ b/keyboards/boardsource/equals/info.json
@@ -4,18 +4,64 @@
     "diode_direction": "COL2ROW",
     "features": {
         "bootmagic": true,
-        "command": false,
-        "console": false,
         "extrakey": true,
         "mousekey": true,
         "nkro": true,
         "rgb_matrix": true
         },
-    "url": "",
     "usb": {
         "device_version": "1.0.0",
         "pid": "0x7688",
         "vid": "0x4273"
+    },
+    "rgb_matrix": {
+        "driver": "ws2812",
+        "max_brightness": 150,
+        "sleep": true,
+        "animations": {
+            "alphas_mods": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_sat": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "band_val": true,
+            "breathing": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "cycle_up_down": true,
+            "digital_rain": true,
+            "dual_beacon": true,
+            "gradient_left_right": true,
+            "gradient_up_down": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "jellybean_raindrops": true,
+            "multisplash": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "pixel_rain": true,
+            "rainbow_beacon": true,
+            "rainbow_moving_chevron": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "solid_multisplash": true,
+            "solid_reactive": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_multinexus": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_wide": true,
+            "solid_splash": true,
+            "splash": true,
+            "typing_heatmap": true
+        }
     }
-
 }
diff --git a/keyboards/boardsource/equals/readme.md b/keyboards/boardsource/equals/readme.md
index 9c5d48f5c29..82d24b18145 100644
--- a/keyboards/boardsource/equals/readme.md
+++ b/keyboards/boardsource/equals/readme.md
@@ -3,7 +3,7 @@
 ![equals](https://i.imgur.com/c3adFqsh.jpeg)
 
 * Keyboard Maintainer: [Cole Smith](https://github.com/boardsource)
-* Hardware Supported: Equals PCB w/ RP2040
+* Hardware Supported: Equals PCB w/ RP2040 or Equals Kit w/ Pro Micro
 * Hardware Availability: [boardsource](https://boardsource.xyz)
 
 Make example for this keyboard (after setting up your build environment):
diff --git a/keyboards/boardsource/equals/ui.c b/keyboards/boardsource/equals/ui.c
deleted file mode 100644
index f953fc4c889..00000000000
--- a/keyboards/boardsource/equals/ui.c
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright 2023 Cole Smith (@boardsource)
-// SPDX-License-Identifier: GPL-2.0-or-later
-#include <stdio.h>
-#include "qp.h"
-#include "qp_st7735.h"
-#include "graphics/thintel15.qff.c"
-
-static painter_device_t      oled;
-static painter_font_handle_t font;
-
-__attribute__((weak)) void ui_init(void) {
-    oled = qp_st7735_make_spi_device(128, 160, OLED_CS_PIN, OLED_DC_PIN, OLED_RST_PIN, 8, 0);
-    font = qp_load_font_mem(font_thintel15);
-    qp_init(oled, QP_ROTATION_0);
-    qp_rect(oled, 0, 0, 130, 162, 0, 0, 0, true);
-    qp_rect(oled, 20, 20, 108, 60, 55, 55, 55, true);
-    qp_rect(oled, 20, 80, 108, 120, 55, 55, 55, true);
-    qp_flush(oled);
-}
-
-__attribute__((weak)) void ui_task(void) {
-    static const char *text  = "Layer:";
-    int16_t            width = qp_textwidth(font, text);
-    qp_drawtext(oled, 20, 140, font, text);
-
-    switch (get_highest_layer(layer_state)) {
-        case 0:
-            qp_drawtext(oled, (20 + width), 140, font, "QWERTY");
-            break;
-        case 1:
-            qp_drawtext(oled, (20 + width), 140, font, "SYMBOL");
-            break;
-        case 2:
-            qp_drawtext(oled, (20 + width), 140, font, "NUMBER");
-            break;
-        default:
-            qp_drawtext(oled, (20 + width), 140, font, "_PANIC_");
-            break;
-    }
-}
diff --git a/keyboards/buildakb/mw60/info.json b/keyboards/buildakb/mw60/info.json
new file mode 100644
index 00000000000..9a8b7955a85
--- /dev/null
+++ b/keyboards/buildakb/mw60/info.json
@@ -0,0 +1,945 @@
+{
+    "manufacturer": "Maelkworks",
+    "keyboard_name": "mw60",
+    "maintainer": "Maelkk",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["F0", "C7", "C6", "B6", "B5", "F5", "B4", "D7", "D6", "D4", "D5", "D3", "F6", "D2"],
+        "rows": ["E6", "D1", "F7", "F4", "F1"]
+    },
+    "processor": "atmega32u4",
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0004",
+        "vid": "0x4A56"
+    },
+    "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_ansi_tsangan", "60_tsangan_hhkb", "60_ansi_wkl", "60_ansi_wkl_split_bs_rshift", "60_hhkb", "60_iso", "60_iso_split_bs_rshift", "60_iso_tsangan", "60_iso_tsangan_split_bs_rshift", "60_iso_wkl", "60_iso_wkl_split_bs_rshift"],
+    "layouts": {
+        "LAYOUT_60_ansi": {
+            "layout": [
+                {"label": "k000", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "k001", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "k002", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "k003", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "k004", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "k005", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "k006", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "k007", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "k008", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "k009", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "k010", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "k011", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "k012", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "k013", "matrix": [0, 13], "x": 14, "y": 0, "w": 2},
+                {"label": "k100", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "k101", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "k102", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "k103", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "k104", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "k105", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "k106", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "k107", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "k108", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "k109", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "k110", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "k111", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "k112", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "k113", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "k200", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "k201", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "k202", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "k203", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "k204", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "k205", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "k206", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "k207", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "k208", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "k209", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "k210", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "k211", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "k213", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "k300", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "k302", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "k303", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "k304", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "k305", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "k306", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "k307", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "k308", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "k309", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": "k310", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "k311", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "k312", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+                {"label": "k400", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "k401", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "k402", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "k407", "matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "k410", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "k411", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "k412", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "k413", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_ansi_split_bs_rshift": {
+            "layout": [
+                {"label": "k000", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "k001", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "k002", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "k003", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "k004", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "k005", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "k006", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "k007", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "k008", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "k009", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "k010", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "k011", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "k012", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "k212", "matrix": [2, 12], "x": 13, "y": 0},
+                {"label": "k013", "matrix": [0, 13], "x": 14, "y": 0},
+                {"label": "k100", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "k101", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "k102", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "k103", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "k104", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "k105", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "k106", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "k107", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "k108", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "k109", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "k110", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "k111", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "k112", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "k113", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "k200", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "k201", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "k202", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "k203", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "k204", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "k205", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "k206", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "k207", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "k208", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "k209", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "k210", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "k211", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "k213", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "k300", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "k302", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "k303", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "k304", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "k305", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "k306", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "k307", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "k308", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "k309", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": "k310", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "k311", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "k312", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "k313", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "k400", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "k401", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "k402", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "k407", "matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "k410", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "k411", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "k412", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "k413", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_ansi_tsangan": {
+            "layout": [
+                {"label": "k000", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "k001", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "k002", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "k003", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "k004", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "k005", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "k006", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "k007", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "k008", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "k009", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "k010", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "k011", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "k012", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "k013", "matrix": [0, 13], "x": 14, "y": 0, "w": 2},
+                {"label": "k100", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "k101", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "k102", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "k103", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "k104", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "k105", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "k106", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "k107", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "k108", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "k109", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "k110", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "k111", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "k112", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "k113", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "k200", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "k201", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "k202", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "k203", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "k204", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "k205", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "k206", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "k207", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "k208", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "k209", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "k210", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "k211", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "k213", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "k300", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "k302", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "k303", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "k304", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "k305", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "k306", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "k307", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "k308", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "k309", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": "k310", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "k311", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "k312", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+                {"label": "k400", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "k401", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "k402", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "k407", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+                {"label": "k411", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "k412", "matrix": [4, 12], "x": 12.5, "y": 4},
+                {"label": "k413", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_ansi_wkl": {
+            "layout": [
+                {"label": "k000", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "k001", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "k002", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "k003", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "k004", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "k005", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "k006", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "k007", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "k008", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "k009", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "k010", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "k011", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "k012", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "k013", "matrix": [0, 13], "x": 14, "y": 0, "w": 2},
+                {"label": "k100", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "k101", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "k102", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "k103", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "k104", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "k105", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "k106", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "k107", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "k108", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "k109", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "k110", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "k111", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "k112", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "k113", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "k200", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "k201", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "k202", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "k203", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "k204", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "k205", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "k206", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "k207", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "k208", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "k209", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "k210", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "k211", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "k213", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "k300", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "k302", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "k303", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "k304", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "k305", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "k306", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "k307", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "k308", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "k309", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": "k310", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "k311", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "k312", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+                {"label": "k400", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "k402", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "k407", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+                {"label": "k411", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "k413", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_ansi_wkl_split_bs_rshift": {
+            "layout": [
+                {"label": "k000", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "k001", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "k002", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "k003", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "k004", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "k005", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "k006", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "k007", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "k008", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "k009", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "k010", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "k011", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "k012", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "k212", "matrix": [2, 12], "x": 13, "y": 0},
+                {"label": "k013", "matrix": [0, 13], "x": 14, "y": 0},
+                {"label": "k100", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "k101", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "k102", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "k103", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "k104", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "k105", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "k106", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "k107", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "k108", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "k109", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "k110", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "k111", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "k112", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "k113", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "k200", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "k201", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "k202", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "k203", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "k204", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "k205", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "k206", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "k207", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "k208", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "k209", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "k210", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "k211", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "k213", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "k300", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "k302", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "k303", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "k304", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "k305", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "k306", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "k307", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "k308", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "k309", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": "k310", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "k311", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "k312", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "k313", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "k400", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "k402", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "k407", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+                {"label": "k411", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "k413", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_hhkb": {
+            "layout": [
+                {"label": "k000", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "k001", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "k002", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "k003", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "k004", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "k005", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "k006", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "k007", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "k008", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "k009", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "k010", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "k011", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "k012", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "k212", "matrix": [2, 12], "x": 13, "y": 0},
+                {"label": "k013", "matrix": [0, 13], "x": 14, "y": 0},
+                {"label": "k100", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "k101", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "k102", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "k103", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "k104", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "k105", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "k106", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "k107", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "k108", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "k109", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "k110", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "k111", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "k112", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "k113", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "k200", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "k201", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "k202", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "k203", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "k204", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "k205", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "k206", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "k207", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "k208", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "k209", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "k210", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "k211", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "k213", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "k300", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "k302", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "k303", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "k304", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "k305", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "k306", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "k307", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "k308", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "k309", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": "k310", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "k311", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "k312", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "k313", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "k401", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "k402", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "k407", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+                {"label": "k411", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "k412", "matrix": [4, 12], "x": 12.5, "y": 4}
+            ]
+        },
+        "LAYOUT_60_iso": {
+            "layout": [
+                {"label": "k000", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "k001", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "k002", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "k003", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "k004", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "k005", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "k006", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "k007", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "k008", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "k009", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "k010", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "k011", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "k012", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "k013", "matrix": [0, 13], "x": 14, "y": 0, "w": 2},
+                {"label": "k100", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "k101", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "k102", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "k103", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "k104", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "k105", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "k106", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "k107", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "k108", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "k109", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "k110", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "k111", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "k112", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "k200", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "k201", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "k202", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "k203", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "k204", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "k205", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "k206", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "k207", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "k208", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "k209", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "k210", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "k211", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "k113", "matrix": [1, 13], "x": 12.75, "y": 2},
+                {"label": "k213", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"label": "k300", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "k301", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "k302", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "k303", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "k304", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "k305", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "k306", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "k307", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "k308", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "k309", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": "k310", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "k311", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "k312", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+                {"label": "k400", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "k401", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "k402", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "k407", "matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "k410", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "k411", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "k412", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "k413", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_iso_split_bs_rshift": {
+            "layout": [
+                {"label": "k000", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "k001", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "k002", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "k003", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "k004", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "k005", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "k006", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "k007", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "k008", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "k009", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "k010", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "k011", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "k012", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "k212", "matrix": [2, 12], "x": 13, "y": 0},
+                {"label": "k013", "matrix": [0, 13], "x": 14, "y": 0},
+                {"label": "k100", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "k101", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "k102", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "k103", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "k104", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "k105", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "k106", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "k107", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "k108", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "k109", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "k110", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "k111", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "k112", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "k200", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "k201", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "k202", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "k203", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "k204", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "k205", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "k206", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "k207", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "k208", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "k209", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "k210", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "k211", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "k113", "matrix": [1, 13], "x": 12.75, "y": 2},
+                {"label": "k213", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"label": "k300", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "k301", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "k302", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "k303", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "k304", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "k305", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "k306", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "k307", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "k308", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "k309", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": "k310", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "k311", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "k312", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "k313", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "k400", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "k401", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "k402", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "k407", "matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "k410", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "k411", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "k412", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "k413", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_iso_tsangan": {
+            "layout": [
+                {"label": "k000", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "k001", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "k002", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "k003", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "k004", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "k005", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "k006", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "k007", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "k008", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "k009", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "k010", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "k011", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "k012", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "k013", "matrix": [0, 13], "x": 14, "y": 0, "w": 2},
+                {"label": "k100", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "k101", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "k102", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "k103", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "k104", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "k105", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "k106", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "k107", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "k108", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "k109", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "k110", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "k111", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "k112", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "k200", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "k201", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "k202", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "k203", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "k204", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "k205", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "k206", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "k207", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "k208", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "k209", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "k210", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "k211", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "k113", "matrix": [1, 13], "x": 12.75, "y": 2},
+                {"label": "k213", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"label": "k300", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "k301", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "k302", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "k303", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "k304", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "k305", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "k306", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "k307", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "k308", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "k309", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": "k310", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "k311", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "k312", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+                {"label": "k400", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "k401", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "k402", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "k407", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+                {"label": "k411", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "k412", "matrix": [4, 12], "x": 12.5, "y": 4},
+                {"label": "k413", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_iso_tsangan_split_bs_rshift": {
+            "layout": [
+                {"label": "k000", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "k001", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "k002", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "k003", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "k004", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "k005", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "k006", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "k007", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "k008", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "k009", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "k010", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "k011", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "k012", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "k212", "matrix": [2, 12], "x": 13, "y": 0},
+                {"label": "k013", "matrix": [0, 13], "x": 14, "y": 0},
+                {"label": "k100", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "k101", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "k102", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "k103", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "k104", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "k105", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "k106", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "k107", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "k108", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "k109", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "k110", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "k111", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "k112", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "k200", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "k201", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "k202", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "k203", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "k204", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "k205", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "k206", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "k207", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "k208", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "k209", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "k210", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "k211", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "k113", "matrix": [1, 13], "x": 12.75, "y": 2},
+                {"label": "k213", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"label": "k300", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "k301", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "k302", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "k303", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "k304", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "k305", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "k306", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "k307", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "k308", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "k309", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": "k310", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "k311", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "k312", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "k313", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "k400", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "k401", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "k402", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "k407", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+                {"label": "k411", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "k412", "matrix": [4, 12], "x": 12.5, "y": 4},
+                {"label": "k413", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_iso_wkl": {
+            "layout": [
+                {"label": "k000", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "k001", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "k002", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "k003", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "k004", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "k005", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "k006", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "k007", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "k008", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "k009", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "k010", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "k011", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "k012", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "k013", "matrix": [0, 13], "x": 14, "y": 0, "w": 2},
+                {"label": "k100", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "k101", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "k102", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "k103", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "k104", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "k105", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "k106", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "k107", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "k108", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "k109", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "k110", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "k111", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "k112", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "k200", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "k201", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "k202", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "k203", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "k204", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "k205", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "k206", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "k207", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "k208", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "k209", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "k210", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "k211", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "k113", "matrix": [1, 13], "x": 12.75, "y": 2},
+                {"label": "k213", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"label": "k300", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "k301", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "k302", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "k303", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "k304", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "k305", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "k306", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "k307", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "k308", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "k309", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": "k310", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "k311", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "k312", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+                {"label": "k400", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "k402", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "k407", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+                {"label": "k411", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "k413", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_iso_wkl_split_bs_rshift": {
+            "layout": [
+                {"label": "k000", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "k001", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "k002", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "k003", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "k004", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "k005", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "k006", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "k007", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "k008", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "k009", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "k010", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "k011", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "k012", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "k212", "matrix": [2, 12], "x": 13, "y": 0},
+                {"label": "k013", "matrix": [0, 13], "x": 14, "y": 0},
+                {"label": "k100", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "k101", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "k102", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "k103", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "k104", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "k105", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "k106", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "k107", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "k108", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "k109", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "k110", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "k111", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "k112", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "k200", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "k201", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "k202", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "k203", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "k204", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "k205", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "k206", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "k207", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "k208", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "k209", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "k210", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "k211", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "k113", "matrix": [1, 13], "x": 12.75, "y": 2},
+                {"label": "k213", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"label": "k300", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "k301", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "k302", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "k303", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "k304", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "k305", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "k306", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "k307", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "k308", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "k309", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": "k310", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "k311", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "k312", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "k313", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "k400", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "k402", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "k407", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+                {"label": "k411", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "k413", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_tsangan_hhkb": {
+            "layout": [
+                {"label": "k000", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "k001", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "k002", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "k003", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "k004", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "k005", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "k006", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "k007", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "k008", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "k009", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "k010", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "k011", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "k012", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "k212", "matrix": [2, 12], "x": 13, "y": 0},
+                {"label": "k013", "matrix": [0, 13], "x": 14, "y": 0},
+                {"label": "k100", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "k101", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "k102", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "k103", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "k104", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "k105", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "k106", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "k107", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "k108", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "k109", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "k110", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "k111", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "k112", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "k113", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "k200", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "k201", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "k202", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "k203", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "k204", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "k205", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "k206", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "k207", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "k208", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "k209", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "k210", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "k211", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "k213", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "k300", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "k302", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "k303", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "k304", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "k305", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "k306", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "k307", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "k308", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "k309", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": "k310", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "k311", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "k312", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "k313", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "k400", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "k401", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "k402", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "k407", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+                {"label": "k411", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"label": "k412", "matrix": [4, 12], "x": 12.5, "y": 4},
+                {"label": "k413", "matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_all": {
+            "layout": [
+                {"label": "k000", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "k001", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "k002", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "k003", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "k004", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "k005", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "k006", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "k007", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "k008", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "k009", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "k010", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "k011", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "k012", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "k212", "matrix": [2, 12], "x": 13, "y": 0},
+                {"label": "k013", "matrix": [0, 13], "x": 14, "y": 0},
+                {"label": "k100", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "k101", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "k102", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "k103", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "k104", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "k105", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "k106", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "k107", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "k108", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "k109", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "k110", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "k111", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "k112", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "k113", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "k200", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "k201", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "k202", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "k203", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "k204", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "k205", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "k206", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "k207", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "k208", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "k209", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "k210", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "k211", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "k213", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "k300", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "k301", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "k302", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "k303", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "k304", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "k305", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "k306", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "k307", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "k308", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "k309", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": "k310", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "k311", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "k312", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "k313", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "k400", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "k401", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "k402", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "k405", "matrix": [4, 5], "x": 4, "y": 4, "w": 2.75},
+                {"label": "k407", "matrix": [4, 7], "x": 6.75, "y": 4, "w": 1.5},
+                {"label": "k409", "matrix": [4, 9], "x": 8.25, "y": 4, "w": 2.75},
+                {"label": "k410", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "k411", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "k412", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "k413", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/buildakb/mw60/keymaps/default/keymap.c b/keyboards/buildakb/mw60/keymaps/default/keymap.c
new file mode 100644
index 00000000000..efd37afe26d
--- /dev/null
+++ b/keyboards/buildakb/mw60/keymaps/default/keymap.c
@@ -0,0 +1,32 @@
+/* Copyright 2023 Maelkk
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_all(
+    KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS,    KC_EQL,     KC_BSLS,  KC_BSPC,
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,     KC_LBRC,    KC_RBRC,    KC_BSLS,
+    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,  KC_QUOT,    KC_ENT,
+    KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT,    MO(1),
+    KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,                   KC_SPC,           KC_SPC, KC_RALT, MO(1),    KC_RGUI,    KC_RCTL),
+    [1] = LAYOUT_all(
+    KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
+};
diff --git a/keyboards/buildakb/mw60/keymaps/via/keymap.c b/keyboards/buildakb/mw60/keymaps/via/keymap.c
new file mode 100644
index 00000000000..3a04af81134
--- /dev/null
+++ b/keyboards/buildakb/mw60/keymaps/via/keymap.c
@@ -0,0 +1,31 @@
+/* Copyright 2023 Maelkk
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_all(
+    KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS,    KC_EQL,     KC_BSLS,  KC_BSPC,
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,     KC_LBRC,    KC_RBRC,    KC_BSLS,
+    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,  KC_QUOT,    KC_ENT,
+    KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT,    MO(1),
+    KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,                   KC_SPC,           KC_SPC, KC_RALT, MO(1),    KC_RGUI,    KC_RCTL),
+    [1] = LAYOUT_all(
+    KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+};
diff --git a/keyboards/epoch80/keymaps/via/rules.mk b/keyboards/buildakb/mw60/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/epoch80/keymaps/via/rules.mk
rename to keyboards/buildakb/mw60/keymaps/via/rules.mk
diff --git a/keyboards/buildakb/mw60/readme.md b/keyboards/buildakb/mw60/readme.md
new file mode 100644
index 00000000000..f5e0119eeb4
--- /dev/null
+++ b/keyboards/buildakb/mw60/readme.md
@@ -0,0 +1,24 @@
+# MW60 PCB
+
+![MW60 PCB](https://i.imgur.com/5E48mAPh.jpg)
+
+A simple standard 60% PCB available in hotswap and solderable variants
+
+-   Keyboard Maintainer: [Maelkk](https://github.com/Aeonstrife)
+-   Hardware Supported: MW60 PCB
+-   Hardware Availability: [sandkeys.me](https://sandkeys.me/product/petals-60-addon-pcbs/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make buildakb/mw60:default
+
+Flashing example for this keyboard:
+
+    make buildakb/mw60:default:flash
+
+To reset into bootloader mode:
+
+While plugged in, press the RESET switch located on the back of the pcb.
+The keyboard should now be in bootloader mode.
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
\ No newline at end of file
diff --git a/keyboards/buildakb/mw60/rules.mk b/keyboards/buildakb/mw60/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/buildakb/mw60/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/canary/canary60rgb/canary60rgb.c b/keyboards/canary/canary60rgb/canary60rgb.c
index 55569f50492..b14878ff22d 100644
--- a/keyboards/canary/canary60rgb/canary60rgb.c
+++ b/keyboards/canary/canary60rgb/canary60rgb.c
@@ -17,73 +17,73 @@
 
 #ifdef RGB_MATRIX_ENABLE
 const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
-    { 0, J_14, K_14,  L_14 },
-    { 0, J_13, K_13,  L_13 },
-    { 0, J_12, K_12,  L_12 },
-    { 0, J_11, K_11,  L_11 },
-    { 0, J_10, K_10,  L_10 },
-    { 0, J_9,  K_9,   L_9 },
-    { 0, J_8,  K_8,   L_8 },
-    { 0, J_7,  K_7,   L_7 },
-    { 0, J_6,  K_6,   L_6 },
-    { 0, J_5,  K_5,   L_5 },
-    { 0, J_4,  K_4,   L_4 },
-    { 0, J_3,  K_3,   L_3 },
-    { 0, J_2,  K_2,   L_2 },
-    { 0, J_1,  K_1,   L_1 },
+    { 0, SW10_CS14, SW11_CS14,  SW12_CS14 },
+    { 0, SW10_CS13, SW11_CS13,  SW12_CS13 },
+    { 0, SW10_CS12, SW11_CS12,  SW12_CS12 },
+    { 0, SW10_CS11, SW11_CS11,  SW12_CS11 },
+    { 0, SW10_CS10, SW11_CS10,  SW12_CS10 },
+    { 0, SW10_CS9,  SW11_CS9,   SW12_CS9 },
+    { 0, SW10_CS8,  SW11_CS8,   SW12_CS8 },
+    { 0, SW10_CS7,  SW11_CS7,   SW12_CS7 },
+    { 0, SW10_CS6,  SW11_CS6,   SW12_CS6 },
+    { 0, SW10_CS5,  SW11_CS5,   SW12_CS5 },
+    { 0, SW10_CS4,  SW11_CS4,   SW12_CS4 },
+    { 0, SW10_CS3,  SW11_CS3,   SW12_CS3 },
+    { 0, SW10_CS2,  SW11_CS2,   SW12_CS2 },
+    { 0, SW10_CS1,  SW11_CS1,   SW12_CS1 },
 
-    { 0, G_14, H_14,  I_14 },
-    { 0, G_13, H_13,  I_13 },
-    { 0, G_12, H_12,  I_12 },
-    { 0, G_11, H_11,  I_11 },
-    { 0, G_10, H_10,  I_10 },
-    { 0, G_9,  H_9,   I_9 },
-    { 0, G_8,  H_8,   I_8 },
-    { 0, G_7,  H_7,   I_7 },
-    { 0, G_6,  H_6,   I_6 },
-    { 0, G_5,  H_5,   I_5 },
-    { 0, G_4,  H_4,   I_4 },
-    { 0, G_3,  H_3,   I_3 },
-    { 0, G_2,  H_2,   I_2 },
-    { 0, G_1,  H_1,   I_1 },
+    { 0, SW7_CS14, SW8_CS14,  SW9_CS14 },
+    { 0, SW7_CS13, SW8_CS13,  SW9_CS13 },
+    { 0, SW7_CS12, SW8_CS12,  SW9_CS12 },
+    { 0, SW7_CS11, SW8_CS11,  SW9_CS11 },
+    { 0, SW7_CS10, SW8_CS10,  SW9_CS10 },
+    { 0, SW7_CS9,  SW8_CS9,   SW9_CS9 },
+    { 0, SW7_CS8,  SW8_CS8,   SW9_CS8 },
+    { 0, SW7_CS7,  SW8_CS7,   SW9_CS7 },
+    { 0, SW7_CS6,  SW8_CS6,   SW9_CS6 },
+    { 0, SW7_CS5,  SW8_CS5,   SW9_CS5 },
+    { 0, SW7_CS4,  SW8_CS4,   SW9_CS4 },
+    { 0, SW7_CS3,  SW8_CS3,   SW9_CS3 },
+    { 0, SW7_CS2,  SW8_CS2,   SW9_CS2 },
+    { 0, SW7_CS1,  SW8_CS1,   SW9_CS1 },
 
-    { 0, D_14, E_14,  F_14 },
-    { 0, D_12, E_12,  F_12 },
-    { 0, D_11, E_11,  F_11 },
-    { 0, D_10, E_10,  F_10 },
-    { 0, D_9,  E_9,   F_9 },
-    { 0, D_8,  E_8,   F_8 },
-    { 0, D_7,  E_7,   F_7 },
-    { 0, D_6,  E_6,   F_6 },
-    { 0, D_5,  E_5,   F_5 },
-    { 0, D_4,  E_4,   F_4 },
-    { 0, D_3,  E_3,   F_3 },
-    { 0, D_2,  E_2,   F_2 },
-    { 0, D_1,  E_1,   F_1 },
+    { 0, SW4_CS14, SW5_CS14,  SW6_CS14 },
+    { 0, SW4_CS12, SW5_CS12,  SW6_CS12 },
+    { 0, SW4_CS11, SW5_CS11,  SW6_CS11 },
+    { 0, SW4_CS10, SW5_CS10,  SW6_CS10 },
+    { 0, SW4_CS9,  SW5_CS9,   SW6_CS9 },
+    { 0, SW4_CS8,  SW5_CS8,   SW6_CS8 },
+    { 0, SW4_CS7,  SW5_CS7,   SW6_CS7 },
+    { 0, SW4_CS6,  SW5_CS6,   SW6_CS6 },
+    { 0, SW4_CS5,  SW5_CS5,   SW6_CS5 },
+    { 0, SW4_CS4,  SW5_CS4,   SW6_CS4 },
+    { 0, SW4_CS3,  SW5_CS3,   SW6_CS3 },
+    { 0, SW4_CS2,  SW5_CS2,   SW6_CS2 },
+    { 0, SW4_CS1,  SW5_CS1,   SW6_CS1 },
 
-    { 0, A_14, B_14,  C_14 },
-    { 0, A_13, B_13,  C_13 },
-    { 0, A_11, B_11,  C_11 },
-    { 0, A_10, B_10,  C_10 },
-    { 0, A_9,  B_9,   C_9 },
-    { 0, A_8,  B_8,   C_8 },
-    { 0, A_7,  B_7,   C_7 },
-    { 0, A_6,  B_6,   C_6 },
-    { 0, A_5,  B_5,   C_5 },
-    { 0, A_4,  B_4,   C_4 },
-    { 0, A_3,  B_3,   C_3 },
-    { 0, A_2,  B_2,   C_2 },
-    { 0, A_1,  B_1,   C_1 },
+    { 0, SW1_CS14, SW2_CS14,  SW3_CS14 },
+    { 0, SW1_CS13, SW2_CS13,  SW3_CS13 },
+    { 0, SW1_CS11, SW2_CS11,  SW3_CS11 },
+    { 0, SW1_CS10, SW2_CS10,  SW3_CS10 },
+    { 0, SW1_CS9,  SW2_CS9,   SW3_CS9 },
+    { 0, SW1_CS8,  SW2_CS8,   SW3_CS8 },
+    { 0, SW1_CS7,  SW2_CS7,   SW3_CS7 },
+    { 0, SW1_CS6,  SW2_CS6,   SW3_CS6 },
+    { 0, SW1_CS5,  SW2_CS5,   SW3_CS5 },
+    { 0, SW1_CS4,  SW2_CS4,   SW3_CS4 },
+    { 0, SW1_CS3,  SW2_CS3,   SW3_CS3 },
+    { 0, SW1_CS2,  SW2_CS2,   SW3_CS2 },
+    { 0, SW1_CS1,  SW2_CS1,   SW3_CS1 },
 
-    { 0, A_15, B_15,  C_15 },
-    { 0, D_13, E_13,  F_13 },
-    { 0, A_12, B_12,  C_12 },
-    { 0, D_15, E_15,  F_15 },
-    { 0, G_15, H_15,  I_15 },
-    { 0, A_16, B_16,  C_16 },
-    { 0, D_16, E_16,  F_16 },
-    { 0, G_16, H_16,  I_16 },
-    { 0, J_16, K_16,  L_16 }
+    { 0, SW1_CS15, SW2_CS15,  SW3_CS15 },
+    { 0, SW4_CS13, SW5_CS13,  SW6_CS13 },
+    { 0, SW1_CS12, SW2_CS12,  SW3_CS12 },
+    { 0, SW4_CS15, SW5_CS15,  SW6_CS15 },
+    { 0, SW7_CS15, SW8_CS15,  SW9_CS15 },
+    { 0, SW1_CS16, SW2_CS16,  SW3_CS16 },
+    { 0, SW4_CS16, SW5_CS16,  SW6_CS16 },
+    { 0, SW7_CS16, SW8_CS16,  SW9_CS16 },
+    { 0, SW10_CS16, SW11_CS16,  SW12_CS16 }
 };
 
 led_config_t g_led_config = {
diff --git a/keyboards/cannonkeys/satisfaction75/satisfaction75.c b/keyboards/cannonkeys/lib/satisfaction75/satisfaction_core.c
similarity index 80%
rename from keyboards/cannonkeys/satisfaction75/satisfaction75.c
rename to keyboards/cannonkeys/lib/satisfaction75/satisfaction_core.c
index 29fb6e76191..e148ae468a6 100644
--- a/keyboards/cannonkeys/satisfaction75/satisfaction75.c
+++ b/keyboards/cannonkeys/lib/satisfaction75/satisfaction_core.c
@@ -1,4 +1,7 @@
-#include "satisfaction75.h"
+// Copyright 2023 Andrew Kannan
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "satisfaction_core.h"
 #include "print.h"
 #include "debug.h"
 
@@ -42,66 +45,29 @@ int8_t month_config = 0;
 int8_t day_config = 0;
 uint8_t previous_encoder_mode = 0;
 
-backlight_config_t kb_backlight_config = {
-  .enable = true,
-  .breathing = true,
-  .level = BACKLIGHT_LEVELS
-};
-
 void board_init(void) {
   SYSCFG->CFGR1 |= SYSCFG_CFGR1_I2C1_DMA_RMP;
   SYSCFG->CFGR1 &= ~(SYSCFG_CFGR1_SPI2_DMA_RMP);
 }
 
+void keyboard_post_init_kb(void) {
+      /*
+        This is a workaround to some really weird behavior
+        Without this code, the OLED will turn on, but not when you initially plug the keyboard in. 
+        You have to manually trigger a user reset to get the OLED to initialize properly
+        I'm not sure what the root cause is at this time, but this workaround fixes it.
+    */
+    #ifdef OLED_ENABLE
+    if(!is_oled_on()){
+        wait_ms(3000);
+        oled_init(OLED_ROTATION_0);
+    }
+    #endif
+
+    keyboard_post_init_user();
+}
+
 #ifdef VIA_ENABLE
-
-void backlight_get_value( uint8_t *data )
-{
-	uint8_t *value_id = &(data[0]);
-	uint8_t *value_data = &(data[1]);
-  switch (*value_id)
-  {
-    case id_qmk_backlight_brightness:
-    {
-      // level / BACKLIGHT_LEVELS * 255
-      value_data[0] = ((uint16_t)kb_backlight_config.level) * 255 / BACKLIGHT_LEVELS;
-      break;
-    }
-    case id_qmk_backlight_effect:
-    {
-      value_data[0] = kb_backlight_config.breathing ? 1 : 0;
-      break;
-    }
-  }
-}
-
-void backlight_set_value( uint8_t *data )
-{
-	uint8_t *value_id = &(data[0]);
-	uint8_t *value_data = &(data[1]);
-  switch (*value_id)
-  {
-    case id_qmk_backlight_brightness:
-    {
-      // level / 255 * BACKLIGHT_LEVELS
-      kb_backlight_config.level = ((uint16_t)value_data[0]) * BACKLIGHT_LEVELS / 255;
-      backlight_set(kb_backlight_config.level);
-      break;
-    }
-    case id_qmk_backlight_effect:
-    {
-      if ( value_data[0] == 0 ) {
-        kb_backlight_config.breathing = false;
-        breathing_disable();
-      } else {
-        kb_backlight_config.breathing = true;
-        breathing_enable();
-      }
-      break;
-    }
-  }
-}
-
 void custom_set_value(uint8_t *data) {
     uint8_t *value_id = &(data[0]);
     uint8_t *value_data = &(data[1]);
@@ -171,43 +137,12 @@ void custom_get_value(uint8_t *data) {
     }
 }
 
-// TODO
-// Refactor so this keyboard uses QMK Core backlight code,
-// then change this to via_custom_value_command_kb() so it
-// only handles the custom values not the backlight
-// (i.e. use QMK Core default handler for backlight values).
-//
-void via_custom_value_command(uint8_t *data, uint8_t length) {
+void via_custom_value_command_kb(uint8_t *data, uint8_t length) {
     uint8_t *command_id        = &(data[0]);
     uint8_t *channel_id        = &(data[1]);
     uint8_t *value_id_and_data = &(data[2]);
 
-    if ( *channel_id == id_qmk_backlight_channel ) {
-        switch ( *command_id )
-        {
-            case id_custom_set_value:
-            {
-                backlight_set_value(value_id_and_data);
-                break;
-            }
-            case id_custom_get_value:
-            {
-                backlight_get_value(value_id_and_data);
-                break;
-            }
-            case id_custom_save:
-            {
-                backlight_config_save();
-                break;
-            }
-            default:
-            {
-                // Unhandled message.
-                *command_id = id_unhandled;
-                break;
-            }
-        }
-    } else if ( *channel_id == id_custom_channel ) {
+    if ( *channel_id == id_custom_channel ) {
         switch ( *command_id )
         {
             case id_custom_set_value:
@@ -361,12 +296,7 @@ void custom_config_reset(void){
   eeprom_update_byte((uint8_t*)EEPROM_ENABLED_ENCODER_MODES, 0x1F);
 }
 
-void backlight_config_save(void){
-  eeprom_update_byte((uint8_t*)EEPROM_CUSTOM_BACKLIGHT, kb_backlight_config.raw);
-}
-
 void custom_config_load(void){
-  kb_backlight_config.raw = eeprom_read_byte((uint8_t*)EEPROM_CUSTOM_BACKLIGHT);
 #ifdef DYNAMIC_KEYMAP_ENABLE
   oled_mode = eeprom_read_byte((uint8_t*)EEPROM_DEFAULT_OLED);
   enabled_encoder_modes = eeprom_read_byte((uint8_t*)EEPROM_ENABLED_ENCODER_MODES);
@@ -398,7 +328,6 @@ void matrix_init_kb(void)
 #endif // VIA_ENABLE
 
   rtcGetTime(&RTCD1, &last_timespec);
-  backlight_init_ports();
   matrix_init_user();
   oled_request_wakeup();
 }
diff --git a/keyboards/cannonkeys/lib/satisfaction75/satisfaction_core.h b/keyboards/cannonkeys/lib/satisfaction75/satisfaction_core.h
new file mode 100644
index 00000000000..9c466421952
--- /dev/null
+++ b/keyboards/cannonkeys/lib/satisfaction75/satisfaction_core.h
@@ -0,0 +1,95 @@
+// Copyright 2023 Andrew Kannan
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "quantum.h"
+
+#include "via.h" // only for EEPROM address
+#include "satisfaction_keycodes.h"
+
+#define EEPROM_ENABLED_ENCODER_MODES (VIA_EEPROM_CUSTOM_CONFIG_ADDR)
+#define EEPROM_DEFAULT_OLED (VIA_EEPROM_CUSTOM_CONFIG_ADDR+1)
+#define EEPROM_CUSTOM_ENCODER (VIA_EEPROM_CUSTOM_CONFIG_ADDR+2)
+
+enum s75_keyboard_value_id {
+  id_encoder_modes = 1,
+  id_oled_default_mode,
+  id_encoder_custom,
+  id_oled_mode
+};
+
+enum encoder_modes {
+  ENC_MODE_VOLUME,
+  ENC_MODE_MEDIA,
+  ENC_MODE_SCROLL,
+  ENC_MODE_BRIGHTNESS,
+  ENC_MODE_BACKLIGHT,
+  ENC_MODE_CUSTOM0,
+  ENC_MODE_CUSTOM1,
+  ENC_MODE_CUSTOM2,
+  _NUM_ENCODER_MODES,
+  ENC_MODE_CLOCK_SET // This shouldn't be included in the default modes, so we put it after NUM_ENCODER_MODES
+};
+
+enum custom_encoder_behavior {
+    ENC_CUSTOM_CW,
+    ENC_CUSTOM_CCW,
+    ENC_CUSTOM_PRESS
+};
+
+enum oled_modes {
+  OLED_DEFAULT,
+  OLED_TIME,
+  OLED_OFF,
+  _NUM_OLED_MODES
+};
+
+
+// Keyboard Information
+extern volatile uint8_t led_numlock;
+extern volatile uint8_t led_capslock;
+extern volatile uint8_t led_scrolllock;
+extern uint8_t layer;
+
+// OLED Behavior
+extern uint8_t oled_mode;
+extern bool oled_repaint_requested;
+extern bool oled_wakeup_requested;
+extern uint32_t oled_sleep_timer;
+
+// Encoder Behavior
+extern uint8_t encoder_value;
+extern uint8_t encoder_mode;
+extern uint8_t enabled_encoder_modes;
+
+// RTC
+extern RTCDateTime last_timespec;
+extern uint16_t last_minute;
+
+// RTC Configuration
+extern bool clock_set_mode;
+extern uint8_t time_config_idx;
+extern int8_t hour_config;
+extern int16_t minute_config;
+extern int8_t year_config;
+extern int8_t month_config;
+extern int8_t day_config;
+extern uint8_t previous_encoder_mode;
+
+void pre_encoder_mode_change(void);
+void post_encoder_mode_change(void);
+void change_encoder_mode(bool negative);
+uint16_t handle_encoder_clockwise(void);
+uint16_t handle_encoder_ccw(void);
+uint16_t handle_encoder_press(void);
+uint16_t retrieve_custom_encoder_config(uint8_t encoder_idx, uint8_t behavior);
+void set_custom_encoder_config(uint8_t encoder_idx, uint8_t behavior, uint16_t new_code);
+
+void update_time_config(int8_t increment);
+
+void oled_request_wakeup(void);
+void oled_request_repaint(void);
+bool oled_task_needs_to_repaint(void);
+
+void custom_config_load(void);
diff --git a/keyboards/cannonkeys/satisfaction75/satisfaction_encoder.c b/keyboards/cannonkeys/lib/satisfaction75/satisfaction_encoder.c
similarity index 86%
rename from keyboards/cannonkeys/satisfaction75/satisfaction_encoder.c
rename to keyboards/cannonkeys/lib/satisfaction75/satisfaction_encoder.c
index c8bb999df46..7122091ea3c 100644
--- a/keyboards/cannonkeys/satisfaction75/satisfaction_encoder.c
+++ b/keyboards/cannonkeys/lib/satisfaction75/satisfaction_encoder.c
@@ -1,4 +1,7 @@
-#include "satisfaction75.h"
+// Copyright 2023 Andrew Kannan
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "satisfaction_core.h"
 #include "eeprom.h"
 
 void pre_encoder_mode_change(void){
@@ -11,8 +14,6 @@ void pre_encoder_mode_change(void){
     // timespec.dstflag = last_timespec.dstflag;
     timespec.millisecond = (hour_config * 60 + minute_config) * 60 * 1000;
     rtcSetTime(&RTCD1, &timespec);
-  } else if (encoder_mode == ENC_MODE_BACKLIGHT){
-    backlight_config_save();
   }
 }
 
@@ -99,16 +100,14 @@ uint16_t handle_encoder_clockwise(void){
     case ENC_MODE_SCROLL:
       mapped_code = KC_WH_D;
       break;
+#ifdef BACKLIGHT_ENABLE
     case ENC_MODE_BACKLIGHT:
-      kb_backlight_config.level = kb_backlight_config.level + 1;
-      if(kb_backlight_config.level > BACKLIGHT_LEVELS){
-        kb_backlight_config.level = BACKLIGHT_LEVELS;
-      }
-      backlight_set(kb_backlight_config.level);
-      if (kb_backlight_config.level != 0){
-        kb_backlight_config.enable = true;
+      backlight_increase();
+      if(get_backlight_level() != 0){
+        backlight_enable();
       }
       break;
+#endif
     case ENC_MODE_BRIGHTNESS:
       mapped_code = KC_BRIGHTNESS_UP;
       break;
@@ -143,16 +142,14 @@ uint16_t handle_encoder_ccw(void){
     case ENC_MODE_SCROLL:
       mapped_code = KC_WH_U;
       break;
+#ifdef BACKLIGHT_ENABLE
     case ENC_MODE_BACKLIGHT:
-      // mapped_code = BL_DOWN;
-      if(kb_backlight_config.level != 0){
-        kb_backlight_config.level = kb_backlight_config.level - 1;
-      }
-      backlight_set(kb_backlight_config.level);
-      if (kb_backlight_config.level == 0){
-        kb_backlight_config.enable = false;
+      backlight_decrease();
+      if(get_backlight_level() == 0){
+        backlight_disable();
       }
       break;
+#endif
     case ENC_MODE_BRIGHTNESS:
       mapped_code = KC_BRIGHTNESS_DOWN;
       break;
@@ -188,15 +185,11 @@ uint16_t handle_encoder_press(void){
     case ENC_MODE_SCROLL:
       mapped_code = KC_BTN3;
       break;
+#ifdef BACKLIGHT_ENABLE
     case ENC_MODE_BACKLIGHT:
-      // mapped_code = BL_TOGG;
-      kb_backlight_config.breathing = !kb_backlight_config.breathing;
-      if(!kb_backlight_config.breathing){
-        breathing_disable();
-      } else{
-        breathing_enable();
-      }
+      breathing_toggle();
       break;
+#endif
 #ifdef DYNAMIC_KEYMAP_ENABLE
     case ENC_MODE_CUSTOM0:
       mapped_code = retrieve_custom_encoder_config(0, ENC_CUSTOM_PRESS);
diff --git a/keyboards/cannonkeys/lib/satisfaction75/satisfaction_keycodes.h b/keyboards/cannonkeys/lib/satisfaction75/satisfaction_keycodes.h
new file mode 100644
index 00000000000..53f9facfc85
--- /dev/null
+++ b/keyboards/cannonkeys/lib/satisfaction75/satisfaction_keycodes.h
@@ -0,0 +1,10 @@
+// Copyright 2023 Andrew Kannan
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+enum my_keycodes {
+  ENC_PRESS = QK_KB_0,
+  CLOCK_SET,
+  OLED_TOGG
+};
diff --git a/keyboards/cannonkeys/satisfaction75/satisfaction_oled.c b/keyboards/cannonkeys/lib/satisfaction75/satisfaction_oled.c
similarity index 93%
rename from keyboards/cannonkeys/satisfaction75/satisfaction_oled.c
rename to keyboards/cannonkeys/lib/satisfaction75/satisfaction_oled.c
index 0fd69ca59b0..18ae368e535 100644
--- a/keyboards/cannonkeys/satisfaction75/satisfaction_oled.c
+++ b/keyboards/cannonkeys/lib/satisfaction75/satisfaction_oled.c
@@ -1,4 +1,8 @@
-#include "satisfaction75.h"
+// Copyright 2023 Andrew Kannan
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "satisfaction_core.h"
+#include <stdio.h>
 
 void draw_default(void);
 void draw_clock(void);
@@ -15,7 +19,7 @@ bool oled_task_kb(void) {
     oled_clear();
     if (clock_set_mode) {
         draw_clock();
-        return false;;
+        return false;
     }
     switch (oled_mode) {
         default:
@@ -145,8 +149,8 @@ static char* get_time(void) {
         hour = 12;
     }
 
-    static char time_str[11] = "";
-    sprintf(time_str, "%02d:%02d%s", hour, minute, is_pm ? "pm" : "am");
+    static char time_str[8] = "";
+    snprintf(time_str, sizeof(time_str), "%02hhu:%02hu%s", hour, minute, is_pm ? "pm" : "am");
 
     return time_str;
 }
@@ -162,8 +166,8 @@ static char* get_date(void) {
         day   = day_config;
     }
 
-    static char date_str[15] = "";
-    sprintf(date_str, "%04d-%02d-%02d", year, month, day);
+    static char date_str[11] = "";
+    snprintf(date_str, sizeof(date_str), "%04hd-%02hhd-%02hhd", year, month, day);
 
     return date_str;
 }
@@ -264,4 +268,12 @@ void draw_clock(void) {
     draw_line_v(113, 8, 8);
 }
 
-#endif
+#else
+
+void oled_request_repaint(void){
+}
+
+void oled_request_wakeup(void){
+}
+
+#endif
\ No newline at end of file
diff --git a/keyboards/cannonkeys/satisfaction75/chconf.h b/keyboards/cannonkeys/satisfaction75/chconf.h
index ca4a976c27c..d1b9cf32b7f 100644
--- a/keyboards/cannonkeys/satisfaction75/chconf.h
+++ b/keyboards/cannonkeys/satisfaction75/chconf.h
@@ -1,18 +1,5 @@
-/* Copyright 2020 QMK
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+// Copyright 2023 Andrew Kannan (@awkannan)
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 /*
  * This file was auto-generated by:
diff --git a/keyboards/cannonkeys/satisfaction75/config.h b/keyboards/cannonkeys/satisfaction75/config.h
index 9005b064b79..1ca72c9c7c5 100644
--- a/keyboards/cannonkeys/satisfaction75/config.h
+++ b/keyboards/cannonkeys/satisfaction75/config.h
@@ -1,19 +1,5 @@
-/*
-Copyright 2015 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
+// Copyright 2023 Andrew Kannan (@awkannan)
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #pragma once
 
@@ -23,6 +9,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* LSE clock */
 #define STM32_LSECLK 32768
 
+#define BACKLIGHT_PWM_DRIVER    PWMD3
+#define BACKLIGHT_PWM_CHANNEL   1
+#define BACKLIGHT_PAL_MODE      1
+
 // I2C config
 #define I2C_DRIVER I2CD1
 #define I2C1_SCL_PIN B6
@@ -53,23 +43,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // dynamic keymaps start after this.
 // Custom config Usage:
 // 1 for enabled encoder modes (1 byte)
-// 1 for custom backlighting controls (1 byte)
 // 1 for OLED default mode (1 byte)
 // 6 for 3x custom encoder settings, left, right, and press (18 bytes)
-#define VIA_EEPROM_CUSTOM_CONFIG_SIZE 21
+#define VIA_EEPROM_CUSTOM_CONFIG_SIZE 20
 
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
 
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/cannonkeys/satisfaction75/halconf.h b/keyboards/cannonkeys/satisfaction75/halconf.h
index aed3fef0a83..45fe60ab072 100644
--- a/keyboards/cannonkeys/satisfaction75/halconf.h
+++ b/keyboards/cannonkeys/satisfaction75/halconf.h
@@ -1,18 +1,5 @@
-/* Copyright 2020 QMK
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+// Copyright 2023 Andrew Kannan (@awkannan)
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 /*
  * This file was auto-generated by:
@@ -27,7 +14,5 @@
 
 #define HAL_USE_RTC TRUE
 
-#define HAL_USE_SPI TRUE
-
 #include_next <halconf.h>
 
diff --git a/keyboards/cannonkeys/satisfaction75/info.json b/keyboards/cannonkeys/satisfaction75/info.json
index 60695b9ac71..a06faccd230 100644
--- a/keyboards/cannonkeys/satisfaction75/info.json
+++ b/keyboards/cannonkeys/satisfaction75/info.json
@@ -1,27 +1,27 @@
 {
-    "keyboard_name": "Satisfaction75",
     "manufacturer": "CannonKeys",
-    "url": "",
-    "maintainer": "Cannon Keys",
-    "usb": {
-        "vid": "0xCA04",
-        "pid": "0x57F5",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["B1", "B2", "B10", "B11", "B12", "B13", "B14", "A8", "A9", "A10", "B0", "A7", "A5", "B5", "A15", "A1"],
-        "rows": ["B3", "B4", "A0", "A2", "A4", "A3"]
-    },
-    "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "B9", "pin_b": "B8", "resolution": 2}
-        ]
-    },
+    "keyboard_name": "Satisfaction75",
+    "maintainer": "awkannan",
     "backlight": {
+        "breathing": true,
         "levels": 24,
-        "breathing": true
+        "pin": "A6"
+    },
+    "bootloader": "stm32-dfu",
+    "features": {
+        "backlight": true,
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "oled": true
     },
     "processor": "STM32F072",
-    "bootloader": "stm32-dfu"
-}
+    "url": "https://cannonkeys.com",
+    "usb": {
+        "vid": "0xCA04"
+    }
+}
\ No newline at end of file
diff --git a/keyboards/cannonkeys/satisfaction75/keymaps/default/keymap.c b/keyboards/cannonkeys/satisfaction75/keymaps/default/keymap.c
index 0bdc0aa9e79..f1dc5ae8bb3 100644
--- a/keyboards/cannonkeys/satisfaction75/keymaps/default/keymap.c
+++ b/keyboards/cannonkeys/satisfaction75/keymaps/default/keymap.c
@@ -1,19 +1,5 @@
-/*
-Copyright 2012,2013 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
+// Copyright 2023 Andrew Kannan (@awkannan)
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #include QMK_KEYBOARD_H
 
diff --git a/keyboards/cannonkeys/satisfaction75/keymaps/tester/rules.mk b/keyboards/cannonkeys/satisfaction75/keymaps/tester/rules.mk
deleted file mode 100644
index 3357eb91c05..00000000000
--- a/keyboards/cannonkeys/satisfaction75/keymaps/tester/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-QWIIC_ENABLE = no
diff --git a/keyboards/cannonkeys/satisfaction75/keymaps/via/keymap.c b/keyboards/cannonkeys/satisfaction75/keymaps/via/keymap.c
index 47806ff8a29..61981c65211 100644
--- a/keyboards/cannonkeys/satisfaction75/keymaps/via/keymap.c
+++ b/keyboards/cannonkeys/satisfaction75/keymaps/via/keymap.c
@@ -1,19 +1,5 @@
-/*
-Copyright 2012,2013 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
+// Copyright 2023 Andrew Kannan (@awkannan)
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #include QMK_KEYBOARD_H
 
diff --git a/keyboards/cannonkeys/satisfaction75/led.c b/keyboards/cannonkeys/satisfaction75/led.c
deleted file mode 100644
index 68bfc99d2ed..00000000000
--- a/keyboards/cannonkeys/satisfaction75/led.c
+++ /dev/null
@@ -1,256 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include <hal.h>
-#include "led_custom.h"
-#include "satisfaction75.h"
-
-#define BREATHING_PERIOD 6
-
-static void breathing_callback(PWMDriver *pwmp);
-
-static PWMConfig pwmCFG = {
-  0xFFFF,                              /* PWM clock frequency  */
-  256,                              /* PWM period (in ticks) 1S (1/10kHz=0.1mS 0.1ms*10000 ticks=1S) */
-  NULL,                               /* No Callback */
-  {
-      {PWM_OUTPUT_ACTIVE_HIGH, NULL}, /* Enable Channel 0 */
-      {PWM_OUTPUT_DISABLED, NULL},
-      {PWM_OUTPUT_DISABLED, NULL},
-      {PWM_OUTPUT_DISABLED, NULL}
-  },
-  0,                                  /* HW dependent part.*/
-  0
-};
-
-static PWMConfig pwmCFG_breathing = {
-  0xFFFF,                              /* 10kHz PWM clock frequency  */
-  256,                              /* PWM period (in ticks) 1S (1/10kHz=0.1mS 0.1ms*10000 ticks=1S) */
-  breathing_callback,                               /* Breathing Callback */
-  {
-      {PWM_OUTPUT_ACTIVE_HIGH, NULL}, /* Enable Channel 0 */
-      {PWM_OUTPUT_DISABLED, NULL},
-      {PWM_OUTPUT_DISABLED, NULL},
-      {PWM_OUTPUT_DISABLED, NULL}
-  },
-  0,                                  /* HW dependent part.*/
-  0
-};
-
-// See http://jared.geek.nz/2013/feb/linear-led-pwm
-static uint16_t cie_lightness(uint16_t v) {
-  if (v <= 5243) // if below 8% of max
-    return v / 9; // same as dividing by 900%
-  else {
-    uint32_t y = (((uint32_t) v + 10486) << 8) / (10486 + 0xFFFFUL); // add 16% of max and compare
-    // to get a useful result with integer division, we shift left in the expression above
-    // and revert what we've done again after squaring.
-    y = y * y * y >> 8;
-    if (y > 0xFFFFUL) // prevent overflow
-      return 0xFFFFU;
-    else
-      return (uint16_t) y;
-  }
-}
-
-
-void backlight_init_ports(void) {
-  palSetPadMode(GPIOA, 6, PAL_MODE_ALTERNATE(1));
-  pwmStart(&PWMD3, &pwmCFG);
-  if(kb_backlight_config.enable){
-    if(kb_backlight_config.breathing){
-      breathing_enable();
-    } else{
-      backlight_set(kb_backlight_config.level);
-    }
-  } else {
-    backlight_set(0);
-  }
-}
-
-void suspend_power_down_user(void) {
-    backlight_set(0);
-}
-void suspend_wakeup_init_user(void) {
-  if(kb_backlight_config.enable){
-    if(kb_backlight_config.breathing){
-      breathing_enable();
-    } else{
-      backlight_set(kb_backlight_config.level);
-    }
-  } else {
-    backlight_set(0);
-  }
-}
-
-void backlight_set(uint8_t level) {
-  uint32_t duty = (uint32_t)(cie_lightness(0xFFFF * (uint32_t) level / BACKLIGHT_LEVELS));
-  if (level == 0) {
-      // Turn backlight off
-      pwmDisableChannel(&PWMD3, 0);
-  } else {
-    // Turn backlight on
-    if(!is_breathing()){
-      pwmEnableChannel(&PWMD3, 0, PWM_FRACTION_TO_WIDTH(&PWMD3,0xFFFF,duty));
-    }
-  }
-}
-
-
-uint8_t backlight_tick = 0;
-
-void backlight_task(void) {
-}
-
-#define BREATHING_NO_HALT  0
-#define BREATHING_HALT_OFF 1
-#define BREATHING_HALT_ON  2
-#define BREATHING_STEPS 128
-
-static uint8_t breathing_period = BREATHING_PERIOD;
-static uint8_t breathing_halt = BREATHING_NO_HALT;
-static uint16_t breathing_counter = 0;
-
-bool is_breathing(void) {
-    return PWMD3.config == &pwmCFG_breathing;
-}
-
-#define breathing_min() do {breathing_counter = 0;} while (0)
-#define breathing_max() do {breathing_counter = breathing_period * 256 / 2;} while (0)
-
-
-void breathing_interrupt_enable(void){
-    pwmStop(&PWMD3);
-    pwmStart(&PWMD3, &pwmCFG_breathing);
-    chSysLockFromISR();
-    pwmEnablePeriodicNotification(&PWMD3);
-    pwmEnableChannelI(
-      &PWMD3,
-      0,
-      PWM_FRACTION_TO_WIDTH(
-        &PWMD3,
-        0xFFFF,
-        0xFFFF
-      )
-    );
-    chSysUnlockFromISR();
-}
-
-void breathing_interrupt_disable(void){
-    pwmStop(&PWMD3);
-    pwmStart(&PWMD3, &pwmCFG);
-}
-
-void breathing_enable(void)
-{
-  breathing_counter = 0;
-  breathing_halt = BREATHING_NO_HALT;
-  breathing_interrupt_enable();
-}
-
-void breathing_pulse(void)
-{
-    if (kb_backlight_config.level == 0)
-      breathing_min();
-    else
-      breathing_max();
-    breathing_halt = BREATHING_HALT_ON;
-    breathing_interrupt_enable();
-}
-
-void breathing_disable(void)
-{
-    breathing_interrupt_disable();
-    // Restore backlight level
-    backlight_set(kb_backlight_config.level);
-}
-
-void breathing_self_disable(void)
-{
-  if (kb_backlight_config.level == 0)
-    breathing_halt = BREATHING_HALT_OFF;
-  else
-    breathing_halt = BREATHING_HALT_ON;
-}
-
-void breathing_toggle(void) {
-  if (is_breathing()){
-    breathing_disable();
-  } else {
-    breathing_enable();
-  }
-}
-
-void breathing_period_set(uint8_t value)
-{
-  if (!value)
-    value = 1;
-  breathing_period = value;
-}
-
-void breathing_period_default(void) {
-  breathing_period_set(BREATHING_PERIOD);
-}
-
-void breathing_period_inc(void)
-{
-  breathing_period_set(breathing_period+1);
-}
-
-void breathing_period_dec(void)
-{
-  breathing_period_set(breathing_period-1);
-}
-
-/* To generate breathing curve in python:
- * from math import sin, pi; [int(sin(x/128.0*pi)**4*255) for x in range(128)]
- */
-static const uint8_t breathing_table[BREATHING_STEPS] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 2, 3, 4, 5, 6, 8, 10, 12, 15, 17, 20, 24, 28, 32, 36, 41, 46, 51, 57, 63, 70, 76, 83, 91, 98, 106, 113, 121, 129, 138, 146, 154, 162, 170, 178, 185, 193, 200, 207, 213, 220, 225, 231, 235, 240, 244, 247, 250, 252, 253, 254, 255, 254, 253, 252, 250, 247, 244, 240, 235, 231, 225, 220, 213, 207, 200, 193, 185, 178, 170, 162, 154, 146, 138, 129, 121, 113, 106, 98, 91, 83, 76, 70, 63, 57, 51, 46, 41, 36, 32, 28, 24, 20, 17, 15, 12, 10, 8, 6, 5, 4, 3, 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
-
-// Use this before the cie_lightness function.
-static inline uint16_t scale_backlight(uint16_t v) {
-  return v / BACKLIGHT_LEVELS * kb_backlight_config.level;
-}
-
-static void breathing_callback(PWMDriver *pwmp)
-{
-  (void)pwmp;
-  uint16_t interval = (uint16_t) breathing_period * 256 / BREATHING_STEPS;
-  // resetting after one period to prevent ugly reset at overflow.
-  breathing_counter = (breathing_counter + 1) % (breathing_period * 256);
-  uint8_t index = breathing_counter / interval % BREATHING_STEPS;
-
-  if (((breathing_halt == BREATHING_HALT_ON) && (index == BREATHING_STEPS / 2)) ||
-      ((breathing_halt == BREATHING_HALT_OFF) && (index == BREATHING_STEPS - 1)))
-  {
-      breathing_interrupt_disable();
-  }
-
-  uint32_t duty = cie_lightness(scale_backlight(breathing_table[index] * 256));
-
-  chSysLockFromISR();
-  pwmEnableChannelI(
-    &PWMD3,
-    0,
-    PWM_FRACTION_TO_WIDTH(
-      &PWMD3,
-      0xFFFF,
-      duty
-    )
-  );
-  chSysUnlockFromISR();
-}
diff --git a/keyboards/cannonkeys/satisfaction75/led_custom.h b/keyboards/cannonkeys/satisfaction75/led_custom.h
deleted file mode 100644
index d818b48ce98..00000000000
--- a/keyboards/cannonkeys/satisfaction75/led_custom.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-void backlight_task(void);
-void breathing_interrupt_disable(void);
-void breathing_interrupt_enable(void);
-void breathing_enable(void);
-void breathing_disable(void);
diff --git a/keyboards/cannonkeys/satisfaction75/mcuconf.h b/keyboards/cannonkeys/satisfaction75/mcuconf.h
index 0c84a1e1a8a..2c81f2243e3 100644
--- a/keyboards/cannonkeys/satisfaction75/mcuconf.h
+++ b/keyboards/cannonkeys/satisfaction75/mcuconf.h
@@ -1,18 +1,5 @@
-/* Copyright 2020 QMK
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+// Copyright 2023 Andrew Kannan (@awkannan)
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 /*
  * This file was auto-generated by:
@@ -34,7 +21,3 @@
 
 #undef STM32_PWM_USE_TIM3
 #define STM32_PWM_USE_TIM3 TRUE
-
-#undef STM32_SPI_USE_SPI2
-#define STM32_SPI_USE_SPI2 TRUE
-
diff --git a/keyboards/cannonkeys/satisfaction75/prototype/info.json b/keyboards/cannonkeys/satisfaction75/prototype/info.json
index 9f932b65057..4f67754d8fb 100644
--- a/keyboards/cannonkeys/satisfaction75/prototype/info.json
+++ b/keyboards/cannonkeys/satisfaction75/prototype/info.json
@@ -1,24 +1,34 @@
 {
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B9", "pin_b": "B8", "resolution": 2}
+        ]
+    },
+    "matrix_pins": {
+        "cols": ["B1", "B2", "B10", "B11", "B12", "B13", "B14", "A8", "A9", "A10", "B0", "A7", "A5", "B5", "A15", "A1"],
+        "rows": ["B3", "B4", "A0", "A2", "A4", "A3"]
+    },
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x57F5"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [
                 {"label": "K000", "matrix": [0, 0], "x": 0, "y": 0},
-
                 {"label": "K002", "matrix": [0, 2], "x": 1.5, "y": 0},
                 {"label": "K003", "matrix": [0, 3], "x": 2.5, "y": 0},
                 {"label": "K004", "matrix": [0, 4], "x": 3.5, "y": 0},
                 {"label": "K005", "matrix": [0, 5], "x": 4.5, "y": 0},
-
                 {"label": "K006", "matrix": [0, 6], "x": 5.75, "y": 0},
                 {"label": "K007", "matrix": [0, 7], "x": 6.75, "y": 0},
                 {"label": "K008", "matrix": [0, 8], "x": 7.75, "y": 0},
                 {"label": "K009", "matrix": [0, 9], "x": 8.75, "y": 0},
-
                 {"label": "K010", "matrix": [0, 10], "x": 10, "y": 0},
                 {"label": "K011", "matrix": [0, 11], "x": 11, "y": 0},
                 {"label": "K012", "matrix": [0, 12], "x": 12, "y": 0},
                 {"label": "K013", "matrix": [0, 13], "x": 13, "y": 0},
-
                 {"label": "K100", "matrix": [1, 0], "x": 0, "y": 1.25},
                 {"label": "K101", "matrix": [1, 1], "x": 1, "y": 1.25},
                 {"label": "K102", "matrix": [1, 2], "x": 2, "y": 1.25},
@@ -34,9 +44,7 @@
                 {"label": "K112", "matrix": [1, 12], "x": 12, "y": 1.25},
                 {"label": "K113", "matrix": [1, 13], "x": 13, "y": 1.25},
                 {"label": "K114", "matrix": [1, 14], "x": 14, "y": 1.25},
-
                 {"label": "K115", "matrix": [1, 15], "x": 15.5, "y": 1},
-
                 {"label": "K200", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
                 {"label": "K201", "matrix": [2, 1], "x": 1.5, "y": 2.25},
                 {"label": "K202", "matrix": [2, 2], "x": 2.5, "y": 2.25},
@@ -51,9 +59,7 @@
                 {"label": "K211", "matrix": [2, 11], "x": 11.5, "y": 2.25},
                 {"label": "K212", "matrix": [2, 12], "x": 12.5, "y": 2.25},
                 {"label": "K213", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
                 {"label": "K215", "matrix": [2, 15], "x": 15.5, "y": 2.25},
-
                 {"label": "K300", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
                 {"label": "K301", "matrix": [3, 1], "x": 1.75, "y": 3.25},
                 {"label": "K302", "matrix": [3, 2], "x": 2.75, "y": 3.25},
@@ -68,9 +74,7 @@
                 {"label": "K311", "matrix": [3, 11], "x": 11.75, "y": 3.25},
                 {"label": "K312", "matrix": [3, 12], "x": 12.75, "y": 3.25},
                 {"label": "K313", "matrix": [3, 13], "x": 13.75, "y": 3.25, "w": 1.25},
-
                 {"label": "K315", "matrix": [3, 15], "x": 15.5, "y": 3.25},
-
                 {"label": "K400", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
                 {"label": "K401", "matrix": [4, 1], "x": 1.25, "y": 4.25},
                 {"label": "K402", "matrix": [4, 2], "x": 2.25, "y": 4.25},
@@ -84,11 +88,8 @@
                 {"label": "K410", "matrix": [4, 10], "x": 10.25, "y": 4.25},
                 {"label": "K411", "matrix": [4, 11], "x": 11.25, "y": 4.25},
                 {"label": "K412", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-
                 {"label": "K413", "matrix": [4, 13], "x": 14.25, "y": 4.5},
-
                 {"label": "K415", "matrix": [4, 15], "x": 15.5, "y": 4.25},
-
                 {"label": "K500", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
                 {"label": "K501", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
                 {"label": "K502", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
@@ -98,7 +99,6 @@
                 {"label": "K509", "matrix": [5, 9], "x": 10, "y": 5.25},
                 {"label": "K510", "matrix": [5, 10], "x": 11, "y": 5.25},
                 {"label": "K511", "matrix": [5, 11], "x": 12, "y": 5.25},
-
                 {"label": "K512", "matrix": [5, 12], "x": 13.25, "y": 5.5},
                 {"label": "K513", "matrix": [5, 13], "x": 14.25, "y": 5.5},
                 {"label": "K515", "matrix": [5, 15], "x": 15.25, "y": 5.5}
@@ -107,22 +107,18 @@
         "LAYOUT_default": {
             "layout": [
                 {"label": "K000", "matrix": [0, 0], "x": 0, "y": 0},
-
                 {"label": "K002", "matrix": [0, 2], "x": 1.5, "y": 0},
                 {"label": "K003", "matrix": [0, 3], "x": 2.5, "y": 0},
                 {"label": "K004", "matrix": [0, 4], "x": 3.5, "y": 0},
                 {"label": "K005", "matrix": [0, 5], "x": 4.5, "y": 0},
-
                 {"label": "K006", "matrix": [0, 6], "x": 5.75, "y": 0},
                 {"label": "K007", "matrix": [0, 7], "x": 6.75, "y": 0},
                 {"label": "K008", "matrix": [0, 8], "x": 7.75, "y": 0},
                 {"label": "K009", "matrix": [0, 9], "x": 8.75, "y": 0},
-
                 {"label": "K010", "matrix": [0, 10], "x": 10, "y": 0},
                 {"label": "K011", "matrix": [0, 11], "x": 11, "y": 0},
                 {"label": "K012", "matrix": [0, 12], "x": 12, "y": 0},
                 {"label": "K013", "matrix": [0, 13], "x": 13, "y": 0},
-
                 {"label": "K100", "matrix": [1, 0], "x": 0, "y": 1.25},
                 {"label": "K101", "matrix": [1, 1], "x": 1, "y": 1.25},
                 {"label": "K102", "matrix": [1, 2], "x": 2, "y": 1.25},
@@ -137,9 +133,7 @@
                 {"label": "K111", "matrix": [1, 11], "x": 11, "y": 1.25},
                 {"label": "K112", "matrix": [1, 12], "x": 12, "y": 1.25},
                 {"label": "K113", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-
                 {"label": "K115", "matrix": [1, 15], "x": 15.5, "y": 1},
-
                 {"label": "K200", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
                 {"label": "K201", "matrix": [2, 1], "x": 1.5, "y": 2.25},
                 {"label": "K202", "matrix": [2, 2], "x": 2.5, "y": 2.25},
@@ -154,9 +148,7 @@
                 {"label": "K211", "matrix": [2, 11], "x": 11.5, "y": 2.25},
                 {"label": "K212", "matrix": [2, 12], "x": 12.5, "y": 2.25},
                 {"label": "K213", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
                 {"label": "K215", "matrix": [2, 15], "x": 15.5, "y": 2.25},
-
                 {"label": "K300", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
                 {"label": "K301", "matrix": [3, 1], "x": 1.75, "y": 3.25},
                 {"label": "K302", "matrix": [3, 2], "x": 2.75, "y": 3.25},
@@ -170,9 +162,7 @@
                 {"label": "K310", "matrix": [3, 10], "x": 10.75, "y": 3.25},
                 {"label": "K311", "matrix": [3, 11], "x": 11.75, "y": 3.25},
                 {"label": "K312", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25},
-
                 {"label": "K315", "matrix": [3, 15], "x": 15.5, "y": 3.25},
-
                 {"label": "K400", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
                 {"label": "K401", "matrix": [4, 1], "x": 2.25, "y": 4.25},
                 {"label": "K402", "matrix": [4, 2], "x": 3.25, "y": 4.25},
@@ -185,11 +175,8 @@
                 {"label": "K409", "matrix": [4, 9], "x": 10.25, "y": 4.25},
                 {"label": "K410", "matrix": [4, 10], "x": 11.25, "y": 4.25},
                 {"label": "K411", "matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 1.75},
-
                 {"label": "K413", "matrix": [4, 13], "x": 14.25, "y": 4.5},
-
                 {"label": "K415", "matrix": [4, 15], "x": 15.5, "y": 4.25},
-
                 {"label": "K500", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
                 {"label": "K501", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
                 {"label": "K502", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
@@ -197,11 +184,10 @@
                 {"label": "K509", "matrix": [5, 9], "x": 10, "y": 5.25},
                 {"label": "K510", "matrix": [5, 10], "x": 11, "y": 5.25},
                 {"label": "K511", "matrix": [5, 11], "x": 12, "y": 5.25},
-
                 {"label": "K512", "matrix": [5, 12], "x": 13.25, "y": 5.5},
                 {"label": "K513", "matrix": [5, 13], "x": 14.25, "y": 5.5},
                 {"label": "K515", "matrix": [5, 15], "x": 15.25, "y": 5.5}
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/keyboards/cannonkeys/satisfaction75/prototype/rules.mk b/keyboards/cannonkeys/satisfaction75/prototype/rules.mk
index e69de29bb2d..7ff128fa692 100644
--- a/keyboards/cannonkeys/satisfaction75/prototype/rules.mk
+++ b/keyboards/cannonkeys/satisfaction75/prototype/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/cannonkeys/satisfaction75/readme.md b/keyboards/cannonkeys/satisfaction75/readme.md
index 361d1eb0f1a..9e2891b93fa 100644
--- a/keyboards/cannonkeys/satisfaction75/readme.md
+++ b/keyboards/cannonkeys/satisfaction75/readme.md
@@ -2,11 +2,39 @@
 
 Satisfaction75 Keyboard
 
-Keyboard Maintainer: [Andrew Kannan](https://github.com/awkannan1)  
-Hardware Supported: STM32F072CBT6  
+* Keyboard Maintainer: [Andrew Kannan](https://github.com/awkannan)
+* Hardware Supported: STM32F072CBT6
+
+## Revisions
+
+Please be advised that there are many revisions of Satisfaction75 PCBs.
+
+- Prototype revisions do not really exist in the wild, unless you are one of very few people who have an early pre-production Satisfaction75
+- Rev1 was the PCB sold with Round 1 and Round 2 of the Satisfaction75 keyboard group buy, as well as any extra PCBs sold before 2023.
+- Rev2 is the PCB sold with the late 2023/early 2024 Injection molded Satisfaction75, and any extra PCBs sold after that. These PCBs also have extra edge cuts to support the injection molded Satisfaction75. It was redesigned from scratch and has a little less layout support compared to Rev1.
+
+Revision 2 PCBs will have Revision 2 printed on the PCBs.
+
+Revisions _are_ backwards compatible, so you can use a Rev2 PCB in a board that originally had a Rev1 PCB in it. They are _not_ forwards compatible - Rev 1 PCBs will not work in the injection molded Satisfaction75.
+
+Change the below commands to reflect the revision you need!
+
+## Building and Flashing
 
 Make example for this keyboard (after setting up your build environment):
 
-    make cannonkeys/Satisfaction75:default
+    make cannonkeys/satisfaction75/rev1:default
+    
+Flashing example for this keyboard:
+
+    make cannonkeys/satisfaction75/rev1:default:flash
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Toggle the switch on the back of the pcb to "1" and briefly press the button on the back of the PCB
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
\ No newline at end of file
diff --git a/keyboards/cannonkeys/satisfaction75/rev1/info.json b/keyboards/cannonkeys/satisfaction75/rev1/info.json
index cc4ad80d42a..d4a6b4423c0 100644
--- a/keyboards/cannonkeys/satisfaction75/rev1/info.json
+++ b/keyboards/cannonkeys/satisfaction75/rev1/info.json
@@ -1,24 +1,34 @@
 {
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B9", "pin_b": "B8", "resolution": 2}
+        ]
+    },
+    "matrix_pins": {
+        "cols": ["B1", "B2", "B10", "B11", "B12", "B13", "B14", "A8", "A9", "A10", "B0", "A7", "A5", "B5", "A15", "A1"],
+        "rows": ["B3", "B4", "A0", "A2", "A4", "A3"]
+    },
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x57F5"
+    },
     "layouts": {
-        "LAYOUT_default": {
+        "LAYOUT_2x2": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
-
                 {"matrix": [0, 2], "x": 1.5, "y": 0},
                 {"matrix": [0, 3], "x": 2.5, "y": 0},
                 {"matrix": [0, 4], "x": 3.5, "y": 0},
                 {"matrix": [0, 5], "x": 4.5, "y": 0},
-
                 {"matrix": [0, 6], "x": 5.75, "y": 0},
                 {"matrix": [0, 7], "x": 6.75, "y": 0},
                 {"matrix": [0, 8], "x": 7.75, "y": 0},
                 {"matrix": [0, 9], "x": 8.75, "y": 0},
-
                 {"matrix": [0, 10], "x": 10, "y": 0},
                 {"matrix": [0, 11], "x": 11, "y": 0},
                 {"matrix": [0, 12], "x": 12, "y": 0},
                 {"matrix": [0, 13], "x": 13, "y": 0},
-
                 {"matrix": [1, 0], "x": 0, "y": 1.25},
                 {"matrix": [1, 1], "x": 1, "y": 1.25},
                 {"matrix": [1, 2], "x": 2, "y": 1.25},
@@ -32,10 +42,9 @@
                 {"matrix": [1, 10], "x": 10, "y": 1.25},
                 {"matrix": [1, 11], "x": 11, "y": 1.25},
                 {"matrix": [1, 12], "x": 12, "y": 1.25},
-                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [1, 14], "x": 14, "y": 1.25},
                 {"matrix": [1, 15], "x": 15.5, "y": 1},
-
                 {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
                 {"matrix": [2, 1], "x": 1.5, "y": 2.25},
                 {"matrix": [2, 2], "x": 2.5, "y": 2.25},
@@ -50,9 +59,7 @@
                 {"matrix": [2, 11], "x": 11.5, "y": 2.25},
                 {"matrix": [2, 12], "x": 12.5, "y": 2.25},
                 {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
                 {"matrix": [2, 15], "x": 15.5, "y": 2.25},
-
                 {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
                 {"matrix": [3, 1], "x": 1.75, "y": 3.25},
                 {"matrix": [3, 2], "x": 2.75, "y": 3.25},
@@ -66,9 +73,7 @@
                 {"matrix": [3, 10], "x": 10.75, "y": 3.25},
                 {"matrix": [3, 11], "x": 11.75, "y": 3.25},
                 {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
                 {"matrix": [3, 15], "x": 15.5, "y": 3.25},
-
                 {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
                 {"matrix": [4, 2], "x": 2.25, "y": 4.25},
                 {"matrix": [4, 3], "x": 3.25, "y": 4.25},
@@ -81,119 +86,13 @@
                 {"matrix": [4, 10], "x": 10.25, "y": 4.25},
                 {"matrix": [4, 11], "x": 11.25, "y": 4.25},
                 {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-
                 {"matrix": [4, 13], "x": 14.25, "y": 4.5},
-
                 {"matrix": [4, 15], "x": 15.5, "y": 4.25},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"matrix": [5, 9], "x": 10, "y": 5.25},
-                {"matrix": [5, 10], "x": 11, "y": 5.25},
-                {"matrix": [5, 11], "x": 12, "y": 5.25},
-
-                {"matrix": [5, 12], "x": 13.25, "y": 5.5},
-                {"matrix": [5, 13], "x": 14.25, "y": 5.5},
-                {"matrix": [5, 15], "x": 15.25, "y": 5.5}
-            ]
-        },
-        "LAYOUT_iso": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [0, 2], "x": 1.5, "y": 0},
-                {"matrix": [0, 3], "x": 2.5, "y": 0},
-                {"matrix": [0, 4], "x": 3.5, "y": 0},
-                {"matrix": [0, 5], "x": 4.5, "y": 0},
-
-                {"matrix": [0, 6], "x": 5.75, "y": 0},
-                {"matrix": [0, 7], "x": 6.75, "y": 0},
-                {"matrix": [0, 8], "x": 7.75, "y": 0},
-                {"matrix": [0, 9], "x": 8.75, "y": 0},
-
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.25},
-                {"matrix": [1, 1], "x": 1, "y": 1.25},
-                {"matrix": [1, 2], "x": 2, "y": 1.25},
-                {"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.5, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"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.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, 12], "x": 12.75, "y": 3.25},
-                {"matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-
-                {"matrix": [3, 15], "x": 15.5, "y": 3.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 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.25, "y": 4.5},
-
-                {"matrix": [4, 15], "x": 15.5, "y": 4.25},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
-                {"matrix": [5, 9], "x": 10, "y": 5.25},
-                {"matrix": [5, 10], "x": 11, "y": 5.25},
-                {"matrix": [5, 11], "x": 12, "y": 5.25},
-
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 5], "x": 3, "y": 5.25, "w": 7},
+                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.5},
                 {"matrix": [5, 12], "x": 13.25, "y": 5.5},
                 {"matrix": [5, 13], "x": 14.25, "y": 5.5},
                 {"matrix": [5, 15], "x": 15.25, "y": 5.5}
@@ -202,22 +101,18 @@
         "LAYOUT_3x2": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
-
                 {"matrix": [0, 2], "x": 1.5, "y": 0},
                 {"matrix": [0, 3], "x": 2.5, "y": 0},
                 {"matrix": [0, 4], "x": 3.5, "y": 0},
                 {"matrix": [0, 5], "x": 4.5, "y": 0},
-
                 {"matrix": [0, 6], "x": 5.75, "y": 0},
                 {"matrix": [0, 7], "x": 6.75, "y": 0},
                 {"matrix": [0, 8], "x": 7.75, "y": 0},
                 {"matrix": [0, 9], "x": 8.75, "y": 0},
-
                 {"matrix": [0, 10], "x": 10, "y": 0},
                 {"matrix": [0, 11], "x": 11, "y": 0},
                 {"matrix": [0, 12], "x": 12, "y": 0},
                 {"matrix": [0, 13], "x": 13, "y": 0},
-
                 {"matrix": [1, 0], "x": 0, "y": 1.25},
                 {"matrix": [1, 1], "x": 1, "y": 1.25},
                 {"matrix": [1, 2], "x": 2, "y": 1.25},
@@ -232,9 +127,7 @@
                 {"matrix": [1, 11], "x": 11, "y": 1.25},
                 {"matrix": [1, 12], "x": 12, "y": 1.25},
                 {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-
                 {"matrix": [1, 15], "x": 15.5, "y": 1},
-
                 {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
                 {"matrix": [2, 1], "x": 1.5, "y": 2.25},
                 {"matrix": [2, 2], "x": 2.5, "y": 2.25},
@@ -249,9 +142,7 @@
                 {"matrix": [2, 11], "x": 11.5, "y": 2.25},
                 {"matrix": [2, 12], "x": 12.5, "y": 2.25},
                 {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
                 {"matrix": [2, 15], "x": 15.5, "y": 2.25},
-
                 {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
                 {"matrix": [3, 1], "x": 1.75, "y": 3.25},
                 {"matrix": [3, 2], "x": 2.75, "y": 3.25},
@@ -265,9 +156,7 @@
                 {"matrix": [3, 10], "x": 10.75, "y": 3.25},
                 {"matrix": [3, 11], "x": 11.75, "y": 3.25},
                 {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
                 {"matrix": [3, 15], "x": 15.5, "y": 3.25},
-
                 {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
                 {"matrix": [4, 2], "x": 2.25, "y": 4.25},
                 {"matrix": [4, 3], "x": 3.25, "y": 4.25},
@@ -280,217 +169,14 @@
                 {"matrix": [4, 10], "x": 10.25, "y": 4.25},
                 {"matrix": [4, 11], "x": 11.25, "y": 4.25},
                 {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-
                 {"matrix": [4, 13], "x": 14.25, "y": 4.5},
-
                 {"matrix": [4, 15], "x": 15.5, "y": 4.25},
-
                 {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
                 {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
                 {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
                 {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
                 {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.5},
                 {"matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.5},
-
-                {"matrix": [5, 12], "x": 13.25, "y": 5.5},
-                {"matrix": [5, 13], "x": 14.25, "y": 5.5},
-                {"matrix": [5, 15], "x": 15.25, "y": 5.5}
-            ]
-        },
-        "LAYOUT_2x2": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [0, 2], "x": 1.5, "y": 0},
-                {"matrix": [0, 3], "x": 2.5, "y": 0},
-                {"matrix": [0, 4], "x": 3.5, "y": 0},
-                {"matrix": [0, 5], "x": 4.5, "y": 0},
-
-                {"matrix": [0, 6], "x": 5.75, "y": 0},
-                {"matrix": [0, 7], "x": 6.75, "y": 0},
-                {"matrix": [0, 8], "x": 7.75, "y": 0},
-                {"matrix": [0, 9], "x": 8.75, "y": 0},
-
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.25},
-                {"matrix": [1, 1], "x": 1, "y": 1.25},
-                {"matrix": [1, 2], "x": 2, "y": 1.25},
-                {"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.5, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"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.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, 15], "x": 15.5, "y": 3.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-
-                {"matrix": [4, 13], "x": 14.25, "y": 4.5},
-
-                {"matrix": [4, 15], "x": 15.5, "y": 4.25},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
-                {"matrix": [5, 1], "x": 1.5, "y": 5.25, "w": 1.5},
-                {"matrix": [5, 5], "x": 3, "y": 5.25, "w": 7},
-                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.5},
-                {"matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.5},
-
-                {"matrix": [5, 12], "x": 13.25, "y": 5.5},
-                {"matrix": [5, 13], "x": 14.25, "y": 5.5},
-                {"matrix": [5, 15], "x": 15.25, "y": 5.5}
-            ]
-        },
-        "LAYOUT_split_space": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-
-                {"matrix": [0, 2], "x": 1.5, "y": 0},
-                {"matrix": [0, 3], "x": 2.5, "y": 0},
-                {"matrix": [0, 4], "x": 3.5, "y": 0},
-                {"matrix": [0, 5], "x": 4.5, "y": 0},
-
-                {"matrix": [0, 6], "x": 5.75, "y": 0},
-                {"matrix": [0, 7], "x": 6.75, "y": 0},
-                {"matrix": [0, 8], "x": 7.75, "y": 0},
-                {"matrix": [0, 9], "x": 8.75, "y": 0},
-
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1.25},
-                {"matrix": [1, 1], "x": 1, "y": 1.25},
-                {"matrix": [1, 2], "x": 2, "y": 1.25},
-                {"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.5, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
-                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
-                {"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.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, 15], "x": 15.5, "y": 3.25},
-
-                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
-                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
-                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
-                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
-                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
-                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
-                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
-                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
-                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
-                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
-                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-
-                {"matrix": [4, 13], "x": 14.25, "y": 4.5},
-
-                {"matrix": [4, 15], "x": 15.5, "y": 4.25},
-
-                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 3], "x": 3.75, "y": 5.25, "w": 2.25},
-                {"matrix": [5, 5], "x": 6, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 7], "x": 7.25, "y": 5.25, "w": 2.75},
-                {"matrix": [5, 9], "x": 10, "y": 5.25},
-                {"matrix": [5, 10], "x": 11, "y": 5.25},
-                {"matrix": [5, 11], "x": 12, "y": 5.25},
-
                 {"matrix": [5, 12], "x": 13.25, "y": 5.5},
                 {"matrix": [5, 13], "x": 14.25, "y": 5.5},
                 {"matrix": [5, 15], "x": 15.25, "y": 5.5}
@@ -499,22 +185,18 @@
         "LAYOUT_all": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
-
                 {"matrix": [0, 2], "x": 1.5, "y": 0},
                 {"matrix": [0, 3], "x": 2.5, "y": 0},
                 {"matrix": [0, 4], "x": 3.5, "y": 0},
                 {"matrix": [0, 5], "x": 4.5, "y": 0},
-
                 {"matrix": [0, 6], "x": 5.75, "y": 0},
                 {"matrix": [0, 7], "x": 6.75, "y": 0},
                 {"matrix": [0, 8], "x": 7.75, "y": 0},
                 {"matrix": [0, 9], "x": 8.75, "y": 0},
-
                 {"matrix": [0, 10], "x": 10, "y": 0},
                 {"matrix": [0, 11], "x": 11, "y": 0},
                 {"matrix": [0, 12], "x": 12, "y": 0},
                 {"matrix": [0, 13], "x": 13, "y": 0},
-
                 {"matrix": [1, 0], "x": 0, "y": 1.25},
                 {"matrix": [1, 1], "x": 1, "y": 1.25},
                 {"matrix": [1, 2], "x": 2, "y": 1.25},
@@ -530,9 +212,7 @@
                 {"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.5, "y": 1},
-
                 {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
                 {"matrix": [2, 1], "x": 1.5, "y": 2.25},
                 {"matrix": [2, 2], "x": 2.5, "y": 2.25},
@@ -547,9 +227,7 @@
                 {"matrix": [2, 11], "x": 11.5, "y": 2.25},
                 {"matrix": [2, 12], "x": 12.5, "y": 2.25},
                 {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
                 {"matrix": [2, 15], "x": 15.5, "y": 2.25},
-
                 {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
                 {"matrix": [3, 1], "x": 1.75, "y": 3.25},
                 {"matrix": [3, 2], "x": 2.75, "y": 3.25},
@@ -564,9 +242,7 @@
                 {"matrix": [3, 11], "x": 11.75, "y": 3.25},
                 {"matrix": [3, 12], "x": 12.75, "y": 3.25},
                 {"matrix": [3, 13], "x": 13.75, "y": 3.25, "w": 1.25},
-
                 {"matrix": [3, 15], "x": 15.5, "y": 3.25},
-
                 {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
                 {"matrix": [4, 1], "x": 1.25, "y": 4.25},
                 {"matrix": [4, 2], "x": 2.25, "y": 4.25},
@@ -580,11 +256,8 @@
                 {"matrix": [4, 10], "x": 10.25, "y": 4.25},
                 {"matrix": [4, 11], "x": 11.25, "y": 4.25},
                 {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
-
                 {"matrix": [4, 13], "x": 14.25, "y": 4.5},
-
                 {"matrix": [4, 15], "x": 15.5, "y": 4.25},
-
                 {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
                 {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
                 {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
@@ -594,11 +267,268 @@
                 {"matrix": [5, 9], "x": 10, "y": 5.25},
                 {"matrix": [5, 10], "x": 11, "y": 5.25},
                 {"matrix": [5, 11], "x": 12, "y": 5.25},
-
+                {"matrix": [5, 12], "x": 13.25, "y": 5.5},
+                {"matrix": [5, 13], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 15.25, "y": 5.5}
+            ]
+        },
+        "LAYOUT_default": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 2], "x": 1.5, "y": 0},
+                {"matrix": [0, 3], "x": 2.5, "y": 0},
+                {"matrix": [0, 4], "x": 3.5, "y": 0},
+                {"matrix": [0, 5], "x": 4.5, "y": 0},
+                {"matrix": [0, 6], "x": 5.75, "y": 0},
+                {"matrix": [0, 7], "x": 6.75, "y": 0},
+                {"matrix": [0, 8], "x": 7.75, "y": 0},
+                {"matrix": [0, 9], "x": 8.75, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"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.5, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"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.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, 15], "x": 15.5, "y": 3.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "x": 14.25, "y": 4.5},
+                {"matrix": [4, 15], "x": 15.5, "y": 4.25},
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25},
+                {"matrix": [5, 10], "x": 11, "y": 5.25},
+                {"matrix": [5, 11], "x": 12, "y": 5.25},
+                {"matrix": [5, 12], "x": 13.25, "y": 5.5},
+                {"matrix": [5, 13], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 15.25, "y": 5.5}
+            ]
+        },
+        "LAYOUT_iso": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 2], "x": 1.5, "y": 0},
+                {"matrix": [0, 3], "x": 2.5, "y": 0},
+                {"matrix": [0, 4], "x": 3.5, "y": 0},
+                {"matrix": [0, 5], "x": 4.5, "y": 0},
+                {"matrix": [0, 6], "x": 5.75, "y": 0},
+                {"matrix": [0, 7], "x": 6.75, "y": 0},
+                {"matrix": [0, 8], "x": 7.75, "y": 0},
+                {"matrix": [0, 9], "x": 8.75, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"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.5, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"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.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, 12], "x": 12.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+                {"matrix": [3, 15], "x": 15.5, "y": 3.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 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.25, "y": 4.5},
+                {"matrix": [4, 15], "x": 15.5, "y": 4.25},
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25},
+                {"matrix": [5, 10], "x": 11, "y": 5.25},
+                {"matrix": [5, 11], "x": 12, "y": 5.25},
+                {"matrix": [5, 12], "x": 13.25, "y": 5.5},
+                {"matrix": [5, 13], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 15.25, "y": 5.5}
+            ]
+        },
+        "LAYOUT_split_space": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 2], "x": 1.5, "y": 0},
+                {"matrix": [0, 3], "x": 2.5, "y": 0},
+                {"matrix": [0, 4], "x": 3.5, "y": 0},
+                {"matrix": [0, 5], "x": 4.5, "y": 0},
+                {"matrix": [0, 6], "x": 5.75, "y": 0},
+                {"matrix": [0, 7], "x": 6.75, "y": 0},
+                {"matrix": [0, 8], "x": 7.75, "y": 0},
+                {"matrix": [0, 9], "x": 8.75, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"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.5, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"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.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, 15], "x": 15.5, "y": 3.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "x": 14.25, "y": 4.5},
+                {"matrix": [4, 15], "x": 15.5, "y": 4.25},
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 3], "x": 3.75, "y": 5.25, "w": 2.25},
+                {"matrix": [5, 5], "x": 6, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 7], "x": 7.25, "y": 5.25, "w": 2.75},
+                {"matrix": [5, 9], "x": 10, "y": 5.25},
+                {"matrix": [5, 10], "x": 11, "y": 5.25},
+                {"matrix": [5, 11], "x": 12, "y": 5.25},
                 {"matrix": [5, 12], "x": 13.25, "y": 5.5},
                 {"matrix": [5, 13], "x": 14.25, "y": 5.5},
                 {"matrix": [5, 15], "x": 15.25, "y": 5.5}
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/keyboards/cannonkeys/satisfaction75/keymaps/tester/keymap.c b/keyboards/cannonkeys/satisfaction75/rev1/keymaps/tester/keymap.c
similarity index 73%
rename from keyboards/cannonkeys/satisfaction75/keymaps/tester/keymap.c
rename to keyboards/cannonkeys/satisfaction75/rev1/keymaps/tester/keymap.c
index c648333c3d8..8b05d53fb7e 100644
--- a/keyboards/cannonkeys/satisfaction75/keymaps/tester/keymap.c
+++ b/keyboards/cannonkeys/satisfaction75/rev1/keymaps/tester/keymap.c
@@ -1,19 +1,5 @@
-/*
-Copyright 2012,2013 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
+// Copyright 2023 Andrew Kannan (@awkannan)
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #include QMK_KEYBOARD_H
 
diff --git a/keyboards/cannonkeys/satisfaction75/rev1/keymaps/tester/rules.mk b/keyboards/cannonkeys/satisfaction75/rev1/keymaps/tester/rules.mk
new file mode 100644
index 00000000000..517f469b6d7
--- /dev/null
+++ b/keyboards/cannonkeys/satisfaction75/rev1/keymaps/tester/rules.mk
@@ -0,0 +1 @@
+OLED_ENABLE = no
diff --git a/keyboards/cannonkeys/satisfaction75/rev1/rules.mk b/keyboards/cannonkeys/satisfaction75/rev1/rules.mk
index e69de29bb2d..7ff128fa692 100644
--- a/keyboards/cannonkeys/satisfaction75/rev1/rules.mk
+++ b/keyboards/cannonkeys/satisfaction75/rev1/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/cannonkeys/satisfaction75/rev2/info.json b/keyboards/cannonkeys/satisfaction75/rev2/info.json
new file mode 100644
index 00000000000..e8ddb90c89c
--- /dev/null
+++ b/keyboards/cannonkeys/satisfaction75/rev2/info.json
@@ -0,0 +1,193 @@
+{
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B9", "pin_b": "B8"}
+        ]
+    },
+    "indicators": {
+        "caps_lock": "B14",
+        "on_state": 0
+    },
+    "matrix_pins": {
+        "cols": ["A10", "A9", "A8", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A5", "A4", "A3", "A2", "B3"],
+        "rows": ["A13", "A14", "A15", "B4", "B5", "C13"]
+    },
+    "usb": {
+        "device_version": "0.0.2",
+        "pid": "0x001A"
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "F1", "matrix": [0, 2], "x": 1.5, "y": 0},
+                {"label": "F2", "matrix": [0, 3], "x": 2.5, "y": 0},
+                {"label": "F3", "matrix": [0, 4], "x": 3.5, "y": 0},
+                {"label": "F4", "matrix": [0, 5], "x": 4.5, "y": 0},
+                {"label": "F5", "matrix": [0, 6], "x": 5.75, "y": 0},
+                {"label": "F6", "matrix": [0, 7], "x": 6.75, "y": 0},
+                {"label": "F7", "matrix": [0, 8], "x": 7.75, "y": 0},
+                {"label": "F8", "matrix": [0, 9], "x": 8.75, "y": 0},
+                {"label": "F9", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "F10", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "F11", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "F12", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "~", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "!", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "@", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "#", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "$", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "%", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "^", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "&", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "*", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "(", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": ")", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "_", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "+", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Bksp", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "Del", "matrix": [0, 14], "x": 14, "y": 1.25},
+                {"label": "EncPress", "matrix": [1, 14], "x": 15.5, "y": 0.75},
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "{", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "}", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "|", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"label": "Del", "matrix": [2, 14], "x": 15.5, "y": 2.25},
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ":", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "\"", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"label": "PgUp", "matrix": [3, 14], "x": 15.5, "y": 3.25},
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"label": "|", "matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": "<", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ">", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "?", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Up", "matrix": [4, 13], "x": 14.25, "y": 4.5},
+                {"label": "PgDn", "matrix": [4, 14], "x": 15.5, "y": 4.25},
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"label": "Win", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 9], "x": 10, "y": 5.25},
+                {"label": "Fn", "matrix": [5, 10], "x": 11, "y": 5.25},
+                {"label": "Ctrl", "matrix": [5, 11], "x": 12, "y": 5.25},
+                {"label": "Left", "matrix": [5, 12], "x": 13.25, "y": 5.5},
+                {"label": "Down", "matrix": [5, 13], "x": 14.25, "y": 5.5},
+                {"label": "Right", "matrix": [5, 14], "x": 15.25, "y": 5.5}
+            ]
+        },
+        "LAYOUT_iso_split_bs_7u": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "F1", "matrix": [0, 2], "x": 1.5, "y": 0},
+                {"label": "F2", "matrix": [0, 3], "x": 2.5, "y": 0},
+                {"label": "F3", "matrix": [0, 4], "x": 3.5, "y": 0},
+                {"label": "F4", "matrix": [0, 5], "x": 4.5, "y": 0},
+                {"label": "F5", "matrix": [0, 6], "x": 5.75, "y": 0},
+                {"label": "F6", "matrix": [0, 7], "x": 6.75, "y": 0},
+                {"label": "F7", "matrix": [0, 8], "x": 7.75, "y": 0},
+                {"label": "F8", "matrix": [0, 9], "x": 8.75, "y": 0},
+                {"label": "F9", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "F10", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "F11", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "F12", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "~", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "!", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "@", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "#", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "$", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "%", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "^", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "&", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "*", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "(", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": ")", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "_", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "+", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "Bksp", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "Del", "matrix": [0, 14], "x": 14, "y": 1.25},
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "{", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "}", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+                {"label": "Del", "matrix": [2, 14], "x": 15.5, "y": 2.25},
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": ":", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "\"", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [2, 13], "x": 12.75, "y": 3.25},
+                {"label": "PgUp", "matrix": [3, 14], "x": 15.5, "y": 3.25},
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"label": "|", "matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": "<", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": ">", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "?", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Up", "matrix": [4, 13], "x": 14.25, "y": 4.5},
+                {"label": "PgDn", "matrix": [4, 14], "x": 15.5, "y": 4.25},
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 6], "x": 3, "y": 5.25, "w": 7},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.5},
+                {"label": "Left", "matrix": [5, 12], "x": 13.25, "y": 5.5},
+                {"label": "Down", "matrix": [5, 13], "x": 14.25, "y": 5.5},
+                {"label": "Right", "matrix": [5, 14], "x": 15.25, "y": 5.5}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/cannonkeys/satisfaction75/rev2/keymaps/default/keymap.c b/keyboards/cannonkeys/satisfaction75/rev2/keymaps/default/keymap.c
new file mode 100644
index 00000000000..bce6632706b
--- /dev/null
+++ b/keyboards/cannonkeys/satisfaction75/rev2/keymaps/default/keymap.c
@@ -0,0 +1,26 @@
+// Copyright 2023 Andrew Kannan (@awkannan)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+
+#include QMK_KEYBOARD_H
+#include "satisfaction_keycodes.h"
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT_all(
+    KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,
+    KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_DEL, ENC_PRESS,
+    KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,  KC_DEL,
+    KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_ENTER,           KC_PGUP,
+    KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,            KC_UP,    KC_PGDN,
+    KC_LCTL,  KC_LGUI,  KC_LALT,                      KC_SPC,                                 KC_RALT,  MO(1),  KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT
+  ),
+  [1] = LAYOUT_all(
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, OLED_TOGG,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, CLOCK_SET,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+    QK_BOOT, _______, _______,                   _______,                            _______, _______, _______, _______, _______, _______
+  )
+};
diff --git a/keyboards/cannonkeys/satisfaction75/rev2/keymaps/via/keymap.c b/keyboards/cannonkeys/satisfaction75/rev2/keymaps/via/keymap.c
new file mode 100644
index 00000000000..a0119fc0cd3
--- /dev/null
+++ b/keyboards/cannonkeys/satisfaction75/rev2/keymaps/via/keymap.c
@@ -0,0 +1,25 @@
+// Copyright 2023 Andrew Kannan (@awkannan)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+
+#include QMK_KEYBOARD_H
+#include "satisfaction_keycodes.h"
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT_all(
+    KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,
+    KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_DEL, ENC_PRESS,
+    KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,  KC_DEL,
+    KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_ENTER,           KC_PGUP,
+    KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,            KC_UP,    KC_PGDN,
+    KC_LCTL,  KC_LGUI,  KC_LALT,                      KC_SPC,                                 KC_RALT,  MO(1),  KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT
+  ),
+  [1] = LAYOUT_all(
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, OLED_TOGG,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, CLOCK_SET,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+    QK_BOOT, _______, _______,                   _______,                            _______, _______, _______, _______, _______, _______
+  )
+};
diff --git a/keyboards/hs60/v2/hhkb/keymaps/goatmaster/rules.mk b/keyboards/cannonkeys/satisfaction75/rev2/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/hs60/v2/hhkb/keymaps/goatmaster/rules.mk
rename to keyboards/cannonkeys/satisfaction75/rev2/keymaps/via/rules.mk
diff --git a/keyboards/cannonkeys/satisfaction75/rev2/readme.md b/keyboards/cannonkeys/satisfaction75/rev2/readme.md
new file mode 100644
index 00000000000..ac393283e08
--- /dev/null
+++ b/keyboards/cannonkeys/satisfaction75/rev2/readme.md
@@ -0,0 +1,29 @@
+# Satisfaction75 - Revision 2
+
+A new revision of the Satisfaction75 PCB.
+Layout support has been streamlined.
+
+This PCB was released in late 2023/2024. If you have a Satisfaction75 PCB from before that time, please use the rev1 satisfaction75 PCB.
+
+The revision 2 of the PCB also has "Revision 2" printed on it.
+
+* Keyboard Maintainer: [Andrew Kannan](https://github.com/awkannan)
+* Hardware Supported: STM32F072CBT6
+
+Make example for this keyboard (after setting up your build environment):
+
+    make cannonkeys/satisfaction75/rev2:default
+    
+Flashing example for this keyboard:
+
+    make cannonkeys/satisfaction75/rev2:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Toggle the switch on the back of the pcb to "1" and briefly press the button on the back of the PCB
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/cannonkeys/satisfaction75/rev2/rules.mk b/keyboards/cannonkeys/satisfaction75/rev2/rules.mk
new file mode 100644
index 00000000000..7ff128fa692
--- /dev/null
+++ b/keyboards/cannonkeys/satisfaction75/rev2/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/cannonkeys/satisfaction75/rules.mk b/keyboards/cannonkeys/satisfaction75/rules.mk
index 8cee2da595e..c92469d1bd4 100644
--- a/keyboards/cannonkeys/satisfaction75/rules.mk
+++ b/keyboards/cannonkeys/satisfaction75/rules.mk
@@ -1,21 +1,9 @@
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -v FFFF -p FFFF
 
-SRC += led.c \
-      satisfaction_encoder.c \
-      satisfaction_oled.c
+VPATH += keyboards/cannonkeys/lib/satisfaction75
+SRC += satisfaction_encoder.c \
+      satisfaction_oled.c \
+      satisfaction_core.c 
 
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes	# Mouse keys
-EXTRAKEY_ENABLE = yes	# Audio control and System control
-CONSOLE_ENABLE = yes	# Console for debug
-COMMAND_ENABLE = yes    # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-ENCODER_ENABLE = yes
-OLED_ENABLE = yes
-#BACKLIGHT_ENABLE = yes
-
-DEFAULT_FOLDER = cannonkeys/satisfaction75/rev1
+DEFAULT_FOLDER = cannonkeys/satisfaction75/rev1
\ No newline at end of file
diff --git a/keyboards/cannonkeys/satisfaction75/satisfaction75.h b/keyboards/cannonkeys/satisfaction75/satisfaction75.h
index 157eff902ef..d4fc7aca87d 100644
--- a/keyboards/cannonkeys/satisfaction75/satisfaction75.h
+++ b/keyboards/cannonkeys/satisfaction75/satisfaction75.h
@@ -1,117 +1,6 @@
+// Copyright 2023 Andrew Kannan
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 #pragma once
 
-#include "quantum.h"
-
-#include "via.h" // only for EEPROM address
-#define EEPROM_ENABLED_ENCODER_MODES (VIA_EEPROM_CUSTOM_CONFIG_ADDR)
-#define EEPROM_CUSTOM_BACKLIGHT (VIA_EEPROM_CUSTOM_CONFIG_ADDR+1)
-#define EEPROM_DEFAULT_OLED (VIA_EEPROM_CUSTOM_CONFIG_ADDR+2)
-#define EEPROM_CUSTOM_ENCODER (VIA_EEPROM_CUSTOM_CONFIG_ADDR+3)
-
-typedef union {
-    uint8_t raw;
-    struct {
-        bool    enable :1;
-        bool    breathing : 1;
-        uint8_t level  :6;
-    };
-} backlight_config_t;
-
-// Start these at the USER code range in VIA
-enum my_keycodes {
-  ENC_PRESS = QK_KB_0,
-  CLOCK_SET,
-  OLED_TOGG
-};
-
-enum s75_custom_value_id {
-  id_encoder_modes = 1,
-  id_oled_default_mode,
-  id_encoder_custom,
-  id_oled_mode
-};
-
-enum encoder_modes {
-  ENC_MODE_VOLUME,
-  ENC_MODE_MEDIA,
-  ENC_MODE_SCROLL,
-  ENC_MODE_BRIGHTNESS,
-  ENC_MODE_BACKLIGHT,
-  ENC_MODE_CUSTOM0,
-  ENC_MODE_CUSTOM1,
-  ENC_MODE_CUSTOM2,
-  _NUM_ENCODER_MODES,
-  ENC_MODE_CLOCK_SET // This shouldn't be included in the default modes, so we put it after NUM_ENCODER_MODES
-};
-
-enum custom_encoder_behavior {
-    ENC_CUSTOM_CW = 0,
-    ENC_CUSTOM_CCW,
-    ENC_CUSTOM_PRESS
-};
-
-enum oled_modes {
-  OLED_DEFAULT,
-  OLED_TIME,
-  OLED_OFF,
-  _NUM_OLED_MODES
-};
-
-
-// Keyboard Information
-extern volatile uint8_t led_numlock;
-extern volatile uint8_t led_capslock;
-extern volatile uint8_t led_scrolllock;
-extern uint8_t layer;
-
-// OLED Behavior
-extern uint8_t oled_mode;
-extern bool oled_repaint_requested;
-extern bool oled_wakeup_requested;
-extern uint32_t oled_sleep_timer;
-
-// Encoder Behavior
-extern uint8_t encoder_value;
-extern uint8_t encoder_mode;
-extern uint8_t enabled_encoder_modes;
-
-// RTC
-extern RTCDateTime last_timespec;
-extern uint16_t last_minute;
-
-// RTC Configuration
-extern bool clock_set_mode;
-extern uint8_t time_config_idx;
-extern int8_t hour_config;
-extern int16_t minute_config;
-extern int8_t year_config;
-extern int8_t month_config;
-extern int8_t day_config;
-extern uint8_t previous_encoder_mode;
-
-// Backlighting
-extern backlight_config_t kb_backlight_config;
-extern bool kb_backlight_breathing;
-
-void pre_encoder_mode_change(void);
-void post_encoder_mode_change(void);
-void change_encoder_mode(bool negative);
-uint16_t handle_encoder_clockwise(void);
-uint16_t handle_encoder_ccw(void);
-uint16_t handle_encoder_press(void);
-uint16_t retrieve_custom_encoder_config(uint8_t encoder_idx, uint8_t behavior);
-void set_custom_encoder_config(uint8_t encoder_idx, uint8_t behavior, uint16_t new_code);
-
-void update_time_config(int8_t increment);
-
-void oled_request_wakeup(void);
-void oled_request_repaint(void);
-bool oled_task_needs_to_repaint(void);
-
-void backlight_init_ports(void);
-void backlight_set(uint8_t level);
-bool is_breathing(void);
-void breathing_enable(void);
-void breathing_disable(void);
-void custom_config_load(void);
-void backlight_config_save(void);
+#include "satisfaction_keycodes.h"
\ No newline at end of file
diff --git a/keyboards/cannonkeys/satisfaction75_hs/chconf.h b/keyboards/cannonkeys/satisfaction75_hs/chconf.h
new file mode 100644
index 00000000000..d1b9cf32b7f
--- /dev/null
+++ b/keyboards/cannonkeys/satisfaction75_hs/chconf.h
@@ -0,0 +1,18 @@
+// Copyright 2023 Andrew Kannan (@awkannan)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/cannonkeys/satisfaction75/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ */
+
+#pragma once
+
+#define CH_CFG_ST_FREQUENCY 10000
+
+#define CH_CFG_OPTIMIZE_SPEED FALSE
+
+#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
+
+#include_next <chconf.h>
+
diff --git a/keyboards/cannonkeys/satisfaction75_hs/config.h b/keyboards/cannonkeys/satisfaction75_hs/config.h
new file mode 100644
index 00000000000..658babd3c08
--- /dev/null
+++ b/keyboards/cannonkeys/satisfaction75_hs/config.h
@@ -0,0 +1,44 @@
+// Copyright 2023 Andrew Kannan (@awkannan)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+/* Ensure we jump to bootloader if the QK_BOOT keycode was pressed */
+#define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
+
+/* LSE clock */
+#define STM32_LSECLK 32768
+
+#define ENCODER_RESOLUTION 2
+
+// I2C config
+#define I2C_DRIVER I2CD1
+#define I2C1_SCL_PIN B6
+#define I2C1_SDA_PIN B7
+#define I2C1_SCL_PAL_MODE 1
+#define I2C1_SDA_PAL_MODE 1
+#define I2C1_TIMINGR_PRESC 0x00U
+#define I2C1_TIMINGR_SCLDEL 0x03U
+#define I2C1_TIMINGR_SDADEL 0x01U
+#define I2C1_TIMINGR_SCLH 0x03U
+#define I2C1_TIMINGR_SCLL 0x09U
+
+// configure oled driver for the 128x32 oled
+#define OLED_UPDATE_INTERVAL 66 // ~15fps
+
+// OLED_TIMEOUT is incompatible with the OLED_OFF mode
+#define OLED_TIMEOUT 0
+
+// OLED timeout reimplemented in the keyboard-specific code
+#define CUSTOM_OLED_TIMEOUT 60000
+
+// Custom config starts after VIA's EEPROM usage,
+// dynamic keymaps start after this.
+// Custom config Usage:
+// 1 for enabled encoder modes (1 byte)
+// 1 for OLED default mode (1 byte)
+// 6 for 3x custom encoder settings, left, right, and press (18 bytes)
+#define VIA_EEPROM_CUSTOM_CONFIG_SIZE 20
+
+// VIA lighting is handled by the keyboard-level code
+#define VIA_CUSTOM_LIGHTING_ENABLE
diff --git a/keyboards/cannonkeys/satisfaction75_hs/halconf.h b/keyboards/cannonkeys/satisfaction75_hs/halconf.h
new file mode 100644
index 00000000000..e4cce5cdfb9
--- /dev/null
+++ b/keyboards/cannonkeys/satisfaction75_hs/halconf.h
@@ -0,0 +1,16 @@
+// Copyright 2023 Andrew Kannan (@awkannan)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/cannonkeys/satisfaction75/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ */
+
+#pragma once
+
+#define HAL_USE_I2C TRUE
+
+#define HAL_USE_RTC TRUE
+
+#include_next <halconf.h>
+
diff --git a/keyboards/cannonkeys/satisfaction75_hs/info.json b/keyboards/cannonkeys/satisfaction75_hs/info.json
new file mode 100644
index 00000000000..214ef5f48ad
--- /dev/null
+++ b/keyboards/cannonkeys/satisfaction75_hs/info.json
@@ -0,0 +1,207 @@
+{
+    "manufacturer": "CannonKeys",
+    "keyboard_name": "Satisfaction75 HS",
+    "maintainer": "awkannan",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B9", "pin_b": "B8"}
+        ]
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": true,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "oled": true
+    },
+    "indicators": {
+        "caps_lock": "B14",
+        "on_state": 0
+    },
+    "matrix_pins": {
+        "cols": ["A8", "C13", "B2", "B1", "B0", "B12", "B5", "B4", "B3", "A7", "A5", "A4", "A3", "A2", "A1"],
+        "rows": ["A10", "A14", "A15", "A0", "B11", "B10"]
+    },
+    "processor": "STM32F072",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x0011",
+        "vid": "0xCA04"
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 2], "x": 1.5, "y": 0},
+                {"matrix": [0, 3], "x": 2.5, "y": 0},
+                {"matrix": [0, 4], "x": 3.5, "y": 0},
+                {"matrix": [0, 5], "x": 4.5, "y": 0},
+                {"matrix": [0, 6], "x": 5.75, "y": 0},
+                {"matrix": [0, 7], "x": 6.75, "y": 0},
+                {"matrix": [0, 8], "x": 7.75, "y": 0},
+                {"matrix": [0, 9], "x": 8.75, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [1, 14], "x": 15.5, "y": 0.75},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [0, 14], "x": 14, "y": 1.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 14], "x": 15.5, "y": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 14], "x": 15.5, "y": 3.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "x": 14.25, "y": 4.5},
+                {"matrix": [4, 14], "x": 15.5, "y": 4.25},
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 12], "x": 13.25, "y": 5.5},
+                {"matrix": [5, 13], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5}
+            ]
+        },
+        "LAYOUT_full_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 2], "x": 1.5, "y": 0},
+                {"matrix": [0, 3], "x": 2.5, "y": 0},
+                {"matrix": [0, 4], "x": 3.5, "y": 0},
+                {"matrix": [0, 5], "x": 4.5, "y": 0},
+                {"matrix": [0, 6], "x": 5.75, "y": 0},
+                {"matrix": [0, 7], "x": 6.75, "y": 0},
+                {"matrix": [0, 8], "x": 7.75, "y": 0},
+                {"matrix": [0, 9], "x": 8.75, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [1, 14], "x": 15.5, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 14], "x": 15.5, "y": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 14], "x": 15.5, "y": 3.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "x": 14.25, "y": 4.5},
+                {"matrix": [4, 14], "x": 15.5, "y": 4.25},
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 12], "x": 13.25, "y": 5.5},
+                {"matrix": [5, 13], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/cannonkeys/satisfaction75_hs/keymaps/default/keymap.c b/keyboards/cannonkeys/satisfaction75_hs/keymaps/default/keymap.c
new file mode 100644
index 00000000000..c869bfc4b0c
--- /dev/null
+++ b/keyboards/cannonkeys/satisfaction75_hs/keymaps/default/keymap.c
@@ -0,0 +1,23 @@
+// Copyright 2023 Andrew Kannan (@awkannan)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT_all(
+    KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   ENC_PRESS,
+    KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_DEL,
+    KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,  KC_DEL,
+    KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,            KC_ENTER, KC_PGUP,
+    KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,  KC_UP,    KC_PGDN,
+    KC_LCTL,  KC_LGUI,  KC_LALT,                      KC_SPC,                                           MO(1),    KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT
+  ),
+  [1] = LAYOUT_all(
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, OLED_TOGG,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, CLOCK_SET,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    QK_BOOT, _______, _______,                   _______,                                     _______, _______, _______, _______, _______
+  )
+};
diff --git a/keyboards/cannonkeys/satisfaction75_hs/keymaps/via/keymap.c b/keyboards/cannonkeys/satisfaction75_hs/keymaps/via/keymap.c
new file mode 100644
index 00000000000..c869bfc4b0c
--- /dev/null
+++ b/keyboards/cannonkeys/satisfaction75_hs/keymaps/via/keymap.c
@@ -0,0 +1,23 @@
+// Copyright 2023 Andrew Kannan (@awkannan)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT_all(
+    KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   ENC_PRESS,
+    KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_DEL,
+    KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,  KC_DEL,
+    KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,            KC_ENTER, KC_PGUP,
+    KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,  KC_UP,    KC_PGDN,
+    KC_LCTL,  KC_LGUI,  KC_LALT,                      KC_SPC,                                           MO(1),    KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT
+  ),
+  [1] = LAYOUT_all(
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, OLED_TOGG,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, CLOCK_SET,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    QK_BOOT, _______, _______,                   _______,                                     _______, _______, _______, _______, _______
+  )
+};
diff --git a/keyboards/keebwerk/mega/ansi/keymaps/jesusvallejo/rules.mk b/keyboards/cannonkeys/satisfaction75_hs/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/keebwerk/mega/ansi/keymaps/jesusvallejo/rules.mk
rename to keyboards/cannonkeys/satisfaction75_hs/keymaps/via/rules.mk
diff --git a/keyboards/cannonkeys/satisfaction75_hs/mcuconf.h b/keyboards/cannonkeys/satisfaction75_hs/mcuconf.h
new file mode 100644
index 00000000000..4967f844568
--- /dev/null
+++ b/keyboards/cannonkeys/satisfaction75_hs/mcuconf.h
@@ -0,0 +1,20 @@
+// Copyright 2023 Andrew Kannan (@awkannan)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/cannonkeys/satisfaction75/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_LSE_ENABLED
+#define STM32_LSE_ENABLED TRUE
+
+#undef STM32_RTCSEL
+#define STM32_RTCSEL STM32_RTCSEL_LSE
+
+#undef STM32_I2C_USE_I2C1
+#define STM32_I2C_USE_I2C1 TRUE
diff --git a/keyboards/cannonkeys/satisfaction75_hs/readme.md b/keyboards/cannonkeys/satisfaction75_hs/readme.md
new file mode 100644
index 00000000000..41d3d8a7dbb
--- /dev/null
+++ b/keyboards/cannonkeys/satisfaction75_hs/readme.md
@@ -0,0 +1,20 @@
+# Satisfaction75 Hotswap
+
+Satisfaction75 Hotswap PCB for Satisfaction75 Keyboard
+
+* Keyboard Maintainer: [Andrew Kannan](https://github.com/awkannan1)
+* Hardware Supported: STM32F072CBT6
+
+Make example for this keyboard (after setting up your build environment):
+
+    make cannonkeys/satisfaction75_hs:default
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Toggle the switch on the back of the pcb to "0" and briefly press the button on the back of the PCB
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/cannonkeys/satisfaction75_hs/rules.mk b/keyboards/cannonkeys/satisfaction75_hs/rules.mk
new file mode 100644
index 00000000000..25eebb90542
--- /dev/null
+++ b/keyboards/cannonkeys/satisfaction75_hs/rules.mk
@@ -0,0 +1,7 @@
+# Wildcard to allow APM32 MCU
+DFU_SUFFIX_ARGS = -v FFFF -p FFFF
+
+VPATH += keyboards/cannonkeys/lib/satisfaction75
+SRC += satisfaction_encoder.c \
+      satisfaction_oled.c \
+      satisfaction_core.c 
diff --git a/keyboards/cannonkeys/satisfaction75_hs/satisfaction75_hs.h b/keyboards/cannonkeys/satisfaction75_hs/satisfaction75_hs.h
new file mode 100644
index 00000000000..d4fc7aca87d
--- /dev/null
+++ b/keyboards/cannonkeys/satisfaction75_hs/satisfaction75_hs.h
@@ -0,0 +1,6 @@
+// Copyright 2023 Andrew Kannan
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "satisfaction_keycodes.h"
\ No newline at end of file
diff --git a/keyboards/chickenman/ciel65/info.json b/keyboards/chickenman/ciel65/info.json
index 76578121795..8c316759a8c 100644
--- a/keyboards/chickenman/ciel65/info.json
+++ b/keyboards/chickenman/ciel65/info.json
@@ -22,10 +22,7 @@
         "console": false,
         "command": false,
         "nkro": true,
-        "backlight": false,
-        "rgblight": true,
-        "audio": false,
-        "key_lock": false
+        "rgblight": true
     },
     "rgblight": {
         "led_count": 14,
diff --git a/keyboards/kingly_keys/romac/keymaps/boss566y/config.h b/keyboards/chlx/ppr_merro60/config.h
old mode 100755
new mode 100644
similarity index 84%
rename from keyboards/kingly_keys/romac/keymaps/boss566y/config.h
rename to keyboards/chlx/ppr_merro60/config.h
index 8b098b6c0ca..bdeed0c824e
--- a/keyboards/kingly_keys/romac/keymaps/boss566y/config.h
+++ b/keyboards/chlx/ppr_merro60/config.h
@@ -1,5 +1,5 @@
 /*
-Copyright 2020 boss566y
+Copyright 2024 Alexander Lee <chlx.bsmt@gmail.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -17,4 +17,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define DYNAMIC_KEYMAP_LAYER_COUNT 8
+/* VIA related config */
+#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
diff --git a/keyboards/chlx/ppr_merro60/info.json b/keyboards/chlx/ppr_merro60/info.json
new file mode 100644
index 00000000000..f8f45232a1a
--- /dev/null
+++ b/keyboards/chlx/ppr_merro60/info.json
@@ -0,0 +1,957 @@
+{
+    "manufacturer": "chlx bsmt",
+    "keyboard_name": "ppr.merro60",
+    "maintainer": "gaclee3b",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "ROW2COL",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "indicators": {
+        "caps_lock": "C7",
+        "on_state": 0,
+        "scroll_lock": "F0"
+    },
+    "matrix_pins": {
+        "rows": ["F6", "F4", "F5", "F1", "B1", "B0", "C6", "B6", "D2", "D4"],
+        "cols": ["F7", "B2", "B3", "B7", "D7", "B4", "B5"]
+    },
+    "processor": "atmega32u4",
+    "url": "www.github.com/gaclee3b",
+    "usb": {
+        "device_version": "1.0.1",
+        "pid": "0x0603",
+        "vid": "0x4358"
+    },
+    "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_ansi_tsangan", "60_tsangan_hhkb", "60_ansi_wkl", "60_ansi_wkl_split_bs_rshift", "60_hhkb", "60_iso", "60_iso_split_bs_rshift", "60_iso_tsangan", "60_iso_tsangan_split_bs_rshift", "60_iso_wkl", "60_iso_wkl_split_bs_rshift"],
+    "layouts": {
+        "LAYOUT_60_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0, "w": 2},
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
+                {"matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 2},
+                {"matrix": [4, 1], "x": 2.75, "y": 2},
+                {"matrix": [5, 1], "x": 3.75, "y": 2},
+                {"matrix": [4, 2], "x": 4.75, "y": 2},
+                {"matrix": [5, 2], "x": 5.75, "y": 2},
+                {"matrix": [4, 3], "x": 6.75, "y": 2},
+                {"matrix": [5, 3], "x": 7.75, "y": 2},
+                {"matrix": [4, 4], "x": 8.75, "y": 2},
+                {"matrix": [5, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
+                {"matrix": [5, 5], "x": 11.75, "y": 2},
+                {"matrix": [5, 6], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 2.75},
+                {"matrix": [9, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [8, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 3], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [9, 4], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 6], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_ansi_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0},
+                {"matrix": [9, 6], "x": 14, "y": 0},
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
+                {"matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 2},
+                {"matrix": [4, 1], "x": 2.75, "y": 2},
+                {"matrix": [5, 1], "x": 3.75, "y": 2},
+                {"matrix": [4, 2], "x": 4.75, "y": 2},
+                {"matrix": [5, 2], "x": 5.75, "y": 2},
+                {"matrix": [4, 3], "x": 6.75, "y": 2},
+                {"matrix": [5, 3], "x": 7.75, "y": 2},
+                {"matrix": [4, 4], "x": 8.75, "y": 2},
+                {"matrix": [5, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
+                {"matrix": [5, 5], "x": 11.75, "y": 2},
+                {"matrix": [5, 6], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [7, 6], "x": 14, "y": 3},
+                {"matrix": [9, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [8, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 3], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [9, 4], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 6], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_ansi_tsangan": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0, "w": 2},
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
+                {"matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 2},
+                {"matrix": [4, 1], "x": 2.75, "y": 2},
+                {"matrix": [5, 1], "x": 3.75, "y": 2},
+                {"matrix": [4, 2], "x": 4.75, "y": 2},
+                {"matrix": [5, 2], "x": 5.75, "y": 2},
+                {"matrix": [4, 3], "x": 6.75, "y": 2},
+                {"matrix": [5, 3], "x": 7.75, "y": 2},
+                {"matrix": [4, 4], "x": 8.75, "y": 2},
+                {"matrix": [5, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
+                {"matrix": [5, 5], "x": 11.75, "y": 2},
+                {"matrix": [5, 6], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 2.75},
+                {"matrix": [9, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [8, 0], "x": 1.5, "y": 4},
+                {"matrix": [9, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [8, 3], "x": 4, "y": 4, "w": 7},
+                {"matrix": [8, 5], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [9, 5], "x": 12.5, "y": 4},
+                {"matrix": [8, 6], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_ansi_wkl": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0, "w": 2},
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
+                {"matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 2},
+                {"matrix": [4, 1], "x": 2.75, "y": 2},
+                {"matrix": [5, 1], "x": 3.75, "y": 2},
+                {"matrix": [4, 2], "x": 4.75, "y": 2},
+                {"matrix": [5, 2], "x": 5.75, "y": 2},
+                {"matrix": [4, 3], "x": 6.75, "y": 2},
+                {"matrix": [5, 3], "x": 7.75, "y": 2},
+                {"matrix": [4, 4], "x": 8.75, "y": 2},
+                {"matrix": [5, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
+                {"matrix": [5, 5], "x": 11.75, "y": 2},
+                {"matrix": [5, 6], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 2.75},
+                {"matrix": [9, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [8, 3], "x": 4, "y": 4, "w": 7},
+                {"matrix": [8, 5], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [8, 6], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_ansi_wkl_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0},
+                {"matrix": [9, 6], "x": 14, "y": 0},
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
+                {"matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 2},
+                {"matrix": [4, 1], "x": 2.75, "y": 2},
+                {"matrix": [5, 1], "x": 3.75, "y": 2},
+                {"matrix": [4, 2], "x": 4.75, "y": 2},
+                {"matrix": [5, 2], "x": 5.75, "y": 2},
+                {"matrix": [4, 3], "x": 6.75, "y": 2},
+                {"matrix": [5, 3], "x": 7.75, "y": 2},
+                {"matrix": [4, 4], "x": 8.75, "y": 2},
+                {"matrix": [5, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
+                {"matrix": [5, 5], "x": 11.75, "y": 2},
+                {"matrix": [5, 6], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [7, 6], "x": 14, "y": 3},
+                {"matrix": [9, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [8, 3], "x": 4, "y": 4, "w": 7},
+                {"matrix": [8, 5], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [8, 6], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_hhkb": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0},
+                {"matrix": [9, 6], "x": 14, "y": 0},
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
+                {"matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 2},
+                {"matrix": [4, 1], "x": 2.75, "y": 2},
+                {"matrix": [5, 1], "x": 3.75, "y": 2},
+                {"matrix": [4, 2], "x": 4.75, "y": 2},
+                {"matrix": [5, 2], "x": 5.75, "y": 2},
+                {"matrix": [4, 3], "x": 6.75, "y": 2},
+                {"matrix": [5, 3], "x": 7.75, "y": 2},
+                {"matrix": [4, 4], "x": 8.75, "y": 2},
+                {"matrix": [5, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
+                {"matrix": [5, 5], "x": 11.75, "y": 2},
+                {"matrix": [5, 6], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [7, 6], "x": 14, "y": 3},
+                {"matrix": [8, 0], "x": 1.5, "y": 4},
+                {"matrix": [9, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [8, 3], "x": 4, "y": 4, "w": 7},
+                {"matrix": [8, 5], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [9, 5], "x": 12.5, "y": 4}
+            ]
+        },
+        "LAYOUT_60_iso": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0, "w": 2},
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 2},
+                {"matrix": [4, 1], "x": 2.75, "y": 2},
+                {"matrix": [5, 1], "x": 3.75, "y": 2},
+                {"matrix": [4, 2], "x": 4.75, "y": 2},
+                {"matrix": [5, 2], "x": 5.75, "y": 2},
+                {"matrix": [4, 3], "x": 6.75, "y": 2},
+                {"matrix": [5, 3], "x": 7.75, "y": 2},
+                {"matrix": [4, 4], "x": 8.75, "y": 2},
+                {"matrix": [5, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
+                {"matrix": [5, 5], "x": 11.75, "y": 2},
+                {"matrix": [4, 6], "x": 12.75, "y": 2},
+                {"matrix": [5, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [7, 0], "x": 1.25, "y": 3},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 2.75},
+                {"matrix": [9, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [8, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 3], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [9, 4], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 6], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_iso_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0},
+                {"matrix": [9, 6], "x": 14, "y": 0},
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 2},
+                {"matrix": [4, 1], "x": 2.75, "y": 2},
+                {"matrix": [5, 1], "x": 3.75, "y": 2},
+                {"matrix": [4, 2], "x": 4.75, "y": 2},
+                {"matrix": [5, 2], "x": 5.75, "y": 2},
+                {"matrix": [4, 3], "x": 6.75, "y": 2},
+                {"matrix": [5, 3], "x": 7.75, "y": 2},
+                {"matrix": [4, 4], "x": 8.75, "y": 2},
+                {"matrix": [5, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
+                {"matrix": [5, 5], "x": 11.75, "y": 2},
+                {"matrix": [4, 6], "x": 12.75, "y": 2},
+                {"matrix": [5, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [7, 0], "x": 1.25, "y": 3},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [7, 6], "x": 14, "y": 3},
+                {"matrix": [9, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [8, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 3], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [9, 4], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 6], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_iso_tsangan": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0, "w": 2},
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 2},
+                {"matrix": [4, 1], "x": 2.75, "y": 2},
+                {"matrix": [5, 1], "x": 3.75, "y": 2},
+                {"matrix": [4, 2], "x": 4.75, "y": 2},
+                {"matrix": [5, 2], "x": 5.75, "y": 2},
+                {"matrix": [4, 3], "x": 6.75, "y": 2},
+                {"matrix": [5, 3], "x": 7.75, "y": 2},
+                {"matrix": [4, 4], "x": 8.75, "y": 2},
+                {"matrix": [5, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
+                {"matrix": [5, 5], "x": 11.75, "y": 2},
+                {"matrix": [4, 6], "x": 12.75, "y": 2},
+                {"matrix": [5, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [7, 0], "x": 1.25, "y": 3},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 2.75},
+                {"matrix": [9, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [8, 0], "x": 1.5, "y": 4},
+                {"matrix": [9, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [8, 3], "x": 4, "y": 4, "w": 7},
+                {"matrix": [8, 5], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [9, 5], "x": 12.5, "y": 4},
+                {"matrix": [8, 6], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_iso_tsangan_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0},
+                {"matrix": [9, 6], "x": 14, "y": 0},
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 2},
+                {"matrix": [4, 1], "x": 2.75, "y": 2},
+                {"matrix": [5, 1], "x": 3.75, "y": 2},
+                {"matrix": [4, 2], "x": 4.75, "y": 2},
+                {"matrix": [5, 2], "x": 5.75, "y": 2},
+                {"matrix": [4, 3], "x": 6.75, "y": 2},
+                {"matrix": [5, 3], "x": 7.75, "y": 2},
+                {"matrix": [4, 4], "x": 8.75, "y": 2},
+                {"matrix": [5, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
+                {"matrix": [5, 5], "x": 11.75, "y": 2},
+                {"matrix": [4, 6], "x": 12.75, "y": 2},
+                {"matrix": [5, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [7, 0], "x": 1.25, "y": 3},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [7, 6], "x": 14, "y": 3},
+                {"matrix": [9, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [8, 0], "x": 1.5, "y": 4},
+                {"matrix": [9, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [8, 3], "x": 4, "y": 4, "w": 7},
+                {"matrix": [8, 5], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [9, 5], "x": 12.5, "y": 4},
+                {"matrix": [8, 6], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_iso_wkl": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0, "w": 2},
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 2},
+                {"matrix": [4, 1], "x": 2.75, "y": 2},
+                {"matrix": [5, 1], "x": 3.75, "y": 2},
+                {"matrix": [4, 2], "x": 4.75, "y": 2},
+                {"matrix": [5, 2], "x": 5.75, "y": 2},
+                {"matrix": [4, 3], "x": 6.75, "y": 2},
+                {"matrix": [5, 3], "x": 7.75, "y": 2},
+                {"matrix": [4, 4], "x": 8.75, "y": 2},
+                {"matrix": [5, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
+                {"matrix": [5, 5], "x": 11.75, "y": 2},
+                {"matrix": [4, 6], "x": 12.75, "y": 2},
+                {"matrix": [5, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [7, 0], "x": 1.25, "y": 3},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 2.75},
+                {"matrix": [9, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [8, 3], "x": 4, "y": 4, "w": 7},
+                {"matrix": [8, 5], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [8, 6], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_iso_wkl_split_bs_rshift": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0},
+                {"matrix": [9, 6], "x": 14, "y": 0},
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 2},
+                {"matrix": [4, 1], "x": 2.75, "y": 2},
+                {"matrix": [5, 1], "x": 3.75, "y": 2},
+                {"matrix": [4, 2], "x": 4.75, "y": 2},
+                {"matrix": [5, 2], "x": 5.75, "y": 2},
+                {"matrix": [4, 3], "x": 6.75, "y": 2},
+                {"matrix": [5, 3], "x": 7.75, "y": 2},
+                {"matrix": [4, 4], "x": 8.75, "y": 2},
+                {"matrix": [5, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
+                {"matrix": [5, 5], "x": 11.75, "y": 2},
+                {"matrix": [4, 6], "x": 12.75, "y": 2},
+                {"matrix": [5, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [7, 0], "x": 1.25, "y": 3},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [7, 6], "x": 14, "y": 3},
+                {"matrix": [9, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [8, 3], "x": 4, "y": 4, "w": 7},
+                {"matrix": [8, 5], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [8, 6], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_60_tsangan_hhkb": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0},
+                {"matrix": [9, 6], "x": 14, "y": 0},
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
+                {"matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 2},
+                {"matrix": [4, 1], "x": 2.75, "y": 2},
+                {"matrix": [5, 1], "x": 3.75, "y": 2},
+                {"matrix": [4, 2], "x": 4.75, "y": 2},
+                {"matrix": [5, 2], "x": 5.75, "y": 2},
+                {"matrix": [4, 3], "x": 6.75, "y": 2},
+                {"matrix": [5, 3], "x": 7.75, "y": 2},
+                {"matrix": [4, 4], "x": 8.75, "y": 2},
+                {"matrix": [5, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
+                {"matrix": [5, 5], "x": 11.75, "y": 2},
+                {"matrix": [5, 6], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [7, 6], "x": 14, "y": 3},
+                {"matrix": [9, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [8, 0], "x": 1.5, "y": 4},
+                {"matrix": [9, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [8, 3], "x": 4, "y": 4, "w": 7},
+                {"matrix": [8, 5], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [9, 5], "x": 12.5, "y": 4},
+                {"matrix": [8, 6], "x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0},
+                {"matrix": [9, 6], "x": 14, "y": 0},
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
+                {"matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 2},
+                {"matrix": [4, 1], "x": 2.75, "y": 2},
+                {"matrix": [5, 1], "x": 3.75, "y": 2},
+                {"matrix": [4, 2], "x": 4.75, "y": 2},
+                {"matrix": [5, 2], "x": 5.75, "y": 2},
+                {"matrix": [4, 3], "x": 6.75, "y": 2},
+                {"matrix": [5, 3], "x": 7.75, "y": 2},
+                {"matrix": [4, 4], "x": 8.75, "y": 2},
+                {"matrix": [5, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
+                {"matrix": [5, 5], "x": 11.75, "y": 2},
+                {"matrix": [4, 6], "x": 12.75, "y": 2},
+                {"matrix": [5, 6], "x": 13.75, "y": 2, "w": 1.25},
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [7, 0], "x": 1.25, "y": 3},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [7, 6], "x": 14, "y": 3},
+                {"matrix": [9, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [8, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 2], "x": 3.75, "y": 4, "w": 2.75},
+                {"matrix": [8, 3], "x": 6.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 3], "x": 7.75, "y": 4, "w": 2.25},
+                {"matrix": [9, 4], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 6], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/chlx/ppr_merro60/keymaps/ansi/keymap.c b/keyboards/chlx/ppr_merro60/keymaps/ansi/keymap.c
new file mode 100644
index 00000000000..4012c4a2dac
--- /dev/null
+++ b/keyboards/chlx/ppr_merro60/keymaps/ansi/keymap.c
@@ -0,0 +1,35 @@
+/* 
+Copyright 2024 Alexander Lee <chlx.bsmt@gmail.com> 
+
+This program is free software: you can redistribute it and/or modify 
+it under the terms of the GNU General Public License as published by 
+the Free Software Foundation, either version 2 of the License, or 
+(at your option) any later version. 
+
+This program is distributed in the hope that it will be useful, 
+but WITHOUT ANY WARRANTY; without even the implied warranty of 
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+GNU General Public License for more details. 
+
+You should have received a copy of the GNU General Public License 
+along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+*/ 
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[0] = LAYOUT_60_ansi(
+  QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+  KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+  KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
+  KC_LCTL, KC_LGUI,                   KC_LALT,          KC_SPC,                    KC_RALT, KC_RGUI, MO(1),   KC_RCTL),
+
+[1] = LAYOUT_60_ansi(
+  KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
+  KC_CAPS, _______, KC_HOME, KC_UP,   KC_PGUP, _______, _______, _______, _______, _______, _______, KC_UP,   _______, QK_BOOT,
+  _______, KC_END,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,          _______,
+  _______,          KC_VOLD, KC_VOLU, KC_MUTE, KC_MPLY, _______, _______, _______, KC_END,  KC_PGDN, KC_DOWN, _______,
+  _______, _______,                   _______,          _______,                   _______, _______, _______, _______),
+};
diff --git a/keyboards/chlx/ppr_merro60/keymaps/ansi_split_bs_rshift/keymap.c b/keyboards/chlx/ppr_merro60/keymaps/ansi_split_bs_rshift/keymap.c
new file mode 100644
index 00000000000..ebb2ced9f7a
--- /dev/null
+++ b/keyboards/chlx/ppr_merro60/keymaps/ansi_split_bs_rshift/keymap.c
@@ -0,0 +1,35 @@
+/* 
+Copyright 2024 Alexander Lee <chlx.bsmt@gmail.com> 
+
+This program is free software: you can redistribute it and/or modify 
+it under the terms of the GNU General Public License as published by 
+the Free Software Foundation, either version 2 of the License, or 
+(at your option) any later version. 
+
+This program is distributed in the hope that it will be useful, 
+but WITHOUT ANY WARRANTY; without even the implied warranty of 
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+GNU General Public License for more details. 
+
+You should have received a copy of the GNU General Public License 
+along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+*/ 
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[0] = LAYOUT_60_ansi_split_bs_rshift(
+  QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_GRV,
+  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,
+  KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+  KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
+  KC_LCTL, KC_LGUI,                   KC_LALT,          KC_SPC,                    KC_RALT, KC_RGUI, KC_APP,  KC_RCTL),
+
+[1] = LAYOUT_60_ansi_split_bs_rshift(
+  KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  _______,
+  KC_CAPS, _______, KC_HOME, KC_UP,   KC_PGUP, _______, _______, _______, _______, _______, _______, KC_UP,   _______, QK_BOOT,
+  _______, KC_END,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,          _______,
+  _______,          KC_VOLD, KC_VOLU, KC_MUTE, KC_MPLY, _______, _______, _______, KC_END,  KC_PGDN, KC_DOWN, _______, _______,
+  _______, _______,                   _______,          _______,                   _______, _______, _______, _______),
+};
diff --git a/keyboards/chlx/ppr_merro60/keymaps/ansi_tsangan/keymap.c b/keyboards/chlx/ppr_merro60/keymaps/ansi_tsangan/keymap.c
new file mode 100644
index 00000000000..a51098d586b
--- /dev/null
+++ b/keyboards/chlx/ppr_merro60/keymaps/ansi_tsangan/keymap.c
@@ -0,0 +1,35 @@
+/* 
+Copyright 2024 Alexander Lee <chlx.bsmt@gmail.com> 
+
+This program is free software: you can redistribute it and/or modify 
+it under the terms of the GNU General Public License as published by 
+the Free Software Foundation, either version 2 of the License, or 
+(at your option) any later version. 
+
+This program is distributed in the hope that it will be useful, 
+but WITHOUT ANY WARRANTY; without even the implied warranty of 
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+GNU General Public License for more details. 
+
+You should have received a copy of the GNU General Public License 
+along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+*/ 
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[0] = LAYOUT_60_ansi_tsangan(
+  QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+  KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+  KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
+  KC_LCTL, KC_LGUI,                   KC_LALT,          KC_SPC,                             KC_RALT, KC_RGUI, KC_RCTL),
+
+[1] = LAYOUT_60_ansi_tsangan(
+  KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
+  KC_CAPS, _______, KC_HOME, KC_UP,   KC_PGUP, _______, _______, _______, _______, _______, _______, KC_UP,   _______, QK_BOOT,
+  _______, KC_END,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,          _______,
+  _______,          KC_VOLD, KC_VOLU, KC_MUTE, KC_MPLY, _______, _______, _______, KC_END,  KC_PGDN, KC_DOWN, _______,
+  _______, _______,                   _______,          _______,                            _______, _______, _______),
+};
diff --git a/keyboards/chlx/ppr_merro60/keymaps/ansi_wkl/keymap.c b/keyboards/chlx/ppr_merro60/keymaps/ansi_wkl/keymap.c
new file mode 100644
index 00000000000..ca3686c071b
--- /dev/null
+++ b/keyboards/chlx/ppr_merro60/keymaps/ansi_wkl/keymap.c
@@ -0,0 +1,35 @@
+/* 
+Copyright 2024 Alexander Lee <chlx.bsmt@gmail.com> 
+
+This program is free software: you can redistribute it and/or modify 
+it under the terms of the GNU General Public License as published by 
+the Free Software Foundation, either version 2 of the License, or 
+(at your option) any later version. 
+
+This program is distributed in the hope that it will be useful, 
+but WITHOUT ANY WARRANTY; without even the implied warranty of 
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+GNU General Public License for more details. 
+
+You should have received a copy of the GNU General Public License 
+along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+*/ 
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[0] = LAYOUT_60_ansi_wkl(
+  QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+  KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+  KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
+  KC_LCTL,                            KC_LALT,          KC_SPC,                             KC_RALT,          KC_RCTL),
+
+[1] = LAYOUT_60_ansi_wkl(
+  KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
+  KC_CAPS, _______, KC_HOME, KC_UP,   KC_PGUP, _______, _______, _______, _______, _______, _______, KC_UP,   _______, QK_BOOT,
+  _______, KC_END,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,          _______,
+  _______,          KC_VOLD, KC_VOLU, KC_MUTE, KC_MPLY, _______, _______, _______, KC_END,  KC_PGDN, KC_DOWN, _______,
+  _______,                            _______,          _______,                            _______,          _______),
+};
diff --git a/keyboards/chlx/ppr_merro60/keymaps/ansi_wkl_split_bs_rshift/keymap.c b/keyboards/chlx/ppr_merro60/keymaps/ansi_wkl_split_bs_rshift/keymap.c
new file mode 100644
index 00000000000..1f6ff266d8d
--- /dev/null
+++ b/keyboards/chlx/ppr_merro60/keymaps/ansi_wkl_split_bs_rshift/keymap.c
@@ -0,0 +1,35 @@
+/* 
+Copyright 2024 Alexander Lee <chlx.bsmt@gmail.com> 
+
+This program is free software: you can redistribute it and/or modify 
+it under the terms of the GNU General Public License as published by 
+the Free Software Foundation, either version 2 of the License, or 
+(at your option) any later version. 
+
+This program is distributed in the hope that it will be useful, 
+but WITHOUT ANY WARRANTY; without even the implied warranty of 
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+GNU General Public License for more details. 
+
+You should have received a copy of the GNU General Public License 
+along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+*/ 
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[0] = LAYOUT_60_ansi_wkl_split_bs_rshift(
+  QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_GRV,
+  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,
+  KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+  KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
+  KC_LCTL,                            KC_LALT,          KC_SPC,                             KC_RALT,          KC_RCTL),
+
+[1] = LAYOUT_60_ansi_wkl_split_bs_rshift(
+  KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  _______,
+  KC_CAPS, _______, KC_HOME, KC_UP,   KC_PGUP, _______, _______, _______, _______, _______, _______, KC_UP,   _______, QK_BOOT,
+  _______, KC_END,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,          _______,
+  _______,          KC_VOLD, KC_VOLU, KC_MUTE, KC_MPLY, _______, _______, _______, KC_END,  KC_PGDN, KC_DOWN, _______, _______,
+  _______,                            _______,          _______,                            _______,          _______),
+};
diff --git a/keyboards/chlx/ppr_merro60/keymaps/default/keymap.c b/keyboards/chlx/ppr_merro60/keymaps/default/keymap.c
new file mode 100644
index 00000000000..070f6f022b8
--- /dev/null
+++ b/keyboards/chlx/ppr_merro60/keymaps/default/keymap.c
@@ -0,0 +1,35 @@
+/* 
+Copyright 2024 Alexander Lee <chlx.bsmt@gmail.com> 
+
+This program is free software: you can redistribute it and/or modify 
+it under the terms of the GNU General Public License as published by 
+the Free Software Foundation, either version 2 of the License, or 
+(at your option) any later version. 
+
+This program is distributed in the hope that it will be useful, 
+but WITHOUT ANY WARRANTY; without even the implied warranty of 
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+GNU General Public License for more details. 
+
+You should have received a copy of the GNU General Public License 
+along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+*/ 
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[0] = LAYOUT_all(
+  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_GRV,
+  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,
+  KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_UP,   KC_ENT,
+  KC_LSFT, KC_LEFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_RGHT,
+  KC_LCTL, KC_LGUI,                   KC_LALT, KC_SPC,  KC_SPC,  KC_SPC,           KC_RALT, KC_RGUI, MO(1),   KC_RCTL),
+
+[1] = LAYOUT_all(
+  KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_DEL,
+  KC_CAPS, _______, KC_HOME, KC_UP,   KC_PGUP, _______, _______, _______, _______, _______, _______, KC_UP,   _______, QK_BOOT,
+  _______, KC_END,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, _______,
+  _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPLY, _______, _______, _______, KC_END,  KC_PGDN, KC_DOWN, _______, _______,
+  _______, _______,                   _______, _______, _______, _______,          _______, _______, _______, _______),
+};
diff --git a/keyboards/chlx/ppr_merro60/keymaps/hhkb/keymap.c b/keyboards/chlx/ppr_merro60/keymaps/hhkb/keymap.c
new file mode 100644
index 00000000000..8614ad28487
--- /dev/null
+++ b/keyboards/chlx/ppr_merro60/keymaps/hhkb/keymap.c
@@ -0,0 +1,35 @@
+/* 
+Copyright 2024 Alexander Lee <chlx.bsmt@gmail.com> 
+
+This program is free software: you can redistribute it and/or modify 
+it under the terms of the GNU General Public License as published by 
+the Free Software Foundation, either version 2 of the License, or 
+(at your option) any later version. 
+
+This program is distributed in the hope that it will be useful, 
+but WITHOUT ANY WARRANTY; without even the implied warranty of 
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+GNU General Public License for more details. 
+
+You should have received a copy of the GNU General Public License 
+along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+*/ 
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[0] = LAYOUT_60_hhkb(
+  QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_GRV,
+  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,
+  KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+  KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
+           KC_LALT,                   KC_LGUI,          KC_SPC,                             KC_RGUI, KC_RALT),
+
+[1] = LAYOUT_60_hhkb(
+  KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL,
+  KC_CAPS, _______, KC_HOME, KC_UP,   KC_PGUP, _______, _______, _______, _______, _______, _______, KC_UP,   _______, QK_BOOT,
+  _______, KC_END,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,          _______,
+  _______,          KC_VOLD, KC_VOLU, KC_MUTE, KC_MPLY, _______, _______, _______, KC_END,  KC_PGDN, KC_DOWN, _______, _______,
+           _______,                   _______,          _______,                            _______, _______),
+};
diff --git a/keyboards/chlx/ppr_merro60/keymaps/iso/keymap.c b/keyboards/chlx/ppr_merro60/keymaps/iso/keymap.c
new file mode 100644
index 00000000000..ffdc49a2fb0
--- /dev/null
+++ b/keyboards/chlx/ppr_merro60/keymaps/iso/keymap.c
@@ -0,0 +1,35 @@
+/* 
+Copyright 2024 Alexander Lee <chlx.bsmt@gmail.com> 
+
+This program is free software: you can redistribute it and/or modify 
+it under the terms of the GNU General Public License as published by 
+the Free Software Foundation, either version 2 of the License, or 
+(at your option) any later version. 
+
+This program is distributed in the hope that it will be useful, 
+but WITHOUT ANY WARRANTY; without even the implied warranty of 
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+GNU General Public License for more details. 
+
+You should have received a copy of the GNU General Public License 
+along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+*/ 
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[0] = LAYOUT_60_iso(
+  QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,
+  KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
+  KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
+  KC_LCTL, KC_LGUI,                   KC_LALT,          KC_SPC,                    KC_RALT, KC_RGUI, KC_APP,  KC_RCTL),
+
+[1] = LAYOUT_60_iso(
+  KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  QK_BOOT,
+  KC_CAPS, _______, KC_HOME, KC_UP,   KC_PGUP, _______, _______, _______, _______, _______, _______, KC_UP,   _______,
+  _______, KC_END,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, _______,
+  _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPLY, _______, _______, _______, KC_END,  KC_PGDN, KC_DOWN, _______,
+  _______, _______,                   _______,          _______,                   _______, _______, _______, _______),
+};
diff --git a/keyboards/chlx/ppr_merro60/keymaps/tsangan/keymap.c b/keyboards/chlx/ppr_merro60/keymaps/tsangan/keymap.c
new file mode 100644
index 00000000000..73282416ab8
--- /dev/null
+++ b/keyboards/chlx/ppr_merro60/keymaps/tsangan/keymap.c
@@ -0,0 +1,35 @@
+/* 
+Copyright 2024 Alexander Lee <chlx.bsmt@gmail.com> 
+
+This program is free software: you can redistribute it and/or modify 
+it under the terms of the GNU General Public License as published by 
+the Free Software Foundation, either version 2 of the License, or 
+(at your option) any later version. 
+
+This program is distributed in the hope that it will be useful, 
+but WITHOUT ANY WARRANTY; without even the implied warranty of 
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+GNU General Public License for more details. 
+
+You should have received a copy of the GNU General Public License 
+along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+*/ 
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[0] = LAYOUT_60_tsangan_hhkb(
+  QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,
+  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+  KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+  KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
+  KC_LCTL, KC_LGUI,                   KC_LALT,          KC_SPC,                             KC_RALT, KC_RGUI, KC_RCTL),
+
+[1] = LAYOUT_60_tsangan_hhkb(
+  KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  _______,
+  KC_CAPS, _______, KC_HOME, KC_UP,   KC_PGUP, _______, _______, _______, _______, _______, _______, KC_UP,   _______, QK_BOOT,
+  _______, KC_END,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,          _______,
+  _______,          KC_VOLD, KC_VOLU, KC_MUTE, KC_MPLY, _______, _______, _______, KC_END,  KC_PGDN, KC_DOWN, _______, _______,
+  _______, _______,                   _______,          _______,                            _______, _______, _______),
+};
diff --git a/keyboards/chlx/ppr_merro60/keymaps/via/keymap.c b/keyboards/chlx/ppr_merro60/keymaps/via/keymap.c
new file mode 100644
index 00000000000..6d668def020
--- /dev/null
+++ b/keyboards/chlx/ppr_merro60/keymaps/via/keymap.c
@@ -0,0 +1,35 @@
+/* 
+Copyright 2024 Alexander Lee <chlx.bsmt@gmail.com> 
+
+This program is free software: you can redistribute it and/or modify 
+it under the terms of the GNU General Public License as published by 
+the Free Software Foundation, either version 2 of the License, or 
+(at your option) any later version. 
+
+This program is distributed in the hope that it will be useful, 
+but WITHOUT ANY WARRANTY; without even the implied warranty of 
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+GNU General Public License for more details. 
+
+You should have received a copy of the GNU General Public License 
+along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+*/ 
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[0] = LAYOUT_all(
+  QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_GRV,
+  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,
+  KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
+  KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_RGHT,
+  KC_LCTL, KC_LGUI,                   KC_LALT, MO(1),   KC_SPC,  KC_LSCR,          KC_RALT, KC_RGUI, MO(1),   KC_RCTL),
+
+[1] = LAYOUT_all(
+  KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_DEL,
+  KC_CAPS, _______, KC_HOME, KC_UP,   KC_PGUP, _______, _______, _______, _______, _______, _______, KC_UP,   _______, QK_BOOT,
+  _______, KC_END,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, _______,
+  _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPLY, _______, _______, _______, KC_END,  KC_PGDN, KC_DOWN, _______, _______,
+  _______, _______,                   _______, _______, _______, _______,          _______, _______, _______, _______),
+};
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/pascalpfeil/rules.mk b/keyboards/chlx/ppr_merro60/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/kbdfans/kbd67/mkiirgb/keymaps/pascalpfeil/rules.mk
rename to keyboards/chlx/ppr_merro60/keymaps/via/rules.mk
diff --git a/keyboards/chlx/ppr_merro60/readme.md b/keyboards/chlx/ppr_merro60/readme.md
new file mode 100644
index 00000000000..14674ff9ab3
--- /dev/null
+++ b/keyboards/chlx/ppr_merro60/readme.md
@@ -0,0 +1,28 @@
+# ppr.merro60
+
+![ppr.merro60 PCB](https://i.imgur.com/xyQA68Xh.jpg)
+
+- Standard 60% format keyboard PCB with USB-C and unified daughterboard compatibility.
+- Modified cutouts to allow usage of certain tray mount cases into gummy gasket o-ring mount.
+- Additional center flex cut.
+- Meant to be manufactured in 1.2mm thickness.
+
+* Keyboard Maintainer: [Alexander Lee](https://github.com/gaclee3b)
+* Hardware Supported: chlx PCB ppr.merro60.x.x.x
+
+Make example for this keyboard (after setting up your build environment):
+
+    make chlx/ppr_merro60:default
+
+Flashing example for this keyboard:
+
+    make chlx/ppr_merro60:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter bootloader mode by any of the following options -
+- When unplugged, holding the top-left key (typically ESC) while plugging in the keyboard
+- When plugged in, pressing and releasing the reset button on the pcb bottom behind the CAPSLOCK / A-key region
+- When plugged in, shorting out the two reset metal contacts near the 'z' key (accessible through the switch LED slot)
diff --git a/keyboards/chlx/ppr_merro60/rules.mk b/keyboards/chlx/ppr_merro60/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/chlx/ppr_merro60/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/chosfox/cf81/cf81.c b/keyboards/chosfox/cf81/cf81.c
index b864a56bc65..2e014dbe724 100644
--- a/keyboards/chosfox/cf81/cf81.c
+++ b/keyboards/chosfox/cf81/cf81.c
@@ -25,122 +25,122 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {1, A_1,   B_1,   C_1},
-    {1, A_2,   B_2,   C_2},
-    {1, A_3,   B_3,   C_3},
-    {1, A_4,   B_4,   C_4},
-    {1, A_5,   B_5,   C_5},
-    {1, A_6,   B_6,   C_6},
-    {1, A_7,   B_7,   C_7},
-    {1, A_8,   B_8,   C_8},
-    {1, A_9,   B_9,   C_9},
-    {1, A_10,  B_10,  C_10},
-    {1, A_11,  B_11,  C_11},
-    {1, A_12,  B_12,  C_12},
-    {1, A_13,  B_13,  C_13},
-    {1, A_14,  B_14,  C_14},
+    {1, CB1_CA1,   CB2_CA1,   CB3_CA1},
+    {1, CB1_CA2,   CB2_CA2,   CB3_CA2},
+    {1, CB1_CA3,   CB2_CA3,   CB3_CA3},
+    {1, CB1_CA4,   CB2_CA4,   CB3_CA4},
+    {1, CB1_CA5,   CB2_CA5,   CB3_CA5},
+    {1, CB1_CA6,   CB2_CA6,   CB3_CA6},
+    {1, CB1_CA7,   CB2_CA7,   CB3_CA7},
+    {1, CB1_CA8,   CB2_CA8,   CB3_CA8},
+    {1, CB1_CA9,   CB2_CA9,   CB3_CA9},
+    {1, CB1_CA10,  CB2_CA10,  CB3_CA10},
+    {1, CB1_CA11,  CB2_CA11,  CB3_CA11},
+    {1, CB1_CA12,  CB2_CA12,  CB3_CA12},
+    {1, CB1_CA13,  CB2_CA13,  CB3_CA13},
+    {1, CB1_CA14,  CB2_CA14,  CB3_CA14},
 
-    {0, A_1,   B_1,   C_1},
-    {0, A_2,   B_2,   C_2},
-    {0, A_3,   B_3,   C_3},
-    {0, A_4,   B_4,   C_4},
-    {0, A_5,   B_5,   C_5},
-    {0, A_6,   B_6,   C_6},
-    {0, A_7,   B_7,   C_7},
-    {0, A_8,   B_8,   C_8},
-    {0, A_9,   B_9,   C_9},
-    {0, A_10,  B_10,  C_10},
-    {0, A_11,  B_11,  C_11},
-    {0, A_12,  B_12,  C_12},
-    {0, A_13,  B_13,  C_13},
-    {0, A_14,  B_14,  C_14},
-    {1, D_1,   E_1,   F_1},
+    {0, CB1_CA1,   CB2_CA1,   CB3_CA1},
+    {0, CB1_CA2,   CB2_CA2,   CB3_CA2},
+    {0, CB1_CA3,   CB2_CA3,   CB3_CA3},
+    {0, CB1_CA4,   CB2_CA4,   CB3_CA4},
+    {0, CB1_CA5,   CB2_CA5,   CB3_CA5},
+    {0, CB1_CA6,   CB2_CA6,   CB3_CA6},
+    {0, CB1_CA7,   CB2_CA7,   CB3_CA7},
+    {0, CB1_CA8,   CB2_CA8,   CB3_CA8},
+    {0, CB1_CA9,   CB2_CA9,   CB3_CA9},
+    {0, CB1_CA10,  CB2_CA10,  CB3_CA10},
+    {0, CB1_CA11,  CB2_CA11,  CB3_CA11},
+    {0, CB1_CA12,  CB2_CA12,  CB3_CA12},
+    {0, CB1_CA13,  CB2_CA13,  CB3_CA13},
+    {0, CB1_CA14,  CB2_CA14,  CB3_CA14},
+    {1, CB4_CA1,   CB5_CA1,   CB6_CA1},
 
-    {0, D_1,   E_1,   F_1},
-    {0, D_2,   E_2,   F_2},
-    {0, D_3,   E_3,   F_3},
-    {0, D_4,   E_4,   F_4},
-    {0, D_5,   E_5,   F_5},
-    {0, D_6,   E_6,   F_6},
-    {0, D_7,   E_7,   F_7},
-    {0, D_8,   E_8,   F_8},
-    {0, D_9,   E_9,   F_9},
-    {0, D_10,  E_10,  F_10},
-    {0, D_11,  E_11,  F_11},
-    {0, D_12,  E_12,  F_12},
-    {0, D_13,  E_13,  F_13},
-    {0, D_14,  E_14,  F_14},
-    {1, D_2,   E_2,   F_2},
+    {0, CB4_CA1,   CB5_CA1,   CB6_CA1},
+    {0, CB4_CA2,   CB5_CA2,   CB6_CA2},
+    {0, CB4_CA3,   CB5_CA3,   CB6_CA3},
+    {0, CB4_CA4,   CB5_CA4,   CB6_CA4},
+    {0, CB4_CA5,   CB5_CA5,   CB6_CA5},
+    {0, CB4_CA6,   CB5_CA6,   CB6_CA6},
+    {0, CB4_CA7,   CB5_CA7,   CB6_CA7},
+    {0, CB4_CA8,   CB5_CA8,   CB6_CA8},
+    {0, CB4_CA9,   CB5_CA9,   CB6_CA9},
+    {0, CB4_CA10,  CB5_CA10,  CB6_CA10},
+    {0, CB4_CA11,  CB5_CA11,  CB6_CA11},
+    {0, CB4_CA12,  CB5_CA12,  CB6_CA12},
+    {0, CB4_CA13,  CB5_CA13,  CB6_CA13},
+    {0, CB4_CA14,  CB5_CA14,  CB6_CA14},
+    {1, CB4_CA2,   CB5_CA2,   CB6_CA2},
 
-    {0, G_1,   H_1,   I_1},
-    {0, G_2,   H_2,   I_2},
-    {0, G_3,   H_3,   I_3},
-    {0, G_4,   H_4,   I_4},
-    {0, G_5,   H_5,   I_5},
-    {0, G_6,   H_6,   I_6},
-    {0, G_7,   H_7,   I_7},
-    {0, G_8,   H_8,   I_8},
-    {0, G_9,   H_9,   I_9},
-    {0, G_10,  H_10,  I_10},
-    {0, G_11,  H_11,  I_11},
-    {0, G_12,  H_12,  I_12},
-    {0, A_15,  B_15,  C_15},
-    {0, G_13,  H_13,  I_13},
-    {1, D_3,   E_3,   F_3},
+    {0, CB7_CA1,   CB8_CA1,   CB9_CA1},
+    {0, CB7_CA2,   CB8_CA2,   CB9_CA2},
+    {0, CB7_CA3,   CB8_CA3,   CB9_CA3},
+    {0, CB7_CA4,   CB8_CA4,   CB9_CA4},
+    {0, CB7_CA5,   CB8_CA5,   CB9_CA5},
+    {0, CB7_CA6,   CB8_CA6,   CB9_CA6},
+    {0, CB7_CA7,   CB8_CA7,   CB9_CA7},
+    {0, CB7_CA8,   CB8_CA8,   CB9_CA8},
+    {0, CB7_CA9,   CB8_CA9,   CB9_CA9},
+    {0, CB7_CA10,  CB8_CA10,  CB9_CA10},
+    {0, CB7_CA11,  CB8_CA11,  CB9_CA11},
+    {0, CB7_CA12,  CB8_CA12,  CB9_CA12},
+    {0, CB1_CA15,  CB2_CA15,  CB3_CA15},
+    {0, CB7_CA13,  CB8_CA13,  CB9_CA13},
+    {1, CB4_CA3,   CB5_CA3,   CB6_CA3},
 
-    {0, J_1,   K_1,   L_1},
-    {0, A_16,  B_16,  C_16},
-    {0, J_2,   K_2,   L_2},
-    {0, J_3,   K_3,   L_3},
-    {0, J_4,   K_4,   L_4},
-    {0, J_5,   K_5,   L_5},
-    {0, J_6,   K_6,   L_6},
-    {0, J_7,   K_7,   L_7},
-    {0, J_8,   K_8,   L_8},
-    {0, J_9,   K_9,   L_9},
-    {0, J_10,  K_10,  L_10},
-    {0, J_11,  K_11,  L_11},
-    {0, J_12,  K_12,  L_12},
-    {1, D_7,   E_7,   F_7},
+    {0, CB10_CA1,   CB11_CA1,   CB12_CA1},
+    {0, CB1_CA16,  CB2_CA16,  CB3_CA16},
+    {0, CB10_CA2,   CB11_CA2,   CB12_CA2},
+    {0, CB10_CA3,   CB11_CA3,   CB12_CA3},
+    {0, CB10_CA4,   CB11_CA4,   CB12_CA4},
+    {0, CB10_CA5,   CB11_CA5,   CB12_CA5},
+    {0, CB10_CA6,   CB11_CA6,   CB12_CA6},
+    {0, CB10_CA7,   CB11_CA7,   CB12_CA7},
+    {0, CB10_CA8,   CB11_CA8,   CB12_CA8},
+    {0, CB10_CA9,   CB11_CA9,   CB12_CA9},
+    {0, CB10_CA10,  CB11_CA10,  CB12_CA10},
+    {0, CB10_CA11,  CB11_CA11,  CB12_CA11},
+    {0, CB10_CA12,  CB11_CA12,  CB12_CA12},
+    {1, CB4_CA7,   CB5_CA7,   CB6_CA7},
 
 
-    {0, J_13,  K_13,  L_13},
-    {0, J_14,  K_14,  L_14},
-    {0, J_15,  K_15,  L_15},
-    {0, J_16,  K_16,  L_16},
+    {0, CB10_CA13,  CB11_CA13,  CB12_CA13},
+    {0, CB10_CA14,  CB11_CA14,  CB12_CA14},
+    {0, CB10_CA15,  CB11_CA15,  CB12_CA15},
+    {0, CB10_CA16,  CB11_CA16,  CB12_CA16},
 
-    {0, G_14,  H_14,  I_14},
-    {0, G_15,  H_15,  I_15},
-    {0, G_16,  H_16,  I_16},
+    {0, CB7_CA14,  CB8_CA14,  CB9_CA14},
+    {0, CB7_CA15,  CB8_CA15,  CB9_CA15},
+    {0, CB7_CA16,  CB8_CA16,  CB9_CA16},
 
-    {0, D_15,  E_15,  F_15},
-    {1, D_6,   E_6,   F_6},
-    {1, D_5,   E_5,   F_5},
+    {0, CB4_CA15,  CB5_CA15,  CB6_CA15},
+    {1, CB4_CA6,   CB5_CA6,   CB6_CA6},
+    {1, CB4_CA5,   CB5_CA5,   CB6_CA5},
 
 
-    {1, G_1,   H_1,   I_1},
-    {1, G_2,   H_2,   I_2},
-    {1, G_3,   H_3,   I_3},
-    {1, G_4,   H_4,   I_4},
-    {1, G_5,   H_5,   I_5},
-    {1, G_6,   H_6,   I_6},
-    {1, G_7,   H_7,   I_7},
-    {1, G_8,   H_8,   I_8},
-    {1, G_9,   H_9,   I_9},
-    {1, G_10,  H_10,  I_10},
-    {1, G_11,  H_11,  I_11},
+    {1, CB7_CA1,   CB8_CA1,   CB9_CA1},
+    {1, CB7_CA2,   CB8_CA2,   CB9_CA2},
+    {1, CB7_CA3,   CB8_CA3,   CB9_CA3},
+    {1, CB7_CA4,   CB8_CA4,   CB9_CA4},
+    {1, CB7_CA5,   CB8_CA5,   CB9_CA5},
+    {1, CB7_CA6,   CB8_CA6,   CB9_CA6},
+    {1, CB7_CA7,   CB8_CA7,   CB9_CA7},
+    {1, CB7_CA8,   CB8_CA8,   CB9_CA8},
+    {1, CB7_CA9,   CB8_CA9,   CB9_CA9},
+    {1, CB7_CA10,  CB8_CA10,  CB9_CA10},
+    {1, CB7_CA11,  CB8_CA11,  CB9_CA11},
 
-    {1, J_1,   K_1,   L_1},
-    {1, J_2,   K_2,   L_2},
-    {1, J_3,   K_3,   L_3},
-    {1, J_4,   K_4,   L_4},
-    {1, J_5,   K_5,   L_5},
-    {1, J_6,   K_6,   L_6},
-    {1, J_7,   K_7,   L_7},
-    {1, J_8,   K_8,   L_8},
-    {1, J_9,   K_9,   L_9},
-    {1, J_10,  K_10,  L_10},
-    {1, J_11,  K_11,  L_11},
+    {1, CB10_CA1,   CB11_CA1,   CB12_CA1},
+    {1, CB10_CA2,   CB11_CA2,   CB12_CA2},
+    {1, CB10_CA3,   CB11_CA3,   CB12_CA3},
+    {1, CB10_CA4,   CB11_CA4,   CB12_CA4},
+    {1, CB10_CA5,   CB11_CA5,   CB12_CA5},
+    {1, CB10_CA6,   CB11_CA6,   CB12_CA6},
+    {1, CB10_CA7,   CB11_CA7,   CB12_CA7},
+    {1, CB10_CA8,   CB11_CA8,   CB12_CA8},
+    {1, CB10_CA9,   CB11_CA9,   CB12_CA9},
+    {1, CB10_CA10,  CB11_CA10,  CB12_CA10},
+    {1, CB10_CA11,  CB11_CA11,  CB12_CA11},
 };
 // clang-format on
 bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) {
diff --git a/keyboards/cipulot/60xt/info.json b/keyboards/cipulot/60xt/info.json
new file mode 100644
index 00000000000..606e6b33633
--- /dev/null
+++ b/keyboards/cipulot/60xt/info.json
@@ -0,0 +1,118 @@
+{
+    "manufacturer": "Cipulot",
+    "keyboard_name": "60XT",
+    "maintainer": "Cipulot",
+    "bootloader": "stm32-dfu",
+    "build": {
+        "lto": true
+    },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "indicators": {
+        "caps_lock": "A1"
+    },
+    "matrix_pins": {
+        "cols": ["A5", "A2", "A0", "F1", "F0", "C15", "C14", "C13", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15"],
+        "rows": ["B1", "B2", "A6", "A7", "B0"]
+    },
+    "processor": "STM32F072",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x6BC2",
+        "shared_endpoint": {
+            "keyboard": true
+        },
+        "vid": "0x6369"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+                {"matrix": [0, 8], "x": 8.25, "y": 0},
+                {"matrix": [0, 9], "x": 9.25, "y": 0},
+                {"matrix": [0, 10], "x": 10.25, "y": 0},
+                {"matrix": [0, 11], "x": 11.25, "y": 0},
+                {"matrix": [0, 12], "x": 12.25, "y": 0},
+                {"matrix": [0, 13], "x": 13.25, "y": 0},
+                {"matrix": [0, 14], "x": 14.25, "y": 0},
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [1, 15], "x": 16.5, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 2.75, "y": 1},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+                {"matrix": [1, 7], "x": 7.75, "y": 1},
+                {"matrix": [1, 8], "x": 8.75, "y": 1},
+                {"matrix": [1, 9], "x": 9.75, "y": 1},
+                {"matrix": [1, 10], "x": 10.75, "y": 1},
+                {"matrix": [1, 11], "x": 11.75, "y": 1},
+                {"matrix": [1, 12], "x": 12.75, "y": 1},
+                {"matrix": [1, 13], "x": 13.75, "y": 1},
+                {"matrix": [1, 14], "x": 14.75, "y": 1, "w": 1.5},
+                {"matrix": [2, 15], "x": 16.5, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+                {"matrix": [2, 8], "x": 9, "y": 2},
+                {"matrix": [2, 9], "x": 10, "y": 2},
+                {"matrix": [2, 10], "x": 11, "y": 2},
+                {"matrix": [2, 11], "x": 12, "y": 2},
+                {"matrix": [2, 12], "x": 13, "y": 2},
+                {"matrix": [2, 13], "x": 14, "y": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2, "w": 1.25},
+                {"matrix": [3, 15], "x": 16.5, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 2], "x": 2.5, "y": 3},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 8], "x": 8.5, "y": 3},
+                {"matrix": [3, 9], "x": 9.5, "y": 3},
+                {"matrix": [3, 10], "x": 10.5, "y": 3},
+                {"matrix": [3, 11], "x": 11.5, "y": 3},
+                {"matrix": [3, 12], "x": 12.5, "y": 3},
+                {"matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 15.25, "y": 3},
+                {"matrix": [4, 14], "x": 16.5, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 2.75, "y": 4},
+                {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.5},
+                {"matrix": [4, 8], "x": 5.25, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 12.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 13.75, "y": 4},
+                {"matrix": [4, 13], "x": 14.75, "y": 4, "w": 1.5},
+                {"matrix": [4, 15], "x": 16.5, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/cipulot/60xt/keymaps/default/keymap.c b/keyboards/cipulot/60xt/keymaps/default/keymap.c
new file mode 100644
index 00000000000..41008ef92ad
--- /dev/null
+++ b/keyboards/cipulot/60xt/keymaps/default/keymap.c
@@ -0,0 +1,43 @@
+/* Copyright 2023 Cipulot
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    // clang-format off
+    [0] = LAYOUT(
+        KC_F1, KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, KC_F6,
+        KC_F2, KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_F7,
+        KC_F3, KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,           KC_F8,
+        KC_F4, KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),            KC_F9,
+        KC_F5, KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                      KC_RALT, KC_RGUI, KC_RCTL,          KC_F10
+    ),
+    [1] = LAYOUT(
+        _______, KC_GRV,  KC_F1,   KC_F2,   KC_F3,    KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12,  _______, KC_DEL, _______,
+        _______, _______, _______, KC_UP,   _______,  _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUSE, _______, _______, _______,         _______,
+        _______, _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______,         _______,
+        _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______,         _______,
+        _______, _______, _______, _______,                            _______,                                       _______, _______, MO(2),           _______
+    ),
+    [2] = LAYOUT(
+       QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+       _______, _______, _______, _______,                            _______,                                     _______, _______, _______,          _______
+    )
+    // clang-format on
+};
diff --git a/keyboards/cipulot/60xt/keymaps/via/keymap.c b/keyboards/cipulot/60xt/keymaps/via/keymap.c
new file mode 100644
index 00000000000..41008ef92ad
--- /dev/null
+++ b/keyboards/cipulot/60xt/keymaps/via/keymap.c
@@ -0,0 +1,43 @@
+/* Copyright 2023 Cipulot
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    // clang-format off
+    [0] = LAYOUT(
+        KC_F1, KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, KC_F6,
+        KC_F2, KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_F7,
+        KC_F3, KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,           KC_F8,
+        KC_F4, KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),            KC_F9,
+        KC_F5, KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                      KC_RALT, KC_RGUI, KC_RCTL,          KC_F10
+    ),
+    [1] = LAYOUT(
+        _______, KC_GRV,  KC_F1,   KC_F2,   KC_F3,    KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12,  _______, KC_DEL, _______,
+        _______, _______, _______, KC_UP,   _______,  _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUSE, _______, _______, _______,         _______,
+        _______, _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______,         _______,
+        _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______,         _______,
+        _______, _______, _______, _______,                            _______,                                       _______, _______, MO(2),           _______
+    ),
+    [2] = LAYOUT(
+       QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+       _______, _______, _______, _______,                            _______,                                     _______, _______, _______,          _______
+    )
+    // clang-format on
+};
diff --git a/keyboards/kprepublic/bm80v2/keymaps/smooted/rules.mk b/keyboards/cipulot/60xt/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/kprepublic/bm80v2/keymaps/smooted/rules.mk
rename to keyboards/cipulot/60xt/keymaps/via/rules.mk
diff --git a/keyboards/cipulot/60xt/readme.md b/keyboards/cipulot/60xt/readme.md
new file mode 100644
index 00000000000..19abf2340cc
--- /dev/null
+++ b/keyboards/cipulot/60xt/readme.md
@@ -0,0 +1,27 @@
+# 60XT
+
+![60XT](https://i.imgur.com/7lAvjpmh.png)
+
+A 60% XT solder and hot swap PCB.
+
+* Keyboard Maintainer: [cipulot](https://github.com/cipulot)
+* Hardware Supported: 60XT
+* Hardware Availability: [Eloquent Clicks](https://eloquentclicks.com/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make cipulot/60xt:default
+
+Flashing example for this keyboard:
+
+    make cipulot/60xt:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is configured.
+* **Physical reset button**: Long press the reset button soldered on the PCB.
+* **Bootmagic reset**: Hold down the top left key and plug in the controller.
diff --git a/keyboards/cipulot/60xt/rules.mk b/keyboards/cipulot/60xt/rules.mk
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/keyboards/cipulot/common/ec_board.c b/keyboards/cipulot/common/ec_board.c
new file mode 100644
index 00000000000..2225d6da63d
--- /dev/null
+++ b/keyboards/cipulot/common/ec_board.c
@@ -0,0 +1,64 @@
+/* Copyright 2023 Cipulot
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "ec_switch_matrix.h"
+#include "quantum.h"
+
+void eeconfig_init_kb(void) {
+    // Default values
+    eeprom_ec_config.actuation_mode                 = DEFAULT_ACTUATION_MODE;
+    eeprom_ec_config.mode_0_actuation_threshold     = DEFAULT_MODE_0_ACTUATION_LEVEL;
+    eeprom_ec_config.mode_0_release_threshold       = DEFAULT_MODE_0_RELEASE_LEVEL;
+    eeprom_ec_config.mode_1_initial_deadzone_offset = DEFAULT_MODE_1_INITIAL_DEADZONE_OFFSET;
+    eeprom_ec_config.mode_1_actuation_offset        = DEFAULT_MODE_1_ACTUATION_OFFSET;
+    eeprom_ec_config.mode_1_release_offset          = DEFAULT_MODE_1_RELEASE_OFFSET;
+
+    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+        for (uint8_t col = 0; col < MATRIX_COLS; col++) {
+            eeprom_ec_config.bottoming_reading[row][col] = DEFAULT_BOTTOMING_READING;
+        }
+    }
+    // Write default value to EEPROM now
+    eeconfig_update_kb_datablock(&eeprom_ec_config);
+
+    eeconfig_init_user();
+}
+
+// On Keyboard startup
+void keyboard_post_init_kb(void) {
+    // Read custom menu variables from memory
+    eeconfig_read_kb_datablock(&eeprom_ec_config);
+
+    // Set runtime values to EEPROM values
+    ec_config.actuation_mode                 = eeprom_ec_config.actuation_mode;
+    ec_config.mode_0_actuation_threshold     = eeprom_ec_config.mode_0_actuation_threshold;
+    ec_config.mode_0_release_threshold       = eeprom_ec_config.mode_0_release_threshold;
+    ec_config.mode_1_initial_deadzone_offset = eeprom_ec_config.mode_1_initial_deadzone_offset;
+    ec_config.mode_1_actuation_offset        = eeprom_ec_config.mode_1_actuation_offset;
+    ec_config.mode_1_release_offset          = eeprom_ec_config.mode_1_release_offset;
+    ec_config.bottoming_calibration          = false;
+    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+        for (uint8_t col = 0; col < MATRIX_COLS; col++) {
+            ec_config.bottoming_calibration_starter[row][col]           = true;
+            ec_config.bottoming_reading[row][col]                       = eeprom_ec_config.bottoming_reading[row][col];
+            ec_config.rescaled_mode_0_actuation_threshold[row][col]     = rescale(ec_config.mode_0_actuation_threshold, 0, 1023, ec_config.noise_floor[row][col], eeprom_ec_config.bottoming_reading[row][col]);
+            ec_config.rescaled_mode_0_release_threshold[row][col]       = rescale(ec_config.mode_0_release_threshold, 0, 1023, ec_config.noise_floor[row][col], eeprom_ec_config.bottoming_reading[row][col]);
+            ec_config.rescaled_mode_1_initial_deadzone_offset[row][col] = rescale(ec_config.mode_1_initial_deadzone_offset, 0, 1023, ec_config.noise_floor[row][col], eeprom_ec_config.bottoming_reading[row][col]);
+        }
+    }
+
+    keyboard_post_init_user();
+}
diff --git a/keyboards/cipulot/common/ec_switch_matrix.c b/keyboards/cipulot/common/ec_switch_matrix.c
new file mode 100644
index 00000000000..845ef99d223
--- /dev/null
+++ b/keyboards/cipulot/common/ec_switch_matrix.c
@@ -0,0 +1,318 @@
+/* Copyright 2023 Cipulot
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "ec_switch_matrix.h"
+#include "analog.h"
+#include "atomic_util.h"
+#include "math.h"
+#include "print.h"
+#include "wait.h"
+
+#if defined(__AVR__)
+#    error "AVR platforms not supported due to a variety of reasons. Among them there are limited memory, limited number of pins and ADC not being able to give satisfactory results."
+#endif
+
+#define OPEN_DRAIN_SUPPORT defined(PAL_MODE_OUTPUT_OPENDRAIN)
+
+eeprom_ec_config_t eeprom_ec_config;
+ec_config_t        ec_config;
+
+// Pin and port array
+const pin_t row_pins[]                                 = MATRIX_ROW_PINS;
+const pin_t amux_sel_pins[]                            = AMUX_SEL_PINS;
+const pin_t amux_en_pins[]                             = AMUX_EN_PINS;
+const pin_t amux_n_col_sizes[]                         = AMUX_COL_CHANNELS_SIZES;
+const pin_t amux_n_col_channels[][AMUX_MAX_COLS_COUNT] = {AMUX_COL_CHANNELS};
+
+#define AMUX_SEL_PINS_COUNT ARRAY_SIZE(amux_sel_pins)
+#define EXPECTED_AMUX_SEL_PINS_COUNT ceil(log2(AMUX_MAX_COLS_COUNT)
+// Checks for the correctness of the configuration
+_Static_assert(ARRAY_SIZE(amux_en_pins) == AMUX_COUNT, "AMUX_EN_PINS doesn't have the minimum number of bits required to enable all the multiplexers available");
+// Check that number of select pins is enough to select all the channels
+_Static_assert(AMUX_SEL_PINS_COUNT == EXPECTED_AMUX_SEL_PINS_COUNT), "AMUX_SEL_PINS doesn't have the minimum number of bits required address all the channels");
+// Check that number of elements in AMUX_COL_CHANNELS_SIZES is enough to specify the number of channels for all the multiplexers available
+_Static_assert(ARRAY_SIZE(amux_n_col_sizes) == AMUX_COUNT, "AMUX_COL_CHANNELS_SIZES doesn't have the minimum number of elements required to specify the number of channels for all the multiplexers available");
+
+static uint16_t sw_value[MATRIX_ROWS][MATRIX_COLS];
+
+static adc_mux adcMux;
+
+// Initialize the row pins
+void init_row(void) {
+    // Set all row pins as output and low
+    for (uint8_t idx = 0; idx < MATRIX_ROWS; idx++) {
+        setPinOutput(row_pins[idx]);
+        writePinLow(row_pins[idx]);
+    }
+}
+
+// Initialize the multiplexers
+void init_amux(void) {
+    for (uint8_t idx = 0; idx < AMUX_COUNT; idx++) {
+        setPinOutput(amux_en_pins[idx]);
+        writePinLow(amux_en_pins[idx]);
+    }
+    for (uint8_t idx = 0; idx < AMUX_SEL_PINS_COUNT; idx++) {
+        setPinOutput(amux_sel_pins[idx]);
+    }
+}
+
+// Select the multiplexer channel of the specified multiplexer
+void select_amux_channel(uint8_t channel, uint8_t col) {
+    // Get the channel for the specified multiplexer
+    uint8_t ch = amux_n_col_channels[channel][col];
+    // momentarily disable specified multiplexer
+    writePinHigh(amux_en_pins[channel]);
+    // Select the multiplexer channel
+    for (uint8_t i = 0; i < AMUX_SEL_PINS_COUNT; i++) {
+        writePin(amux_sel_pins[i], ch & (1 << i));
+    }
+    // re enable specified multiplexer
+    writePinLow(amux_en_pins[channel]);
+}
+
+// Disable all the unused multiplexers
+void disable_unused_amux(uint8_t channel) {
+    // disable all the other multiplexers apart from the current selected one
+    for (uint8_t idx = 0; idx < AMUX_COUNT; idx++) {
+        if (idx != channel) {
+            writePinHigh(amux_en_pins[idx]);
+        }
+    }
+}
+// Discharge the peak hold capacitor
+void discharge_capacitor(void) {
+#ifdef OPEN_DRAIN_SUPPORT
+    writePinLow(DISCHARGE_PIN);
+#else
+    writePinLow(DISCHARGE_PIN);
+    setPinOutput(DISCHARGE_PIN);
+#endif
+}
+
+// Charge the peak hold capacitor
+void charge_capacitor(uint8_t row) {
+#ifdef OPEN_DRAIN_SUPPORT
+    writePinHigh(DISCHARGE_PIN);
+#else
+    setPinInput(DISCHARGE_PIN);
+#endif
+    writePinHigh(row_pins[row]);
+}
+
+// Initialize the peripherals pins
+int ec_init(void) {
+    // Initialize ADC
+    palSetLineMode(ANALOG_PORT, PAL_MODE_INPUT_ANALOG);
+    adcMux = pinToMux(ANALOG_PORT);
+
+    // Dummy call to make sure that adcStart() has been called in the appropriate state
+    adc_read(adcMux);
+
+    // Initialize discharge pin as discharge mode
+    writePinLow(DISCHARGE_PIN);
+#ifdef OPEN_DRAIN_SUPPORT
+    setPinOutputOpenDrain(DISCHARGE_PIN);
+#else
+    setPinOutput(DISCHARGE_PIN);
+#endif
+
+    // Initialize drive lines
+    init_row();
+
+    // Initialize AMUXs
+    init_amux();
+
+    return 0;
+}
+
+// Get the noise floor
+void ec_noise_floor(void) {
+    // Initialize the noise floor
+    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+        for (uint8_t col = 0; col < MATRIX_COLS; col++) {
+            ec_config.noise_floor[row][col] = 0;
+        }
+    }
+
+    // Sample the noise floor
+    for (uint8_t i = 0; i < DEFAULT_NOISE_FLOOR_SAMPLING_COUNT; i++) {
+        for (uint8_t amux = 0; amux < AMUX_COUNT; amux++) {
+            disable_unused_amux(amux);
+            for (uint8_t col = 0; col < amux_n_col_sizes[amux]; col++) {
+                uint8_t sum = 0;
+                for (uint8_t i = 0; i < (amux > 0 ? amux : 0); i++)
+                    sum += amux_n_col_sizes[i];
+                uint8_t adjusted_col = col + sum;
+                for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+                    ec_config.noise_floor[row][adjusted_col] += ec_readkey_raw(amux, row, col);
+                }
+            }
+        }
+        wait_ms(5);
+    }
+
+    // Average the noise floor
+    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+        for (uint8_t col = 0; col < MATRIX_COLS; col++) {
+            ec_config.noise_floor[row][col] /= DEFAULT_NOISE_FLOOR_SAMPLING_COUNT;
+        }
+    }
+}
+
+// Scan key values and update matrix state
+bool ec_matrix_scan(matrix_row_t current_matrix[]) {
+    bool updated = false;
+
+    for (uint8_t amux = 0; amux < AMUX_COUNT; amux++) {
+        disable_unused_amux(amux);
+        for (uint8_t col = 0; col < amux_n_col_sizes[amux]; col++) {
+            for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+                uint8_t sum = 0;
+                for (uint8_t i = 0; i < (amux > 0 ? amux : 0); i++)
+                    sum += amux_n_col_sizes[i];
+                uint8_t adjusted_col        = col + sum;
+                sw_value[row][adjusted_col] = ec_readkey_raw(amux, row, col);
+
+                if (ec_config.bottoming_calibration) {
+                    if (ec_config.bottoming_calibration_starter[row][adjusted_col]) {
+                        ec_config.bottoming_reading[row][adjusted_col]             = sw_value[row][adjusted_col];
+                        ec_config.bottoming_calibration_starter[row][adjusted_col] = false;
+                    } else if (sw_value[row][adjusted_col] > ec_config.bottoming_reading[row][adjusted_col]) {
+                        ec_config.bottoming_reading[row][adjusted_col] = sw_value[row][adjusted_col];
+                    }
+                } else {
+                    updated |= ec_update_key(&current_matrix[row], row, adjusted_col, sw_value[row][adjusted_col]);
+                }
+            }
+        }
+    }
+
+    return ec_config.bottoming_calibration ? false : updated;
+}
+
+// Read the capacitive sensor value
+uint16_t ec_readkey_raw(uint8_t channel, uint8_t row, uint8_t col) {
+    uint16_t sw_value = 0;
+
+    // Select the multiplexer
+    select_amux_channel(channel, col);
+
+    // Set the row pin to low state to avoid ghosting
+    writePinLow(row_pins[row]);
+
+    ATOMIC_BLOCK_FORCEON {
+        // Set the row pin to high state and have capacitor charge
+        charge_capacitor(row);
+        // Read the ADC value
+        sw_value = adc_read(adcMux);
+    }
+    // Discharge peak hold capacitor
+    discharge_capacitor();
+    // Waiting for the ghost capacitor to discharge fully
+    wait_us(DISCHARGE_TIME);
+
+    return sw_value;
+}
+
+// Update press/release state of key
+bool ec_update_key(matrix_row_t* current_row, uint8_t row, uint8_t col, uint16_t sw_value) {
+    bool current_state = (*current_row >> col) & 1;
+
+    // Real Time Noise Floor Calibration
+    if (sw_value < (ec_config.noise_floor[row][col] - NOISE_FLOOR_THRESHOLD)) {
+        uprintf("Noise Floor Change: %d, %d, %d\n", row, col, sw_value);
+        ec_config.noise_floor[row][col]                             = sw_value;
+        ec_config.rescaled_mode_0_actuation_threshold[row][col]     = rescale(ec_config.mode_0_actuation_threshold, 0, 1023, ec_config.noise_floor[row][col], eeprom_ec_config.bottoming_reading[row][col]);
+        ec_config.rescaled_mode_0_release_threshold[row][col]       = rescale(ec_config.mode_0_release_threshold, 0, 1023, ec_config.noise_floor[row][col], eeprom_ec_config.bottoming_reading[row][col]);
+        ec_config.rescaled_mode_1_initial_deadzone_offset[row][col] = rescale(ec_config.mode_1_initial_deadzone_offset, 0, 1023, ec_config.noise_floor[row][col], eeprom_ec_config.bottoming_reading[row][col]);
+    }
+
+    // Normal board-wide APC
+    if (ec_config.actuation_mode == 0) {
+        if (current_state && sw_value < ec_config.rescaled_mode_0_release_threshold[row][col]) {
+            *current_row &= ~(1 << col);
+            uprintf("Key released: %d, %d, %d\n", row, col, sw_value);
+            return true;
+        }
+        if ((!current_state) && sw_value > ec_config.rescaled_mode_0_actuation_threshold[row][col]) {
+            *current_row |= (1 << col);
+            uprintf("Key pressed: %d, %d, %d\n", row, col, sw_value);
+            return true;
+        }
+    }
+    // Rapid Trigger
+    else if (ec_config.actuation_mode == 1) {
+        // Is key in active zone?
+        if (sw_value > ec_config.rescaled_mode_1_initial_deadzone_offset[row][col]) {
+            // Is key pressed while in active zone?
+            if (current_state) {
+                // Is the key still moving down?
+                if (sw_value > ec_config.extremum[row][col]) {
+                    ec_config.extremum[row][col] = sw_value;
+                    uprintf("Key pressed: %d, %d, %d\n", row, col, sw_value);
+                }
+                // Has key moved up enough to be released?
+                else if (sw_value < ec_config.extremum[row][col] - ec_config.mode_1_release_offset) {
+                    ec_config.extremum[row][col] = sw_value;
+                    *current_row &= ~(1 << col);
+                    uprintf("Key released: %d, %d, %d\n", row, col, sw_value);
+                    return true;
+                }
+            }
+            // Key is not pressed while in active zone
+            else {
+                // Is the key still moving up?
+                if (sw_value < ec_config.extremum[row][col]) {
+                    ec_config.extremum[row][col] = sw_value;
+                }
+                // Has key moved down enough to be pressed?
+                else if (sw_value > ec_config.extremum[row][col] + ec_config.mode_1_actuation_offset) {
+                    ec_config.extremum[row][col] = sw_value;
+                    *current_row |= (1 << col);
+                    uprintf("Key pressed: %d, %d, %d\n", row, col, sw_value);
+                    return true;
+                }
+            }
+        }
+        // Key is not in active zone
+        else {
+            // Check to avoid key being stuck in pressed state near the active zone threshold
+            if (sw_value < ec_config.extremum[row][col]) {
+                ec_config.extremum[row][col] = sw_value;
+                *current_row &= ~(1 << col);
+                return true;
+            }
+        }
+    }
+    return false;
+}
+
+// Print the matrix values
+void ec_print_matrix(void) {
+    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+        for (uint8_t col = 0; col < MATRIX_COLS - 1; col++) {
+            uprintf("%4d,", sw_value[row][col]);
+        }
+        uprintf("%4d\n", sw_value[row][MATRIX_COLS - 1]);
+    }
+    print("\n");
+}
+
+// Rescale the value to a different range
+uint16_t rescale(uint16_t x, uint16_t in_min, uint16_t in_max, uint16_t out_min, uint16_t out_max) {
+    return (x - in_min) * (out_max - out_min) / (in_max - in_min) + out_min;
+}
diff --git a/keyboards/cipulot/common/ec_switch_matrix.h b/keyboards/cipulot/common/ec_switch_matrix.h
new file mode 100644
index 00000000000..ad03f093de7
--- /dev/null
+++ b/keyboards/cipulot/common/ec_switch_matrix.h
@@ -0,0 +1,72 @@
+/* Copyright 2023 Cipulot
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include <stdint.h>
+#include <stdbool.h>
+#include "matrix.h"
+#include "eeconfig.h"
+
+typedef struct PACKED {
+    uint8_t  actuation_mode;                              // 0: normal board-wide APC, 1: Rapid trigger from specific board-wide actuation point, 2: Rapid trigger from resting point
+    uint16_t mode_0_actuation_threshold;                  // threshold for key press in mode 0
+    uint16_t mode_0_release_threshold;                    // threshold for key release in mode 0
+    uint16_t mode_1_initial_deadzone_offset;              // threshold for key press in mode 1
+    uint8_t  mode_1_actuation_offset;                     // offset for key press in mode 1 and 2 (1-255)
+    uint8_t  mode_1_release_offset;                       // offset for key release in mode 1 and 2 (1-255)
+    uint16_t bottoming_reading[MATRIX_ROWS][MATRIX_COLS]; // bottoming reading
+} eeprom_ec_config_t;
+
+typedef struct {
+    uint8_t  actuation_mode;                                                    // 0: normal board-wide APC, 1: Rapid trigger from specific board-wide actuation point (it can be very near that baseline noise and be "full travel")
+    uint16_t mode_0_actuation_threshold;                                        // threshold for key press in mode 0
+    uint16_t mode_0_release_threshold;                                          // threshold for key release in mode 0
+    uint16_t mode_1_initial_deadzone_offset;                                    // threshold for key press in mode 1 (initial deadzone)
+    uint16_t rescaled_mode_0_actuation_threshold[MATRIX_ROWS][MATRIX_COLS];     // threshold for key press in mode 0 rescaled to actual scale
+    uint16_t rescaled_mode_0_release_threshold[MATRIX_ROWS][MATRIX_COLS];       // threshold for key release in mode 0 rescaled to actual scale
+    uint16_t rescaled_mode_1_initial_deadzone_offset[MATRIX_ROWS][MATRIX_COLS]; // threshold for key press in mode 1 (initial deadzone) rescaled to actual scale
+    uint8_t  mode_1_actuation_offset;                                           // offset for key press in mode 1 (1-255)
+    uint8_t  mode_1_release_offset;                                             // offset for key release in mode 1 (1-255)
+    uint16_t extremum[MATRIX_ROWS][MATRIX_COLS];                                // extremum values for mode 1
+    uint16_t noise_floor[MATRIX_ROWS][MATRIX_COLS];                             // noise floor detected during startup
+    bool     bottoming_calibration;                                             // calibration mode for bottoming out values (true: calibration mode, false: normal mode)
+    bool     bottoming_calibration_starter[MATRIX_ROWS][MATRIX_COLS];           // calibration mode for bottoming out values (true: calibration mode, false: normal mode)
+    uint16_t bottoming_reading[MATRIX_ROWS][MATRIX_COLS];                       // bottoming reading
+} ec_config_t;
+
+// Check if the size of the reserved persistent memory is the same as the size of struct eeprom_ec_config_t
+_Static_assert(sizeof(eeprom_ec_config_t) == EECONFIG_KB_DATA_SIZE, "Mismatch in keyboard EECONFIG stored data");
+
+extern eeprom_ec_config_t eeprom_ec_config;
+
+extern ec_config_t ec_config;
+
+void init_row(void);
+void init_amux(void);
+void select_amux_channel(uint8_t channel, uint8_t col);
+void disable_unused_amux(uint8_t channel);
+void discharge_capacitor(void);
+void charge_capacitor(uint8_t row);
+
+int      ec_init(void);
+void     ec_noise_floor(void);
+bool     ec_matrix_scan(matrix_row_t current_matrix[]);
+uint16_t ec_readkey_raw(uint8_t channel, uint8_t row, uint8_t col);
+bool     ec_update_key(matrix_row_t* current_row, uint8_t row, uint8_t col, uint16_t sw_value);
+void     ec_print_matrix(void);
+
+uint16_t rescale(uint16_t x, uint16_t in_min, uint16_t in_max, uint16_t out_min, uint16_t out_max);
diff --git a/keyboards/kbdfans/tiger80/keymaps/micros24/config.h b/keyboards/cipulot/common/eeprom_tools.h
similarity index 51%
rename from keyboards/kbdfans/tiger80/keymaps/micros24/config.h
rename to keyboards/cipulot/common/eeprom_tools.h
index adafb144e5b..b3c90d87592 100644
--- a/keyboards/kbdfans/tiger80/keymaps/micros24/config.h
+++ b/keyboards/cipulot/common/eeprom_tools.h
@@ -1,8 +1,8 @@
-/* Copyright 2022 micros24 <jasperjano.ph@gmail.com>
+/* Copyright 2023 Cipulot
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * 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,
@@ -15,23 +15,12 @@
  */
 #pragma once
 
-/* Disable locking support */
-#ifdef LOCKING_SUPPORT_ENABLE
-	#undef LOCKING_SUPPORT_ENABLE
+#include "eeprom.h"
+
+#if (EECONFIG_KB_DATA_SIZE) > 0
+#    define EEPROM_KB_PARTIAL_UPDATE(__struct, __field) eeprom_update_block(&(__struct.__field), (void *)((void *)(EECONFIG_KB_DATABLOCK) + offsetof(typeof(__struct), __field)), sizeof(__struct.__field))
 #endif
 
-/* Disable locking support */
-#ifdef LOCKING_RESYNC_ENABLE
-	#undef LOCKING_RESYNC_ENABLE
+#if (EECONFIG_USER_DATA_SIZE) > 0
+#    define EEPROM_USER_PARTIAL_UPDATE(__struct, __field) eeprom_update_block(&(__struct.__field), (void *)((void *)(EECONFIG_USER_DATABLOCK) + offsetof(typeof(__struct), __field)), sizeof(__struct.__field))
 #endif
-
-/* Increasing performance */
-#define MATRIX_IO_DELAY 20
-#define FORCE_NKRO
-
-/* Disable unused features to save space */
-#define NO_ACTION_LAYER
-#define NO_ACTION_ONESHOT
-
-/* Tap-Hold configuration */
-#define TAPPING_TERM 200
\ No newline at end of file
diff --git a/keyboards/cipulot/ec_alveus/1_0_0/matrix.c b/keyboards/cipulot/common/matrix.c
similarity index 63%
rename from keyboards/cipulot/ec_alveus/1_0_0/matrix.c
rename to keyboards/cipulot/common/matrix.c
index 1850acf2641..cfa2efe0506 100644
--- a/keyboards/cipulot/ec_alveus/1_0_0/matrix.c
+++ b/keyboards/cipulot/common/matrix.c
@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -17,28 +17,26 @@
 #include "ec_switch_matrix.h"
 #include "matrix.h"
 
-/* matrix state(1:on, 0:off) */
 extern matrix_row_t raw_matrix[MATRIX_ROWS]; // raw values
 extern matrix_row_t matrix[MATRIX_ROWS];     // debounced values
 
+// Custom matrix init function
 void matrix_init_custom(void) {
-    // Default values, overwritten by VIA if enabled later
-    ecsm_config.ecsm_actuation_threshold = DEFAULT_ACTUATION_LEVEL;
-    ecsm_config.ecsm_release_threshold   = DEFAULT_RELEASE_LEVEL;
+    // Initialize EC
+    ec_init();
 
-    ecsm_init(&ecsm_config);
+    // Get the noise floor at boot
+    ec_noise_floor();
 }
 
+// Custom matrix scan function
 bool matrix_scan_custom(matrix_row_t current_matrix[]) {
-    bool updated = ecsm_matrix_scan(current_matrix);
+    bool updated = ec_matrix_scan(current_matrix);
 
-// RAW matrix values on console
-#ifdef CONSOLE_ENABLE
-    static int cnt = 0;
-    if (cnt++ == 350) {
-        cnt = 0;
-        ecsm_print_matrix();
-    }
-#endif
     return updated;
 }
+
+// Bootmagic overriden to avoid conflicts with EC
+void bootmagic_scan(void) {
+    ;
+}
diff --git a/keyboards/cipulot/common/via_apc.c b/keyboards/cipulot/common/via_apc.c
deleted file mode 100644
index 2a92052d883..00000000000
--- a/keyboards/cipulot/common/via_apc.c
+++ /dev/null
@@ -1,158 +0,0 @@
-/* Copyright 2023 Cipulot
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "ec_switch_matrix.h"
-#include "action.h"
-#include "via.h"
-
-#ifdef VIA_ENABLE
-
-void apc_init_thresholds(void);
-void apc_set_threshold(bool is_for_actuation);
-
-// Declaring an _apc_config_t struct that will store our data
-typedef struct _apc_config_t {
-    uint16_t actuation_threshold;
-    uint16_t release_threshold;
-} apc_config;
-
-// Check if the size of the reserved persistent memory is the same as the size of struct apc_config
-_Static_assert(sizeof(apc_config) == EECONFIG_USER_DATA_SIZE, "Mismatch in keyboard EECONFIG stored data");
-
-// Declaring a new variable apc of type apc_config
-apc_config apc;
-
-// Declaring enums for VIA config menu
-enum via_apc_enums {
-    // clang-format off
-    id_apc_actuation_threshold = 1,
-    id_apc_release_threshold = 2
-    // clang-format on
-};
-
-// Initializing persistent memory configuration: default values are declared and stored in PMEM
-void eeconfig_init_user(void) {
-    // Default values
-    apc.actuation_threshold = DEFAULT_ACTUATION_LEVEL;
-    apc.release_threshold   = DEFAULT_RELEASE_LEVEL;
-    // Write default value to EEPROM now
-    eeconfig_update_user_datablock(&apc);
-}
-
-// On Keyboard startup
-void keyboard_post_init_user(void) {
-    // Read custom menu variables from memory
-    eeconfig_read_user_datablock(&apc);
-    apc_init_thresholds();
-}
-
-// Handle the data received by the keyboard from the VIA menus
-void apc_config_set_value(uint8_t *data) {
-    // data = [ value_id, value_data ]
-    uint8_t *value_id   = &(data[0]);
-    uint8_t *value_data = &(data[1]);
-
-    switch (*value_id) {
-        case id_apc_actuation_threshold: {
-            apc.actuation_threshold = value_data[1] | (value_data[0] << 8);
-            apc_set_threshold(true);
-            break;
-        }
-        case id_apc_release_threshold: {
-            apc.release_threshold = value_data[1] | (value_data[0] << 8);
-            apc_set_threshold(false);
-            break;
-        }
-    }
-}
-
-// Handle the data sent by the keyboard to the VIA menus
-void apc_config_get_value(uint8_t *data) {
-    // data = [ value_id, value_data ]
-    uint8_t *value_id   = &(data[0]);
-    uint8_t *value_data = &(data[1]);
-
-    switch (*value_id) {
-        case id_apc_actuation_threshold: {
-            value_data[0] = apc.actuation_threshold >> 8;
-            value_data[1] = apc.actuation_threshold & 0xFF;
-            break;
-        }
-        case id_apc_release_threshold: {
-            value_data[0] = apc.release_threshold >> 8;
-            value_data[1] = apc.release_threshold & 0xFF;
-            break;
-        }
-    }
-}
-
-// Save the data to persistent memory after changes are made
-void apc_config_save(void) {
-    eeconfig_update_user_datablock(&apc);
-}
-
-void via_custom_value_command_kb(uint8_t *data, uint8_t length) {
-    // data = [ command_id, channel_id, value_id, value_data ]
-    uint8_t *command_id        = &(data[0]);
-    uint8_t *channel_id        = &(data[1]);
-    uint8_t *value_id_and_data = &(data[2]);
-
-    if (*channel_id == id_custom_channel) {
-        switch (*command_id) {
-            case id_custom_set_value: {
-                apc_config_set_value(value_id_and_data);
-                break;
-            }
-            case id_custom_get_value: {
-                apc_config_get_value(value_id_and_data);
-                break;
-            }
-            case id_custom_save: {
-                apc_config_save();
-                break;
-            }
-            default: {
-                // Unhandled message.
-                *command_id = id_unhandled;
-                break;
-            }
-        }
-        return;
-    }
-
-    *command_id = id_unhandled;
-}
-
-// Initialize the thresholds
-void apc_init_thresholds(void) {
-    ecsm_config.ecsm_actuation_threshold = apc.actuation_threshold;
-    ecsm_config.ecsm_release_threshold   = apc.release_threshold;
-
-    // Update the ecsm_config
-    ecsm_update(&ecsm_config);
-}
-
-// Set the thresholds
-void apc_set_threshold(bool is_for_actuation) {
-    if (is_for_actuation) {
-        ecsm_config.ecsm_actuation_threshold = apc.actuation_threshold;
-
-    } else {
-        ecsm_config.ecsm_release_threshold = apc.release_threshold;
-    }
-    // Update the ecsm_config
-    ecsm_update(&ecsm_config);
-}
-#endif // VIA_ENABLE
diff --git a/keyboards/cipulot/common/via_ec.c b/keyboards/cipulot/common/via_ec.c
new file mode 100644
index 00000000000..ce4e813f759
--- /dev/null
+++ b/keyboards/cipulot/common/via_ec.c
@@ -0,0 +1,363 @@
+/* Copyright 2023 Cipulot
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include "eeprom_tools.h"
+#include "ec_switch_matrix.h"
+#include "action.h"
+#include "print.h"
+#include "via.h"
+
+#ifdef VIA_ENABLE
+
+void ec_rescale_values(uint8_t item);
+void ec_save_threshold_data(uint8_t option);
+void ec_save_bottoming_reading(void);
+void ec_show_calibration_data(void);
+void ec_clear_bottoming_calibration_data(void);
+
+// Declaring enums for VIA config menu
+enum via_enums {
+    // clang-format off
+    id_actuation_mode = 1,
+    id_mode_0_actuation_threshold = 2,
+    id_mode_0_release_threshold = 3,
+    id_save_threshold_data = 4,
+    id_mode_1_initial_deadzone_offset = 5,
+    id_mode_1_actuation_offset = 6,
+    id_mode_1_release_offset = 7,
+    id_bottoming_calibration = 8,
+    id_noise_floor_calibration = 9,
+    id_show_calibration_data = 10,
+    id_clear_bottoming_calibration_data = 11
+    // clang-format on
+};
+
+// Handle the data received by the keyboard from the VIA menus
+void via_config_set_value(uint8_t *data) {
+    // data = [ value_id, value_data ]
+    uint8_t *value_id   = &(data[0]);
+    uint8_t *value_data = &(data[1]);
+
+    switch (*value_id) {
+        case id_actuation_mode: {
+            eeprom_ec_config.actuation_mode = value_data[0];
+            ec_config.actuation_mode        = eeprom_ec_config.actuation_mode;
+            if (ec_config.actuation_mode == 0) {
+                uprintf("#########################\n");
+                uprintf("#  Actuation Mode: APC  #\n");
+                uprintf("#########################\n");
+            } else if (ec_config.actuation_mode == 1) {
+                uprintf("#################################\n");
+                uprintf("# Actuation Mode: Rapid Trigger #\n");
+                uprintf("#################################\n");
+            }
+            EEPROM_KB_PARTIAL_UPDATE(eeprom_ec_config, actuation_mode);
+            break;
+        }
+        case id_mode_0_actuation_threshold: {
+            ec_config.mode_0_actuation_threshold = value_data[1] | (value_data[0] << 8);
+            uprintf("APC Mode Actuation Threshold: %d\n", ec_config.mode_0_actuation_threshold);
+            break;
+        }
+        case id_mode_0_release_threshold: {
+            ec_config.mode_0_release_threshold = value_data[1] | (value_data[0] << 8);
+            uprintf("APC Mode Release Threshold: %d\n", ec_config.mode_0_release_threshold);
+            break;
+        }
+        case id_mode_1_initial_deadzone_offset: {
+            ec_config.mode_1_initial_deadzone_offset = value_data[1] | (value_data[0] << 8);
+            uprintf("Rapid Trigger Mode Initial Deadzone Offset: %d\n", ec_config.mode_1_initial_deadzone_offset);
+            break;
+        }
+        case id_mode_1_actuation_offset: {
+            ec_config.mode_1_actuation_offset = value_data[0];
+            uprintf("Rapid Trigger Mode Actuation Offset: %d\n", ec_config.mode_1_actuation_offset);
+            break;
+        }
+        case id_mode_1_release_offset: {
+            ec_config.mode_1_release_offset = value_data[0];
+            uprintf("Rapid Trigger Mode Release Offset: %d\n", ec_config.mode_1_release_offset);
+            break;
+        }
+        case id_bottoming_calibration: {
+            if (value_data[0] == 1) {
+                ec_config.bottoming_calibration = true;
+                uprintf("##############################\n");
+                uprintf("# Bottoming calibration mode #\n");
+                uprintf("##############################\n");
+            } else {
+                ec_config.bottoming_calibration = false;
+                ec_save_bottoming_reading();
+                uprintf("## Bottoming calibration done ##\n");
+                ec_show_calibration_data();
+            }
+            break;
+        }
+        case id_save_threshold_data: {
+            ec_save_threshold_data(value_data[0]);
+            break;
+        }
+        case id_noise_floor_calibration: {
+            if (value_data[0] == 0) {
+                ec_noise_floor();
+                ec_rescale_values(0);
+                ec_rescale_values(1);
+                ec_rescale_values(2);
+                uprintf("#############################\n");
+                uprintf("# Noise floor data acquired #\n");
+                uprintf("#############################\n");
+                break;
+            }
+        }
+        case id_show_calibration_data: {
+            if (value_data[0] == 0) {
+                ec_show_calibration_data();
+                break;
+            }
+        }
+        case id_clear_bottoming_calibration_data: {
+            if (value_data[0] == 0) {
+                ec_clear_bottoming_calibration_data();
+            }
+        }
+        default: {
+            // Unhandled value.
+            break;
+        }
+    }
+}
+
+// Handle the data sent by the keyboard to the VIA menus
+void via_config_get_value(uint8_t *data) {
+    // data = [ value_id, value_data ]
+    uint8_t *value_id   = &(data[0]);
+    uint8_t *value_data = &(data[1]);
+
+    switch (*value_id) {
+        case id_actuation_mode: {
+            value_data[0] = eeprom_ec_config.actuation_mode;
+            break;
+        }
+        case id_mode_0_actuation_threshold: {
+            value_data[0] = eeprom_ec_config.mode_0_actuation_threshold >> 8;
+            value_data[1] = eeprom_ec_config.mode_0_actuation_threshold & 0xFF;
+            break;
+        }
+        case id_mode_0_release_threshold: {
+            value_data[0] = eeprom_ec_config.mode_0_release_threshold >> 8;
+            value_data[1] = eeprom_ec_config.mode_0_release_threshold & 0xFF;
+            break;
+        }
+        case id_mode_1_initial_deadzone_offset: {
+            value_data[0] = eeprom_ec_config.mode_1_initial_deadzone_offset >> 8;
+            value_data[1] = eeprom_ec_config.mode_1_initial_deadzone_offset & 0xFF;
+            break;
+        }
+        case id_mode_1_actuation_offset: {
+            value_data[0] = eeprom_ec_config.mode_1_actuation_offset;
+            break;
+        }
+        case id_mode_1_release_offset: {
+            value_data[0] = eeprom_ec_config.mode_1_release_offset;
+            break;
+        }
+        default: {
+            // Unhandled value.
+            break;
+        }
+    }
+}
+
+// Handle the commands sent and received by the keyboard with VIA
+void via_custom_value_command_kb(uint8_t *data, uint8_t length) {
+    // data = [ command_id, channel_id, value_id, value_data ]
+    uint8_t *command_id        = &(data[0]);
+    uint8_t *channel_id        = &(data[1]);
+    uint8_t *value_id_and_data = &(data[2]);
+
+    if (*channel_id == id_custom_channel) {
+        switch (*command_id) {
+            case id_custom_set_value: {
+                via_config_set_value(value_id_and_data);
+                break;
+            }
+            case id_custom_get_value: {
+                via_config_get_value(value_id_and_data);
+                break;
+            }
+            case id_custom_save: {
+                // Bypass the save function in favor of pinpointed saves
+                break;
+            }
+            default: {
+                // Unhandled message.
+                *command_id = id_unhandled;
+                break;
+            }
+        }
+        return;
+    }
+
+    *command_id = id_unhandled;
+}
+
+// Rescale the values received by VIA to fit the new range
+void ec_rescale_values(uint8_t item) {
+    switch (item) {
+        // Rescale the APC mode actuation thresholds
+        case 0:
+            for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+                for (uint8_t col = 0; col < MATRIX_COLS; col++) {
+                    ec_config.rescaled_mode_0_actuation_threshold[row][col] = rescale(ec_config.mode_0_actuation_threshold, 0, 1023, ec_config.noise_floor[row][col], eeprom_ec_config.bottoming_reading[row][col]);
+                }
+            }
+            break;
+        // Rescale the APC mode release thresholds
+        case 1:
+            for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+                for (uint8_t col = 0; col < MATRIX_COLS; col++) {
+                    ec_config.rescaled_mode_0_release_threshold[row][col] = rescale(ec_config.mode_0_release_threshold, 0, 1023, ec_config.noise_floor[row][col], eeprom_ec_config.bottoming_reading[row][col]);
+                }
+            }
+            break;
+        // Rescale the Rapid Trigger mode initial deadzone offsets
+        case 2:
+            for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+                for (uint8_t col = 0; col < MATRIX_COLS; col++) {
+                    ec_config.rescaled_mode_1_initial_deadzone_offset[row][col] = rescale(ec_config.mode_1_initial_deadzone_offset, 0, 1023, ec_config.noise_floor[row][col], eeprom_ec_config.bottoming_reading[row][col]);
+                }
+            }
+            break;
+
+        default:
+            // Unhandled item.
+            break;
+    }
+}
+
+void ec_save_threshold_data(uint8_t option) {
+    // Save APC mode thresholds and rescale them for runtime usage
+    if (option == 0) {
+        eeprom_ec_config.mode_0_actuation_threshold = ec_config.mode_0_actuation_threshold;
+        eeprom_ec_config.mode_0_release_threshold   = ec_config.mode_0_release_threshold;
+        ec_rescale_values(0);
+        ec_rescale_values(1);
+    }
+    // Save Rapid Trigger mode thresholds and rescale them for runtime usage
+    else if (option == 1) {
+        eeprom_ec_config.mode_1_initial_deadzone_offset = ec_config.mode_1_initial_deadzone_offset;
+        eeprom_ec_config.mode_1_actuation_offset   = ec_config.mode_1_actuation_offset;
+        eeprom_ec_config.mode_1_release_offset     = ec_config.mode_1_release_offset;
+        ec_rescale_values(2);
+    }
+    eeconfig_update_kb_datablock(&eeprom_ec_config);
+    uprintf("####################################\n");
+    uprintf("# New thresholds applied and saved #\n");
+    uprintf("####################################\n");
+}
+
+// Save the bottoming reading
+void ec_save_bottoming_reading(void) {
+    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+        for (uint8_t col = 0; col < MATRIX_COLS; col++) {
+            // If the bottom reading doesn't go over the noise floor by BOTTOMING_CALIBRATION_THRESHOLD, it is likely that:
+            // 1. The key is not actually in the matrix
+            // 2. The key is on an alternative layout, therefore not being pressed
+            // 3. The key in in the current layout but not being pressed
+            if (ec_config.bottoming_reading[row][col] < (ec_config.noise_floor[row][col] + BOTTOMING_CALIBRATION_THRESHOLD)) {
+                eeprom_ec_config.bottoming_reading[row][col] = 1023;
+            } else {
+                eeprom_ec_config.bottoming_reading[row][col] = ec_config.bottoming_reading[row][col];
+            }
+        }
+    }
+    // Rescale the values to fit the new range for runtime usage
+    ec_rescale_values(0);
+    ec_rescale_values(1);
+    ec_rescale_values(2);
+    eeconfig_update_kb_datablock(&eeprom_ec_config);
+}
+
+// Show the calibration data
+void ec_show_calibration_data(void) {
+    uprintf("\n###############\n");
+    uprintf("# Noise Floor #\n");
+    uprintf("###############\n");
+    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+        for (uint8_t col = 0; col < MATRIX_COLS - 1; col++) {
+            uprintf("%4d,", ec_config.noise_floor[row][col]);
+        }
+        uprintf("%4d\n", ec_config.noise_floor[row][MATRIX_COLS - 1]);
+    }
+
+    uprintf("\n######################\n");
+    uprintf("# Bottoming Readings #\n");
+    uprintf("######################\n");
+    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+        for (uint8_t col = 0; col < MATRIX_COLS - 1; col++) {
+            uprintf("%4d,", eeprom_ec_config.bottoming_reading[row][col]);
+        }
+        uprintf("%4d\n", eeprom_ec_config.bottoming_reading[row][MATRIX_COLS - 1]);
+    }
+
+    uprintf("\n######################################\n");
+    uprintf("# Rescaled APC Mode Actuation Points #\n");
+    uprintf("######################################\n");
+    uprintf("Original APC Mode Actuation Point: %4d\n", ec_config.mode_0_actuation_threshold);
+    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+        for (uint8_t col = 0; col < MATRIX_COLS - 1; col++) {
+            uprintf("%4d,", ec_config.rescaled_mode_0_actuation_threshold[row][col]);
+        }
+        uprintf("%4d\n", ec_config.rescaled_mode_0_actuation_threshold[row][MATRIX_COLS - 1]);
+    }
+
+    uprintf("\n######################################\n");
+    uprintf("# Rescaled APC Mode Release Points   #\n");
+    uprintf("######################################\n");
+    uprintf("Original APC Mode Release Point: %4d\n", ec_config.mode_0_release_threshold);
+    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+        for (uint8_t col = 0; col < MATRIX_COLS - 1; col++) {
+            uprintf("%4d,", ec_config.rescaled_mode_0_release_threshold[row][col]);
+        }
+        uprintf("%4d\n", ec_config.rescaled_mode_0_release_threshold[row][MATRIX_COLS - 1]);
+    }
+
+    uprintf("\n#######################################################\n");
+    uprintf("# Rescaled Rapid Trigger Mode Initial Deadzone Offset #\n");
+    uprintf("#######################################################\n");
+    uprintf("Original Rapid Trigger Mode Initial Deadzone Offset: %4d\n", ec_config.mode_1_initial_deadzone_offset);
+    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+        for (uint8_t col = 0; col < MATRIX_COLS - 1; col++) {
+            uprintf("%4d,", ec_config.rescaled_mode_1_initial_deadzone_offset[row][col]);
+        }
+        uprintf("%4d\n", ec_config.rescaled_mode_1_initial_deadzone_offset[row][MATRIX_COLS - 1]);
+    }
+    print("\n");
+}
+
+// Clear the calibration data
+void ec_clear_bottoming_calibration_data(void) {
+    // Clear the EEPROM data
+    eeconfig_init_kb();
+
+    // Reset the runtime values to the EEPROM values
+    keyboard_post_init_kb();
+
+    uprintf("######################################\n");
+    uprintf("# Bottoming calibration data cleared #\n");
+    uprintf("######################################\n");
+}
+
+#endif // VIA_ENABLE
diff --git a/keyboards/cipulot/ec_23u/config.h b/keyboards/cipulot/ec_23u/config.h
index 8bb39367b94..da210fe0c63 100644
--- a/keyboards/cipulot/ec_23u/config.h
+++ b/keyboards/cipulot/ec_23u/config.h
@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -19,29 +19,51 @@
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 6
 
-/* Custom matrix pins and port select array */
 #define MATRIX_ROW_PINS \
     { B13, B12, A7, B0 }
-#define MATRIX_COL_CHANNELS \
-    { 4, 6, 3, 2, 0, 1 }
-#define MUX_SEL_PINS \
+
+#define AMUX_COUNT 1
+#define AMUX_MAX_COLS_COUNT 6
+
+#define AMUX_EN_PINS \
+    { C15 }
+
+#define AMUX_SEL_PINS \
     { C14, C13, B6 }
 
-/* Hardware peripherals pins */
-#define APLEX_EN_PIN C15
+#define AMUX_COL_CHANNELS_SIZES \
+    { 6 }
+
+#define AMUX_0_COL_CHANNELS \
+    { 4, 6, 3, 2, 0, 1 }
+
+#define AMUX_COL_CHANNELS AMUX_0_COL_CHANNELS
+
 #define DISCHARGE_PIN A3
 #define ANALOG_PORT A2
 
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-//#define DEBOUNCE 5
+#define DEFAULT_ACTUATION_MODE 0
+#define DEFAULT_MODE_0_ACTUATION_LEVEL 550
+#define DEFAULT_MODE_0_RELEASE_LEVEL 500
+#define DEFAULT_MODE_1_INITIAL_DEADZONE_OFFSET DEFAULT_MODE_0_ACTUATION_LEVEL
+#define DEFAULT_MODE_1_ACTUATION_OFFSET 70
+#define DEFAULT_MODE_1_RELEASE_OFFSET 70
+#define DEFAULT_EXTREMUM 1023
+#define EXPECTED_NOISE_FLOOR 0
+#define NOISE_FLOOR_THRESHOLD 50
+#define BOTTOMING_CALIBRATION_THRESHOLD 100
+#define DEFAULT_NOISE_FLOOR_SAMPLING_COUNT 30
+#define DEFAULT_BOTTOMING_READING 1023
+#define DEFAULT_CALIBRATION_STARTER true
+
+#define DISCHARGE_TIME 10
+
+// #define DEBUG_MATRIX_SCAN_RATE
+
+#define EECONFIG_KB_DATA_SIZE 58
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-#define DEFAULT_ACTUATION_LEVEL 550
-#define DEFAULT_RELEASE_LEVEL 500
-
-#define DISCHARGE_TIME 10
diff --git a/keyboards/cipulot/ec_23u/ec_switch_matrix.c b/keyboards/cipulot/ec_23u/ec_switch_matrix.c
deleted file mode 100644
index 4059a80e5db..00000000000
--- a/keyboards/cipulot/ec_23u/ec_switch_matrix.c
+++ /dev/null
@@ -1,165 +0,0 @@
-/* Copyright 2023 Cipulot
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "ec_switch_matrix.h"
-#include "analog.h"
-#include "atomic_util.h"
-#include "print.h"
-#include "wait.h"
-
-/* Pin and port array */
-const uint32_t row_pins[]     = MATRIX_ROW_PINS;
-const uint8_t  col_channels[] = MATRIX_COL_CHANNELS;
-const uint32_t mux_sel_pins[] = MUX_SEL_PINS;
-
-static ecsm_config_t config;
-static uint16_t      ecsm_sw_value[MATRIX_ROWS][MATRIX_COLS];
-
-static adc_mux adcMux;
-
-static inline void discharge_capacitor(void) {
-    writePinLow(DISCHARGE_PIN);
-}
-static inline void charge_capacitor(uint8_t row) {
-    writePinHigh(DISCHARGE_PIN);
-    writePinHigh(row_pins[row]);
-}
-
-static inline void init_mux_sel(void) {
-    for (int idx = 0; idx < 3; idx++) {
-        setPinOutput(mux_sel_pins[idx]);
-    }
-}
-
-static inline void select_mux(uint8_t col) {
-    uint8_t ch = col_channels[col];
-    writePin(mux_sel_pins[0], ch & 1);
-    writePin(mux_sel_pins[1], ch & 2);
-    writePin(mux_sel_pins[2], ch & 4);
-}
-
-static inline void init_row(void) {
-    for (int idx = 0; idx < MATRIX_ROWS; idx++) {
-        setPinOutput(row_pins[idx]);
-        writePinLow(row_pins[idx]);
-    }
-}
-
-/* Initialize the peripherals pins */
-int ecsm_init(ecsm_config_t const* const ecsm_config) {
-    // Initialize config
-    config = *ecsm_config;
-
-    palSetLineMode(ANALOG_PORT, PAL_MODE_INPUT_ANALOG);
-    adcMux = pinToMux(ANALOG_PORT);
-
-    //Dummy call to make sure that adcStart() has been called in the appropriate state
-    adc_read(adcMux);
-
-    // Initialize discharge pin as discharge mode
-    writePinLow(DISCHARGE_PIN);
-    setPinOutputOpenDrain(DISCHARGE_PIN);
-
-    // Initialize drive lines
-    init_row();
-
-    // Initialize multiplexer select pin
-    init_mux_sel();
-
-    // Enable AMUX
-    setPinOutput(APLEX_EN_PIN);
-    writePinLow(APLEX_EN_PIN);
-
-    return 0;
-}
-
-int ecsm_update(ecsm_config_t const* const ecsm_config) {
-    // Save config
-    config = *ecsm_config;
-    return 0;
-}
-
-// Read the capacitive sensor value
-uint16_t ecsm_readkey_raw(uint8_t channel, uint8_t row, uint8_t col) {
-    uint16_t sw_value = 0;
-
-    // Select the multiplexer
-    writePinHigh(APLEX_EN_PIN);
-    select_mux(col);
-    writePinLow(APLEX_EN_PIN);
-
-    // Set strobe pins to low state
-    writePinLow(row_pins[row]);
-    ATOMIC_BLOCK_FORCEON {
-        // Set the row pin to high state and have capacitor charge
-        charge_capacitor(row);
-        // Read the ADC value
-        sw_value = adc_read(adcMux);
-    }
-    // Discharge peak hold capacitor
-    discharge_capacitor();
-    // Waiting for the ghost capacitor to discharge fully
-    wait_us(DISCHARGE_TIME);
-
-    return sw_value;
-}
-
-// Update press/release state of key
-bool ecsm_update_key(matrix_row_t* current_row, uint8_t row, uint8_t col, uint16_t sw_value) {
-    bool current_state = (*current_row >> col) & 1;
-
-    // Press to release
-    if (current_state && sw_value < config.ecsm_actuation_threshold) {
-        *current_row &= ~(1 << col);
-        return true;
-    }
-
-    // Release to press
-    if ((!current_state) && sw_value > config.ecsm_release_threshold) {
-        *current_row |= (1 << col);
-        return true;
-    }
-
-    return false;
-}
-
-// Scan key values and update matrix state
-bool ecsm_matrix_scan(matrix_row_t current_matrix[]) {
-    bool updated = false;
-
-    for (int col = 0; col < sizeof(col_channels); col++) {
-        for (int row = 0; row < MATRIX_ROWS; row++) {
-            ecsm_sw_value[row][col] = ecsm_readkey_raw(0, row, col);
-            updated |= ecsm_update_key(&current_matrix[row], row, col, ecsm_sw_value[row][col]);
-        }
-    }
-
-    return updated;
-}
-
-// Debug print key values
-void ecsm_print_matrix(void) {
-    for (int row = 0; row < MATRIX_ROWS; row++) {
-        for (int col = 0; col < MATRIX_COLS; col++) {
-            uprintf("%4d", ecsm_sw_value[row][col]);
-            if (col < (MATRIX_COLS - 1)) {
-                print(",");
-            }
-        }
-        print("\n");
-    }
-    print("\n");
-}
diff --git a/keyboards/cipulot/ec_23u/ec_switch_matrix.h b/keyboards/cipulot/ec_23u/ec_switch_matrix.h
deleted file mode 100644
index 9dcb216caa3..00000000000
--- a/keyboards/cipulot/ec_23u/ec_switch_matrix.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2023 Cipulot
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include <stdint.h>
-#include <stdbool.h>
-
-#include "matrix.h"
-
-typedef struct {
-    uint16_t ecsm_actuation_threshold; // threshold for key release
-    uint16_t ecsm_release_threshold;   // threshold for key press
-} ecsm_config_t;
-
-ecsm_config_t ecsm_config;
-
-int      ecsm_init(ecsm_config_t const* const ecsm_config);
-int      ecsm_update(ecsm_config_t const* const ecsm_config);
-bool     ecsm_matrix_scan(matrix_row_t current_matrix[]);
-uint16_t ecsm_readkey_raw(uint8_t channel, uint8_t row, uint8_t col);
-bool     ecsm_update_key(matrix_row_t* current_row, uint8_t row, uint8_t col, uint16_t sw_value);
-void     ecsm_print_matrix(void);
diff --git a/keyboards/cipulot/ec_23u/halconf.h b/keyboards/cipulot/ec_23u/halconf.h
index 5b71acecbbc..835d43b6a0a 100644
--- a/keyboards/cipulot/ec_23u/halconf.h
+++ b/keyboards/cipulot/ec_23u/halconf.h
@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/keyboards/cipulot/ec_23u/info.json b/keyboards/cipulot/ec_23u/info.json
index 7358099759b..0f656f8e8ca 100644
--- a/keyboards/cipulot/ec_23u/info.json
+++ b/keyboards/cipulot/ec_23u/info.json
@@ -8,19 +8,13 @@
     },
     "diode_direction": "COL2ROW",
     "features": {
-        "audio": false,
-        "backlight": false,
-        "bootmagic": true,
-        "command": false,
+        "bootmagic": false,
         "console": true,
         "extrakey": true,
         "mousekey": true,
         "nkro": true,
         "rgblight": true
     },
-    "mouse_key": {
-        "enabled": true
-    },
     "indicators": {
         "num_lock": "B14"
     },
diff --git a/keyboards/cipulot/ec_23u/keymaps/default/keymap.c b/keyboards/cipulot/ec_23u/keymaps/default/keymap.c
index 93ceadb842c..1f54d78a62b 100644
--- a/keyboards/cipulot/ec_23u/keymaps/default/keymap.c
+++ b/keyboards/cipulot/ec_23u/keymaps/default/keymap.c
@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -28,27 +28,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [1] = LAYOUT_all(
         RGB_TOG, RGB_VAD, RGB_VAI, _______,
+        _______, _______, _______, NK_TOGG,
         _______, _______, _______, _______,
         _______, _______, _______, _______,
         _______, _______, _______, _______,
-        _______, _______, _______, _______,
-        _______, _______, QK_BOOT, _______),
-
-
-    [2] = LAYOUT_all(
-        _______, _______, _______, _______,
-        _______, _______, _______, _______,
-        _______, _______, _______, _______,
-        _______, _______, _______, _______,
-        _______, _______, _______, _______,
-        _______, _______, _______, _______),
-
-    [3] = LAYOUT_all(
-        _______, _______, _______, _______,
-        _______, _______, _______, _______,
-        _______, _______, _______, _______,
-        _______, _______, _______, _______,
-        _______, _______, _______, _______,
-        _______, _______, _______, _______)
+        _______, _______, QK_BOOT, _______)
     // clang-format on
 };
diff --git a/keyboards/cipulot/ec_23u/keymaps/via/config.h b/keyboards/cipulot/ec_23u/keymaps/via/config.h
index ebf954d07ac..036188669d1 100644
--- a/keyboards/cipulot/ec_23u/keymaps/via/config.h
+++ b/keyboards/cipulot/ec_23u/keymaps/via/config.h
@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,5 +16,7 @@
 
 #pragma once
 
+// This is the firmware version for VIA support to avoid conflicts on menu fetching
+#define VIA_FIRMWARE_VERSION 1
 // This is the size of the EEPROM for the custom VIA-specific data
 #define EECONFIG_USER_DATA_SIZE 4
diff --git a/keyboards/cipulot/ec_23u/keymaps/via/keymap.c b/keyboards/cipulot/ec_23u/keymaps/via/keymap.c
index 93ceadb842c..1f54d78a62b 100644
--- a/keyboards/cipulot/ec_23u/keymaps/via/keymap.c
+++ b/keyboards/cipulot/ec_23u/keymaps/via/keymap.c
@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -28,27 +28,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [1] = LAYOUT_all(
         RGB_TOG, RGB_VAD, RGB_VAI, _______,
+        _______, _______, _______, NK_TOGG,
         _______, _______, _______, _______,
         _______, _______, _______, _______,
         _______, _______, _______, _______,
-        _______, _______, _______, _______,
-        _______, _______, QK_BOOT, _______),
-
-
-    [2] = LAYOUT_all(
-        _______, _______, _______, _______,
-        _______, _______, _______, _______,
-        _______, _______, _______, _______,
-        _______, _______, _______, _______,
-        _______, _______, _______, _______,
-        _______, _______, _______, _______),
-
-    [3] = LAYOUT_all(
-        _______, _______, _______, _______,
-        _______, _______, _______, _______,
-        _______, _______, _______, _______,
-        _______, _______, _______, _______,
-        _______, _______, _______, _______,
-        _______, _______, _______, _______)
+        _______, _______, QK_BOOT, _______)
     // clang-format on
 };
diff --git a/keyboards/cipulot/ec_23u/keymaps/via/rules.mk b/keyboards/cipulot/ec_23u/keymaps/via/rules.mk
index 520b11f2031..1e5b99807cb 100644
--- a/keyboards/cipulot/ec_23u/keymaps/via/rules.mk
+++ b/keyboards/cipulot/ec_23u/keymaps/via/rules.mk
@@ -1,3 +1 @@
 VIA_ENABLE = yes
-
-SRC += via_apc.c
diff --git a/keyboards/cipulot/ec_23u/keymaps/via/via_apc.c b/keyboards/cipulot/ec_23u/keymaps/via/via_apc.c
deleted file mode 100644
index 5ea77af44c8..00000000000
--- a/keyboards/cipulot/ec_23u/keymaps/via/via_apc.c
+++ /dev/null
@@ -1,156 +0,0 @@
-/* Copyright 2023 Cipulot
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "ec_switch_matrix.h"
-#include "action.h"
-#include "via.h"
-
-void apc_init_thresholds(void);
-void apc_set_threshold(bool is_for_actuation);
-
-// Declaring an _apc_config_t struct that will store our data
-typedef struct _apc_config_t {
-    uint16_t actuation_threshold;
-    uint16_t release_threshold;
-} apc_config;
-
-// Check if the size of the reserved persistent memory is the same as the size of struct apc_config
-_Static_assert(sizeof(apc_config) == EECONFIG_USER_DATA_SIZE, "Mismatch in keyboard EECONFIG stored data");
-
-// Declaring a new variable apc of type apc_config
-apc_config apc;
-
-// Declaring enums for VIA config menu
-enum via_apc_enums {
-    // clang-format off
-    id_apc_actuation_threshold = 1,
-    id_apc_release_threshold = 2
-    // clang-format on
-};
-
-// Initializing persistent memory configuration: default values are declared and stored in PMEM
-void eeconfig_init_user(void) {
-    // Default values
-    apc.actuation_threshold = DEFAULT_ACTUATION_LEVEL;
-    apc.release_threshold   = DEFAULT_RELEASE_LEVEL;
-    // Write default value to EEPROM now
-    eeconfig_update_user_datablock(&apc);
-}
-
-// On Keyboard startup
-void keyboard_post_init_user(void) {
-    // Read custom menu variables from memory
-    eeconfig_read_user_datablock(&apc);
-    apc_init_thresholds();
-}
-
-// Handle the data received by the keyboard from the VIA menus
-void apc_config_set_value(uint8_t *data) {
-    // data = [ value_id, value_data ]
-    uint8_t *value_id   = &(data[0]);
-    uint8_t *value_data = &(data[1]);
-
-    switch (*value_id) {
-        case id_apc_actuation_threshold: {
-            apc.actuation_threshold = value_data[1] | (value_data[0] << 8);
-            apc_set_threshold(true);
-            break;
-        }
-        case id_apc_release_threshold: {
-            apc.release_threshold = value_data[1] | (value_data[0] << 8);
-            apc_set_threshold(false);
-            break;
-        }
-    }
-}
-
-// Handle the data sent by the keyboard to the VIA menus
-void apc_config_get_value(uint8_t *data) {
-    // data = [ value_id, value_data ]
-    uint8_t *value_id   = &(data[0]);
-    uint8_t *value_data = &(data[1]);
-
-    switch (*value_id) {
-        case id_apc_actuation_threshold: {
-            value_data[0] = apc.actuation_threshold >> 8;
-            value_data[1] = apc.actuation_threshold & 0xFF;
-            break;
-        }
-        case id_apc_release_threshold: {
-            value_data[0] = apc.release_threshold >> 8;
-            value_data[1] = apc.release_threshold & 0xFF;
-            break;
-        }
-    }
-}
-
-// Save the data to persistent memory after changes are made
-void apc_config_save(void) {
-    eeconfig_update_user_datablock(&apc);
-}
-
-void via_custom_value_command_kb(uint8_t *data, uint8_t length) {
-    // data = [ command_id, channel_id, value_id, value_data ]
-    uint8_t *command_id        = &(data[0]);
-    uint8_t *channel_id        = &(data[1]);
-    uint8_t *value_id_and_data = &(data[2]);
-
-    if (*channel_id == id_custom_channel) {
-        switch (*command_id) {
-            case id_custom_set_value: {
-                apc_config_set_value(value_id_and_data);
-                break;
-            }
-            case id_custom_get_value: {
-                apc_config_get_value(value_id_and_data);
-                break;
-            }
-            case id_custom_save: {
-                apc_config_save();
-                break;
-            }
-            default: {
-                // Unhandled message.
-                *command_id = id_unhandled;
-                break;
-            }
-        }
-        return;
-    }
-
-    *command_id = id_unhandled;
-}
-
-// Initialize the thresholds
-void apc_init_thresholds(void) {
-    ecsm_config.ecsm_actuation_threshold = apc.actuation_threshold;
-    ecsm_config.ecsm_release_threshold   = apc.release_threshold;
-
-    // Update the ecsm_config
-    ecsm_update(&ecsm_config);
-}
-
-// Set the thresholds
-void apc_set_threshold(bool is_for_actuation) {
-    if (is_for_actuation) {
-        ecsm_config.ecsm_actuation_threshold = apc.actuation_threshold;
-
-    } else {
-        ecsm_config.ecsm_release_threshold = apc.release_threshold;
-    }
-    // Update the ecsm_config
-    ecsm_update(&ecsm_config);
-}
diff --git a/keyboards/cipulot/ec_23u/matrix.c b/keyboards/cipulot/ec_23u/matrix.c
deleted file mode 100644
index 1850acf2641..00000000000
--- a/keyboards/cipulot/ec_23u/matrix.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Copyright 2023 Cipulot
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "ec_switch_matrix.h"
-#include "matrix.h"
-
-/* matrix state(1:on, 0:off) */
-extern matrix_row_t raw_matrix[MATRIX_ROWS]; // raw values
-extern matrix_row_t matrix[MATRIX_ROWS];     // debounced values
-
-void matrix_init_custom(void) {
-    // Default values, overwritten by VIA if enabled later
-    ecsm_config.ecsm_actuation_threshold = DEFAULT_ACTUATION_LEVEL;
-    ecsm_config.ecsm_release_threshold   = DEFAULT_RELEASE_LEVEL;
-
-    ecsm_init(&ecsm_config);
-}
-
-bool matrix_scan_custom(matrix_row_t current_matrix[]) {
-    bool updated = ecsm_matrix_scan(current_matrix);
-
-// RAW matrix values on console
-#ifdef CONSOLE_ENABLE
-    static int cnt = 0;
-    if (cnt++ == 350) {
-        cnt = 0;
-        ecsm_print_matrix();
-    }
-#endif
-    return updated;
-}
diff --git a/keyboards/cipulot/ec_23u/mcuconf.h b/keyboards/cipulot/ec_23u/mcuconf.h
index d91f576bd48..fa3c955e0d8 100644
--- a/keyboards/cipulot/ec_23u/mcuconf.h
+++ b/keyboards/cipulot/ec_23u/mcuconf.h
@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/keyboards/cipulot/ec_23u/post_rules.mk b/keyboards/cipulot/ec_23u/post_rules.mk
new file mode 100644
index 00000000000..d726a112a8c
--- /dev/null
+++ b/keyboards/cipulot/ec_23u/post_rules.mk
@@ -0,0 +1,3 @@
+ifeq ($(strip $(VIA_ENABLE)), yes)
+    SRC += keyboards/cipulot/common/via_ec.c
+endif
diff --git a/keyboards/cipulot/ec_23u/readme.md b/keyboards/cipulot/ec_23u/readme.md
index d4832edff5d..28535c37873 100644
--- a/keyboards/cipulot/ec_23u/readme.md
+++ b/keyboards/cipulot/ec_23u/readme.md
@@ -20,8 +20,7 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to
 
 ## Bootloader
 
-Enter the bootloader in 3 ways:
+Enter the bootloader in 2 ways:
 
-* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
-* **Physical Boot0 pins**: Short the Boot0 pins on the back of the PCB while plugging in the keyboard
-* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
+* **Physical reset**: Long short the exposed pads on the top of the PCB
+* **Keycode in layout**: Press the key mapped to QK_BOOT if it is available
diff --git a/keyboards/cipulot/ec_23u/rules.mk b/keyboards/cipulot/ec_23u/rules.mk
index fc2dcf32ab1..ab6c37cad43 100644
--- a/keyboards/cipulot/ec_23u/rules.mk
+++ b/keyboards/cipulot/ec_23u/rules.mk
@@ -1,4 +1,4 @@
 CUSTOM_MATRIX = lite
-SRC += matrix.c ec_switch_matrix.c
-
 ANALOG_DRIVER_REQUIRED = yes
+SRC += keyboards/cipulot/common/matrix.c keyboards/cipulot/common/ec_board.c keyboards/cipulot/common/ec_switch_matrix.c
+OPT = 2
diff --git a/keyboards/cipulot/ec_60/config.h b/keyboards/cipulot/ec_60/config.h
index 083b71cc136..d4dc8cf68ac 100644
--- a/keyboards/cipulot/ec_60/config.h
+++ b/keyboards/cipulot/ec_60/config.h
@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -19,27 +19,54 @@
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15
 
-/* Custom matrix pins and port select array */
 #define MATRIX_ROW_PINS \
     { B15, A8, B0, A7, B1 }
-#define MATRIX_COL_CHANNELS \
-    { 0, 3, 1, 2, 5, 7, 6, 4 }
-#define MUX_SEL_PINS \
+
+#define AMUX_COUNT 2
+#define AMUX_MAX_COLS_COUNT 8
+
+#define AMUX_EN_PINS \
+    { B7, B3 }
+
+#define AMUX_SEL_PINS \
     { B6, B5, B4 }
 
-/* Hardware peripherals pins */
-#define APLEX_EN_PIN_0 B7
-#define APLEX_EN_PIN_1 B3
+#define AMUX_COL_CHANNELS_SIZES \
+    { 8, 7 }
+
+#define AMUX_0_COL_CHANNELS \
+    { 0, 3, 1, 2, 5, 7, 6, 4 }
+
+#define AMUX_1_COL_CHANNELS \
+    { 0, 3, 1, 2, 5, 7, 6 }
+
+#define AMUX_COL_CHANNELS AMUX_0_COL_CHANNELS, AMUX_1_COL_CHANNELS
+
 #define DISCHARGE_PIN A6
 #define ANALOG_PORT A3
 
+#define DEFAULT_ACTUATION_MODE 0
+#define DEFAULT_MODE_0_ACTUATION_LEVEL 550
+#define DEFAULT_MODE_0_RELEASE_LEVEL 500
+#define DEFAULT_MODE_1_INITIAL_DEADZONE_OFFSET DEFAULT_MODE_0_ACTUATION_LEVEL
+#define DEFAULT_MODE_1_ACTUATION_OFFSET 70
+#define DEFAULT_MODE_1_RELEASE_OFFSET 70
+#define DEFAULT_EXTREMUM 1023
+#define EXPECTED_NOISE_FLOOR 0
+#define NOISE_FLOOR_THRESHOLD 50
+#define BOTTOMING_CALIBRATION_THRESHOLD 100
+#define DEFAULT_NOISE_FLOOR_SAMPLING_COUNT 30
+#define DEFAULT_BOTTOMING_READING 1023
+#define DEFAULT_CALIBRATION_STARTER true
+
+#define DISCHARGE_TIME 10
+
+// #define DEBUG_MATRIX_SCAN_RATE
+
+#define EECONFIG_KB_DATA_SIZE 160
+
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-#define DEFAULT_ACTUATION_LEVEL 550
-#define DEFAULT_RELEASE_LEVEL 500
-
-#define DISCHARGE_TIME 10
diff --git a/keyboards/cipulot/ec_60/ec_switch_matrix.c b/keyboards/cipulot/ec_60/ec_switch_matrix.c
deleted file mode 100644
index 72220b87336..00000000000
--- a/keyboards/cipulot/ec_60/ec_switch_matrix.c
+++ /dev/null
@@ -1,183 +0,0 @@
-/* Copyright 2023 Cipulot
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "ec_switch_matrix.h"
-#include "analog.h"
-#include "atomic_util.h"
-#include "print.h"
-#include "wait.h"
-
-/* Pin and port array */
-const uint32_t row_pins[]     = MATRIX_ROW_PINS;
-const uint8_t  col_channels[] = MATRIX_COL_CHANNELS;
-const uint32_t mux_sel_pins[] = MUX_SEL_PINS;
-
-static ecsm_config_t config;
-static uint16_t      ecsm_sw_value[MATRIX_ROWS][MATRIX_COLS];
-
-static adc_mux adcMux;
-
-static inline void discharge_capacitor(void) {
-    writePinLow(DISCHARGE_PIN);
-}
-static inline void charge_capacitor(uint8_t row) {
-    writePinHigh(DISCHARGE_PIN);
-    writePinHigh(row_pins[row]);
-}
-
-static inline void init_mux_sel(void) {
-    for (int idx = 0; idx < 3; idx++) {
-        setPinOutput(mux_sel_pins[idx]);
-    }
-}
-
-static inline void select_mux(uint8_t col) {
-    uint8_t ch = col_channels[col];
-    writePin(mux_sel_pins[0], ch & 1);
-    writePin(mux_sel_pins[1], ch & 2);
-    writePin(mux_sel_pins[2], ch & 4);
-}
-
-static inline void init_row(void) {
-    for (int idx = 0; idx < MATRIX_ROWS; idx++) {
-        setPinOutput(row_pins[idx]);
-        writePinLow(row_pins[idx]);
-    }
-}
-
-/* Initialize the peripherals pins */
-int ecsm_init(ecsm_config_t const* const ecsm_config) {
-    // Initialize config
-    config = *ecsm_config;
-
-    palSetLineMode(ANALOG_PORT, PAL_MODE_INPUT_ANALOG);
-    adcMux = pinToMux(ANALOG_PORT);
-
-    //Dummy call to make sure that adcStart() has been called in the appropriate state
-    adc_read(adcMux);
-
-    // Initialize discharge pin as discharge mode
-    writePinLow(DISCHARGE_PIN);
-    setPinOutputOpenDrain(DISCHARGE_PIN);
-
-    // Initialize drive lines
-    init_row();
-
-    // Initialize multiplexer select pin
-    init_mux_sel();
-
-    // Enable AMUX
-    setPinOutput(APLEX_EN_PIN_0);
-    writePinLow(APLEX_EN_PIN_0);
-    setPinOutput(APLEX_EN_PIN_1);
-    writePinLow(APLEX_EN_PIN_1);
-
-    return 0;
-}
-
-int ecsm_update(ecsm_config_t const* const ecsm_config) {
-    // Save config
-    config = *ecsm_config;
-    return 0;
-}
-
-// Read the capacitive sensor value
-uint16_t ecsm_readkey_raw(uint8_t channel, uint8_t row, uint8_t col) {
-    uint16_t sw_value = 0;
-
-    // Select the multiplexer
-    if (channel == 0) {
-        writePinHigh(APLEX_EN_PIN_0);
-        select_mux(col);
-        writePinLow(APLEX_EN_PIN_0);
-    } else {
-        writePinHigh(APLEX_EN_PIN_1);
-        select_mux(col);
-        writePinLow(APLEX_EN_PIN_1);
-    }
-
-    // Set strobe pins to low state
-    writePinLow(row_pins[row]);
-    ATOMIC_BLOCK_FORCEON {
-        // Set the row pin to high state and have capacitor charge
-        charge_capacitor(row);
-        // Read the ADC value
-        sw_value = adc_read(adcMux);
-    }
-    // Discharge peak hold capacitor
-    discharge_capacitor();
-    // Waiting for the ghost capacitor to discharge fully
-    wait_us(DISCHARGE_TIME);
-
-    return sw_value;
-}
-
-// Update press/release state of key
-bool ecsm_update_key(matrix_row_t* current_row, uint8_t row, uint8_t col, uint16_t sw_value) {
-    bool current_state = (*current_row >> col) & 1;
-
-    // Press to release
-    if (current_state && sw_value < config.ecsm_actuation_threshold) {
-        *current_row &= ~(1 << col);
-        return true;
-    }
-
-    // Release to press
-    if ((!current_state) && sw_value > config.ecsm_release_threshold) {
-        *current_row |= (1 << col);
-        return true;
-    }
-
-    return false;
-}
-
-// Scan key values and update matrix state
-bool ecsm_matrix_scan(matrix_row_t current_matrix[]) {
-    bool updated = false;
-
-    // Disable AMUX of channel 1
-    writePinHigh(APLEX_EN_PIN_1);
-    for (int col = 0; col < sizeof(col_channels); col++) {
-        for (int row = 0; row < MATRIX_ROWS; row++) {
-            ecsm_sw_value[row][col] = ecsm_readkey_raw(0, row, col);
-            updated |= ecsm_update_key(&current_matrix[row], row, col, ecsm_sw_value[row][col]);
-        }
-    }
-
-    // Disable AMUX of channel 1
-    writePinHigh(APLEX_EN_PIN_0);
-    for (int col = 0; col < (sizeof(col_channels) - 1); col++) {
-        for (int row = 0; row < MATRIX_ROWS; row++) {
-            ecsm_sw_value[row][col + 8] = ecsm_readkey_raw(1, row, col);
-            updated |= ecsm_update_key(&current_matrix[row], row, col + 8, ecsm_sw_value[row][col + 8]);
-        }
-    }
-    return updated;
-}
-
-// Debug print key values
-void ecsm_print_matrix(void) {
-    for (int row = 0; row < MATRIX_ROWS; row++) {
-        for (int col = 0; col < MATRIX_COLS; col++) {
-            uprintf("%4d", ecsm_sw_value[row][col]);
-            if (col < (MATRIX_COLS - 1)) {
-                print(",");
-            }
-        }
-        print("\n");
-    }
-    print("\n");
-}
diff --git a/keyboards/cipulot/ec_60/ec_switch_matrix.h b/keyboards/cipulot/ec_60/ec_switch_matrix.h
deleted file mode 100644
index 9dcb216caa3..00000000000
--- a/keyboards/cipulot/ec_60/ec_switch_matrix.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2023 Cipulot
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include <stdint.h>
-#include <stdbool.h>
-
-#include "matrix.h"
-
-typedef struct {
-    uint16_t ecsm_actuation_threshold; // threshold for key release
-    uint16_t ecsm_release_threshold;   // threshold for key press
-} ecsm_config_t;
-
-ecsm_config_t ecsm_config;
-
-int      ecsm_init(ecsm_config_t const* const ecsm_config);
-int      ecsm_update(ecsm_config_t const* const ecsm_config);
-bool     ecsm_matrix_scan(matrix_row_t current_matrix[]);
-uint16_t ecsm_readkey_raw(uint8_t channel, uint8_t row, uint8_t col);
-bool     ecsm_update_key(matrix_row_t* current_row, uint8_t row, uint8_t col, uint16_t sw_value);
-void     ecsm_print_matrix(void);
diff --git a/keyboards/cipulot/ec_60/halconf.h b/keyboards/cipulot/ec_60/halconf.h
index 5b71acecbbc..835d43b6a0a 100644
--- a/keyboards/cipulot/ec_60/halconf.h
+++ b/keyboards/cipulot/ec_60/halconf.h
@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/keyboards/cipulot/ec_60/info.json b/keyboards/cipulot/ec_60/info.json
index e162eb8db86..a86b20bfd63 100644
--- a/keyboards/cipulot/ec_60/info.json
+++ b/keyboards/cipulot/ec_60/info.json
@@ -8,18 +8,11 @@
     },
     "diode_direction": "COL2ROW",
     "features": {
-        "audio": false,
-        "backlight": false,
-        "bootmagic": true,
-        "command": false,
+        "bootmagic": false,
         "console": true,
         "extrakey": true,
         "mousekey": true,
-        "nkro": true,
-        "rgblight": false
-    },
-    "mouse_key": {
-        "enabled": true
+        "nkro": true
     },
     "processor": "STM32F401",
     "url": "https://www.github.com/Cipulot/EC60",
diff --git a/keyboards/cipulot/ec_60/keymaps/60_ansi_tsangan/keymap.c b/keyboards/cipulot/ec_60/keymaps/60_ansi_tsangan/keymap.c
index 82c1e711c95..cc33a90f3df 100644
--- a/keyboards/cipulot/ec_60/keymaps/60_ansi_tsangan/keymap.c
+++ b/keyboards/cipulot/ec_60/keymaps/60_ansi_tsangan/keymap.c
@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -32,14 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______,                             _______,                                     _______, _______, _______),
 
     [2] = LAYOUT_60_ansi_tsangan(
-        QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______,                            _______,                                     _______, _______, _______),
-
-    [3] = LAYOUT_60_ansi_tsangan(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        QK_BOOT, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/cipulot/ec_60/keymaps/60_iso_tsangan/keymap.c b/keyboards/cipulot/ec_60/keymaps/60_iso_tsangan/keymap.c
index 530832885b9..8abe5c13bbd 100644
--- a/keyboards/cipulot/ec_60/keymaps/60_iso_tsangan/keymap.c
+++ b/keyboards/cipulot/ec_60/keymaps/60_iso_tsangan/keymap.c
@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -32,14 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______,                             _______,                                     _______, _______, _______),
 
     [2] = LAYOUT_60_iso_tsangan(
-        QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______,                            _______,                                     _______, _______, _______),
-
-    [3] = LAYOUT_60_iso_tsangan(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        QK_BOOT, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/cipulot/ec_60/keymaps/60_jis/keymap.c b/keyboards/cipulot/ec_60/keymaps/60_jis/keymap.c
index 76ecd082594..985a587f3ca 100644
--- a/keyboards/cipulot/ec_60/keymaps/60_jis/keymap.c
+++ b/keyboards/cipulot/ec_60/keymaps/60_jis/keymap.c
@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -34,14 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______,                             _______,          _______, _______, _______, _______, _______),
 
     [2] = LAYOUT_60_jis(
-        QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______,                            _______,          _______, _______, _______, _______, _______),
-
-    [3] = LAYOUT_60_jis(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        QK_BOOT, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/cipulot/ec_60/keymaps/default/keymap.c b/keyboards/cipulot/ec_60/keymaps/default/keymap.c
index d76f9166b45..d41d43c8850 100644
--- a/keyboards/cipulot/ec_60/keymaps/default/keymap.c
+++ b/keyboards/cipulot/ec_60/keymaps/default/keymap.c
@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -34,14 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______,  _______,  _______,  _______,        _______,  _______,       _______,  _______,  _______,  _______,  _______),
 
     [2] = LAYOUT_all(
-        QK_BOOT,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  _______,  _______,       _______,  _______,       _______,  _______,  _______,  _______,  _______),
-
-    [3] = LAYOUT_all(
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,
+        QK_BOOT,  NK_TOGG,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
diff --git a/keyboards/cipulot/ec_60/keymaps/via/config.h b/keyboards/cipulot/ec_60/keymaps/via/config.h
index ebf954d07ac..1ab0d3d9aa2 100644
--- a/keyboards/cipulot/ec_60/keymaps/via/config.h
+++ b/keyboards/cipulot/ec_60/keymaps/via/config.h
@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,5 +16,5 @@
 
 #pragma once
 
-// This is the size of the EEPROM for the custom VIA-specific data
-#define EECONFIG_USER_DATA_SIZE 4
+// This is the firmware version for VIA support to avoid conflicts on menu fetching
+#define VIA_FIRMWARE_VERSION 1
diff --git a/keyboards/cipulot/ec_60/keymaps/via/keymap.c b/keyboards/cipulot/ec_60/keymaps/via/keymap.c
index d76f9166b45..d41d43c8850 100644
--- a/keyboards/cipulot/ec_60/keymaps/via/keymap.c
+++ b/keyboards/cipulot/ec_60/keymaps/via/keymap.c
@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -34,14 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______,  _______,  _______,  _______,        _______,  _______,       _______,  _______,  _______,  _______,  _______),
 
     [2] = LAYOUT_all(
-        QK_BOOT,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  _______,  _______,       _______,  _______,       _______,  _______,  _______,  _______,  _______),
-
-    [3] = LAYOUT_all(
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,
+        QK_BOOT,  NK_TOGG,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
diff --git a/keyboards/cipulot/ec_60/keymaps/via/rules.mk b/keyboards/cipulot/ec_60/keymaps/via/rules.mk
index 520b11f2031..1e5b99807cb 100644
--- a/keyboards/cipulot/ec_60/keymaps/via/rules.mk
+++ b/keyboards/cipulot/ec_60/keymaps/via/rules.mk
@@ -1,3 +1 @@
 VIA_ENABLE = yes
-
-SRC += via_apc.c
diff --git a/keyboards/cipulot/ec_60/keymaps/via/via_apc.c b/keyboards/cipulot/ec_60/keymaps/via/via_apc.c
deleted file mode 100644
index 5ea77af44c8..00000000000
--- a/keyboards/cipulot/ec_60/keymaps/via/via_apc.c
+++ /dev/null
@@ -1,156 +0,0 @@
-/* Copyright 2023 Cipulot
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "ec_switch_matrix.h"
-#include "action.h"
-#include "via.h"
-
-void apc_init_thresholds(void);
-void apc_set_threshold(bool is_for_actuation);
-
-// Declaring an _apc_config_t struct that will store our data
-typedef struct _apc_config_t {
-    uint16_t actuation_threshold;
-    uint16_t release_threshold;
-} apc_config;
-
-// Check if the size of the reserved persistent memory is the same as the size of struct apc_config
-_Static_assert(sizeof(apc_config) == EECONFIG_USER_DATA_SIZE, "Mismatch in keyboard EECONFIG stored data");
-
-// Declaring a new variable apc of type apc_config
-apc_config apc;
-
-// Declaring enums for VIA config menu
-enum via_apc_enums {
-    // clang-format off
-    id_apc_actuation_threshold = 1,
-    id_apc_release_threshold = 2
-    // clang-format on
-};
-
-// Initializing persistent memory configuration: default values are declared and stored in PMEM
-void eeconfig_init_user(void) {
-    // Default values
-    apc.actuation_threshold = DEFAULT_ACTUATION_LEVEL;
-    apc.release_threshold   = DEFAULT_RELEASE_LEVEL;
-    // Write default value to EEPROM now
-    eeconfig_update_user_datablock(&apc);
-}
-
-// On Keyboard startup
-void keyboard_post_init_user(void) {
-    // Read custom menu variables from memory
-    eeconfig_read_user_datablock(&apc);
-    apc_init_thresholds();
-}
-
-// Handle the data received by the keyboard from the VIA menus
-void apc_config_set_value(uint8_t *data) {
-    // data = [ value_id, value_data ]
-    uint8_t *value_id   = &(data[0]);
-    uint8_t *value_data = &(data[1]);
-
-    switch (*value_id) {
-        case id_apc_actuation_threshold: {
-            apc.actuation_threshold = value_data[1] | (value_data[0] << 8);
-            apc_set_threshold(true);
-            break;
-        }
-        case id_apc_release_threshold: {
-            apc.release_threshold = value_data[1] | (value_data[0] << 8);
-            apc_set_threshold(false);
-            break;
-        }
-    }
-}
-
-// Handle the data sent by the keyboard to the VIA menus
-void apc_config_get_value(uint8_t *data) {
-    // data = [ value_id, value_data ]
-    uint8_t *value_id   = &(data[0]);
-    uint8_t *value_data = &(data[1]);
-
-    switch (*value_id) {
-        case id_apc_actuation_threshold: {
-            value_data[0] = apc.actuation_threshold >> 8;
-            value_data[1] = apc.actuation_threshold & 0xFF;
-            break;
-        }
-        case id_apc_release_threshold: {
-            value_data[0] = apc.release_threshold >> 8;
-            value_data[1] = apc.release_threshold & 0xFF;
-            break;
-        }
-    }
-}
-
-// Save the data to persistent memory after changes are made
-void apc_config_save(void) {
-    eeconfig_update_user_datablock(&apc);
-}
-
-void via_custom_value_command_kb(uint8_t *data, uint8_t length) {
-    // data = [ command_id, channel_id, value_id, value_data ]
-    uint8_t *command_id        = &(data[0]);
-    uint8_t *channel_id        = &(data[1]);
-    uint8_t *value_id_and_data = &(data[2]);
-
-    if (*channel_id == id_custom_channel) {
-        switch (*command_id) {
-            case id_custom_set_value: {
-                apc_config_set_value(value_id_and_data);
-                break;
-            }
-            case id_custom_get_value: {
-                apc_config_get_value(value_id_and_data);
-                break;
-            }
-            case id_custom_save: {
-                apc_config_save();
-                break;
-            }
-            default: {
-                // Unhandled message.
-                *command_id = id_unhandled;
-                break;
-            }
-        }
-        return;
-    }
-
-    *command_id = id_unhandled;
-}
-
-// Initialize the thresholds
-void apc_init_thresholds(void) {
-    ecsm_config.ecsm_actuation_threshold = apc.actuation_threshold;
-    ecsm_config.ecsm_release_threshold   = apc.release_threshold;
-
-    // Update the ecsm_config
-    ecsm_update(&ecsm_config);
-}
-
-// Set the thresholds
-void apc_set_threshold(bool is_for_actuation) {
-    if (is_for_actuation) {
-        ecsm_config.ecsm_actuation_threshold = apc.actuation_threshold;
-
-    } else {
-        ecsm_config.ecsm_release_threshold = apc.release_threshold;
-    }
-    // Update the ecsm_config
-    ecsm_update(&ecsm_config);
-}
diff --git a/keyboards/cipulot/ec_60/matrix.c b/keyboards/cipulot/ec_60/matrix.c
deleted file mode 100644
index 1850acf2641..00000000000
--- a/keyboards/cipulot/ec_60/matrix.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Copyright 2023 Cipulot
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "ec_switch_matrix.h"
-#include "matrix.h"
-
-/* matrix state(1:on, 0:off) */
-extern matrix_row_t raw_matrix[MATRIX_ROWS]; // raw values
-extern matrix_row_t matrix[MATRIX_ROWS];     // debounced values
-
-void matrix_init_custom(void) {
-    // Default values, overwritten by VIA if enabled later
-    ecsm_config.ecsm_actuation_threshold = DEFAULT_ACTUATION_LEVEL;
-    ecsm_config.ecsm_release_threshold   = DEFAULT_RELEASE_LEVEL;
-
-    ecsm_init(&ecsm_config);
-}
-
-bool matrix_scan_custom(matrix_row_t current_matrix[]) {
-    bool updated = ecsm_matrix_scan(current_matrix);
-
-// RAW matrix values on console
-#ifdef CONSOLE_ENABLE
-    static int cnt = 0;
-    if (cnt++ == 350) {
-        cnt = 0;
-        ecsm_print_matrix();
-    }
-#endif
-    return updated;
-}
diff --git a/keyboards/cipulot/ec_60/mcuconf.h b/keyboards/cipulot/ec_60/mcuconf.h
index d91f576bd48..fa3c955e0d8 100644
--- a/keyboards/cipulot/ec_60/mcuconf.h
+++ b/keyboards/cipulot/ec_60/mcuconf.h
@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/keyboards/cipulot/ec_60/post_rules.mk b/keyboards/cipulot/ec_60/post_rules.mk
new file mode 100644
index 00000000000..d726a112a8c
--- /dev/null
+++ b/keyboards/cipulot/ec_60/post_rules.mk
@@ -0,0 +1,3 @@
+ifeq ($(strip $(VIA_ENABLE)), yes)
+    SRC += keyboards/cipulot/common/via_ec.c
+endif
diff --git a/keyboards/cipulot/ec_60/readme.md b/keyboards/cipulot/ec_60/readme.md
index a171bdfd4e6..be6a8ec6bab 100644
--- a/keyboards/cipulot/ec_60/readme.md
+++ b/keyboards/cipulot/ec_60/readme.md
@@ -20,8 +20,7 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to
 
 ## Bootloader
 
-Enter the bootloader in 3 ways:
+Enter the bootloader in 2 ways:
 
-* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
 * **Physical Boot0 pins**: Short the Boot0 pins on the back of the PCB while plugging in the keyboard
 * **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/cipulot/ec_60/rules.mk b/keyboards/cipulot/ec_60/rules.mk
index fc2dcf32ab1..70494b635f6 100644
--- a/keyboards/cipulot/ec_60/rules.mk
+++ b/keyboards/cipulot/ec_60/rules.mk
@@ -1,4 +1,4 @@
 CUSTOM_MATRIX = lite
-SRC += matrix.c ec_switch_matrix.c
-
 ANALOG_DRIVER_REQUIRED = yes
+SRC += keyboards/cipulot/common/matrix.c keyboards/cipulot/common/ec_board.c keyboards/cipulot/common/ec_switch_matrix.c
+OPT = 3
diff --git a/keyboards/cipulot/ec_alveus/1_0_0/config.h b/keyboards/cipulot/ec_alveus/1_0_0/config.h
index 1947c308026..775c7906adb 100644
--- a/keyboards/cipulot/ec_alveus/1_0_0/config.h
+++ b/keyboards/cipulot/ec_alveus/1_0_0/config.h
@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -19,27 +19,53 @@
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 16
 
-/* Custom matrix pins and port select array */
 #define MATRIX_ROW_PINS \
     { A14, B3, A15, B5, B4 }
-#define MATRIX_COL_CHANNELS \
-    { 3, 0, 1, 2, 6, 5, 7, 4 }
-#define MUX_SEL_PINS \
+
+#define AMUX_COUNT 2
+#define AMUX_MAX_COLS_COUNT 8
+
+#define AMUX_EN_PINS \
+    { C13, C14 }
+
+#define AMUX_SEL_PINS \
     { B7, B8, B9 }
 
-/* Hardware peripherals pins */
-#define APLEX_EN_PIN_0 C13
-#define APLEX_EN_PIN_1 C14
+#define AMUX_COL_CHANNELS_SIZES \
+    { 8, 8 }
+
+#define AMUX_0_COL_CHANNELS \
+    { 3, 0, 1, 2, 6, 5, 7, 4 }
+
+#define AMUX_1_COL_CHANNELS AMUX_0_COL_CHANNELS
+
+#define AMUX_COL_CHANNELS AMUX_0_COL_CHANNELS, AMUX_1_COL_CHANNELS
+
 #define DISCHARGE_PIN B1
 #define ANALOG_PORT A3
 
+#define DEFAULT_ACTUATION_MODE 0
+#define DEFAULT_MODE_0_ACTUATION_LEVEL 550
+#define DEFAULT_MODE_0_RELEASE_LEVEL 500
+#define DEFAULT_MODE_1_INITIAL_DEADZONE_OFFSET DEFAULT_MODE_0_ACTUATION_LEVEL
+#define DEFAULT_MODE_1_ACTUATION_OFFSET 70
+#define DEFAULT_MODE_1_RELEASE_OFFSET 70
+#define DEFAULT_EXTREMUM 1023
+#define EXPECTED_NOISE_FLOOR 0
+#define NOISE_FLOOR_THRESHOLD 50
+#define BOTTOMING_CALIBRATION_THRESHOLD 100
+#define DEFAULT_NOISE_FLOOR_SAMPLING_COUNT 30
+#define DEFAULT_BOTTOMING_READING 1023
+#define DEFAULT_CALIBRATION_STARTER true
+
+#define DISCHARGE_TIME 10
+
+// #define DEBUG_MATRIX_SCAN_RATE
+
+#define EECONFIG_KB_DATA_SIZE 170
+
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-#define DEFAULT_ACTUATION_LEVEL 550
-#define DEFAULT_RELEASE_LEVEL 500
-
-#define DISCHARGE_TIME 10
diff --git a/keyboards/cipulot/ec_alveus/1_0_0/ec_switch_matrix.c b/keyboards/cipulot/ec_alveus/1_0_0/ec_switch_matrix.c
deleted file mode 100644
index 783c00457c7..00000000000
--- a/keyboards/cipulot/ec_alveus/1_0_0/ec_switch_matrix.c
+++ /dev/null
@@ -1,183 +0,0 @@
-/* Copyright 2023 Cipulot
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "ec_switch_matrix.h"
-#include "analog.h"
-#include "atomic_util.h"
-#include "print.h"
-#include "wait.h"
-
-/* Pin and port array */
-const uint32_t row_pins[]     = MATRIX_ROW_PINS;
-const uint8_t  col_channels[] = MATRIX_COL_CHANNELS;
-const uint32_t mux_sel_pins[] = MUX_SEL_PINS;
-
-static ecsm_config_t config;
-static uint16_t      ecsm_sw_value[MATRIX_ROWS][MATRIX_COLS];
-
-static adc_mux adcMux;
-
-static inline void discharge_capacitor(void) {
-    writePinLow(DISCHARGE_PIN);
-}
-static inline void charge_capacitor(uint8_t row) {
-    writePinHigh(DISCHARGE_PIN);
-    writePinHigh(row_pins[row]);
-}
-
-static inline void init_mux_sel(void) {
-    for (int idx = 0; idx < 3; idx++) {
-        setPinOutput(mux_sel_pins[idx]);
-    }
-}
-
-static inline void select_mux(uint8_t col) {
-    uint8_t ch = col_channels[col];
-    writePin(mux_sel_pins[0], ch & 1);
-    writePin(mux_sel_pins[1], ch & 2);
-    writePin(mux_sel_pins[2], ch & 4);
-}
-
-static inline void init_row(void) {
-    for (int idx = 0; idx < MATRIX_ROWS; idx++) {
-        setPinOutput(row_pins[idx]);
-        writePinLow(row_pins[idx]);
-    }
-}
-
-/* Initialize the peripherals pins */
-int ecsm_init(ecsm_config_t const* const ecsm_config) {
-    // Initialize config
-    config = *ecsm_config;
-
-    palSetLineMode(ANALOG_PORT, PAL_MODE_INPUT_ANALOG);
-    adcMux = pinToMux(ANALOG_PORT);
-
-    // Dummy call to make sure that adcStart() has been called in the appropriate state
-    adc_read(adcMux);
-
-    // Initialize discharge pin as discharge mode
-    writePinLow(DISCHARGE_PIN);
-    setPinOutputOpenDrain(DISCHARGE_PIN);
-
-    // Initialize drive lines
-    init_row();
-
-    // Initialize multiplexer select pin
-    init_mux_sel();
-
-    // Enable AMUX
-    setPinOutput(APLEX_EN_PIN_0);
-    writePinLow(APLEX_EN_PIN_0);
-    setPinOutput(APLEX_EN_PIN_1);
-    writePinLow(APLEX_EN_PIN_1);
-
-    return 0;
-}
-
-int ecsm_update(ecsm_config_t const* const ecsm_config) {
-    // Save config
-    config = *ecsm_config;
-    return 0;
-}
-
-// Read the capacitive sensor value
-uint16_t ecsm_readkey_raw(uint8_t channel, uint8_t row, uint8_t col) {
-    uint16_t sw_value = 0;
-
-    // Select the multiplexer
-    if (channel == 0) {
-        writePinHigh(APLEX_EN_PIN_0);
-        select_mux(col);
-        writePinLow(APLEX_EN_PIN_0);
-    } else {
-        writePinHigh(APLEX_EN_PIN_1);
-        select_mux(col);
-        writePinLow(APLEX_EN_PIN_1);
-    }
-
-    // Set strobe pins to low state
-    writePinLow(row_pins[row]);
-    ATOMIC_BLOCK_FORCEON {
-        // Set the row pin to high state and have capacitor charge
-        charge_capacitor(row);
-        // Read the ADC value
-        sw_value = adc_read(adcMux);
-    }
-    // Discharge peak hold capacitor
-    discharge_capacitor();
-    // Waiting for the ghost capacitor to discharge fully
-    wait_us(DISCHARGE_TIME);
-
-    return sw_value;
-}
-
-// Update press/release state of key
-bool ecsm_update_key(matrix_row_t* current_row, uint8_t row, uint8_t col, uint16_t sw_value) {
-    bool current_state = (*current_row >> col) & 1;
-
-    // Press to release
-    if (current_state && sw_value < config.ecsm_actuation_threshold) {
-        *current_row &= ~(1 << col);
-        return true;
-    }
-
-    // Release to press
-    if ((!current_state) && sw_value > config.ecsm_release_threshold) {
-        *current_row |= (1 << col);
-        return true;
-    }
-
-    return false;
-}
-
-// Scan key values and update matrix state
-bool ecsm_matrix_scan(matrix_row_t current_matrix[]) {
-    bool updated = false;
-
-    // Disable AMUX of channel 1
-    writePinHigh(APLEX_EN_PIN_1);
-    for (int col = 0; col < sizeof(col_channels); col++) {
-        for (int row = 0; row < MATRIX_ROWS; row++) {
-            ecsm_sw_value[row][col] = ecsm_readkey_raw(0, row, col);
-            updated |= ecsm_update_key(&current_matrix[row], row, col, ecsm_sw_value[row][col]);
-        }
-    }
-
-    // Disable AMUX of channel 1
-    writePinHigh(APLEX_EN_PIN_0);
-    for (int col = 0; col < sizeof(col_channels); col++) {
-        for (int row = 0; row < MATRIX_ROWS; row++) {
-            ecsm_sw_value[row][col + 8] = ecsm_readkey_raw(1, row, col);
-            updated |= ecsm_update_key(&current_matrix[row], row, col + 8, ecsm_sw_value[row][col + 8]);
-        }
-    }
-    return updated;
-}
-
-// Debug print key values
-void ecsm_print_matrix(void) {
-    for (int row = 0; row < MATRIX_ROWS; row++) {
-        for (int col = 0; col < MATRIX_COLS; col++) {
-            uprintf("%4d", ecsm_sw_value[row][col]);
-            if (col < (MATRIX_COLS - 1)) {
-                print(",");
-            }
-        }
-        print("\n");
-    }
-    print("\n");
-}
diff --git a/keyboards/cipulot/ec_alveus/1_0_0/ec_switch_matrix.h b/keyboards/cipulot/ec_alveus/1_0_0/ec_switch_matrix.h
deleted file mode 100644
index 9dcb216caa3..00000000000
--- a/keyboards/cipulot/ec_alveus/1_0_0/ec_switch_matrix.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2023 Cipulot
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include <stdint.h>
-#include <stdbool.h>
-
-#include "matrix.h"
-
-typedef struct {
-    uint16_t ecsm_actuation_threshold; // threshold for key release
-    uint16_t ecsm_release_threshold;   // threshold for key press
-} ecsm_config_t;
-
-ecsm_config_t ecsm_config;
-
-int      ecsm_init(ecsm_config_t const* const ecsm_config);
-int      ecsm_update(ecsm_config_t const* const ecsm_config);
-bool     ecsm_matrix_scan(matrix_row_t current_matrix[]);
-uint16_t ecsm_readkey_raw(uint8_t channel, uint8_t row, uint8_t col);
-bool     ecsm_update_key(matrix_row_t* current_row, uint8_t row, uint8_t col, uint16_t sw_value);
-void     ecsm_print_matrix(void);
diff --git a/keyboards/cipulot/ec_alveus/1_0_0/halconf.h b/keyboards/cipulot/ec_alveus/1_0_0/halconf.h
index 5b71acecbbc..835d43b6a0a 100644
--- a/keyboards/cipulot/ec_alveus/1_0_0/halconf.h
+++ b/keyboards/cipulot/ec_alveus/1_0_0/halconf.h
@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/keyboards/cipulot/ec_alveus/1_0_0/info.json b/keyboards/cipulot/ec_alveus/1_0_0/info.json
index 3e195460891..4652166cc5e 100644
--- a/keyboards/cipulot/ec_alveus/1_0_0/info.json
+++ b/keyboards/cipulot/ec_alveus/1_0_0/info.json
@@ -8,18 +8,11 @@
     },
     "diode_direction": "COL2ROW",
     "features": {
-        "audio": false,
-        "backlight": false,
-        "bootmagic": true,
-        "command": false,
+        "bootmagic": false,
         "console": true,
         "extrakey": true,
         "mousekey": true,
-        "nkro": true,
-        "rgblight": false
-    },
-    "mouse_key": {
-        "enabled": true
+        "nkro": true
     },
     "processor": "STM32F401",
     "usb": {
diff --git a/keyboards/cipulot/ec_alveus/1_0_0/keymaps/default/keymap.c b/keyboards/cipulot/ec_alveus/1_0_0/keymaps/default/keymap.c
index d111c6a6853..bff38f1fa81 100644
--- a/keyboards/cipulot/ec_alveus/1_0_0/keymaps/default/keymap.c
+++ b/keyboards/cipulot/ec_alveus/1_0_0/keymaps/default/keymap.c
@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -33,14 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______,            _______,                      _______,                                                    _______,            _______,   _______,  _______,  _______),
 
     [2] = LAYOUT_tkl_nofrow_ansi_tsangan_wkl(
-    QK_BOOT,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,
-    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,
-    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,       _______,
-    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                 _______,                  _______,
-    _______,            _______,                      _______,                                                    _______,            _______,   _______,  _______,  _______),
-
-    [3] = LAYOUT_tkl_nofrow_ansi_tsangan_wkl(
-    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,
+    QK_BOOT,  NK_TOGG,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,       _______,
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                 _______,                  _______,
diff --git a/keyboards/cipulot/ec_alveus/1_0_0/keymaps/via/config.h b/keyboards/cipulot/ec_alveus/1_0_0/keymaps/via/config.h
index ebf954d07ac..1ab0d3d9aa2 100644
--- a/keyboards/cipulot/ec_alveus/1_0_0/keymaps/via/config.h
+++ b/keyboards/cipulot/ec_alveus/1_0_0/keymaps/via/config.h
@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,5 +16,5 @@
 
 #pragma once
 
-// This is the size of the EEPROM for the custom VIA-specific data
-#define EECONFIG_USER_DATA_SIZE 4
+// This is the firmware version for VIA support to avoid conflicts on menu fetching
+#define VIA_FIRMWARE_VERSION 1
diff --git a/keyboards/cipulot/ec_alveus/1_0_0/keymaps/via/keymap.c b/keyboards/cipulot/ec_alveus/1_0_0/keymaps/via/keymap.c
index 5fc6c4d94e0..692a631ea82 100644
--- a/keyboards/cipulot/ec_alveus/1_0_0/keymaps/via/keymap.c
+++ b/keyboards/cipulot/ec_alveus/1_0_0/keymaps/via/keymap.c
@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -33,14 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______,  _______,  _______,                      _______,                                                    _______,  _______,  _______,   _______,  _______,  _______),
 
     [2] = LAYOUT_all(
-        QK_BOOT,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,       _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                 _______,                  _______,
-        _______,  _______,  _______,                      _______,                                                    _______,  _______,  _______,   _______,  _______,  _______),
-
-    [3] = LAYOUT_all(
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,
+        QK_BOOT,  NK_TOGG,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,       _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                 _______,                  _______,
diff --git a/keyboards/cipulot/ec_alveus/1_0_0/keymaps/via/rules.mk b/keyboards/cipulot/ec_alveus/1_0_0/keymaps/via/rules.mk
index 520b11f2031..1e5b99807cb 100644
--- a/keyboards/cipulot/ec_alveus/1_0_0/keymaps/via/rules.mk
+++ b/keyboards/cipulot/ec_alveus/1_0_0/keymaps/via/rules.mk
@@ -1,3 +1 @@
 VIA_ENABLE = yes
-
-SRC += via_apc.c
diff --git a/keyboards/cipulot/ec_alveus/1_0_0/keymaps/via/via_apc.c b/keyboards/cipulot/ec_alveus/1_0_0/keymaps/via/via_apc.c
deleted file mode 100644
index 5ea77af44c8..00000000000
--- a/keyboards/cipulot/ec_alveus/1_0_0/keymaps/via/via_apc.c
+++ /dev/null
@@ -1,156 +0,0 @@
-/* Copyright 2023 Cipulot
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "ec_switch_matrix.h"
-#include "action.h"
-#include "via.h"
-
-void apc_init_thresholds(void);
-void apc_set_threshold(bool is_for_actuation);
-
-// Declaring an _apc_config_t struct that will store our data
-typedef struct _apc_config_t {
-    uint16_t actuation_threshold;
-    uint16_t release_threshold;
-} apc_config;
-
-// Check if the size of the reserved persistent memory is the same as the size of struct apc_config
-_Static_assert(sizeof(apc_config) == EECONFIG_USER_DATA_SIZE, "Mismatch in keyboard EECONFIG stored data");
-
-// Declaring a new variable apc of type apc_config
-apc_config apc;
-
-// Declaring enums for VIA config menu
-enum via_apc_enums {
-    // clang-format off
-    id_apc_actuation_threshold = 1,
-    id_apc_release_threshold = 2
-    // clang-format on
-};
-
-// Initializing persistent memory configuration: default values are declared and stored in PMEM
-void eeconfig_init_user(void) {
-    // Default values
-    apc.actuation_threshold = DEFAULT_ACTUATION_LEVEL;
-    apc.release_threshold   = DEFAULT_RELEASE_LEVEL;
-    // Write default value to EEPROM now
-    eeconfig_update_user_datablock(&apc);
-}
-
-// On Keyboard startup
-void keyboard_post_init_user(void) {
-    // Read custom menu variables from memory
-    eeconfig_read_user_datablock(&apc);
-    apc_init_thresholds();
-}
-
-// Handle the data received by the keyboard from the VIA menus
-void apc_config_set_value(uint8_t *data) {
-    // data = [ value_id, value_data ]
-    uint8_t *value_id   = &(data[0]);
-    uint8_t *value_data = &(data[1]);
-
-    switch (*value_id) {
-        case id_apc_actuation_threshold: {
-            apc.actuation_threshold = value_data[1] | (value_data[0] << 8);
-            apc_set_threshold(true);
-            break;
-        }
-        case id_apc_release_threshold: {
-            apc.release_threshold = value_data[1] | (value_data[0] << 8);
-            apc_set_threshold(false);
-            break;
-        }
-    }
-}
-
-// Handle the data sent by the keyboard to the VIA menus
-void apc_config_get_value(uint8_t *data) {
-    // data = [ value_id, value_data ]
-    uint8_t *value_id   = &(data[0]);
-    uint8_t *value_data = &(data[1]);
-
-    switch (*value_id) {
-        case id_apc_actuation_threshold: {
-            value_data[0] = apc.actuation_threshold >> 8;
-            value_data[1] = apc.actuation_threshold & 0xFF;
-            break;
-        }
-        case id_apc_release_threshold: {
-            value_data[0] = apc.release_threshold >> 8;
-            value_data[1] = apc.release_threshold & 0xFF;
-            break;
-        }
-    }
-}
-
-// Save the data to persistent memory after changes are made
-void apc_config_save(void) {
-    eeconfig_update_user_datablock(&apc);
-}
-
-void via_custom_value_command_kb(uint8_t *data, uint8_t length) {
-    // data = [ command_id, channel_id, value_id, value_data ]
-    uint8_t *command_id        = &(data[0]);
-    uint8_t *channel_id        = &(data[1]);
-    uint8_t *value_id_and_data = &(data[2]);
-
-    if (*channel_id == id_custom_channel) {
-        switch (*command_id) {
-            case id_custom_set_value: {
-                apc_config_set_value(value_id_and_data);
-                break;
-            }
-            case id_custom_get_value: {
-                apc_config_get_value(value_id_and_data);
-                break;
-            }
-            case id_custom_save: {
-                apc_config_save();
-                break;
-            }
-            default: {
-                // Unhandled message.
-                *command_id = id_unhandled;
-                break;
-            }
-        }
-        return;
-    }
-
-    *command_id = id_unhandled;
-}
-
-// Initialize the thresholds
-void apc_init_thresholds(void) {
-    ecsm_config.ecsm_actuation_threshold = apc.actuation_threshold;
-    ecsm_config.ecsm_release_threshold   = apc.release_threshold;
-
-    // Update the ecsm_config
-    ecsm_update(&ecsm_config);
-}
-
-// Set the thresholds
-void apc_set_threshold(bool is_for_actuation) {
-    if (is_for_actuation) {
-        ecsm_config.ecsm_actuation_threshold = apc.actuation_threshold;
-
-    } else {
-        ecsm_config.ecsm_release_threshold = apc.release_threshold;
-    }
-    // Update the ecsm_config
-    ecsm_update(&ecsm_config);
-}
diff --git a/keyboards/cipulot/ec_alveus/1_0_0/mcuconf.h b/keyboards/cipulot/ec_alveus/1_0_0/mcuconf.h
index d91f576bd48..fa3c955e0d8 100644
--- a/keyboards/cipulot/ec_alveus/1_0_0/mcuconf.h
+++ b/keyboards/cipulot/ec_alveus/1_0_0/mcuconf.h
@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/keyboards/cipulot/ec_alveus/1_0_0/post_rules.mk b/keyboards/cipulot/ec_alveus/1_0_0/post_rules.mk
new file mode 100644
index 00000000000..d726a112a8c
--- /dev/null
+++ b/keyboards/cipulot/ec_alveus/1_0_0/post_rules.mk
@@ -0,0 +1,3 @@
+ifeq ($(strip $(VIA_ENABLE)), yes)
+    SRC += keyboards/cipulot/common/via_ec.c
+endif
diff --git a/keyboards/cipulot/ec_alveus/1_0_0/readme.md b/keyboards/cipulot/ec_alveus/1_0_0/readme.md
index 01e82a88055..01594cbc4d5 100644
--- a/keyboards/cipulot/ec_alveus/1_0_0/readme.md
+++ b/keyboards/cipulot/ec_alveus/1_0_0/readme.md
@@ -20,8 +20,7 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to
 
 ## Bootloader
 
-Enter the bootloader in 3 ways:
+Enter the bootloader in 2 ways:
 
-* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
 * **Physical reset**: Long short the exposed pads on the top of the PCB
 * **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/cipulot/ec_alveus/1_0_0/rules.mk b/keyboards/cipulot/ec_alveus/1_0_0/rules.mk
index fc2dcf32ab1..70494b635f6 100644
--- a/keyboards/cipulot/ec_alveus/1_0_0/rules.mk
+++ b/keyboards/cipulot/ec_alveus/1_0_0/rules.mk
@@ -1,4 +1,4 @@
 CUSTOM_MATRIX = lite
-SRC += matrix.c ec_switch_matrix.c
-
 ANALOG_DRIVER_REQUIRED = yes
+SRC += keyboards/cipulot/common/matrix.c keyboards/cipulot/common/ec_board.c keyboards/cipulot/common/ec_switch_matrix.c
+OPT = 3
diff --git a/keyboards/cipulot/ec_alveus/1_2_0/config.h b/keyboards/cipulot/ec_alveus/1_2_0/config.h
index 1947c308026..775c7906adb 100644
--- a/keyboards/cipulot/ec_alveus/1_2_0/config.h
+++ b/keyboards/cipulot/ec_alveus/1_2_0/config.h
@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -19,27 +19,53 @@
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 16
 
-/* Custom matrix pins and port select array */
 #define MATRIX_ROW_PINS \
     { A14, B3, A15, B5, B4 }
-#define MATRIX_COL_CHANNELS \
-    { 3, 0, 1, 2, 6, 5, 7, 4 }
-#define MUX_SEL_PINS \
+
+#define AMUX_COUNT 2
+#define AMUX_MAX_COLS_COUNT 8
+
+#define AMUX_EN_PINS \
+    { C13, C14 }
+
+#define AMUX_SEL_PINS \
     { B7, B8, B9 }
 
-/* Hardware peripherals pins */
-#define APLEX_EN_PIN_0 C13
-#define APLEX_EN_PIN_1 C14
+#define AMUX_COL_CHANNELS_SIZES \
+    { 8, 8 }
+
+#define AMUX_0_COL_CHANNELS \
+    { 3, 0, 1, 2, 6, 5, 7, 4 }
+
+#define AMUX_1_COL_CHANNELS AMUX_0_COL_CHANNELS
+
+#define AMUX_COL_CHANNELS AMUX_0_COL_CHANNELS, AMUX_1_COL_CHANNELS
+
 #define DISCHARGE_PIN B1
 #define ANALOG_PORT A3
 
+#define DEFAULT_ACTUATION_MODE 0
+#define DEFAULT_MODE_0_ACTUATION_LEVEL 550
+#define DEFAULT_MODE_0_RELEASE_LEVEL 500
+#define DEFAULT_MODE_1_INITIAL_DEADZONE_OFFSET DEFAULT_MODE_0_ACTUATION_LEVEL
+#define DEFAULT_MODE_1_ACTUATION_OFFSET 70
+#define DEFAULT_MODE_1_RELEASE_OFFSET 70
+#define DEFAULT_EXTREMUM 1023
+#define EXPECTED_NOISE_FLOOR 0
+#define NOISE_FLOOR_THRESHOLD 50
+#define BOTTOMING_CALIBRATION_THRESHOLD 100
+#define DEFAULT_NOISE_FLOOR_SAMPLING_COUNT 30
+#define DEFAULT_BOTTOMING_READING 1023
+#define DEFAULT_CALIBRATION_STARTER true
+
+#define DISCHARGE_TIME 10
+
+// #define DEBUG_MATRIX_SCAN_RATE
+
+#define EECONFIG_KB_DATA_SIZE 170
+
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-#define DEFAULT_ACTUATION_LEVEL 550
-#define DEFAULT_RELEASE_LEVEL 500
-
-#define DISCHARGE_TIME 10
diff --git a/keyboards/cipulot/ec_alveus/1_2_0/ec_switch_matrix.c b/keyboards/cipulot/ec_alveus/1_2_0/ec_switch_matrix.c
deleted file mode 100644
index 783c00457c7..00000000000
--- a/keyboards/cipulot/ec_alveus/1_2_0/ec_switch_matrix.c
+++ /dev/null
@@ -1,183 +0,0 @@
-/* Copyright 2023 Cipulot
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "ec_switch_matrix.h"
-#include "analog.h"
-#include "atomic_util.h"
-#include "print.h"
-#include "wait.h"
-
-/* Pin and port array */
-const uint32_t row_pins[]     = MATRIX_ROW_PINS;
-const uint8_t  col_channels[] = MATRIX_COL_CHANNELS;
-const uint32_t mux_sel_pins[] = MUX_SEL_PINS;
-
-static ecsm_config_t config;
-static uint16_t      ecsm_sw_value[MATRIX_ROWS][MATRIX_COLS];
-
-static adc_mux adcMux;
-
-static inline void discharge_capacitor(void) {
-    writePinLow(DISCHARGE_PIN);
-}
-static inline void charge_capacitor(uint8_t row) {
-    writePinHigh(DISCHARGE_PIN);
-    writePinHigh(row_pins[row]);
-}
-
-static inline void init_mux_sel(void) {
-    for (int idx = 0; idx < 3; idx++) {
-        setPinOutput(mux_sel_pins[idx]);
-    }
-}
-
-static inline void select_mux(uint8_t col) {
-    uint8_t ch = col_channels[col];
-    writePin(mux_sel_pins[0], ch & 1);
-    writePin(mux_sel_pins[1], ch & 2);
-    writePin(mux_sel_pins[2], ch & 4);
-}
-
-static inline void init_row(void) {
-    for (int idx = 0; idx < MATRIX_ROWS; idx++) {
-        setPinOutput(row_pins[idx]);
-        writePinLow(row_pins[idx]);
-    }
-}
-
-/* Initialize the peripherals pins */
-int ecsm_init(ecsm_config_t const* const ecsm_config) {
-    // Initialize config
-    config = *ecsm_config;
-
-    palSetLineMode(ANALOG_PORT, PAL_MODE_INPUT_ANALOG);
-    adcMux = pinToMux(ANALOG_PORT);
-
-    // Dummy call to make sure that adcStart() has been called in the appropriate state
-    adc_read(adcMux);
-
-    // Initialize discharge pin as discharge mode
-    writePinLow(DISCHARGE_PIN);
-    setPinOutputOpenDrain(DISCHARGE_PIN);
-
-    // Initialize drive lines
-    init_row();
-
-    // Initialize multiplexer select pin
-    init_mux_sel();
-
-    // Enable AMUX
-    setPinOutput(APLEX_EN_PIN_0);
-    writePinLow(APLEX_EN_PIN_0);
-    setPinOutput(APLEX_EN_PIN_1);
-    writePinLow(APLEX_EN_PIN_1);
-
-    return 0;
-}
-
-int ecsm_update(ecsm_config_t const* const ecsm_config) {
-    // Save config
-    config = *ecsm_config;
-    return 0;
-}
-
-// Read the capacitive sensor value
-uint16_t ecsm_readkey_raw(uint8_t channel, uint8_t row, uint8_t col) {
-    uint16_t sw_value = 0;
-
-    // Select the multiplexer
-    if (channel == 0) {
-        writePinHigh(APLEX_EN_PIN_0);
-        select_mux(col);
-        writePinLow(APLEX_EN_PIN_0);
-    } else {
-        writePinHigh(APLEX_EN_PIN_1);
-        select_mux(col);
-        writePinLow(APLEX_EN_PIN_1);
-    }
-
-    // Set strobe pins to low state
-    writePinLow(row_pins[row]);
-    ATOMIC_BLOCK_FORCEON {
-        // Set the row pin to high state and have capacitor charge
-        charge_capacitor(row);
-        // Read the ADC value
-        sw_value = adc_read(adcMux);
-    }
-    // Discharge peak hold capacitor
-    discharge_capacitor();
-    // Waiting for the ghost capacitor to discharge fully
-    wait_us(DISCHARGE_TIME);
-
-    return sw_value;
-}
-
-// Update press/release state of key
-bool ecsm_update_key(matrix_row_t* current_row, uint8_t row, uint8_t col, uint16_t sw_value) {
-    bool current_state = (*current_row >> col) & 1;
-
-    // Press to release
-    if (current_state && sw_value < config.ecsm_actuation_threshold) {
-        *current_row &= ~(1 << col);
-        return true;
-    }
-
-    // Release to press
-    if ((!current_state) && sw_value > config.ecsm_release_threshold) {
-        *current_row |= (1 << col);
-        return true;
-    }
-
-    return false;
-}
-
-// Scan key values and update matrix state
-bool ecsm_matrix_scan(matrix_row_t current_matrix[]) {
-    bool updated = false;
-
-    // Disable AMUX of channel 1
-    writePinHigh(APLEX_EN_PIN_1);
-    for (int col = 0; col < sizeof(col_channels); col++) {
-        for (int row = 0; row < MATRIX_ROWS; row++) {
-            ecsm_sw_value[row][col] = ecsm_readkey_raw(0, row, col);
-            updated |= ecsm_update_key(&current_matrix[row], row, col, ecsm_sw_value[row][col]);
-        }
-    }
-
-    // Disable AMUX of channel 1
-    writePinHigh(APLEX_EN_PIN_0);
-    for (int col = 0; col < sizeof(col_channels); col++) {
-        for (int row = 0; row < MATRIX_ROWS; row++) {
-            ecsm_sw_value[row][col + 8] = ecsm_readkey_raw(1, row, col);
-            updated |= ecsm_update_key(&current_matrix[row], row, col + 8, ecsm_sw_value[row][col + 8]);
-        }
-    }
-    return updated;
-}
-
-// Debug print key values
-void ecsm_print_matrix(void) {
-    for (int row = 0; row < MATRIX_ROWS; row++) {
-        for (int col = 0; col < MATRIX_COLS; col++) {
-            uprintf("%4d", ecsm_sw_value[row][col]);
-            if (col < (MATRIX_COLS - 1)) {
-                print(",");
-            }
-        }
-        print("\n");
-    }
-    print("\n");
-}
diff --git a/keyboards/cipulot/ec_alveus/1_2_0/ec_switch_matrix.h b/keyboards/cipulot/ec_alveus/1_2_0/ec_switch_matrix.h
deleted file mode 100644
index 9dcb216caa3..00000000000
--- a/keyboards/cipulot/ec_alveus/1_2_0/ec_switch_matrix.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2023 Cipulot
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include <stdint.h>
-#include <stdbool.h>
-
-#include "matrix.h"
-
-typedef struct {
-    uint16_t ecsm_actuation_threshold; // threshold for key release
-    uint16_t ecsm_release_threshold;   // threshold for key press
-} ecsm_config_t;
-
-ecsm_config_t ecsm_config;
-
-int      ecsm_init(ecsm_config_t const* const ecsm_config);
-int      ecsm_update(ecsm_config_t const* const ecsm_config);
-bool     ecsm_matrix_scan(matrix_row_t current_matrix[]);
-uint16_t ecsm_readkey_raw(uint8_t channel, uint8_t row, uint8_t col);
-bool     ecsm_update_key(matrix_row_t* current_row, uint8_t row, uint8_t col, uint16_t sw_value);
-void     ecsm_print_matrix(void);
diff --git a/keyboards/cipulot/ec_alveus/1_2_0/halconf.h b/keyboards/cipulot/ec_alveus/1_2_0/halconf.h
index 5b71acecbbc..835d43b6a0a 100644
--- a/keyboards/cipulot/ec_alveus/1_2_0/halconf.h
+++ b/keyboards/cipulot/ec_alveus/1_2_0/halconf.h
@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/keyboards/cipulot/ec_alveus/1_2_0/info.json b/keyboards/cipulot/ec_alveus/1_2_0/info.json
index 65af74e99ba..8b63d02f770 100644
--- a/keyboards/cipulot/ec_alveus/1_2_0/info.json
+++ b/keyboards/cipulot/ec_alveus/1_2_0/info.json
@@ -8,18 +8,11 @@
     },
     "diode_direction": "COL2ROW",
     "features": {
-        "audio": false,
-        "backlight": false,
-        "bootmagic": true,
-        "command": false,
+        "bootmagic": false,
         "console": true,
         "extrakey": true,
         "mousekey": true,
-        "nkro": true,
-        "rgblight": false
-    },
-    "mouse_key": {
-        "enabled": true
+        "nkro": true
     },
     "processor": "STM32F401",
     "usb": {
diff --git a/keyboards/cipulot/ec_alveus/1_2_0/keymaps/default/keymap.c b/keyboards/cipulot/ec_alveus/1_2_0/keymaps/default/keymap.c
index d111c6a6853..bff38f1fa81 100644
--- a/keyboards/cipulot/ec_alveus/1_2_0/keymaps/default/keymap.c
+++ b/keyboards/cipulot/ec_alveus/1_2_0/keymaps/default/keymap.c
@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -33,14 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______,            _______,                      _______,                                                    _______,            _______,   _______,  _______,  _______),
 
     [2] = LAYOUT_tkl_nofrow_ansi_tsangan_wkl(
-    QK_BOOT,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,
-    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,
-    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,       _______,
-    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                 _______,                  _______,
-    _______,            _______,                      _______,                                                    _______,            _______,   _______,  _______,  _______),
-
-    [3] = LAYOUT_tkl_nofrow_ansi_tsangan_wkl(
-    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,
+    QK_BOOT,  NK_TOGG,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,       _______,
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                 _______,                  _______,
diff --git a/keyboards/cipulot/ec_alveus/1_2_0/keymaps/tkl_nofrow_ansi_tsangan_wkl_split_bs/keymap.c b/keyboards/cipulot/ec_alveus/1_2_0/keymaps/tkl_nofrow_ansi_tsangan_wkl_split_bs/keymap.c
index 4552cd64575..163f05202ef 100644
--- a/keyboards/cipulot/ec_alveus/1_2_0/keymaps/tkl_nofrow_ansi_tsangan_wkl_split_bs/keymap.c
+++ b/keyboards/cipulot/ec_alveus/1_2_0/keymaps/tkl_nofrow_ansi_tsangan_wkl_split_bs/keymap.c
@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -33,14 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______,            _______,                      _______,                                                    _______,            _______,             _______,  _______,  _______),
 
     [2] = LAYOUT_tkl_nofrow_ansi_tsangan_wkl_split_bs(
-        QK_BOOT,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,             _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,       _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                 _______,                            _______,
-        _______,            _______,                      _______,                                                    _______,    _______,             _______,  _______,  _______),
-
-    [3] = LAYOUT_tkl_nofrow_ansi_tsangan_wkl_split_bs(
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,
+        QK_BOOT,  NK_TOGG,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,             _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,       _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                 _______,                            _______,
diff --git a/keyboards/cipulot/ec_alveus/1_2_0/keymaps/via/config.h b/keyboards/cipulot/ec_alveus/1_2_0/keymaps/via/config.h
index ebf954d07ac..1ab0d3d9aa2 100644
--- a/keyboards/cipulot/ec_alveus/1_2_0/keymaps/via/config.h
+++ b/keyboards/cipulot/ec_alveus/1_2_0/keymaps/via/config.h
@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,5 +16,5 @@
 
 #pragma once
 
-// This is the size of the EEPROM for the custom VIA-specific data
-#define EECONFIG_USER_DATA_SIZE 4
+// This is the firmware version for VIA support to avoid conflicts on menu fetching
+#define VIA_FIRMWARE_VERSION 1
diff --git a/keyboards/cipulot/ec_alveus/1_2_0/keymaps/via/keymap.c b/keyboards/cipulot/ec_alveus/1_2_0/keymaps/via/keymap.c
index 54a8f3b4f00..2134def61ae 100644
--- a/keyboards/cipulot/ec_alveus/1_2_0/keymaps/via/keymap.c
+++ b/keyboards/cipulot/ec_alveus/1_2_0/keymaps/via/keymap.c
@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -33,14 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______,  _______,  _______,                      _______,                                                    _______,  _______,  _______,             _______,  _______,  _______),
 
     [2] = LAYOUT_all(
-        QK_BOOT,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,             _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,       _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                 _______,                            _______,
-        _______,  _______,  _______,                      _______,                                                    _______,  _______,  _______,             _______,  _______,  _______),
-
-    [3] = LAYOUT_all(
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,
+        QK_BOOT,  NK_TOGG,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,             _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,       _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                 _______,                            _______,
diff --git a/keyboards/cipulot/ec_alveus/1_2_0/keymaps/via/rules.mk b/keyboards/cipulot/ec_alveus/1_2_0/keymaps/via/rules.mk
index 520b11f2031..1e5b99807cb 100644
--- a/keyboards/cipulot/ec_alveus/1_2_0/keymaps/via/rules.mk
+++ b/keyboards/cipulot/ec_alveus/1_2_0/keymaps/via/rules.mk
@@ -1,3 +1 @@
 VIA_ENABLE = yes
-
-SRC += via_apc.c
diff --git a/keyboards/cipulot/ec_alveus/1_2_0/keymaps/via/via_apc.c b/keyboards/cipulot/ec_alveus/1_2_0/keymaps/via/via_apc.c
deleted file mode 100644
index 5ea77af44c8..00000000000
--- a/keyboards/cipulot/ec_alveus/1_2_0/keymaps/via/via_apc.c
+++ /dev/null
@@ -1,156 +0,0 @@
-/* Copyright 2023 Cipulot
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "ec_switch_matrix.h"
-#include "action.h"
-#include "via.h"
-
-void apc_init_thresholds(void);
-void apc_set_threshold(bool is_for_actuation);
-
-// Declaring an _apc_config_t struct that will store our data
-typedef struct _apc_config_t {
-    uint16_t actuation_threshold;
-    uint16_t release_threshold;
-} apc_config;
-
-// Check if the size of the reserved persistent memory is the same as the size of struct apc_config
-_Static_assert(sizeof(apc_config) == EECONFIG_USER_DATA_SIZE, "Mismatch in keyboard EECONFIG stored data");
-
-// Declaring a new variable apc of type apc_config
-apc_config apc;
-
-// Declaring enums for VIA config menu
-enum via_apc_enums {
-    // clang-format off
-    id_apc_actuation_threshold = 1,
-    id_apc_release_threshold = 2
-    // clang-format on
-};
-
-// Initializing persistent memory configuration: default values are declared and stored in PMEM
-void eeconfig_init_user(void) {
-    // Default values
-    apc.actuation_threshold = DEFAULT_ACTUATION_LEVEL;
-    apc.release_threshold   = DEFAULT_RELEASE_LEVEL;
-    // Write default value to EEPROM now
-    eeconfig_update_user_datablock(&apc);
-}
-
-// On Keyboard startup
-void keyboard_post_init_user(void) {
-    // Read custom menu variables from memory
-    eeconfig_read_user_datablock(&apc);
-    apc_init_thresholds();
-}
-
-// Handle the data received by the keyboard from the VIA menus
-void apc_config_set_value(uint8_t *data) {
-    // data = [ value_id, value_data ]
-    uint8_t *value_id   = &(data[0]);
-    uint8_t *value_data = &(data[1]);
-
-    switch (*value_id) {
-        case id_apc_actuation_threshold: {
-            apc.actuation_threshold = value_data[1] | (value_data[0] << 8);
-            apc_set_threshold(true);
-            break;
-        }
-        case id_apc_release_threshold: {
-            apc.release_threshold = value_data[1] | (value_data[0] << 8);
-            apc_set_threshold(false);
-            break;
-        }
-    }
-}
-
-// Handle the data sent by the keyboard to the VIA menus
-void apc_config_get_value(uint8_t *data) {
-    // data = [ value_id, value_data ]
-    uint8_t *value_id   = &(data[0]);
-    uint8_t *value_data = &(data[1]);
-
-    switch (*value_id) {
-        case id_apc_actuation_threshold: {
-            value_data[0] = apc.actuation_threshold >> 8;
-            value_data[1] = apc.actuation_threshold & 0xFF;
-            break;
-        }
-        case id_apc_release_threshold: {
-            value_data[0] = apc.release_threshold >> 8;
-            value_data[1] = apc.release_threshold & 0xFF;
-            break;
-        }
-    }
-}
-
-// Save the data to persistent memory after changes are made
-void apc_config_save(void) {
-    eeconfig_update_user_datablock(&apc);
-}
-
-void via_custom_value_command_kb(uint8_t *data, uint8_t length) {
-    // data = [ command_id, channel_id, value_id, value_data ]
-    uint8_t *command_id        = &(data[0]);
-    uint8_t *channel_id        = &(data[1]);
-    uint8_t *value_id_and_data = &(data[2]);
-
-    if (*channel_id == id_custom_channel) {
-        switch (*command_id) {
-            case id_custom_set_value: {
-                apc_config_set_value(value_id_and_data);
-                break;
-            }
-            case id_custom_get_value: {
-                apc_config_get_value(value_id_and_data);
-                break;
-            }
-            case id_custom_save: {
-                apc_config_save();
-                break;
-            }
-            default: {
-                // Unhandled message.
-                *command_id = id_unhandled;
-                break;
-            }
-        }
-        return;
-    }
-
-    *command_id = id_unhandled;
-}
-
-// Initialize the thresholds
-void apc_init_thresholds(void) {
-    ecsm_config.ecsm_actuation_threshold = apc.actuation_threshold;
-    ecsm_config.ecsm_release_threshold   = apc.release_threshold;
-
-    // Update the ecsm_config
-    ecsm_update(&ecsm_config);
-}
-
-// Set the thresholds
-void apc_set_threshold(bool is_for_actuation) {
-    if (is_for_actuation) {
-        ecsm_config.ecsm_actuation_threshold = apc.actuation_threshold;
-
-    } else {
-        ecsm_config.ecsm_release_threshold = apc.release_threshold;
-    }
-    // Update the ecsm_config
-    ecsm_update(&ecsm_config);
-}
diff --git a/keyboards/cipulot/ec_alveus/1_2_0/matrix.c b/keyboards/cipulot/ec_alveus/1_2_0/matrix.c
deleted file mode 100644
index 1850acf2641..00000000000
--- a/keyboards/cipulot/ec_alveus/1_2_0/matrix.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Copyright 2023 Cipulot
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "ec_switch_matrix.h"
-#include "matrix.h"
-
-/* matrix state(1:on, 0:off) */
-extern matrix_row_t raw_matrix[MATRIX_ROWS]; // raw values
-extern matrix_row_t matrix[MATRIX_ROWS];     // debounced values
-
-void matrix_init_custom(void) {
-    // Default values, overwritten by VIA if enabled later
-    ecsm_config.ecsm_actuation_threshold = DEFAULT_ACTUATION_LEVEL;
-    ecsm_config.ecsm_release_threshold   = DEFAULT_RELEASE_LEVEL;
-
-    ecsm_init(&ecsm_config);
-}
-
-bool matrix_scan_custom(matrix_row_t current_matrix[]) {
-    bool updated = ecsm_matrix_scan(current_matrix);
-
-// RAW matrix values on console
-#ifdef CONSOLE_ENABLE
-    static int cnt = 0;
-    if (cnt++ == 350) {
-        cnt = 0;
-        ecsm_print_matrix();
-    }
-#endif
-    return updated;
-}
diff --git a/keyboards/cipulot/ec_alveus/1_2_0/mcuconf.h b/keyboards/cipulot/ec_alveus/1_2_0/mcuconf.h
index d91f576bd48..fa3c955e0d8 100644
--- a/keyboards/cipulot/ec_alveus/1_2_0/mcuconf.h
+++ b/keyboards/cipulot/ec_alveus/1_2_0/mcuconf.h
@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/keyboards/cipulot/ec_alveus/1_2_0/post_rules.mk b/keyboards/cipulot/ec_alveus/1_2_0/post_rules.mk
new file mode 100644
index 00000000000..d726a112a8c
--- /dev/null
+++ b/keyboards/cipulot/ec_alveus/1_2_0/post_rules.mk
@@ -0,0 +1,3 @@
+ifeq ($(strip $(VIA_ENABLE)), yes)
+    SRC += keyboards/cipulot/common/via_ec.c
+endif
diff --git a/keyboards/cipulot/ec_alveus/1_2_0/readme.md b/keyboards/cipulot/ec_alveus/1_2_0/readme.md
index e4c3ef86c3f..43a39b06d80 100644
--- a/keyboards/cipulot/ec_alveus/1_2_0/readme.md
+++ b/keyboards/cipulot/ec_alveus/1_2_0/readme.md
@@ -20,8 +20,7 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to
 
 ## Bootloader
 
-Enter the bootloader in 3 ways:
+Enter the bootloader in 2 ways:
 
-* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
 * **Physical reset**: Long short the exposed pads on the top of the PCB
 * **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/cipulot/ec_alveus/1_2_0/rules.mk b/keyboards/cipulot/ec_alveus/1_2_0/rules.mk
index fc2dcf32ab1..70494b635f6 100644
--- a/keyboards/cipulot/ec_alveus/1_2_0/rules.mk
+++ b/keyboards/cipulot/ec_alveus/1_2_0/rules.mk
@@ -1,4 +1,4 @@
 CUSTOM_MATRIX = lite
-SRC += matrix.c ec_switch_matrix.c
-
 ANALOG_DRIVER_REQUIRED = yes
+SRC += keyboards/cipulot/common/matrix.c keyboards/cipulot/common/ec_board.c keyboards/cipulot/common/ec_switch_matrix.c
+OPT = 3
diff --git a/keyboards/cipulot/ec_pro2/config.h b/keyboards/cipulot/ec_pro2/config.h
index 083b71cc136..d4dc8cf68ac 100644
--- a/keyboards/cipulot/ec_pro2/config.h
+++ b/keyboards/cipulot/ec_pro2/config.h
@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -19,27 +19,54 @@
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15
 
-/* Custom matrix pins and port select array */
 #define MATRIX_ROW_PINS \
     { B15, A8, B0, A7, B1 }
-#define MATRIX_COL_CHANNELS \
-    { 0, 3, 1, 2, 5, 7, 6, 4 }
-#define MUX_SEL_PINS \
+
+#define AMUX_COUNT 2
+#define AMUX_MAX_COLS_COUNT 8
+
+#define AMUX_EN_PINS \
+    { B7, B3 }
+
+#define AMUX_SEL_PINS \
     { B6, B5, B4 }
 
-/* Hardware peripherals pins */
-#define APLEX_EN_PIN_0 B7
-#define APLEX_EN_PIN_1 B3
+#define AMUX_COL_CHANNELS_SIZES \
+    { 8, 7 }
+
+#define AMUX_0_COL_CHANNELS \
+    { 0, 3, 1, 2, 5, 7, 6, 4 }
+
+#define AMUX_1_COL_CHANNELS \
+    { 0, 3, 1, 2, 5, 7, 6 }
+
+#define AMUX_COL_CHANNELS AMUX_0_COL_CHANNELS, AMUX_1_COL_CHANNELS
+
 #define DISCHARGE_PIN A6
 #define ANALOG_PORT A3
 
+#define DEFAULT_ACTUATION_MODE 0
+#define DEFAULT_MODE_0_ACTUATION_LEVEL 550
+#define DEFAULT_MODE_0_RELEASE_LEVEL 500
+#define DEFAULT_MODE_1_INITIAL_DEADZONE_OFFSET DEFAULT_MODE_0_ACTUATION_LEVEL
+#define DEFAULT_MODE_1_ACTUATION_OFFSET 70
+#define DEFAULT_MODE_1_RELEASE_OFFSET 70
+#define DEFAULT_EXTREMUM 1023
+#define EXPECTED_NOISE_FLOOR 0
+#define NOISE_FLOOR_THRESHOLD 50
+#define BOTTOMING_CALIBRATION_THRESHOLD 100
+#define DEFAULT_NOISE_FLOOR_SAMPLING_COUNT 30
+#define DEFAULT_BOTTOMING_READING 1023
+#define DEFAULT_CALIBRATION_STARTER true
+
+#define DISCHARGE_TIME 10
+
+// #define DEBUG_MATRIX_SCAN_RATE
+
+#define EECONFIG_KB_DATA_SIZE 160
+
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-#define DEFAULT_ACTUATION_LEVEL 550
-#define DEFAULT_RELEASE_LEVEL 500
-
-#define DISCHARGE_TIME 10
diff --git a/keyboards/cipulot/ec_pro2/ec_switch_matrix.c b/keyboards/cipulot/ec_pro2/ec_switch_matrix.c
deleted file mode 100644
index d45e8c32812..00000000000
--- a/keyboards/cipulot/ec_pro2/ec_switch_matrix.c
+++ /dev/null
@@ -1,183 +0,0 @@
-/* Copyright 2023 Cipulot
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "ec_switch_matrix.h"
-#include "analog.h"
-#include "atomic_util.h"
-#include "print.h"
-#include "wait.h"
-
-/* Pin and port array */
-const uint32_t row_pins[]     = MATRIX_ROW_PINS;
-const uint8_t  col_channels[] = MATRIX_COL_CHANNELS;
-const uint32_t mux_sel_pins[] = MUX_SEL_PINS;
-
-static ecsm_config_t config;
-static uint16_t      ecsm_sw_value[MATRIX_ROWS][MATRIX_COLS];
-
-static adc_mux adcMux;
-
-static inline void discharge_capacitor(void) {
-    writePinLow(DISCHARGE_PIN);
-}
-static inline void charge_capacitor(uint8_t row) {
-    writePinHigh(DISCHARGE_PIN);
-    writePinHigh(row_pins[row]);
-}
-
-static inline void init_mux_sel(void) {
-    for (int idx = 0; idx < 3; idx++) {
-        setPinOutput(mux_sel_pins[idx]);
-    }
-}
-
-static inline void select_mux(uint8_t col) {
-    uint8_t ch = col_channels[col];
-    writePin(mux_sel_pins[0], ch & 1);
-    writePin(mux_sel_pins[1], ch & 2);
-    writePin(mux_sel_pins[2], ch & 4);
-}
-
-static inline void init_row(void) {
-    for (int idx = 0; idx < MATRIX_ROWS; idx++) {
-        setPinOutput(row_pins[idx]);
-        writePinLow(row_pins[idx]);
-    }
-}
-
-/* Initialize the peripherals pins */
-int ecsm_init(ecsm_config_t const* const ecsm_config) {
-    // Initialize config
-    config = *ecsm_config;
-
-    palSetLineMode(ANALOG_PORT, PAL_MODE_INPUT_ANALOG);
-    adcMux = pinToMux(ANALOG_PORT);
-
-    // Dummy call to make sure that adcStart() has been called in the appropriate state
-    adc_read(adcMux);
-
-    // Initialize discharge pin as discharge mode
-    writePinLow(DISCHARGE_PIN);
-    setPinOutputOpenDrain(DISCHARGE_PIN);
-
-    // Initialize drive lines
-    init_row();
-
-    // Initialize multiplexer select pin
-    init_mux_sel();
-
-    // Enable AMUX
-    setPinOutput(APLEX_EN_PIN_0);
-    writePinLow(APLEX_EN_PIN_0);
-    setPinOutput(APLEX_EN_PIN_1);
-    writePinLow(APLEX_EN_PIN_1);
-
-    return 0;
-}
-
-int ecsm_update(ecsm_config_t const* const ecsm_config) {
-    // Save config
-    config = *ecsm_config;
-    return 0;
-}
-
-// Read the capacitive sensor value
-uint16_t ecsm_readkey_raw(uint8_t channel, uint8_t row, uint8_t col) {
-    uint16_t sw_value = 0;
-
-    // Select the multiplexer
-    if (channel == 0) {
-        writePinHigh(APLEX_EN_PIN_0);
-        select_mux(col);
-        writePinLow(APLEX_EN_PIN_0);
-    } else {
-        writePinHigh(APLEX_EN_PIN_1);
-        select_mux(col);
-        writePinLow(APLEX_EN_PIN_1);
-    }
-
-    // Set strobe pins to low state
-    writePinLow(row_pins[row]);
-    ATOMIC_BLOCK_FORCEON {
-        // Set the row pin to high state and have capacitor charge
-        charge_capacitor(row);
-        // Read the ADC value
-        sw_value = adc_read(adcMux);
-    }
-    // Discharge peak hold capacitor
-    discharge_capacitor();
-    // Waiting for the ghost capacitor to discharge fully
-    wait_us(DISCHARGE_TIME);
-
-    return sw_value;
-}
-
-// Update press/release state of key
-bool ecsm_update_key(matrix_row_t* current_row, uint8_t row, uint8_t col, uint16_t sw_value) {
-    bool current_state = (*current_row >> col) & 1;
-
-    // Press to release
-    if (current_state && sw_value < config.ecsm_actuation_threshold) {
-        *current_row &= ~(1 << col);
-        return true;
-    }
-
-    // Release to press
-    if ((!current_state) && sw_value > config.ecsm_release_threshold) {
-        *current_row |= (1 << col);
-        return true;
-    }
-
-    return false;
-}
-
-// Scan key values and update matrix state
-bool ecsm_matrix_scan(matrix_row_t current_matrix[]) {
-    bool updated = false;
-
-    // Disable AMUX of channel 1
-    writePinHigh(APLEX_EN_PIN_1);
-    for (int col = 0; col < sizeof(col_channels); col++) {
-        for (int row = 0; row < MATRIX_ROWS; row++) {
-            ecsm_sw_value[row][col] = ecsm_readkey_raw(0, row, col);
-            updated |= ecsm_update_key(&current_matrix[row], row, col, ecsm_sw_value[row][col]);
-        }
-    }
-
-    // Disable AMUX of channel 1
-    writePinHigh(APLEX_EN_PIN_0);
-    for (int col = 0; col < (sizeof(col_channels) - 1); col++) {
-        for (int row = 0; row < MATRIX_ROWS; row++) {
-            ecsm_sw_value[row][col + 8] = ecsm_readkey_raw(1, row, col);
-            updated |= ecsm_update_key(&current_matrix[row], row, col + 8, ecsm_sw_value[row][col + 8]);
-        }
-    }
-    return updated;
-}
-
-// Debug print key values
-void ecsm_print_matrix(void) {
-    for (int row = 0; row < MATRIX_ROWS; row++) {
-        for (int col = 0; col < MATRIX_COLS; col++) {
-            uprintf("%4d", ecsm_sw_value[row][col]);
-            if (col < (MATRIX_COLS - 1)) {
-                print(",");
-            }
-        }
-        print("\n");
-    }
-    print("\n");
-}
diff --git a/keyboards/cipulot/ec_pro2/ec_switch_matrix.h b/keyboards/cipulot/ec_pro2/ec_switch_matrix.h
deleted file mode 100644
index 9dcb216caa3..00000000000
--- a/keyboards/cipulot/ec_pro2/ec_switch_matrix.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2023 Cipulot
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include <stdint.h>
-#include <stdbool.h>
-
-#include "matrix.h"
-
-typedef struct {
-    uint16_t ecsm_actuation_threshold; // threshold for key release
-    uint16_t ecsm_release_threshold;   // threshold for key press
-} ecsm_config_t;
-
-ecsm_config_t ecsm_config;
-
-int      ecsm_init(ecsm_config_t const* const ecsm_config);
-int      ecsm_update(ecsm_config_t const* const ecsm_config);
-bool     ecsm_matrix_scan(matrix_row_t current_matrix[]);
-uint16_t ecsm_readkey_raw(uint8_t channel, uint8_t row, uint8_t col);
-bool     ecsm_update_key(matrix_row_t* current_row, uint8_t row, uint8_t col, uint16_t sw_value);
-void     ecsm_print_matrix(void);
diff --git a/keyboards/cipulot/ec_pro2/halconf.h b/keyboards/cipulot/ec_pro2/halconf.h
index 5b71acecbbc..835d43b6a0a 100644
--- a/keyboards/cipulot/ec_pro2/halconf.h
+++ b/keyboards/cipulot/ec_pro2/halconf.h
@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/keyboards/cipulot/ec_pro2/info.json b/keyboards/cipulot/ec_pro2/info.json
index cb107d3da3c..2929edfb19c 100644
--- a/keyboards/cipulot/ec_pro2/info.json
+++ b/keyboards/cipulot/ec_pro2/info.json
@@ -1,6 +1,6 @@
 {
     "manufacturer": "Cipulot",
-    "keyboard_name": "EC Pro2",
+    "keyboard_name": "EC Pro 2",
     "maintainer": "Cipulot",
     "bootloader": "stm32-dfu",
     "build": {
@@ -8,19 +8,13 @@
     },
     "diode_direction": "COL2ROW",
     "features": {
-        "audio": false,
-        "backlight": false,
-        "bootmagic": true,
-        "command": false,
+        "bootmagic": false,
         "console": true,
         "extrakey": true,
         "mousekey": true,
         "nkro": true,
         "rgblight": true
     },
-    "mouse_key": {
-        "enabled": true
-    },
     "processor": "STM32F401",
     "rgblight": {
         "led_count": 22,
@@ -40,7 +34,6 @@
     "ws2812": {
         "pin": "B14"
     },
-    "url": "https://www.github.com/Cipulot/EC-Pro-2",
     "usb": {
         "device_version": "0.0.1",
         "pid": "0x6B8E",
diff --git a/keyboards/cipulot/ec_pro2/keymaps/60_hhkb/keymap.c b/keyboards/cipulot/ec_pro2/keymaps/60_hhkb/keymap.c
index 10c7ffb65fd..71f8cd0368d 100644
--- a/keyboards/cipulot/ec_pro2/keymaps/60_hhkb/keymap.c
+++ b/keyboards/cipulot/ec_pro2/keymaps/60_hhkb/keymap.c
@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -22,8 +22,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_ESC,   KC_1,     KC_2,     KC_3,     KC_4,   KC_5,    KC_6,   KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,   KC_EQL,   KC_BSLS,  KC_GRV,
         KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,   KC_T,    KC_Y,   KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,   KC_RBRC,  KC_DEL,
         KC_LCTL,  KC_A,     KC_S,     KC_D,     KC_F,   KC_G,    KC_H,   KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,   KC_ENTER,
-        KC_LSFT,  KC_Z,     KC_X,     KC_C,   KC_V,    KC_B,   KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,   MO(1),
-                  KC_LGUI,  KC_LALT,                             KC_SPC,                               KC_RALT,  KC_RGUI),
+        KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,   KC_B,    KC_N,   KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,   MO(1),
+                  KC_LALT,  KC_LGUI,                             KC_SPC,                               KC_RGUI,  KC_RALT),
 
     [1] = LAYOUT_60_hhkb(
         _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,      KC_F8,    KC_F9,    KC_F10,   KC_F11,    KC_F12,   KC_INS,  KC_DEL,
@@ -33,13 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                   _______,  _______,                                _______,                                  _______,  MO(2)),
 
     [2] = LAYOUT_60_hhkb(
-        RGB_TOG,  RGB_VAD,  RGB_VAI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  QK_BOOT,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-                  _______,  _______,                                _______,                                _______,  _______),
-    [3] = LAYOUT_60_hhkb(
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        QK_BOOT,  NK_TOGG,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
diff --git a/keyboards/cipulot/ec_pro2/keymaps/default/keymap.c b/keyboards/cipulot/ec_pro2/keymaps/default/keymap.c
index 767b76ea3e7..45e25068e53 100644
--- a/keyboards/cipulot/ec_pro2/keymaps/default/keymap.c
+++ b/keyboards/cipulot/ec_pro2/keymaps/default/keymap.c
@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,   KC_T,    KC_Y,   KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,   KC_RBRC,  KC_DEL,
         KC_LCTL,  KC_A,     KC_S,     KC_D,     KC_F,   KC_G,    KC_H,   KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,   KC_NUHS,  KC_ENTER,
         KC_LSFT,  KC_BSLS,  KC_Z,     KC_X,     KC_C,   KC_V,    KC_B,   KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,   KC_RSFT,  MO(1),
-                  KC_LGUI,  KC_LALT,                             KC_SPC,                               KC_RALT,  KC_RGUI),
+                  KC_LALT,  KC_LGUI,                             KC_SPC,                               KC_RGUI,  KC_RALT),
 
     [1] = LAYOUT_all(
         _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,      KC_F8,    KC_F9,    KC_F10,   KC_F11,    KC_F12,   KC_INS,  KC_DEL,
@@ -33,13 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                   _______,  _______,                                _______,                                  _______,  MO(2)),
 
     [2] = LAYOUT_all(
-        RGB_TOG,  RGB_VAD,  RGB_VAI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  QK_BOOT,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-                  _______,  _______,                                _______,                                _______,  _______),
-    [3] = LAYOUT_all(
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        QK_BOOT,  NK_TOGG,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
diff --git a/keyboards/cipulot/ec_pro2/keymaps/via/config.h b/keyboards/cipulot/ec_pro2/keymaps/via/config.h
index ebf954d07ac..1ab0d3d9aa2 100644
--- a/keyboards/cipulot/ec_pro2/keymaps/via/config.h
+++ b/keyboards/cipulot/ec_pro2/keymaps/via/config.h
@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,5 +16,5 @@
 
 #pragma once
 
-// This is the size of the EEPROM for the custom VIA-specific data
-#define EECONFIG_USER_DATA_SIZE 4
+// This is the firmware version for VIA support to avoid conflicts on menu fetching
+#define VIA_FIRMWARE_VERSION 1
diff --git a/keyboards/cipulot/ec_pro2/keymaps/via/keymap.c b/keyboards/cipulot/ec_pro2/keymaps/via/keymap.c
index 767b76ea3e7..45e25068e53 100644
--- a/keyboards/cipulot/ec_pro2/keymaps/via/keymap.c
+++ b/keyboards/cipulot/ec_pro2/keymaps/via/keymap.c
@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,   KC_T,    KC_Y,   KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,   KC_RBRC,  KC_DEL,
         KC_LCTL,  KC_A,     KC_S,     KC_D,     KC_F,   KC_G,    KC_H,   KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,   KC_NUHS,  KC_ENTER,
         KC_LSFT,  KC_BSLS,  KC_Z,     KC_X,     KC_C,   KC_V,    KC_B,   KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,   KC_RSFT,  MO(1),
-                  KC_LGUI,  KC_LALT,                             KC_SPC,                               KC_RALT,  KC_RGUI),
+                  KC_LALT,  KC_LGUI,                             KC_SPC,                               KC_RGUI,  KC_RALT),
 
     [1] = LAYOUT_all(
         _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,      KC_F8,    KC_F9,    KC_F10,   KC_F11,    KC_F12,   KC_INS,  KC_DEL,
@@ -33,13 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                   _______,  _______,                                _______,                                  _______,  MO(2)),
 
     [2] = LAYOUT_all(
-        RGB_TOG,  RGB_VAD,  RGB_VAI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  QK_BOOT,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-                  _______,  _______,                                _______,                                _______,  _______),
-    [3] = LAYOUT_all(
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        QK_BOOT,  NK_TOGG,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
diff --git a/keyboards/cipulot/ec_pro2/keymaps/via/rules.mk b/keyboards/cipulot/ec_pro2/keymaps/via/rules.mk
index 520b11f2031..1e5b99807cb 100644
--- a/keyboards/cipulot/ec_pro2/keymaps/via/rules.mk
+++ b/keyboards/cipulot/ec_pro2/keymaps/via/rules.mk
@@ -1,3 +1 @@
 VIA_ENABLE = yes
-
-SRC += via_apc.c
diff --git a/keyboards/cipulot/ec_pro2/keymaps/via/via_apc.c b/keyboards/cipulot/ec_pro2/keymaps/via/via_apc.c
deleted file mode 100644
index 5ea77af44c8..00000000000
--- a/keyboards/cipulot/ec_pro2/keymaps/via/via_apc.c
+++ /dev/null
@@ -1,156 +0,0 @@
-/* Copyright 2023 Cipulot
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "ec_switch_matrix.h"
-#include "action.h"
-#include "via.h"
-
-void apc_init_thresholds(void);
-void apc_set_threshold(bool is_for_actuation);
-
-// Declaring an _apc_config_t struct that will store our data
-typedef struct _apc_config_t {
-    uint16_t actuation_threshold;
-    uint16_t release_threshold;
-} apc_config;
-
-// Check if the size of the reserved persistent memory is the same as the size of struct apc_config
-_Static_assert(sizeof(apc_config) == EECONFIG_USER_DATA_SIZE, "Mismatch in keyboard EECONFIG stored data");
-
-// Declaring a new variable apc of type apc_config
-apc_config apc;
-
-// Declaring enums for VIA config menu
-enum via_apc_enums {
-    // clang-format off
-    id_apc_actuation_threshold = 1,
-    id_apc_release_threshold = 2
-    // clang-format on
-};
-
-// Initializing persistent memory configuration: default values are declared and stored in PMEM
-void eeconfig_init_user(void) {
-    // Default values
-    apc.actuation_threshold = DEFAULT_ACTUATION_LEVEL;
-    apc.release_threshold   = DEFAULT_RELEASE_LEVEL;
-    // Write default value to EEPROM now
-    eeconfig_update_user_datablock(&apc);
-}
-
-// On Keyboard startup
-void keyboard_post_init_user(void) {
-    // Read custom menu variables from memory
-    eeconfig_read_user_datablock(&apc);
-    apc_init_thresholds();
-}
-
-// Handle the data received by the keyboard from the VIA menus
-void apc_config_set_value(uint8_t *data) {
-    // data = [ value_id, value_data ]
-    uint8_t *value_id   = &(data[0]);
-    uint8_t *value_data = &(data[1]);
-
-    switch (*value_id) {
-        case id_apc_actuation_threshold: {
-            apc.actuation_threshold = value_data[1] | (value_data[0] << 8);
-            apc_set_threshold(true);
-            break;
-        }
-        case id_apc_release_threshold: {
-            apc.release_threshold = value_data[1] | (value_data[0] << 8);
-            apc_set_threshold(false);
-            break;
-        }
-    }
-}
-
-// Handle the data sent by the keyboard to the VIA menus
-void apc_config_get_value(uint8_t *data) {
-    // data = [ value_id, value_data ]
-    uint8_t *value_id   = &(data[0]);
-    uint8_t *value_data = &(data[1]);
-
-    switch (*value_id) {
-        case id_apc_actuation_threshold: {
-            value_data[0] = apc.actuation_threshold >> 8;
-            value_data[1] = apc.actuation_threshold & 0xFF;
-            break;
-        }
-        case id_apc_release_threshold: {
-            value_data[0] = apc.release_threshold >> 8;
-            value_data[1] = apc.release_threshold & 0xFF;
-            break;
-        }
-    }
-}
-
-// Save the data to persistent memory after changes are made
-void apc_config_save(void) {
-    eeconfig_update_user_datablock(&apc);
-}
-
-void via_custom_value_command_kb(uint8_t *data, uint8_t length) {
-    // data = [ command_id, channel_id, value_id, value_data ]
-    uint8_t *command_id        = &(data[0]);
-    uint8_t *channel_id        = &(data[1]);
-    uint8_t *value_id_and_data = &(data[2]);
-
-    if (*channel_id == id_custom_channel) {
-        switch (*command_id) {
-            case id_custom_set_value: {
-                apc_config_set_value(value_id_and_data);
-                break;
-            }
-            case id_custom_get_value: {
-                apc_config_get_value(value_id_and_data);
-                break;
-            }
-            case id_custom_save: {
-                apc_config_save();
-                break;
-            }
-            default: {
-                // Unhandled message.
-                *command_id = id_unhandled;
-                break;
-            }
-        }
-        return;
-    }
-
-    *command_id = id_unhandled;
-}
-
-// Initialize the thresholds
-void apc_init_thresholds(void) {
-    ecsm_config.ecsm_actuation_threshold = apc.actuation_threshold;
-    ecsm_config.ecsm_release_threshold   = apc.release_threshold;
-
-    // Update the ecsm_config
-    ecsm_update(&ecsm_config);
-}
-
-// Set the thresholds
-void apc_set_threshold(bool is_for_actuation) {
-    if (is_for_actuation) {
-        ecsm_config.ecsm_actuation_threshold = apc.actuation_threshold;
-
-    } else {
-        ecsm_config.ecsm_release_threshold = apc.release_threshold;
-    }
-    // Update the ecsm_config
-    ecsm_update(&ecsm_config);
-}
diff --git a/keyboards/cipulot/ec_pro2/matrix.c b/keyboards/cipulot/ec_pro2/matrix.c
deleted file mode 100644
index 1850acf2641..00000000000
--- a/keyboards/cipulot/ec_pro2/matrix.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Copyright 2023 Cipulot
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "ec_switch_matrix.h"
-#include "matrix.h"
-
-/* matrix state(1:on, 0:off) */
-extern matrix_row_t raw_matrix[MATRIX_ROWS]; // raw values
-extern matrix_row_t matrix[MATRIX_ROWS];     // debounced values
-
-void matrix_init_custom(void) {
-    // Default values, overwritten by VIA if enabled later
-    ecsm_config.ecsm_actuation_threshold = DEFAULT_ACTUATION_LEVEL;
-    ecsm_config.ecsm_release_threshold   = DEFAULT_RELEASE_LEVEL;
-
-    ecsm_init(&ecsm_config);
-}
-
-bool matrix_scan_custom(matrix_row_t current_matrix[]) {
-    bool updated = ecsm_matrix_scan(current_matrix);
-
-// RAW matrix values on console
-#ifdef CONSOLE_ENABLE
-    static int cnt = 0;
-    if (cnt++ == 350) {
-        cnt = 0;
-        ecsm_print_matrix();
-    }
-#endif
-    return updated;
-}
diff --git a/keyboards/cipulot/ec_pro2/mcuconf.h b/keyboards/cipulot/ec_pro2/mcuconf.h
index d91f576bd48..fa3c955e0d8 100644
--- a/keyboards/cipulot/ec_pro2/mcuconf.h
+++ b/keyboards/cipulot/ec_pro2/mcuconf.h
@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/keyboards/cipulot/ec_pro2/post_rules.mk b/keyboards/cipulot/ec_pro2/post_rules.mk
new file mode 100644
index 00000000000..d726a112a8c
--- /dev/null
+++ b/keyboards/cipulot/ec_pro2/post_rules.mk
@@ -0,0 +1,3 @@
+ifeq ($(strip $(VIA_ENABLE)), yes)
+    SRC += keyboards/cipulot/common/via_ec.c
+endif
diff --git a/keyboards/cipulot/ec_pro2/readme.md b/keyboards/cipulot/ec_pro2/readme.md
index 0ada16ec193..6e18a2d0d83 100644
--- a/keyboards/cipulot/ec_pro2/readme.md
+++ b/keyboards/cipulot/ec_pro2/readme.md
@@ -20,8 +20,7 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to
 
 ## Bootloader
 
-Enter the bootloader in 3 ways:
+Enter the bootloader in 2 ways:
 
-* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
 * **Physical Boot0 pins**: Short the Boot0 pins on the back of the PCB while plugging in the keyboard
 * **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/cipulot/ec_pro2/rules.mk b/keyboards/cipulot/ec_pro2/rules.mk
index fc2dcf32ab1..ab6c37cad43 100644
--- a/keyboards/cipulot/ec_pro2/rules.mk
+++ b/keyboards/cipulot/ec_pro2/rules.mk
@@ -1,4 +1,4 @@
 CUSTOM_MATRIX = lite
-SRC += matrix.c ec_switch_matrix.c
-
 ANALOG_DRIVER_REQUIRED = yes
+SRC += keyboards/cipulot/common/matrix.c keyboards/cipulot/common/ec_board.c keyboards/cipulot/common/ec_switch_matrix.c
+OPT = 2
diff --git a/keyboards/cipulot/ec_prox/ansi_iso/config.h b/keyboards/cipulot/ec_prox/ansi_iso/config.h
index b659097656b..ec15808274c 100644
--- a/keyboards/cipulot/ec_prox/ansi_iso/config.h
+++ b/keyboards/cipulot/ec_prox/ansi_iso/config.h
@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -19,27 +19,54 @@
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15
 
-/* Custom matrix pins and port select array */
 #define MATRIX_ROW_PINS \
     { A7, B0, A4, A5, A6 }
-#define MATRIX_COL_CHANNELS \
-    { 0, 3, 1, 2, 5, 7, 6, 4 }
-#define MUX_SEL_PINS \
+
+#define AMUX_COUNT 2
+#define AMUX_MAX_COLS_COUNT 8
+
+#define AMUX_EN_PINS \
+    { B7, B3 }
+
+#define AMUX_SEL_PINS \
     { B4, B5, B6 }
 
-/* Hardware peripherals pins */
-#define APLEX_EN_PIN_0 B7
-#define APLEX_EN_PIN_1 B3
+#define AMUX_COL_CHANNELS_SIZES \
+    { 8, 7 }
+
+#define AMUX_0_COL_CHANNELS \
+    { 0, 3, 1, 2, 5, 7, 6, 4 }
+
+#define AMUX_1_COL_CHANNELS \
+    { 0, 3, 1, 2, 5, 7, 6 }
+
+#define AMUX_COL_CHANNELS AMUX_0_COL_CHANNELS, AMUX_1_COL_CHANNELS
+
 #define DISCHARGE_PIN A2
 #define ANALOG_PORT A1
 
+#define DEFAULT_ACTUATION_MODE 0
+#define DEFAULT_MODE_0_ACTUATION_LEVEL 550
+#define DEFAULT_MODE_0_RELEASE_LEVEL 500
+#define DEFAULT_MODE_1_INITIAL_DEADZONE_OFFSET DEFAULT_MODE_0_ACTUATION_LEVEL
+#define DEFAULT_MODE_1_ACTUATION_OFFSET 70
+#define DEFAULT_MODE_1_RELEASE_OFFSET 70
+#define DEFAULT_EXTREMUM 1023
+#define EXPECTED_NOISE_FLOOR 0
+#define NOISE_FLOOR_THRESHOLD 50
+#define BOTTOMING_CALIBRATION_THRESHOLD 100
+#define DEFAULT_NOISE_FLOOR_SAMPLING_COUNT 30
+#define DEFAULT_BOTTOMING_READING 1023
+#define DEFAULT_CALIBRATION_STARTER true
+
+#define DISCHARGE_TIME 10
+
+// #define DEBUG_MATRIX_SCAN_RATE
+
+#define EECONFIG_KB_DATA_SIZE 160
+
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-#define DEFAULT_ACTUATION_LEVEL 550
-#define DEFAULT_RELEASE_LEVEL 500
-
-#define DISCHARGE_TIME 10
diff --git a/keyboards/cipulot/ec_prox/ansi_iso/ec_switch_matrix.c b/keyboards/cipulot/ec_prox/ansi_iso/ec_switch_matrix.c
deleted file mode 100644
index d45e8c32812..00000000000
--- a/keyboards/cipulot/ec_prox/ansi_iso/ec_switch_matrix.c
+++ /dev/null
@@ -1,183 +0,0 @@
-/* Copyright 2023 Cipulot
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "ec_switch_matrix.h"
-#include "analog.h"
-#include "atomic_util.h"
-#include "print.h"
-#include "wait.h"
-
-/* Pin and port array */
-const uint32_t row_pins[]     = MATRIX_ROW_PINS;
-const uint8_t  col_channels[] = MATRIX_COL_CHANNELS;
-const uint32_t mux_sel_pins[] = MUX_SEL_PINS;
-
-static ecsm_config_t config;
-static uint16_t      ecsm_sw_value[MATRIX_ROWS][MATRIX_COLS];
-
-static adc_mux adcMux;
-
-static inline void discharge_capacitor(void) {
-    writePinLow(DISCHARGE_PIN);
-}
-static inline void charge_capacitor(uint8_t row) {
-    writePinHigh(DISCHARGE_PIN);
-    writePinHigh(row_pins[row]);
-}
-
-static inline void init_mux_sel(void) {
-    for (int idx = 0; idx < 3; idx++) {
-        setPinOutput(mux_sel_pins[idx]);
-    }
-}
-
-static inline void select_mux(uint8_t col) {
-    uint8_t ch = col_channels[col];
-    writePin(mux_sel_pins[0], ch & 1);
-    writePin(mux_sel_pins[1], ch & 2);
-    writePin(mux_sel_pins[2], ch & 4);
-}
-
-static inline void init_row(void) {
-    for (int idx = 0; idx < MATRIX_ROWS; idx++) {
-        setPinOutput(row_pins[idx]);
-        writePinLow(row_pins[idx]);
-    }
-}
-
-/* Initialize the peripherals pins */
-int ecsm_init(ecsm_config_t const* const ecsm_config) {
-    // Initialize config
-    config = *ecsm_config;
-
-    palSetLineMode(ANALOG_PORT, PAL_MODE_INPUT_ANALOG);
-    adcMux = pinToMux(ANALOG_PORT);
-
-    // Dummy call to make sure that adcStart() has been called in the appropriate state
-    adc_read(adcMux);
-
-    // Initialize discharge pin as discharge mode
-    writePinLow(DISCHARGE_PIN);
-    setPinOutputOpenDrain(DISCHARGE_PIN);
-
-    // Initialize drive lines
-    init_row();
-
-    // Initialize multiplexer select pin
-    init_mux_sel();
-
-    // Enable AMUX
-    setPinOutput(APLEX_EN_PIN_0);
-    writePinLow(APLEX_EN_PIN_0);
-    setPinOutput(APLEX_EN_PIN_1);
-    writePinLow(APLEX_EN_PIN_1);
-
-    return 0;
-}
-
-int ecsm_update(ecsm_config_t const* const ecsm_config) {
-    // Save config
-    config = *ecsm_config;
-    return 0;
-}
-
-// Read the capacitive sensor value
-uint16_t ecsm_readkey_raw(uint8_t channel, uint8_t row, uint8_t col) {
-    uint16_t sw_value = 0;
-
-    // Select the multiplexer
-    if (channel == 0) {
-        writePinHigh(APLEX_EN_PIN_0);
-        select_mux(col);
-        writePinLow(APLEX_EN_PIN_0);
-    } else {
-        writePinHigh(APLEX_EN_PIN_1);
-        select_mux(col);
-        writePinLow(APLEX_EN_PIN_1);
-    }
-
-    // Set strobe pins to low state
-    writePinLow(row_pins[row]);
-    ATOMIC_BLOCK_FORCEON {
-        // Set the row pin to high state and have capacitor charge
-        charge_capacitor(row);
-        // Read the ADC value
-        sw_value = adc_read(adcMux);
-    }
-    // Discharge peak hold capacitor
-    discharge_capacitor();
-    // Waiting for the ghost capacitor to discharge fully
-    wait_us(DISCHARGE_TIME);
-
-    return sw_value;
-}
-
-// Update press/release state of key
-bool ecsm_update_key(matrix_row_t* current_row, uint8_t row, uint8_t col, uint16_t sw_value) {
-    bool current_state = (*current_row >> col) & 1;
-
-    // Press to release
-    if (current_state && sw_value < config.ecsm_actuation_threshold) {
-        *current_row &= ~(1 << col);
-        return true;
-    }
-
-    // Release to press
-    if ((!current_state) && sw_value > config.ecsm_release_threshold) {
-        *current_row |= (1 << col);
-        return true;
-    }
-
-    return false;
-}
-
-// Scan key values and update matrix state
-bool ecsm_matrix_scan(matrix_row_t current_matrix[]) {
-    bool updated = false;
-
-    // Disable AMUX of channel 1
-    writePinHigh(APLEX_EN_PIN_1);
-    for (int col = 0; col < sizeof(col_channels); col++) {
-        for (int row = 0; row < MATRIX_ROWS; row++) {
-            ecsm_sw_value[row][col] = ecsm_readkey_raw(0, row, col);
-            updated |= ecsm_update_key(&current_matrix[row], row, col, ecsm_sw_value[row][col]);
-        }
-    }
-
-    // Disable AMUX of channel 1
-    writePinHigh(APLEX_EN_PIN_0);
-    for (int col = 0; col < (sizeof(col_channels) - 1); col++) {
-        for (int row = 0; row < MATRIX_ROWS; row++) {
-            ecsm_sw_value[row][col + 8] = ecsm_readkey_raw(1, row, col);
-            updated |= ecsm_update_key(&current_matrix[row], row, col + 8, ecsm_sw_value[row][col + 8]);
-        }
-    }
-    return updated;
-}
-
-// Debug print key values
-void ecsm_print_matrix(void) {
-    for (int row = 0; row < MATRIX_ROWS; row++) {
-        for (int col = 0; col < MATRIX_COLS; col++) {
-            uprintf("%4d", ecsm_sw_value[row][col]);
-            if (col < (MATRIX_COLS - 1)) {
-                print(",");
-            }
-        }
-        print("\n");
-    }
-    print("\n");
-}
diff --git a/keyboards/cipulot/ec_prox/ansi_iso/ec_switch_matrix.h b/keyboards/cipulot/ec_prox/ansi_iso/ec_switch_matrix.h
deleted file mode 100644
index 9dcb216caa3..00000000000
--- a/keyboards/cipulot/ec_prox/ansi_iso/ec_switch_matrix.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2023 Cipulot
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include <stdint.h>
-#include <stdbool.h>
-
-#include "matrix.h"
-
-typedef struct {
-    uint16_t ecsm_actuation_threshold; // threshold for key release
-    uint16_t ecsm_release_threshold;   // threshold for key press
-} ecsm_config_t;
-
-ecsm_config_t ecsm_config;
-
-int      ecsm_init(ecsm_config_t const* const ecsm_config);
-int      ecsm_update(ecsm_config_t const* const ecsm_config);
-bool     ecsm_matrix_scan(matrix_row_t current_matrix[]);
-uint16_t ecsm_readkey_raw(uint8_t channel, uint8_t row, uint8_t col);
-bool     ecsm_update_key(matrix_row_t* current_row, uint8_t row, uint8_t col, uint16_t sw_value);
-void     ecsm_print_matrix(void);
diff --git a/keyboards/cipulot/ec_prox/ansi_iso/halconf.h b/keyboards/cipulot/ec_prox/ansi_iso/halconf.h
index 5b71acecbbc..835d43b6a0a 100644
--- a/keyboards/cipulot/ec_prox/ansi_iso/halconf.h
+++ b/keyboards/cipulot/ec_prox/ansi_iso/halconf.h
@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/keyboards/cipulot/ec_prox/ansi_iso/info.json b/keyboards/cipulot/ec_prox/ansi_iso/info.json
index b1221bfdd73..3f390d0bc61 100644
--- a/keyboards/cipulot/ec_prox/ansi_iso/info.json
+++ b/keyboards/cipulot/ec_prox/ansi_iso/info.json
@@ -8,19 +8,13 @@
     },
     "diode_direction": "COL2ROW",
     "features": {
-        "audio": false,
-        "backlight": false,
-        "bootmagic": true,
-        "command": false,
+        "bootmagic": false,
         "console": true,
         "extrakey": true,
         "mousekey": true,
         "nkro": true,
         "rgblight": true
     },
-    "mouse_key": {
-        "enabled": true
-    },
     "processor": "STM32F401",
     "rgblight": {
         "led_count": 22,
diff --git a/keyboards/cipulot/ec_prox/ansi_iso/keymaps/60_hhkb/keymap.c b/keyboards/cipulot/ec_prox/ansi_iso/keymaps/60_hhkb/keymap.c
index 10c7ffb65fd..bd4df694af9 100644
--- a/keyboards/cipulot/ec_prox/ansi_iso/keymaps/60_hhkb/keymap.c
+++ b/keyboards/cipulot/ec_prox/ansi_iso/keymaps/60_hhkb/keymap.c
@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,   KC_T,    KC_Y,   KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,   KC_RBRC,  KC_DEL,
         KC_LCTL,  KC_A,     KC_S,     KC_D,     KC_F,   KC_G,    KC_H,   KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,   KC_ENTER,
         KC_LSFT,  KC_Z,     KC_X,     KC_C,   KC_V,    KC_B,   KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,   MO(1),
-                  KC_LGUI,  KC_LALT,                             KC_SPC,                               KC_RALT,  KC_RGUI),
+                  KC_LALT,  KC_LGUI,                             KC_SPC,                               KC_RGUI,  KC_RALT),
 
     [1] = LAYOUT_60_hhkb(
         _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,      KC_F8,    KC_F9,    KC_F10,   KC_F11,    KC_F12,   KC_INS,  KC_DEL,
@@ -33,13 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                   _______,  _______,                                _______,                                  _______,  MO(2)),
 
     [2] = LAYOUT_60_hhkb(
-        RGB_TOG,  RGB_VAD,  RGB_VAI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  QK_BOOT,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-                  _______,  _______,                                _______,                                _______,  _______),
-    [3] = LAYOUT_60_hhkb(
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        QK_BOOT,  NK_TOGG,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
diff --git a/keyboards/cipulot/ec_prox/ansi_iso/keymaps/default/keymap.c b/keyboards/cipulot/ec_prox/ansi_iso/keymaps/default/keymap.c
index 430ed0bafa2..9a0f1dfcbd1 100644
--- a/keyboards/cipulot/ec_prox/ansi_iso/keymaps/default/keymap.c
+++ b/keyboards/cipulot/ec_prox/ansi_iso/keymaps/default/keymap.c
@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -23,24 +23,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,   KC_T,    KC_Y,   KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,   KC_RBRC,  KC_DEL,
         KC_LCTL,  KC_A,     KC_S,     KC_D,     KC_F,   KC_G,    KC_H,   KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,   KC_NUHS,  KC_ENTER,
         KC_LSFT,  KC_BSLS,  KC_Z,     KC_X,     KC_C,   KC_V,    KC_B,   KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,   KC_RSFT,  MO(1),
-                  KC_LGUI,  KC_LALT,                             KC_SPC,                               KC_RALT,  KC_RGUI),
+                  KC_LALT,  KC_LGUI,                             KC_SPC,                               KC_RGUI,  KC_RALT),
 
     [1] = LAYOUT_all(
         _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,      KC_F8,    KC_F9,    KC_F10,    KC_F11,    KC_F12,   KC_INS,  KC_DEL,
         KC_CAPS,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    KC_PSCR,  KC_SCRL,  KC_PAUSE,  KC_UP,     _______,  KC_BSPC,
         _______,  KC_VOLD,  KC_VOLU,  KC_MUTE,  _______,  _______,  S(KC_8),  KC_SLSH,    KC_HOME,  KC_PGUP,  KC_LEFT,   KC_RIGHT,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  S(KC_EQL),  KC_MINS,  KC_END,   KC_PGDN,   KC_DOWN,   _______,  _______,
-                  _______,  _______,                                _______,                                  _______,   _______),
+                  _______,  _______,                                _______,                                  _______,   MO(2)),
 
     [2] = LAYOUT_all(
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-                  _______,  _______,                                _______,                                _______,  _______),
-
-    [3] = LAYOUT_all(
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        QK_BOOT,  NK_TOGG,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
diff --git a/keyboards/cipulot/ec_prox/ansi_iso/keymaps/via/config.h b/keyboards/cipulot/ec_prox/ansi_iso/keymaps/via/config.h
index ebf954d07ac..1ab0d3d9aa2 100644
--- a/keyboards/cipulot/ec_prox/ansi_iso/keymaps/via/config.h
+++ b/keyboards/cipulot/ec_prox/ansi_iso/keymaps/via/config.h
@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,5 +16,5 @@
 
 #pragma once
 
-// This is the size of the EEPROM for the custom VIA-specific data
-#define EECONFIG_USER_DATA_SIZE 4
+// This is the firmware version for VIA support to avoid conflicts on menu fetching
+#define VIA_FIRMWARE_VERSION 1
diff --git a/keyboards/cipulot/ec_prox/ansi_iso/keymaps/via/keymap.c b/keyboards/cipulot/ec_prox/ansi_iso/keymaps/via/keymap.c
index 430ed0bafa2..9a0f1dfcbd1 100644
--- a/keyboards/cipulot/ec_prox/ansi_iso/keymaps/via/keymap.c
+++ b/keyboards/cipulot/ec_prox/ansi_iso/keymaps/via/keymap.c
@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -23,24 +23,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,   KC_T,    KC_Y,   KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,   KC_RBRC,  KC_DEL,
         KC_LCTL,  KC_A,     KC_S,     KC_D,     KC_F,   KC_G,    KC_H,   KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,   KC_NUHS,  KC_ENTER,
         KC_LSFT,  KC_BSLS,  KC_Z,     KC_X,     KC_C,   KC_V,    KC_B,   KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,   KC_RSFT,  MO(1),
-                  KC_LGUI,  KC_LALT,                             KC_SPC,                               KC_RALT,  KC_RGUI),
+                  KC_LALT,  KC_LGUI,                             KC_SPC,                               KC_RGUI,  KC_RALT),
 
     [1] = LAYOUT_all(
         _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,      KC_F8,    KC_F9,    KC_F10,    KC_F11,    KC_F12,   KC_INS,  KC_DEL,
         KC_CAPS,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    KC_PSCR,  KC_SCRL,  KC_PAUSE,  KC_UP,     _______,  KC_BSPC,
         _______,  KC_VOLD,  KC_VOLU,  KC_MUTE,  _______,  _______,  S(KC_8),  KC_SLSH,    KC_HOME,  KC_PGUP,  KC_LEFT,   KC_RIGHT,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  S(KC_EQL),  KC_MINS,  KC_END,   KC_PGDN,   KC_DOWN,   _______,  _______,
-                  _______,  _______,                                _______,                                  _______,   _______),
+                  _______,  _______,                                _______,                                  _______,   MO(2)),
 
     [2] = LAYOUT_all(
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-                  _______,  _______,                                _______,                                _______,  _______),
-
-    [3] = LAYOUT_all(
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        QK_BOOT,  NK_TOGG,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
diff --git a/keyboards/cipulot/ec_prox/ansi_iso/keymaps/via/rules.mk b/keyboards/cipulot/ec_prox/ansi_iso/keymaps/via/rules.mk
index 520b11f2031..1e5b99807cb 100644
--- a/keyboards/cipulot/ec_prox/ansi_iso/keymaps/via/rules.mk
+++ b/keyboards/cipulot/ec_prox/ansi_iso/keymaps/via/rules.mk
@@ -1,3 +1 @@
 VIA_ENABLE = yes
-
-SRC += via_apc.c
diff --git a/keyboards/cipulot/ec_prox/ansi_iso/keymaps/via/via_apc.c b/keyboards/cipulot/ec_prox/ansi_iso/keymaps/via/via_apc.c
deleted file mode 100644
index 5ea77af44c8..00000000000
--- a/keyboards/cipulot/ec_prox/ansi_iso/keymaps/via/via_apc.c
+++ /dev/null
@@ -1,156 +0,0 @@
-/* Copyright 2023 Cipulot
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "ec_switch_matrix.h"
-#include "action.h"
-#include "via.h"
-
-void apc_init_thresholds(void);
-void apc_set_threshold(bool is_for_actuation);
-
-// Declaring an _apc_config_t struct that will store our data
-typedef struct _apc_config_t {
-    uint16_t actuation_threshold;
-    uint16_t release_threshold;
-} apc_config;
-
-// Check if the size of the reserved persistent memory is the same as the size of struct apc_config
-_Static_assert(sizeof(apc_config) == EECONFIG_USER_DATA_SIZE, "Mismatch in keyboard EECONFIG stored data");
-
-// Declaring a new variable apc of type apc_config
-apc_config apc;
-
-// Declaring enums for VIA config menu
-enum via_apc_enums {
-    // clang-format off
-    id_apc_actuation_threshold = 1,
-    id_apc_release_threshold = 2
-    // clang-format on
-};
-
-// Initializing persistent memory configuration: default values are declared and stored in PMEM
-void eeconfig_init_user(void) {
-    // Default values
-    apc.actuation_threshold = DEFAULT_ACTUATION_LEVEL;
-    apc.release_threshold   = DEFAULT_RELEASE_LEVEL;
-    // Write default value to EEPROM now
-    eeconfig_update_user_datablock(&apc);
-}
-
-// On Keyboard startup
-void keyboard_post_init_user(void) {
-    // Read custom menu variables from memory
-    eeconfig_read_user_datablock(&apc);
-    apc_init_thresholds();
-}
-
-// Handle the data received by the keyboard from the VIA menus
-void apc_config_set_value(uint8_t *data) {
-    // data = [ value_id, value_data ]
-    uint8_t *value_id   = &(data[0]);
-    uint8_t *value_data = &(data[1]);
-
-    switch (*value_id) {
-        case id_apc_actuation_threshold: {
-            apc.actuation_threshold = value_data[1] | (value_data[0] << 8);
-            apc_set_threshold(true);
-            break;
-        }
-        case id_apc_release_threshold: {
-            apc.release_threshold = value_data[1] | (value_data[0] << 8);
-            apc_set_threshold(false);
-            break;
-        }
-    }
-}
-
-// Handle the data sent by the keyboard to the VIA menus
-void apc_config_get_value(uint8_t *data) {
-    // data = [ value_id, value_data ]
-    uint8_t *value_id   = &(data[0]);
-    uint8_t *value_data = &(data[1]);
-
-    switch (*value_id) {
-        case id_apc_actuation_threshold: {
-            value_data[0] = apc.actuation_threshold >> 8;
-            value_data[1] = apc.actuation_threshold & 0xFF;
-            break;
-        }
-        case id_apc_release_threshold: {
-            value_data[0] = apc.release_threshold >> 8;
-            value_data[1] = apc.release_threshold & 0xFF;
-            break;
-        }
-    }
-}
-
-// Save the data to persistent memory after changes are made
-void apc_config_save(void) {
-    eeconfig_update_user_datablock(&apc);
-}
-
-void via_custom_value_command_kb(uint8_t *data, uint8_t length) {
-    // data = [ command_id, channel_id, value_id, value_data ]
-    uint8_t *command_id        = &(data[0]);
-    uint8_t *channel_id        = &(data[1]);
-    uint8_t *value_id_and_data = &(data[2]);
-
-    if (*channel_id == id_custom_channel) {
-        switch (*command_id) {
-            case id_custom_set_value: {
-                apc_config_set_value(value_id_and_data);
-                break;
-            }
-            case id_custom_get_value: {
-                apc_config_get_value(value_id_and_data);
-                break;
-            }
-            case id_custom_save: {
-                apc_config_save();
-                break;
-            }
-            default: {
-                // Unhandled message.
-                *command_id = id_unhandled;
-                break;
-            }
-        }
-        return;
-    }
-
-    *command_id = id_unhandled;
-}
-
-// Initialize the thresholds
-void apc_init_thresholds(void) {
-    ecsm_config.ecsm_actuation_threshold = apc.actuation_threshold;
-    ecsm_config.ecsm_release_threshold   = apc.release_threshold;
-
-    // Update the ecsm_config
-    ecsm_update(&ecsm_config);
-}
-
-// Set the thresholds
-void apc_set_threshold(bool is_for_actuation) {
-    if (is_for_actuation) {
-        ecsm_config.ecsm_actuation_threshold = apc.actuation_threshold;
-
-    } else {
-        ecsm_config.ecsm_release_threshold = apc.release_threshold;
-    }
-    // Update the ecsm_config
-    ecsm_update(&ecsm_config);
-}
diff --git a/keyboards/cipulot/ec_prox/ansi_iso/matrix.c b/keyboards/cipulot/ec_prox/ansi_iso/matrix.c
deleted file mode 100644
index 1850acf2641..00000000000
--- a/keyboards/cipulot/ec_prox/ansi_iso/matrix.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Copyright 2023 Cipulot
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "ec_switch_matrix.h"
-#include "matrix.h"
-
-/* matrix state(1:on, 0:off) */
-extern matrix_row_t raw_matrix[MATRIX_ROWS]; // raw values
-extern matrix_row_t matrix[MATRIX_ROWS];     // debounced values
-
-void matrix_init_custom(void) {
-    // Default values, overwritten by VIA if enabled later
-    ecsm_config.ecsm_actuation_threshold = DEFAULT_ACTUATION_LEVEL;
-    ecsm_config.ecsm_release_threshold   = DEFAULT_RELEASE_LEVEL;
-
-    ecsm_init(&ecsm_config);
-}
-
-bool matrix_scan_custom(matrix_row_t current_matrix[]) {
-    bool updated = ecsm_matrix_scan(current_matrix);
-
-// RAW matrix values on console
-#ifdef CONSOLE_ENABLE
-    static int cnt = 0;
-    if (cnt++ == 350) {
-        cnt = 0;
-        ecsm_print_matrix();
-    }
-#endif
-    return updated;
-}
diff --git a/keyboards/cipulot/ec_prox/ansi_iso/mcuconf.h b/keyboards/cipulot/ec_prox/ansi_iso/mcuconf.h
index d91f576bd48..fa3c955e0d8 100644
--- a/keyboards/cipulot/ec_prox/ansi_iso/mcuconf.h
+++ b/keyboards/cipulot/ec_prox/ansi_iso/mcuconf.h
@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/keyboards/cipulot/ec_prox/ansi_iso/post_rules.mk b/keyboards/cipulot/ec_prox/ansi_iso/post_rules.mk
new file mode 100644
index 00000000000..d726a112a8c
--- /dev/null
+++ b/keyboards/cipulot/ec_prox/ansi_iso/post_rules.mk
@@ -0,0 +1,3 @@
+ifeq ($(strip $(VIA_ENABLE)), yes)
+    SRC += keyboards/cipulot/common/via_ec.c
+endif
diff --git a/keyboards/cipulot/ec_prox/ansi_iso/readme.md b/keyboards/cipulot/ec_prox/ansi_iso/readme.md
index 2afa33514ac..fe9d78537fa 100644
--- a/keyboards/cipulot/ec_prox/ansi_iso/readme.md
+++ b/keyboards/cipulot/ec_prox/ansi_iso/readme.md
@@ -20,8 +20,7 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to
 
 ## Bootloader
 
-Enter the bootloader in 3 ways:
+Enter the bootloader in 2 ways:
 
-* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
 * **Physical Boot0 pins**: Short the Boot0 pins on the back of the PCB while plugging in the keyboard
 * **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/cipulot/ec_prox/ansi_iso/rules.mk b/keyboards/cipulot/ec_prox/ansi_iso/rules.mk
index fc2dcf32ab1..ab6c37cad43 100644
--- a/keyboards/cipulot/ec_prox/ansi_iso/rules.mk
+++ b/keyboards/cipulot/ec_prox/ansi_iso/rules.mk
@@ -1,4 +1,4 @@
 CUSTOM_MATRIX = lite
-SRC += matrix.c ec_switch_matrix.c
-
 ANALOG_DRIVER_REQUIRED = yes
+SRC += keyboards/cipulot/common/matrix.c keyboards/cipulot/common/ec_board.c keyboards/cipulot/common/ec_switch_matrix.c
+OPT = 2
diff --git a/keyboards/cipulot/ec_prox/jis/config.h b/keyboards/cipulot/ec_prox/jis/config.h
index 1c6a836867d..8761b692aad 100644
--- a/keyboards/cipulot/ec_prox/jis/config.h
+++ b/keyboards/cipulot/ec_prox/jis/config.h
@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -19,27 +19,54 @@
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 14
 
-/* Custom matrix pins and port select array */
 #define MATRIX_ROW_PINS \
     { A7, B0, A4, A5, A6 }
-#define MATRIX_COL_CHANNELS \
-    { 2, 1, 0, 3, 5, 7, 4, 6 }
-#define MUX_SEL_PINS \
+
+#define AMUX_COUNT 2
+#define AMUX_MAX_COLS_COUNT 8
+
+#define AMUX_EN_PINS \
+    { B7, B3 }
+
+#define AMUX_SEL_PINS \
     { B4, B5, B6 }
 
-/* Hardware peripherals pins */
-#define APLEX_EN_PIN_0 B7
-#define APLEX_EN_PIN_1 B3
+#define AMUX_COL_CHANNELS_SIZES \
+    { 8, 6 }
+
+#define AMUX_0_COL_CHANNELS \
+    { 2, 1, 0, 3, 5, 7, 4, 6 }
+
+#define AMUX_1_COL_CHANNELS \
+    { 2, 1, 0, 3, 5, 7 }
+
+#define AMUX_COL_CHANNELS AMUX_0_COL_CHANNELS, AMUX_1_COL_CHANNELS
+
 #define DISCHARGE_PIN A2
 #define ANALOG_PORT A1
 
+#define DEFAULT_ACTUATION_MODE 0
+#define DEFAULT_MODE_0_ACTUATION_LEVEL 550
+#define DEFAULT_MODE_0_RELEASE_LEVEL 500
+#define DEFAULT_MODE_1_INITIAL_DEADZONE_OFFSET DEFAULT_MODE_0_ACTUATION_LEVEL
+#define DEFAULT_MODE_1_ACTUATION_OFFSET 70
+#define DEFAULT_MODE_1_RELEASE_OFFSET 70
+#define DEFAULT_EXTREMUM 1023
+#define EXPECTED_NOISE_FLOOR 0
+#define NOISE_FLOOR_THRESHOLD 50
+#define BOTTOMING_CALIBRATION_THRESHOLD 100
+#define DEFAULT_NOISE_FLOOR_SAMPLING_COUNT 30
+#define DEFAULT_BOTTOMING_READING 1023
+#define DEFAULT_CALIBRATION_STARTER true
+
+#define DISCHARGE_TIME 10
+
+// #define DEBUG_MATRIX_SCAN_RATE
+
+#define EECONFIG_KB_DATA_SIZE 150
+
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-#define DEFAULT_ACTUATION_LEVEL 550
-#define DEFAULT_RELEASE_LEVEL 500
-
-#define DISCHARGE_TIME 10
diff --git a/keyboards/cipulot/ec_prox/jis/ec_switch_matrix.c b/keyboards/cipulot/ec_prox/jis/ec_switch_matrix.c
deleted file mode 100644
index 81003dd36a4..00000000000
--- a/keyboards/cipulot/ec_prox/jis/ec_switch_matrix.c
+++ /dev/null
@@ -1,183 +0,0 @@
-/* Copyright 2023 Cipulot
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "ec_switch_matrix.h"
-#include "analog.h"
-#include "atomic_util.h"
-#include "print.h"
-#include "wait.h"
-
-/* Pin and port array */
-const uint32_t row_pins[]     = MATRIX_ROW_PINS;
-const uint8_t  col_channels[] = MATRIX_COL_CHANNELS;
-const uint32_t mux_sel_pins[] = MUX_SEL_PINS;
-
-static ecsm_config_t config;
-static uint16_t      ecsm_sw_value[MATRIX_ROWS][MATRIX_COLS];
-
-static adc_mux adcMux;
-
-static inline void discharge_capacitor(void) {
-    writePinLow(DISCHARGE_PIN);
-}
-static inline void charge_capacitor(uint8_t row) {
-    writePinHigh(DISCHARGE_PIN);
-    writePinHigh(row_pins[row]);
-}
-
-static inline void init_mux_sel(void) {
-    for (int idx = 0; idx < 3; idx++) {
-        setPinOutput(mux_sel_pins[idx]);
-    }
-}
-
-static inline void select_mux(uint8_t col) {
-    uint8_t ch = col_channels[col];
-    writePin(mux_sel_pins[0], ch & 1);
-    writePin(mux_sel_pins[1], ch & 2);
-    writePin(mux_sel_pins[2], ch & 4);
-}
-
-static inline void init_row(void) {
-    for (int idx = 0; idx < MATRIX_ROWS; idx++) {
-        setPinOutput(row_pins[idx]);
-        writePinLow(row_pins[idx]);
-    }
-}
-
-/* Initialize the peripherals pins */
-int ecsm_init(ecsm_config_t const* const ecsm_config) {
-    // Initialize config
-    config = *ecsm_config;
-
-    palSetLineMode(ANALOG_PORT, PAL_MODE_INPUT_ANALOG);
-    adcMux = pinToMux(ANALOG_PORT);
-
-    //Dummy call to make sure that adcStart() has been called in the appropriate state
-    adc_read(adcMux);
-
-    // Initialize discharge pin as discharge mode
-    writePinLow(DISCHARGE_PIN);
-    setPinOutputOpenDrain(DISCHARGE_PIN);
-
-    // Initialize drive lines
-    init_row();
-
-    // Initialize multiplexer select pin
-    init_mux_sel();
-
-    // Enable AMUX
-    setPinOutput(APLEX_EN_PIN_0);
-    writePinLow(APLEX_EN_PIN_0);
-    setPinOutput(APLEX_EN_PIN_1);
-    writePinLow(APLEX_EN_PIN_1);
-
-    return 0;
-}
-
-int ecsm_update(ecsm_config_t const* const ecsm_config) {
-    // Save config
-    config = *ecsm_config;
-    return 0;
-}
-
-// Read the capacitive sensor value
-uint16_t ecsm_readkey_raw(uint8_t channel, uint8_t row, uint8_t col) {
-    uint16_t sw_value = 0;
-
-    // Select the multiplexer
-    if (channel == 0) {
-        writePinHigh(APLEX_EN_PIN_0);
-        select_mux(col);
-        writePinLow(APLEX_EN_PIN_0);
-    } else {
-        writePinHigh(APLEX_EN_PIN_1);
-        select_mux(col);
-        writePinLow(APLEX_EN_PIN_1);
-    }
-
-    // Set strobe pins to low state
-    writePinLow(row_pins[row]);
-    ATOMIC_BLOCK_FORCEON {
-        // Set the row pin to high state and have capacitor charge
-        charge_capacitor(row);
-        // Read the ADC value
-        sw_value = adc_read(adcMux);
-    }
-    // Discharge peak hold capacitor
-    discharge_capacitor();
-    // Waiting for the ghost capacitor to discharge fully
-    wait_us(DISCHARGE_TIME);
-
-    return sw_value;
-}
-
-// Update press/release state of key
-bool ecsm_update_key(matrix_row_t* current_row, uint8_t row, uint8_t col, uint16_t sw_value) {
-    bool current_state = (*current_row >> col) & 1;
-
-    // Press to release
-    if (current_state && sw_value < config.ecsm_actuation_threshold) {
-        *current_row &= ~(1 << col);
-        return true;
-    }
-
-    // Release to press
-    if ((!current_state) && sw_value > config.ecsm_release_threshold) {
-        *current_row |= (1 << col);
-        return true;
-    }
-
-    return false;
-}
-
-// Scan key values and update matrix state
-bool ecsm_matrix_scan(matrix_row_t current_matrix[]) {
-    bool updated = false;
-
-    // Disable AMUX of channel 1
-    writePinHigh(APLEX_EN_PIN_1);
-    for (int col = 0; col < sizeof(col_channels); col++) {
-        for (int row = 0; row < MATRIX_ROWS; row++) {
-            ecsm_sw_value[row][col] = ecsm_readkey_raw(0, row, col);
-            updated |= ecsm_update_key(&current_matrix[row], row, col, ecsm_sw_value[row][col]);
-        }
-    }
-
-    // Disable AMUX of channel 1
-    writePinHigh(APLEX_EN_PIN_0);
-    for (int col = 0; col < (sizeof(col_channels) - 2); col++) {
-        for (int row = 0; row < MATRIX_ROWS; row++) {
-            ecsm_sw_value[row][col + 8] = ecsm_readkey_raw(1, row, col);
-            updated |= ecsm_update_key(&current_matrix[row], row, col + 8, ecsm_sw_value[row][col + 8]);
-        }
-    }
-    return updated;
-}
-
-// Debug print key values
-void ecsm_print_matrix(void) {
-    for (int row = 0; row < MATRIX_ROWS; row++) {
-        for (int col = 0; col < MATRIX_COLS; col++) {
-            uprintf("%4d", ecsm_sw_value[row][col]);
-            if (col < (MATRIX_COLS - 1)) {
-                print(",");
-            }
-        }
-        print("\n");
-    }
-    print("\n");
-}
diff --git a/keyboards/cipulot/ec_prox/jis/ec_switch_matrix.h b/keyboards/cipulot/ec_prox/jis/ec_switch_matrix.h
deleted file mode 100644
index 9dcb216caa3..00000000000
--- a/keyboards/cipulot/ec_prox/jis/ec_switch_matrix.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2023 Cipulot
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include <stdint.h>
-#include <stdbool.h>
-
-#include "matrix.h"
-
-typedef struct {
-    uint16_t ecsm_actuation_threshold; // threshold for key release
-    uint16_t ecsm_release_threshold;   // threshold for key press
-} ecsm_config_t;
-
-ecsm_config_t ecsm_config;
-
-int      ecsm_init(ecsm_config_t const* const ecsm_config);
-int      ecsm_update(ecsm_config_t const* const ecsm_config);
-bool     ecsm_matrix_scan(matrix_row_t current_matrix[]);
-uint16_t ecsm_readkey_raw(uint8_t channel, uint8_t row, uint8_t col);
-bool     ecsm_update_key(matrix_row_t* current_row, uint8_t row, uint8_t col, uint16_t sw_value);
-void     ecsm_print_matrix(void);
diff --git a/keyboards/cipulot/ec_prox/jis/halconf.h b/keyboards/cipulot/ec_prox/jis/halconf.h
index 5b71acecbbc..835d43b6a0a 100644
--- a/keyboards/cipulot/ec_prox/jis/halconf.h
+++ b/keyboards/cipulot/ec_prox/jis/halconf.h
@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/keyboards/cipulot/ec_prox/jis/info.json b/keyboards/cipulot/ec_prox/jis/info.json
index 6016004b1ba..88067f9305e 100644
--- a/keyboards/cipulot/ec_prox/jis/info.json
+++ b/keyboards/cipulot/ec_prox/jis/info.json
@@ -8,19 +8,13 @@
     },
     "diode_direction": "COL2ROW",
     "features": {
-        "audio": false,
-        "backlight": false,
-        "bootmagic": true,
-        "command": false,
+        "bootmagic": false,
         "console": true,
         "extrakey": true,
         "mousekey": true,
         "nkro": true,
         "rgblight": true
     },
-    "mouse_key": {
-        "enabled": true
-    },
     "processor": "STM32F401",
     "rgblight": {
         "led_count": 22,
@@ -52,79 +46,75 @@
     "layouts": {
         "LAYOUT_jp": {
             "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0},
-                {"matrix": [1, 13], "x": 14, "y": 0},
-
-                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"matrix": [1, 12], "x": 12.5, "y": 1},
-
-                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"matrix": [2, 12], "x": 12.75, "y": 2},
-                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
-                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2},
-                {"matrix": [3, 1], "x": 2, "y": 3},
-                {"matrix": [3, 2], "x": 3, "y": 3},
-                {"matrix": [3, 3], "x": 4, "y": 3},
-                {"matrix": [3, 4], "x": 5, "y": 3},
-                {"matrix": [3, 5], "x": 6, "y": 3},
-                {"matrix": [3, 6], "x": 7, "y": 3},
-                {"matrix": [3, 7], "x": 8, "y": 3},
-                {"matrix": [3, 8], "x": 9, "y": 3},
-                {"matrix": [3, 9], "x": 10, "y": 3},
-                {"matrix": [3, 10], "x": 11, "y": 3},
-                {"matrix": [3, 11], "x": 12, "y": 3},
-                {"matrix": [3, 12], "x": 13, "y": 3},
-                {"matrix": [3, 13], "x": 14, "y": 3},
-
-                {"matrix": [4, 0], "x": 0, "y": 4},
-                {"matrix": [4, 1], "x": 1.25, "y": 4},
-                {"matrix": [4, 2], "x": 2.25, "y": 4},
-                {"matrix": [4, 3], "x": 3.25, "y": 4},
-                {"matrix": [4, 4], "x": 4.25, "y": 4},
-                {"matrix": [4, 5], "x": 5.25, "y": 4, "w": 2.5},
-                {"matrix": [4, 7], "x": 7.75, "y": 4},
-                {"matrix": [4, 8], "x": 8.75, "y": 4},
-                {"matrix": [4, 9], "x": 9.75, "y": 4},
-                {"matrix": [4, 10], "x": 10.75, "y": 4},
-                {"matrix": [4, 11], "x": 12, "y": 4},
-                {"matrix": [4, 12], "x": 13, "y": 4},
-                {"matrix": [4, 13], "x": 14, "y": 4}
+                {"label": "0,0", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "0,1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "0,2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "0,3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "0,4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "0,5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "0,6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "0,7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "0,8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "0,9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0,10", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "0,11", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "0,12", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "0,13", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "1,13", "matrix": [1, 13], "x": 14, "y": 0},
+                {"label": "1,0", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
+                {"label": "1,1", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "1,2", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "1,3", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "1,4", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "1,5", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "1,6", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "1,7", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "1,8", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "1,9", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "1,10", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "1,11", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "1,12", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "2,13", "matrix": [2, 13], "w": 1.25, "h": 2, "x": 13.75, "y": 1},
+                {"label": "2,0", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
+                {"label": "2,1", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "2,2", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "2,3", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "2,4", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "2,5", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "2,6", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "2,7", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "2,8", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "2,9", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "2,10", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "2,11", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "2,12", "matrix": [2, 12], "x": 12.75, "y": 2},
+                {"label": "3,0", "matrix": [3, 0], "w": 2, "x": 0, "y": 3},
+                {"label": "3,1", "matrix": [3, 1], "x": 2, "y": 3},
+                {"label": "3,2", "matrix": [3, 2], "x": 3, "y": 3},
+                {"label": "3,3", "matrix": [3, 3], "x": 4, "y": 3},
+                {"label": "3,4", "matrix": [3, 4], "x": 5, "y": 3},
+                {"label": "3,5", "matrix": [3, 5], "x": 6, "y": 3},
+                {"label": "3,6", "matrix": [3, 6], "x": 7, "y": 3},
+                {"label": "3,7", "matrix": [3, 7], "x": 8, "y": 3},
+                {"label": "3,8", "matrix": [3, 8], "x": 9, "y": 3},
+                {"label": "3,9", "matrix": [3, 9], "x": 10, "y": 3},
+                {"label": "3,10", "matrix": [3, 10], "x": 11, "y": 3},
+                {"label": "3,11", "matrix": [3, 11], "x": 12, "y": 3},
+                {"label": "3,12", "matrix": [3, 12], "x": 13, "y": 3},
+                {"label": "3,13", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "4,0", "matrix": [4, 0], "x": 0, "y": 4},
+                {"label": "4,1", "matrix": [4, 1], "x": 1.25, "y": 4},
+                {"label": "4,2", "matrix": [4, 2], "x": 2.25, "y": 4},
+                {"label": "4,3", "matrix": [4, 3], "x": 3.25, "y": 4},
+                {"label": "4,4", "matrix": [4, 4], "x": 4.25, "y": 4},
+                {"label": "4,5", "matrix": [4, 5], "w": 2.5, "x": 5.25, "y": 4},
+                {"label": "4,7", "matrix": [4, 7], "x": 7.75, "y": 4},
+                {"label": "4,8", "matrix": [4, 8], "x": 8.75, "y": 4},
+                {"label": "4,9", "matrix": [4, 9], "x": 9.75, "y": 4},
+                {"label": "4,10", "matrix": [4, 10], "x": 10.75, "y": 4},
+                {"label": "4,11", "matrix": [4, 11], "x": 12, "y": 4},
+                {"label": "4,12", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "4,13", "matrix": [4, 13], "x": 14, "y": 4}
             ]
         }
     }
diff --git a/keyboards/cipulot/ec_prox/jis/keymaps/default/keymap.c b/keyboards/cipulot/ec_prox/jis/keymaps/default/keymap.c
index 2a64063a0bc..88836af7804 100644
--- a/keyboards/cipulot/ec_prox/jis/keymaps/default/keymap.c
+++ b/keyboards/cipulot/ec_prox/jis/keymaps/default/keymap.c
@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -21,28 +21,21 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     // clang-format off
     [0] = LAYOUT_jp(
-        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  JP_YEN,  KC_BSPC,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,
-        KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,
-        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, JP_UNDS, KC_UP,   KC_RSFT,
-        MO(1),   JP_ZKHK, KC_LGUI, KC_LALT, JP_MHEN,      KC_SPC,      JP_HENK, JP_KANA, KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT),
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5, KC_6, KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  JP_YEN, KC_BSPC,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T, KC_Y, KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,
+        KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G, KC_H, KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B, KC_N, KC_M,    KC_COMM, KC_DOT,  KC_SLSH, JP_UNDS, KC_UP,   KC_RSFT,
+        MO(1),   JP_ZKHK, KC_LGUI, KC_LALT, JP_MHEN,   KC_SPC,   JP_HENK, JP_KANA, KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT),
 
     [1] = LAYOUT_jp(
-        _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,    KC_F5,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL,
+        _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,    KC_F5,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS, KC_DEL,
         KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   _______,
         _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, KC_PENT,
         _______, _______, _______, _______, _______, _______, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN, _______, _______, _______,
         _______, _______, _______, _______, _______,      _______,     _______, _______, MO(2),   _______, _______, _______, _______),
 
     [2] = LAYOUT_jp(
-        RGB_TOG, RGB_VAD, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______,      _______,     _______, _______, _______, _______, _______, _______, _______),
-
-    [3] = LAYOUT_jp(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        QK_BOOT, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/cipulot/ec_prox/jis/keymaps/via/config.h b/keyboards/cipulot/ec_prox/jis/keymaps/via/config.h
index ebf954d07ac..1ab0d3d9aa2 100644
--- a/keyboards/cipulot/ec_prox/jis/keymaps/via/config.h
+++ b/keyboards/cipulot/ec_prox/jis/keymaps/via/config.h
@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,5 +16,5 @@
 
 #pragma once
 
-// This is the size of the EEPROM for the custom VIA-specific data
-#define EECONFIG_USER_DATA_SIZE 4
+// This is the firmware version for VIA support to avoid conflicts on menu fetching
+#define VIA_FIRMWARE_VERSION 1
diff --git a/keyboards/cipulot/ec_prox/jis/keymaps/via/keymap.c b/keyboards/cipulot/ec_prox/jis/keymaps/via/keymap.c
index 2a64063a0bc..f793b355b23 100644
--- a/keyboards/cipulot/ec_prox/jis/keymaps/via/keymap.c
+++ b/keyboards/cipulot/ec_prox/jis/keymaps/via/keymap.c
@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -21,31 +21,24 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     // clang-format off
     [0] = LAYOUT_jp(
-        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  JP_YEN,  KC_BSPC,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,
-        KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,
-        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, JP_UNDS, KC_UP,   KC_RSFT,
-        MO(1),   JP_ZKHK, KC_LGUI, KC_LALT, JP_MHEN,      KC_SPC,      JP_HENK, JP_KANA, KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT),
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5, KC_6, KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  JP_YEN, KC_BSPC,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T, KC_Y, KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_ENT,
+        KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G, KC_H, KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B, KC_N, KC_M,    KC_COMM, KC_DOT,  KC_SLSH, JP_UNDS, KC_UP,   KC_RSFT,
+        MO(1),   JP_ZKHK, KC_LGUI, KC_LALT, JP_MHEN,   KC_SPC,   JP_HENK, JP_KANA, KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT),
 
     [1] = LAYOUT_jp(
-        _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,    KC_F5,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL,
-        KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   _______,
-        _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, KC_PENT,
+        _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,    KC_F5,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS, KC_DEL,
+        KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   _______, KC_PENT,
+        _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______,
         _______, _______, _______, _______, _______, _______, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN, _______, _______, _______,
         _______, _______, _______, _______, _______,      _______,     _______, _______, MO(2),   _______, _______, _______, _______),
 
     [2] = LAYOUT_jp(
-        RGB_TOG, RGB_VAD, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
+        QK_BOOT, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______,      _______,     _______, _______, _______, _______, _______, _______, _______),
-
-    [3] = LAYOUT_jp(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______,      _______,     _______, _______, _______, _______, _______, _______, _______)
     // clang-format on
 };
diff --git a/keyboards/cipulot/ec_prox/jis/keymaps/via/rules.mk b/keyboards/cipulot/ec_prox/jis/keymaps/via/rules.mk
index 520b11f2031..1e5b99807cb 100644
--- a/keyboards/cipulot/ec_prox/jis/keymaps/via/rules.mk
+++ b/keyboards/cipulot/ec_prox/jis/keymaps/via/rules.mk
@@ -1,3 +1 @@
 VIA_ENABLE = yes
-
-SRC += via_apc.c
diff --git a/keyboards/cipulot/ec_prox/jis/keymaps/via/via_apc.c b/keyboards/cipulot/ec_prox/jis/keymaps/via/via_apc.c
deleted file mode 100644
index 5ea77af44c8..00000000000
--- a/keyboards/cipulot/ec_prox/jis/keymaps/via/via_apc.c
+++ /dev/null
@@ -1,156 +0,0 @@
-/* Copyright 2023 Cipulot
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "ec_switch_matrix.h"
-#include "action.h"
-#include "via.h"
-
-void apc_init_thresholds(void);
-void apc_set_threshold(bool is_for_actuation);
-
-// Declaring an _apc_config_t struct that will store our data
-typedef struct _apc_config_t {
-    uint16_t actuation_threshold;
-    uint16_t release_threshold;
-} apc_config;
-
-// Check if the size of the reserved persistent memory is the same as the size of struct apc_config
-_Static_assert(sizeof(apc_config) == EECONFIG_USER_DATA_SIZE, "Mismatch in keyboard EECONFIG stored data");
-
-// Declaring a new variable apc of type apc_config
-apc_config apc;
-
-// Declaring enums for VIA config menu
-enum via_apc_enums {
-    // clang-format off
-    id_apc_actuation_threshold = 1,
-    id_apc_release_threshold = 2
-    // clang-format on
-};
-
-// Initializing persistent memory configuration: default values are declared and stored in PMEM
-void eeconfig_init_user(void) {
-    // Default values
-    apc.actuation_threshold = DEFAULT_ACTUATION_LEVEL;
-    apc.release_threshold   = DEFAULT_RELEASE_LEVEL;
-    // Write default value to EEPROM now
-    eeconfig_update_user_datablock(&apc);
-}
-
-// On Keyboard startup
-void keyboard_post_init_user(void) {
-    // Read custom menu variables from memory
-    eeconfig_read_user_datablock(&apc);
-    apc_init_thresholds();
-}
-
-// Handle the data received by the keyboard from the VIA menus
-void apc_config_set_value(uint8_t *data) {
-    // data = [ value_id, value_data ]
-    uint8_t *value_id   = &(data[0]);
-    uint8_t *value_data = &(data[1]);
-
-    switch (*value_id) {
-        case id_apc_actuation_threshold: {
-            apc.actuation_threshold = value_data[1] | (value_data[0] << 8);
-            apc_set_threshold(true);
-            break;
-        }
-        case id_apc_release_threshold: {
-            apc.release_threshold = value_data[1] | (value_data[0] << 8);
-            apc_set_threshold(false);
-            break;
-        }
-    }
-}
-
-// Handle the data sent by the keyboard to the VIA menus
-void apc_config_get_value(uint8_t *data) {
-    // data = [ value_id, value_data ]
-    uint8_t *value_id   = &(data[0]);
-    uint8_t *value_data = &(data[1]);
-
-    switch (*value_id) {
-        case id_apc_actuation_threshold: {
-            value_data[0] = apc.actuation_threshold >> 8;
-            value_data[1] = apc.actuation_threshold & 0xFF;
-            break;
-        }
-        case id_apc_release_threshold: {
-            value_data[0] = apc.release_threshold >> 8;
-            value_data[1] = apc.release_threshold & 0xFF;
-            break;
-        }
-    }
-}
-
-// Save the data to persistent memory after changes are made
-void apc_config_save(void) {
-    eeconfig_update_user_datablock(&apc);
-}
-
-void via_custom_value_command_kb(uint8_t *data, uint8_t length) {
-    // data = [ command_id, channel_id, value_id, value_data ]
-    uint8_t *command_id        = &(data[0]);
-    uint8_t *channel_id        = &(data[1]);
-    uint8_t *value_id_and_data = &(data[2]);
-
-    if (*channel_id == id_custom_channel) {
-        switch (*command_id) {
-            case id_custom_set_value: {
-                apc_config_set_value(value_id_and_data);
-                break;
-            }
-            case id_custom_get_value: {
-                apc_config_get_value(value_id_and_data);
-                break;
-            }
-            case id_custom_save: {
-                apc_config_save();
-                break;
-            }
-            default: {
-                // Unhandled message.
-                *command_id = id_unhandled;
-                break;
-            }
-        }
-        return;
-    }
-
-    *command_id = id_unhandled;
-}
-
-// Initialize the thresholds
-void apc_init_thresholds(void) {
-    ecsm_config.ecsm_actuation_threshold = apc.actuation_threshold;
-    ecsm_config.ecsm_release_threshold   = apc.release_threshold;
-
-    // Update the ecsm_config
-    ecsm_update(&ecsm_config);
-}
-
-// Set the thresholds
-void apc_set_threshold(bool is_for_actuation) {
-    if (is_for_actuation) {
-        ecsm_config.ecsm_actuation_threshold = apc.actuation_threshold;
-
-    } else {
-        ecsm_config.ecsm_release_threshold = apc.release_threshold;
-    }
-    // Update the ecsm_config
-    ecsm_update(&ecsm_config);
-}
diff --git a/keyboards/cipulot/ec_prox/jis/matrix.c b/keyboards/cipulot/ec_prox/jis/matrix.c
deleted file mode 100644
index 1850acf2641..00000000000
--- a/keyboards/cipulot/ec_prox/jis/matrix.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Copyright 2023 Cipulot
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "ec_switch_matrix.h"
-#include "matrix.h"
-
-/* matrix state(1:on, 0:off) */
-extern matrix_row_t raw_matrix[MATRIX_ROWS]; // raw values
-extern matrix_row_t matrix[MATRIX_ROWS];     // debounced values
-
-void matrix_init_custom(void) {
-    // Default values, overwritten by VIA if enabled later
-    ecsm_config.ecsm_actuation_threshold = DEFAULT_ACTUATION_LEVEL;
-    ecsm_config.ecsm_release_threshold   = DEFAULT_RELEASE_LEVEL;
-
-    ecsm_init(&ecsm_config);
-}
-
-bool matrix_scan_custom(matrix_row_t current_matrix[]) {
-    bool updated = ecsm_matrix_scan(current_matrix);
-
-// RAW matrix values on console
-#ifdef CONSOLE_ENABLE
-    static int cnt = 0;
-    if (cnt++ == 350) {
-        cnt = 0;
-        ecsm_print_matrix();
-    }
-#endif
-    return updated;
-}
diff --git a/keyboards/cipulot/ec_prox/jis/mcuconf.h b/keyboards/cipulot/ec_prox/jis/mcuconf.h
index d91f576bd48..fa3c955e0d8 100644
--- a/keyboards/cipulot/ec_prox/jis/mcuconf.h
+++ b/keyboards/cipulot/ec_prox/jis/mcuconf.h
@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/keyboards/cipulot/ec_prox/jis/post_rules.mk b/keyboards/cipulot/ec_prox/jis/post_rules.mk
new file mode 100644
index 00000000000..d726a112a8c
--- /dev/null
+++ b/keyboards/cipulot/ec_prox/jis/post_rules.mk
@@ -0,0 +1,3 @@
+ifeq ($(strip $(VIA_ENABLE)), yes)
+    SRC += keyboards/cipulot/common/via_ec.c
+endif
diff --git a/keyboards/cipulot/ec_prox/jis/readme.md b/keyboards/cipulot/ec_prox/jis/readme.md
index f1fa471cc99..2f9c791f256 100644
--- a/keyboards/cipulot/ec_prox/jis/readme.md
+++ b/keyboards/cipulot/ec_prox/jis/readme.md
@@ -20,8 +20,7 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to
 
 ## Bootloader
 
-Enter the bootloader in 3 ways:
+Enter the bootloader in 2 ways:
 
-* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
 * **Physical Boot0 pins**: Short the Boot0 pins on the back of the PCB while plugging in the keyboard
 * **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/cipulot/ec_prox/jis/rules.mk b/keyboards/cipulot/ec_prox/jis/rules.mk
index fc2dcf32ab1..ab6c37cad43 100644
--- a/keyboards/cipulot/ec_prox/jis/rules.mk
+++ b/keyboards/cipulot/ec_prox/jis/rules.mk
@@ -1,4 +1,4 @@
 CUSTOM_MATRIX = lite
-SRC += matrix.c ec_switch_matrix.c
-
 ANALOG_DRIVER_REQUIRED = yes
+SRC += keyboards/cipulot/common/matrix.c keyboards/cipulot/common/ec_board.c keyboards/cipulot/common/ec_switch_matrix.c
+OPT = 2
diff --git a/keyboards/cipulot/ec_theca/config.h b/keyboards/cipulot/ec_theca/config.h
index 481183b80c1..23a0bb4eb40 100644
--- a/keyboards/cipulot/ec_theca/config.h
+++ b/keyboards/cipulot/ec_theca/config.h
@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -19,27 +19,53 @@
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 16
 
-/* Custom matrix pins and port select array */
 #define MATRIX_ROW_PINS \
     { B4, A14, B3, A15, B6, B5 }
-#define MATRIX_COL_CHANNELS \
-    { 3, 0, 1, 2, 6, 5, 7, 4 }
-#define MUX_SEL_PINS \
+
+#define AMUX_COUNT 2
+#define AMUX_MAX_COLS_COUNT 8
+
+#define AMUX_EN_PINS \
+    { C13, C14 }
+
+#define AMUX_SEL_PINS \
     { B7, B8, B9 }
 
-/* Hardware peripherals pins */
-#define APLEX_EN_PIN_0 C13
-#define APLEX_EN_PIN_1 C14
+#define AMUX_COL_CHANNELS_SIZES \
+    { 8, 8 }
+
+#define AMUX_0_COL_CHANNELS \
+    { 3, 0, 1, 2, 6, 5, 7, 4 }
+
+#define AMUX_1_COL_CHANNELS AMUX_0_COL_CHANNELS
+
+#define AMUX_COL_CHANNELS AMUX_0_COL_CHANNELS, AMUX_1_COL_CHANNELS
+
 #define DISCHARGE_PIN B1
 #define ANALOG_PORT A3
 
+#define DEFAULT_ACTUATION_MODE 0
+#define DEFAULT_MODE_0_ACTUATION_LEVEL 550
+#define DEFAULT_MODE_0_RELEASE_LEVEL 500
+#define DEFAULT_MODE_1_INITIAL_DEADZONE_OFFSET DEFAULT_MODE_0_ACTUATION_LEVEL
+#define DEFAULT_MODE_1_ACTUATION_OFFSET 70
+#define DEFAULT_MODE_1_RELEASE_OFFSET 70
+#define DEFAULT_EXTREMUM 1023
+#define EXPECTED_NOISE_FLOOR 0
+#define NOISE_FLOOR_THRESHOLD 50
+#define BOTTOMING_CALIBRATION_THRESHOLD 50
+#define DEFAULT_NOISE_FLOOR_SAMPLING_COUNT 30
+#define DEFAULT_BOTTOMING_READING 1023
+#define DEFAULT_CALIBRATION_STARTER true
+
+#define DISCHARGE_TIME 10
+
+// #define DEBUG_MATRIX_SCAN_RATE
+#define DYNAMIC_KEYMAP_LAYER_COUNT 3
+#define EECONFIG_KB_DATA_SIZE 202
+
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-#define DEFAULT_ACTUATION_LEVEL 550
-#define DEFAULT_RELEASE_LEVEL 500
-
-#define DISCHARGE_TIME 10
diff --git a/keyboards/cipulot/ec_theca/ec_switch_matrix.c b/keyboards/cipulot/ec_theca/ec_switch_matrix.c
deleted file mode 100644
index fdf4479423f..00000000000
--- a/keyboards/cipulot/ec_theca/ec_switch_matrix.c
+++ /dev/null
@@ -1,191 +0,0 @@
-/* Copyright 2023 Cipulot
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "ec_switch_matrix.h"
-#include "analog.h"
-#include "atomic_util.h"
-#include "print.h"
-#include "wait.h"
-
-/* Pin and port array */
-const uint32_t row_pins[]     = MATRIX_ROW_PINS;
-const uint8_t  col_channels[] = MATRIX_COL_CHANNELS;
-const uint32_t mux_sel_pins[] = MUX_SEL_PINS;
-
-static ecsm_config_t config;
-static uint16_t      ecsm_sw_value[MATRIX_ROWS][MATRIX_COLS];
-
-static adc_mux adcMux;
-
-static inline void discharge_capacitor(void) {
-    writePinLow(DISCHARGE_PIN);
-}
-static inline void charge_capacitor(uint8_t row) {
-    writePinHigh(DISCHARGE_PIN);
-    writePinHigh(row_pins[row]);
-}
-
-static inline void init_mux_sel(void) {
-    for (int idx = 0; idx < 3; idx++) {
-        setPinOutput(mux_sel_pins[idx]);
-    }
-}
-
-static inline void select_mux(uint8_t col) {
-    uint8_t ch = col_channels[col];
-    writePin(mux_sel_pins[0], ch & 1);
-    writePin(mux_sel_pins[1], ch & 2);
-    writePin(mux_sel_pins[2], ch & 4);
-}
-
-static inline void init_row(void) {
-    for (int idx = 0; idx < MATRIX_ROWS; idx++) {
-        setPinOutput(row_pins[idx]);
-        writePinLow(row_pins[idx]);
-    }
-}
-
-static inline void clear_row(void) {
-    for (int idx = 0; idx < MATRIX_ROWS; idx++) {
-        setPinOutput(row_pins[idx]);
-        writePinLow(row_pins[idx]);
-    }
-}
-
-/* Initialize the peripherals pins */
-int ecsm_init(ecsm_config_t const* const ecsm_config) {
-    // Initialize config
-    config = *ecsm_config;
-
-    palSetLineMode(ANALOG_PORT, PAL_MODE_INPUT_ANALOG);
-    adcMux = pinToMux(ANALOG_PORT);
-
-    // Dummy call to make sure that adcStart() has been called in the appropriate state
-    adc_read(adcMux);
-
-    // Initialize discharge pin as discharge mode
-    writePinLow(DISCHARGE_PIN);
-    setPinOutputOpenDrain(DISCHARGE_PIN);
-
-    // Initialize drive lines
-    init_row();
-
-    // Initialize multiplexer select pin
-    init_mux_sel();
-
-    // Enable AMUX
-    setPinOutput(APLEX_EN_PIN_0);
-    writePinLow(APLEX_EN_PIN_0);
-    setPinOutput(APLEX_EN_PIN_1);
-    writePinLow(APLEX_EN_PIN_1);
-
-    return 0;
-}
-
-int ecsm_update(ecsm_config_t const* const ecsm_config) {
-    // Save config
-    config = *ecsm_config;
-    return 0;
-}
-
-// Read the capacitive sensor value
-uint16_t ecsm_readkey_raw(uint8_t channel, uint8_t row, uint8_t col) {
-    uint16_t sw_value = 0;
-
-    // Select the multiplexer
-    if (channel == 0) {
-        writePinHigh(APLEX_EN_PIN_0);
-        select_mux(col);
-        writePinLow(APLEX_EN_PIN_0);
-    } else {
-        writePinHigh(APLEX_EN_PIN_1);
-        select_mux(col);
-        writePinLow(APLEX_EN_PIN_1);
-    }
-
-    // Set strobe pins to low state
-    //writePinLow(row_pins[row]);
-    clear_row();
-    ATOMIC_BLOCK_FORCEON {
-        // Set the row pin to high state and have capacitor charge
-        charge_capacitor(row);
-        // Read the ADC value
-        sw_value = adc_read(adcMux);
-    }
-    // Discharge peak hold capacitor
-    discharge_capacitor();
-    // Waiting for the ghost capacitor to discharge fully
-    wait_us(DISCHARGE_TIME);
-
-    return sw_value;
-}
-
-// Update press/release state of key
-bool ecsm_update_key(matrix_row_t* current_row, uint8_t row, uint8_t col, uint16_t sw_value) {
-    bool current_state = (*current_row >> col) & 1;
-
-    // Press to release
-    if (current_state && sw_value < config.ecsm_actuation_threshold) {
-        *current_row &= ~(1 << col);
-        return true;
-    }
-
-    // Release to press
-    if ((!current_state) && sw_value > config.ecsm_release_threshold) {
-        *current_row |= (1 << col);
-        return true;
-    }
-
-    return false;
-}
-
-// Scan key values and update matrix state
-bool ecsm_matrix_scan(matrix_row_t current_matrix[]) {
-    bool updated = false;
-
-    // Disable AMUX of channel 1
-    writePinHigh(APLEX_EN_PIN_1);
-    for (int col = 0; col < sizeof(col_channels); col++) {
-        for (int row = 0; row < MATRIX_ROWS; row++) {
-            ecsm_sw_value[row][col] = ecsm_readkey_raw(0, row, col);
-            updated |= ecsm_update_key(&current_matrix[row], row, col, ecsm_sw_value[row][col]);
-        }
-    }
-
-    // Disable AMUX of channel 1
-    writePinHigh(APLEX_EN_PIN_0);
-    for (int col = 0; col < sizeof(col_channels); col++) {
-        for (int row = 0; row < MATRIX_ROWS; row++) {
-            ecsm_sw_value[row][col + 8] = ecsm_readkey_raw(1, row, col);
-            updated |= ecsm_update_key(&current_matrix[row], row, col + 8, ecsm_sw_value[row][col + 8]);
-        }
-    }
-    return updated;
-}
-
-// Debug print key values
-void ecsm_print_matrix(void) {
-    for (int row = 0; row < MATRIX_ROWS; row++) {
-        for (int col = 0; col < MATRIX_COLS; col++) {
-            uprintf("%4d", ecsm_sw_value[row][col]);
-            if (col < (MATRIX_COLS - 1)) {
-                print(",");
-            }
-        }
-        print("\n");
-    }
-    print("\n");
-}
diff --git a/keyboards/cipulot/ec_theca/ec_switch_matrix.h b/keyboards/cipulot/ec_theca/ec_switch_matrix.h
deleted file mode 100644
index 9dcb216caa3..00000000000
--- a/keyboards/cipulot/ec_theca/ec_switch_matrix.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2023 Cipulot
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include <stdint.h>
-#include <stdbool.h>
-
-#include "matrix.h"
-
-typedef struct {
-    uint16_t ecsm_actuation_threshold; // threshold for key release
-    uint16_t ecsm_release_threshold;   // threshold for key press
-} ecsm_config_t;
-
-ecsm_config_t ecsm_config;
-
-int      ecsm_init(ecsm_config_t const* const ecsm_config);
-int      ecsm_update(ecsm_config_t const* const ecsm_config);
-bool     ecsm_matrix_scan(matrix_row_t current_matrix[]);
-uint16_t ecsm_readkey_raw(uint8_t channel, uint8_t row, uint8_t col);
-bool     ecsm_update_key(matrix_row_t* current_row, uint8_t row, uint8_t col, uint16_t sw_value);
-void     ecsm_print_matrix(void);
diff --git a/keyboards/cipulot/ec_theca/halconf.h b/keyboards/cipulot/ec_theca/halconf.h
index 5b71acecbbc..835d43b6a0a 100644
--- a/keyboards/cipulot/ec_theca/halconf.h
+++ b/keyboards/cipulot/ec_theca/halconf.h
@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/keyboards/cipulot/ec_theca/info.json b/keyboards/cipulot/ec_theca/info.json
index a80a92a7f5d..fbd7d7ec471 100644
--- a/keyboards/cipulot/ec_theca/info.json
+++ b/keyboards/cipulot/ec_theca/info.json
@@ -8,7 +8,7 @@
     },
     "diode_direction": "COL2ROW",
     "features": {
-        "bootmagic": true,
+        "bootmagic": false,
         "console": true,
         "extrakey": true,
         "mousekey": true,
diff --git a/keyboards/cipulot/ec_theca/keymaps/default/keymap.c b/keyboards/cipulot/ec_theca/keymaps/default/keymap.c
index 2ad75a0f3e4..caadf93c1c4 100644
--- a/keyboards/cipulot/ec_theca/keymaps/default/keymap.c
+++ b/keyboards/cipulot/ec_theca/keymaps/default/keymap.c
@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_LCTL,  KC_LGUI,  KC_LALT,                  KC_SPC,                            KC_RALT,  KC_RGUI,  MO(1),    KC_RCTL,               KC_LEFT,  KC_DOWN,  KC_RIGHT),
 
     [1] = LAYOUT_tkl_ansi(
-    QK_BOOT,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,  _______,
+    QK_BOOT,  NK_TOGG,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,  _______,
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
diff --git a/keyboards/cipulot/ec_theca/keymaps/tkl_ansi_tsangan/keymap.c b/keyboards/cipulot/ec_theca/keymaps/tkl_ansi_tsangan/keymap.c
index a8f569b189d..7945b62db9f 100644
--- a/keyboards/cipulot/ec_theca/keymaps/tkl_ansi_tsangan/keymap.c
+++ b/keyboards/cipulot/ec_theca/keymaps/tkl_ansi_tsangan/keymap.c
@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_LCTL,  KC_LGUI,  KC_LALT,                  KC_SPC,                                      KC_RALT,  MO(1),    KC_RCTL,               KC_LEFT,  KC_DOWN,  KC_RIGHT),
 
     [1] = LAYOUT_tkl_ansi_tsangan(
-    QK_BOOT,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,  _______,
+    QK_BOOT,  NK_TOGG,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,  _______,
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
diff --git a/keyboards/cipulot/ec_theca/keymaps/tkl_ansi_tsangan_wkl/keymap.c b/keyboards/cipulot/ec_theca/keymaps/tkl_ansi_tsangan_wkl/keymap.c
index 56548302ddc..7205d9fad09 100644
--- a/keyboards/cipulot/ec_theca/keymaps/tkl_ansi_tsangan_wkl/keymap.c
+++ b/keyboards/cipulot/ec_theca/keymaps/tkl_ansi_tsangan_wkl/keymap.c
@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_LCTL,            KC_LALT,                  KC_SPC,                                      KC_RALT,            KC_RCTL,               KC_LEFT,  KC_DOWN,  KC_RIGHT),
 
     [1] = LAYOUT_tkl_ansi_wkl(
-    QK_BOOT,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,  _______,
+    QK_BOOT,  NK_TOGG,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,  _______,
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,
     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
diff --git a/keyboards/cipulot/ec_theca/keymaps/via/config.h b/keyboards/cipulot/ec_theca/keymaps/via/config.h
index ebf954d07ac..1ab0d3d9aa2 100644
--- a/keyboards/cipulot/ec_theca/keymaps/via/config.h
+++ b/keyboards/cipulot/ec_theca/keymaps/via/config.h
@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,5 +16,5 @@
 
 #pragma once
 
-// This is the size of the EEPROM for the custom VIA-specific data
-#define EECONFIG_USER_DATA_SIZE 4
+// This is the firmware version for VIA support to avoid conflicts on menu fetching
+#define VIA_FIRMWARE_VERSION 1
diff --git a/keyboards/cipulot/ec_theca/keymaps/via/keymap.c b/keyboards/cipulot/ec_theca/keymaps/via/keymap.c
index a8fc1b961a6..ca11bf60fc8 100644
--- a/keyboards/cipulot/ec_theca/keymaps/via/keymap.c
+++ b/keyboards/cipulot/ec_theca/keymaps/via/keymap.c
@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL,  KC_LGUI,  KC_LALT,                  KC_SPC,                            KC_RALT,  MO(1),    MO(1),    KC_RCTL,               KC_LEFT,  KC_DOWN,  KC_RIGHT),
 
     [1] = LAYOUT_all(
-        QK_BOOT,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,  _______,
+        QK_BOOT,  NK_TOGG,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
diff --git a/keyboards/cipulot/ec_theca/keymaps/via/rules.mk b/keyboards/cipulot/ec_theca/keymaps/via/rules.mk
index 72e314e6946..1e5b99807cb 100644
--- a/keyboards/cipulot/ec_theca/keymaps/via/rules.mk
+++ b/keyboards/cipulot/ec_theca/keymaps/via/rules.mk
@@ -1,3 +1 @@
 VIA_ENABLE = yes
-
-SRC += keyboards/cipulot/common/via_apc.c
diff --git a/keyboards/cipulot/ec_theca/matrix.c b/keyboards/cipulot/ec_theca/matrix.c
deleted file mode 100644
index 1850acf2641..00000000000
--- a/keyboards/cipulot/ec_theca/matrix.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Copyright 2023 Cipulot
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "ec_switch_matrix.h"
-#include "matrix.h"
-
-/* matrix state(1:on, 0:off) */
-extern matrix_row_t raw_matrix[MATRIX_ROWS]; // raw values
-extern matrix_row_t matrix[MATRIX_ROWS];     // debounced values
-
-void matrix_init_custom(void) {
-    // Default values, overwritten by VIA if enabled later
-    ecsm_config.ecsm_actuation_threshold = DEFAULT_ACTUATION_LEVEL;
-    ecsm_config.ecsm_release_threshold   = DEFAULT_RELEASE_LEVEL;
-
-    ecsm_init(&ecsm_config);
-}
-
-bool matrix_scan_custom(matrix_row_t current_matrix[]) {
-    bool updated = ecsm_matrix_scan(current_matrix);
-
-// RAW matrix values on console
-#ifdef CONSOLE_ENABLE
-    static int cnt = 0;
-    if (cnt++ == 350) {
-        cnt = 0;
-        ecsm_print_matrix();
-    }
-#endif
-    return updated;
-}
diff --git a/keyboards/cipulot/ec_theca/mcuconf.h b/keyboards/cipulot/ec_theca/mcuconf.h
index d91f576bd48..fa3c955e0d8 100644
--- a/keyboards/cipulot/ec_theca/mcuconf.h
+++ b/keyboards/cipulot/ec_theca/mcuconf.h
@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/keyboards/cipulot/ec_theca/post_rules.mk b/keyboards/cipulot/ec_theca/post_rules.mk
new file mode 100644
index 00000000000..d726a112a8c
--- /dev/null
+++ b/keyboards/cipulot/ec_theca/post_rules.mk
@@ -0,0 +1,3 @@
+ifeq ($(strip $(VIA_ENABLE)), yes)
+    SRC += keyboards/cipulot/common/via_ec.c
+endif
diff --git a/keyboards/cipulot/ec_theca/readme.md b/keyboards/cipulot/ec_theca/readme.md
index c25e498434c..47a70867fa2 100644
--- a/keyboards/cipulot/ec_theca/readme.md
+++ b/keyboards/cipulot/ec_theca/readme.md
@@ -18,8 +18,7 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to
 
 ## Bootloader
 
-Enter the bootloader in 3 ways:
+Enter the bootloader in 2 ways:
 
-* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
 * **Physical reset**: Long short the exposed pads on the top of the PCB
 * **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/cipulot/ec_theca/rules.mk b/keyboards/cipulot/ec_theca/rules.mk
index fc2dcf32ab1..70494b635f6 100644
--- a/keyboards/cipulot/ec_theca/rules.mk
+++ b/keyboards/cipulot/ec_theca/rules.mk
@@ -1,4 +1,4 @@
 CUSTOM_MATRIX = lite
-SRC += matrix.c ec_switch_matrix.c
-
 ANALOG_DRIVER_REQUIRED = yes
+SRC += keyboards/cipulot/common/matrix.c keyboards/cipulot/common/ec_board.c keyboards/cipulot/common/ec_switch_matrix.c
+OPT = 3
diff --git a/keyboards/cipulot/kawayo/config.h b/keyboards/cipulot/kawayo/config.h
index a87365e69db..a08011b9cf9 100644
--- a/keyboards/cipulot/kawayo/config.h
+++ b/keyboards/cipulot/kawayo/config.h
@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/keyboards/cipulot/kawayo/keymaps/default/keymap.c b/keyboards/cipulot/kawayo/keymaps/default/keymap.c
index 5d4bf4a35be..06cf47bc5fc 100644
--- a/keyboards/cipulot/kawayo/keymaps/default/keymap.c
+++ b/keyboards/cipulot/kawayo/keymaps/default/keymap.c
@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/keyboards/cipulot/kawayo/keymaps/default_65_ansi_cb_blocker/keymap.c b/keyboards/cipulot/kawayo/keymaps/default_65_ansi_cb_blocker/keymap.c
index c160269ae85..2af88d24ff5 100644
--- a/keyboards/cipulot/kawayo/keymaps/default_65_ansi_cb_blocker/keymap.c
+++ b/keyboards/cipulot/kawayo/keymaps/default_65_ansi_cb_blocker/keymap.c
@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/keyboards/cipulot/kawayo/keymaps/default_65_ansi_cb_blocker_tsangan/keymap.c b/keyboards/cipulot/kawayo/keymaps/default_65_ansi_cb_blocker_tsangan/keymap.c
index 32a4389d3fc..5db2d32b927 100644
--- a/keyboards/cipulot/kawayo/keymaps/default_65_ansi_cb_blocker_tsangan/keymap.c
+++ b/keyboards/cipulot/kawayo/keymaps/default_65_ansi_cb_blocker_tsangan/keymap.c
@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/keyboards/cipulot/kawayo/keymaps/default_65_ansi_cb_blocker_tsangan_split_bs/keymap.c b/keyboards/cipulot/kawayo/keymaps/default_65_ansi_cb_blocker_tsangan_split_bs/keymap.c
index ca65d38440e..fe290754838 100644
--- a/keyboards/cipulot/kawayo/keymaps/default_65_ansi_cb_blocker_tsangan_split_bs/keymap.c
+++ b/keyboards/cipulot/kawayo/keymaps/default_65_ansi_cb_blocker_tsangan_split_bs/keymap.c
@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/keyboards/cipulot/kawayo/keymaps/via/keymap.c b/keyboards/cipulot/kawayo/keymaps/via/keymap.c
index 5d4bf4a35be..06cf47bc5fc 100644
--- a/keyboards/cipulot/kawayo/keymaps/via/keymap.c
+++ b/keyboards/cipulot/kawayo/keymaps/via/keymap.c
@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/keyboards/cipulot/rf_r1_8_9xu/config.h b/keyboards/cipulot/rf_r1_8_9xu/config.h
index 915348b3f48..bd020ff4333 100644
--- a/keyboards/cipulot/rf_r1_8_9xu/config.h
+++ b/keyboards/cipulot/rf_r1_8_9xu/config.h
@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -19,27 +19,53 @@
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 16
 
-/* Custom matrix pins and port select array */
 #define MATRIX_ROW_PINS \
     { B15, A8, B13, B12, B14, B0 }
-#define MATRIX_COL_CHANNELS \
-    { 3, 0, 1, 2, 4, 6, 7, 5 }
-#define MUX_SEL_PINS \
+
+#define AMUX_COUNT 2
+#define AMUX_MAX_COLS_COUNT 8
+
+#define AMUX_EN_PINS \
+    { B7, A6 }
+
+#define AMUX_SEL_PINS \
     { B4, B5, B6 }
 
-/* Hardware peripherals pins */
-#define APLEX_EN_PIN_0 B7
-#define APLEX_EN_PIN_1 A6
+#define AMUX_COL_CHANNELS_SIZES \
+    { 8, 8 }
+
+#define AMUX_0_COL_CHANNELS \
+    { 3, 0, 1, 2, 4, 6, 7, 5 }
+
+#define AMUX_1_COL_CHANNELS AMUX_0_COL_CHANNELS
+
+#define AMUX_COL_CHANNELS AMUX_0_COL_CHANNELS, AMUX_1_COL_CHANNELS
+
 #define DISCHARGE_PIN A4
 #define ANALOG_PORT A3
 
+#define DEFAULT_ACTUATION_MODE 0
+#define DEFAULT_MODE_0_ACTUATION_LEVEL 550
+#define DEFAULT_MODE_0_RELEASE_LEVEL 500
+#define DEFAULT_MODE_1_INITIAL_DEADZONE_OFFSET DEFAULT_MODE_0_ACTUATION_LEVEL
+#define DEFAULT_MODE_1_ACTUATION_OFFSET 70
+#define DEFAULT_MODE_1_RELEASE_OFFSET 70
+#define DEFAULT_EXTREMUM 1023
+#define EXPECTED_NOISE_FLOOR 0
+#define NOISE_FLOOR_THRESHOLD 50
+#define BOTTOMING_CALIBRATION_THRESHOLD 100
+#define DEFAULT_NOISE_FLOOR_SAMPLING_COUNT 30
+#define DEFAULT_BOTTOMING_READING 1023
+#define DEFAULT_CALIBRATION_STARTER true
+
+#define DISCHARGE_TIME 10
+
+// #define DEBUG_MATRIX_SCAN_RATE
+#define DYNAMIC_KEYMAP_LAYER_COUNT 3
+#define EECONFIG_KB_DATA_SIZE 202
+
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-#define DEFAULT_ACTUATION_LEVEL 700
-#define DEFAULT_RELEASE_LEVEL 650
-
-#define DISCHARGE_TIME 10
diff --git a/keyboards/cipulot/rf_r1_8_9xu/ec_switch_matrix.c b/keyboards/cipulot/rf_r1_8_9xu/ec_switch_matrix.c
deleted file mode 100644
index 3f25e365c0e..00000000000
--- a/keyboards/cipulot/rf_r1_8_9xu/ec_switch_matrix.c
+++ /dev/null
@@ -1,183 +0,0 @@
-/* Copyright 2023 Cipulot
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "ec_switch_matrix.h"
-#include "analog.h"
-#include "atomic_util.h"
-#include "print.h"
-#include "wait.h"
-
-/* Pin and port array */
-const uint32_t row_pins[]     = MATRIX_ROW_PINS;
-const uint8_t  col_channels[] = MATRIX_COL_CHANNELS;
-const uint32_t mux_sel_pins[] = MUX_SEL_PINS;
-
-static ecsm_config_t config;
-static uint16_t      ecsm_sw_value[MATRIX_ROWS][MATRIX_COLS];
-
-static adc_mux adcMux;
-
-static inline void discharge_capacitor(void) {
-    writePinLow(DISCHARGE_PIN);
-}
-static inline void charge_capacitor(uint8_t row) {
-    writePinHigh(DISCHARGE_PIN);
-    writePinHigh(row_pins[row]);
-}
-
-static inline void init_mux_sel(void) {
-    for (int idx = 0; idx < 3; idx++) {
-        setPinOutput(mux_sel_pins[idx]);
-    }
-}
-
-static inline void select_mux(uint8_t col) {
-    uint8_t ch = col_channels[col];
-    writePin(mux_sel_pins[0], ch & 1);
-    writePin(mux_sel_pins[1], ch & 2);
-    writePin(mux_sel_pins[2], ch & 4);
-}
-
-static inline void init_row(void) {
-    for (int idx = 0; idx < MATRIX_ROWS; idx++) {
-        setPinOutput(row_pins[idx]);
-        writePinLow(row_pins[idx]);
-    }
-}
-
-/* Initialize the peripherals pins */
-int ecsm_init(ecsm_config_t const* const ecsm_config) {
-    // Initialize config
-    config = *ecsm_config;
-
-    palSetLineMode(ANALOG_PORT, PAL_MODE_INPUT_ANALOG);
-    adcMux = pinToMux(ANALOG_PORT);
-
-    //Dummy call to make sure that adcStart() has been called in the appropriate state
-    adc_read(adcMux);
-
-    // Initialize discharge pin as discharge mode
-    writePinLow(DISCHARGE_PIN);
-    setPinOutputOpenDrain(DISCHARGE_PIN);
-
-    // Initialize drive lines
-    init_row();
-
-    // Initialize multiplexer select pin
-    init_mux_sel();
-
-    // Enable AMUX
-    setPinOutput(APLEX_EN_PIN_0);
-    writePinLow(APLEX_EN_PIN_0);
-    setPinOutput(APLEX_EN_PIN_1);
-    writePinLow(APLEX_EN_PIN_1);
-
-    return 0;
-}
-
-int ecsm_update(ecsm_config_t const* const ecsm_config) {
-    // Save config
-    config = *ecsm_config;
-    return 0;
-}
-
-// Read the capacitive sensor value
-uint16_t ecsm_readkey_raw(uint8_t channel, uint8_t row, uint8_t col) {
-    uint16_t sw_value = 0;
-
-    // Select the multiplexer
-    if (channel == 0) {
-        writePinHigh(APLEX_EN_PIN_0);
-        select_mux(col);
-        writePinLow(APLEX_EN_PIN_0);
-    } else {
-        writePinHigh(APLEX_EN_PIN_1);
-        select_mux(col);
-        writePinLow(APLEX_EN_PIN_1);
-    }
-
-    // Set strobe pins to low state
-    writePinLow(row_pins[row]);
-    ATOMIC_BLOCK_FORCEON {
-        // Set the row pin to high state and have capacitor charge
-        charge_capacitor(row);
-        // Read the ADC value
-        sw_value = adc_read(adcMux);
-    }
-    // Discharge peak hold capacitor
-    discharge_capacitor();
-    // Waiting for the ghost capacitor to discharge fully
-    wait_us(DISCHARGE_TIME);
-
-    return sw_value;
-}
-
-// Update press/release state of key
-bool ecsm_update_key(matrix_row_t* current_row, uint8_t row, uint8_t col, uint16_t sw_value) {
-    bool current_state = (*current_row >> col) & 1;
-
-    // Press to release
-    if (current_state && sw_value < config.ecsm_actuation_threshold) {
-        *current_row &= ~(1 << col);
-        return true;
-    }
-
-    // Release to press
-    if ((!current_state) && sw_value > config.ecsm_release_threshold) {
-        *current_row |= (1 << col);
-        return true;
-    }
-
-    return false;
-}
-
-// Scan key values and update matrix state
-bool ecsm_matrix_scan(matrix_row_t current_matrix[]) {
-    bool updated = false;
-
-    // Disable AMUX of channel 1
-    writePinHigh(APLEX_EN_PIN_1);
-    for (int col = 0; col < sizeof(col_channels); col++) {
-        for (int row = 0; row < MATRIX_ROWS; row++) {
-            ecsm_sw_value[row][col] = ecsm_readkey_raw(0, row, col);
-            updated |= ecsm_update_key(&current_matrix[row], row, col, ecsm_sw_value[row][col]);
-        }
-    }
-
-    // Disable AMUX of channel 1
-    writePinHigh(APLEX_EN_PIN_0);
-    for (int col = 0; col < sizeof(col_channels); col++) {
-        for (int row = 0; row < MATRIX_ROWS; row++) {
-            ecsm_sw_value[row][col + 8] = ecsm_readkey_raw(1, row, col);
-            updated |= ecsm_update_key(&current_matrix[row], row, col + 8, ecsm_sw_value[row][col + 8]);
-        }
-    }
-    return updated;
-}
-
-// Debug print key values
-void ecsm_print_matrix(void) {
-    for (int row = 0; row < MATRIX_ROWS; row++) {
-        for (int col = 0; col < MATRIX_COLS; col++) {
-            uprintf("%4d", ecsm_sw_value[row][col]);
-            if (col < (MATRIX_COLS - 1)) {
-                print(",");
-            }
-        }
-        print("\n");
-    }
-    print("\n");
-}
diff --git a/keyboards/cipulot/rf_r1_8_9xu/ec_switch_matrix.h b/keyboards/cipulot/rf_r1_8_9xu/ec_switch_matrix.h
deleted file mode 100644
index 9dcb216caa3..00000000000
--- a/keyboards/cipulot/rf_r1_8_9xu/ec_switch_matrix.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2023 Cipulot
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include <stdint.h>
-#include <stdbool.h>
-
-#include "matrix.h"
-
-typedef struct {
-    uint16_t ecsm_actuation_threshold; // threshold for key release
-    uint16_t ecsm_release_threshold;   // threshold for key press
-} ecsm_config_t;
-
-ecsm_config_t ecsm_config;
-
-int      ecsm_init(ecsm_config_t const* const ecsm_config);
-int      ecsm_update(ecsm_config_t const* const ecsm_config);
-bool     ecsm_matrix_scan(matrix_row_t current_matrix[]);
-uint16_t ecsm_readkey_raw(uint8_t channel, uint8_t row, uint8_t col);
-bool     ecsm_update_key(matrix_row_t* current_row, uint8_t row, uint8_t col, uint16_t sw_value);
-void     ecsm_print_matrix(void);
diff --git a/keyboards/cipulot/rf_r1_8_9xu/halconf.h b/keyboards/cipulot/rf_r1_8_9xu/halconf.h
index 5b71acecbbc..835d43b6a0a 100644
--- a/keyboards/cipulot/rf_r1_8_9xu/halconf.h
+++ b/keyboards/cipulot/rf_r1_8_9xu/halconf.h
@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/keyboards/cipulot/rf_r1_8_9xu/info.json b/keyboards/cipulot/rf_r1_8_9xu/info.json
index eb0220f6779..6d3ab8b7091 100644
--- a/keyboards/cipulot/rf_r1_8_9xu/info.json
+++ b/keyboards/cipulot/rf_r1_8_9xu/info.json
@@ -8,19 +8,13 @@
     },
     "diode_direction": "COL2ROW",
     "features": {
-        "audio": false,
-        "backlight": false,
-        "bootmagic": true,
-        "command": false,
+        "bootmagic": false,
         "console": true,
         "extrakey": true,
         "mousekey": true,
         "nkro": true,
         "rgblight": true
     },
-    "mouse_key": {
-        "enabled": true
-    },
     "indicators": {
         "caps_lock": "B3",
         "scroll_lock": "A14"
diff --git a/keyboards/cipulot/rf_r1_8_9xu/keymaps/default/keymap.c b/keyboards/cipulot/rf_r1_8_9xu/keymaps/default/keymap.c
index 6e39d6d4446..983bdefe8a9 100644
--- a/keyboards/cipulot/rf_r1_8_9xu/keymaps/default/keymap.c
+++ b/keyboards/cipulot/rf_r1_8_9xu/keymaps/default/keymap.c
@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -29,23 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL, KC_LGUI, KC_LALT, JP_MHEN,                KC_SPC,                JP_KANA, KC_RALT, KC_RGUI, MO(1),   KC_RCTL,             KC_LEFT, KC_DOWN, KC_RIGHT),
 
     [1] = LAYOUT_all(
-        RGB_TOG, RGB_VAD, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                     _______, _______, QK_BOOT,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                     _______,
-        _______, _______, _______, _______,                   _______,                   _______, _______, _______, _______, _______,            _______, _______, _______),
-
-    [2] = LAYOUT_all(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                     _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                     _______,
-        _______, _______, _______, _______,                   _______,                   _______, _______, _______, _______, _______,            _______, _______, _______),
-
-    [3] = LAYOUT_all(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                     _______, _______, _______,
+        QK_BOOT, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                     _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/cipulot/rf_r1_8_9xu/keymaps/tkl_ansi_tsangan/keymap.c b/keyboards/cipulot/rf_r1_8_9xu/keymaps/tkl_ansi_tsangan/keymap.c
index d9041eae20f..ba948b4fc12 100644
--- a/keyboards/cipulot/rf_r1_8_9xu/keymaps/tkl_ansi_tsangan/keymap.c
+++ b/keyboards/cipulot/rf_r1_8_9xu/keymaps/tkl_ansi_tsangan/keymap.c
@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -27,23 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL, KC_LGUI, KC_LALT,                      KC_SPC,                                   KC_RALT, MO(1),   KC_RCTL,    KC_LEFT, KC_DOWN, KC_RIGHT),
 
     [1] = LAYOUT_tkl_ansi_tsangan(
-        RGB_TOG, RGB_VAD, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, QK_BOOT,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                              _______,
-        _______, _______, _______,                            _______,                                     _______, _______, _______,   _______, _______, _______),
-
-    [2] = LAYOUT_tkl_ansi_tsangan(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                              _______,
-        _______, _______, _______,                            _______,                                     _______, _______, _______,   _______, _______, _______),
-
-    [3] = LAYOUT_tkl_ansi_tsangan(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,
+        QK_BOOT, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/cipulot/rf_r1_8_9xu/keymaps/tkl_iso_tsangan/keymap.c b/keyboards/cipulot/rf_r1_8_9xu/keymaps/tkl_iso_tsangan/keymap.c
index 4bbcb132990..1689d44d408 100644
--- a/keyboards/cipulot/rf_r1_8_9xu/keymaps/tkl_iso_tsangan/keymap.c
+++ b/keyboards/cipulot/rf_r1_8_9xu/keymaps/tkl_iso_tsangan/keymap.c
@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -27,23 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL, KC_LGUI, KC_LALT,                      KC_SPC,                                 KC_RALT, MO(1),   KC_RCTL,   KC_LEFT, KC_DOWN, KC_RIGHT),
 
     [1] = LAYOUT_tkl_iso_tsangan(
-        RGB_TOG, RGB_VAD, RGB_VAI, _______, _______, _______, _______,  _______, _______, _______, _______, _______, _______,            _______, _______, QK_BOOT,
-        _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______, _______,                     _______,
-        _______, _______, _______,                            _______,                                      _______, _______, _______,   _______, _______, _______),
-
-    [2] = LAYOUT_tkl_iso_tsangan(
-        _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______, _______,            _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______, _______,                     _______,
-        _______, _______, _______,                            _______,                                      _______, _______, _______,   _______, _______, _______),
-
-    [3] = LAYOUT_tkl_iso_tsangan(
-        _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______, _______,            _______, _______, _______,
+        QK_BOOT, NK_TOGG, _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______, _______,            _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/cipulot/rf_r1_8_9xu/keymaps/tkl_jis/keymap.c b/keyboards/cipulot/rf_r1_8_9xu/keymaps/tkl_jis/keymap.c
index df2be5eef79..e44575f74f9 100644
--- a/keyboards/cipulot/rf_r1_8_9xu/keymaps/tkl_jis/keymap.c
+++ b/keyboards/cipulot/rf_r1_8_9xu/keymaps/tkl_jis/keymap.c
@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -29,23 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL, KC_LGUI, KC_LALT, JP_MHEN,               KC_SPC,                 JP_HENK, JP_KANA, KC_RALT, MO(1),   KC_RCTL,             KC_LEFT, KC_DOWN, KC_RIGHT),
 
     [1] = LAYOUT_tkl_jis(
-        RGB_TOG, RGB_VAD, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                     _______, _______, QK_BOOT,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                              _______,
-        _______, _______, _______, _______,                   _______,                   _______, _______, _______, _______, _______,            _______, _______, _______),
-
-    [2] = LAYOUT_tkl_jis(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                     _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                              _______,
-        _______, _______, _______, _______,                   _______,                   _______, _______, _______, _______, _______,            _______, _______, _______),
-
-    [3] = LAYOUT_tkl_jis(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                     _______, _______, _______,
+        QK_BOOT, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                     _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/cipulot/rf_r1_8_9xu/keymaps/via/config.h b/keyboards/cipulot/rf_r1_8_9xu/keymaps/via/config.h
index ebf954d07ac..1ab0d3d9aa2 100644
--- a/keyboards/cipulot/rf_r1_8_9xu/keymaps/via/config.h
+++ b/keyboards/cipulot/rf_r1_8_9xu/keymaps/via/config.h
@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,5 +16,5 @@
 
 #pragma once
 
-// This is the size of the EEPROM for the custom VIA-specific data
-#define EECONFIG_USER_DATA_SIZE 4
+// This is the firmware version for VIA support to avoid conflicts on menu fetching
+#define VIA_FIRMWARE_VERSION 1
diff --git a/keyboards/cipulot/rf_r1_8_9xu/keymaps/via/keymap.c b/keyboards/cipulot/rf_r1_8_9xu/keymaps/via/keymap.c
index 6e39d6d4446..983bdefe8a9 100644
--- a/keyboards/cipulot/rf_r1_8_9xu/keymaps/via/keymap.c
+++ b/keyboards/cipulot/rf_r1_8_9xu/keymaps/via/keymap.c
@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -29,23 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL, KC_LGUI, KC_LALT, JP_MHEN,                KC_SPC,                JP_KANA, KC_RALT, KC_RGUI, MO(1),   KC_RCTL,             KC_LEFT, KC_DOWN, KC_RIGHT),
 
     [1] = LAYOUT_all(
-        RGB_TOG, RGB_VAD, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                     _______, _______, QK_BOOT,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                     _______,
-        _______, _______, _______, _______,                   _______,                   _______, _______, _______, _______, _______,            _______, _______, _______),
-
-    [2] = LAYOUT_all(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                     _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                     _______,
-        _______, _______, _______, _______,                   _______,                   _______, _______, _______, _______, _______,            _______, _______, _______),
-
-    [3] = LAYOUT_all(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                     _______, _______, _______,
+        QK_BOOT, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                     _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/cipulot/rf_r1_8_9xu/keymaps/via/rules.mk b/keyboards/cipulot/rf_r1_8_9xu/keymaps/via/rules.mk
index 520b11f2031..1e5b99807cb 100644
--- a/keyboards/cipulot/rf_r1_8_9xu/keymaps/via/rules.mk
+++ b/keyboards/cipulot/rf_r1_8_9xu/keymaps/via/rules.mk
@@ -1,3 +1 @@
 VIA_ENABLE = yes
-
-SRC += via_apc.c
diff --git a/keyboards/cipulot/rf_r1_8_9xu/keymaps/via/via_apc.c b/keyboards/cipulot/rf_r1_8_9xu/keymaps/via/via_apc.c
deleted file mode 100644
index 5ea77af44c8..00000000000
--- a/keyboards/cipulot/rf_r1_8_9xu/keymaps/via/via_apc.c
+++ /dev/null
@@ -1,156 +0,0 @@
-/* Copyright 2023 Cipulot
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "ec_switch_matrix.h"
-#include "action.h"
-#include "via.h"
-
-void apc_init_thresholds(void);
-void apc_set_threshold(bool is_for_actuation);
-
-// Declaring an _apc_config_t struct that will store our data
-typedef struct _apc_config_t {
-    uint16_t actuation_threshold;
-    uint16_t release_threshold;
-} apc_config;
-
-// Check if the size of the reserved persistent memory is the same as the size of struct apc_config
-_Static_assert(sizeof(apc_config) == EECONFIG_USER_DATA_SIZE, "Mismatch in keyboard EECONFIG stored data");
-
-// Declaring a new variable apc of type apc_config
-apc_config apc;
-
-// Declaring enums for VIA config menu
-enum via_apc_enums {
-    // clang-format off
-    id_apc_actuation_threshold = 1,
-    id_apc_release_threshold = 2
-    // clang-format on
-};
-
-// Initializing persistent memory configuration: default values are declared and stored in PMEM
-void eeconfig_init_user(void) {
-    // Default values
-    apc.actuation_threshold = DEFAULT_ACTUATION_LEVEL;
-    apc.release_threshold   = DEFAULT_RELEASE_LEVEL;
-    // Write default value to EEPROM now
-    eeconfig_update_user_datablock(&apc);
-}
-
-// On Keyboard startup
-void keyboard_post_init_user(void) {
-    // Read custom menu variables from memory
-    eeconfig_read_user_datablock(&apc);
-    apc_init_thresholds();
-}
-
-// Handle the data received by the keyboard from the VIA menus
-void apc_config_set_value(uint8_t *data) {
-    // data = [ value_id, value_data ]
-    uint8_t *value_id   = &(data[0]);
-    uint8_t *value_data = &(data[1]);
-
-    switch (*value_id) {
-        case id_apc_actuation_threshold: {
-            apc.actuation_threshold = value_data[1] | (value_data[0] << 8);
-            apc_set_threshold(true);
-            break;
-        }
-        case id_apc_release_threshold: {
-            apc.release_threshold = value_data[1] | (value_data[0] << 8);
-            apc_set_threshold(false);
-            break;
-        }
-    }
-}
-
-// Handle the data sent by the keyboard to the VIA menus
-void apc_config_get_value(uint8_t *data) {
-    // data = [ value_id, value_data ]
-    uint8_t *value_id   = &(data[0]);
-    uint8_t *value_data = &(data[1]);
-
-    switch (*value_id) {
-        case id_apc_actuation_threshold: {
-            value_data[0] = apc.actuation_threshold >> 8;
-            value_data[1] = apc.actuation_threshold & 0xFF;
-            break;
-        }
-        case id_apc_release_threshold: {
-            value_data[0] = apc.release_threshold >> 8;
-            value_data[1] = apc.release_threshold & 0xFF;
-            break;
-        }
-    }
-}
-
-// Save the data to persistent memory after changes are made
-void apc_config_save(void) {
-    eeconfig_update_user_datablock(&apc);
-}
-
-void via_custom_value_command_kb(uint8_t *data, uint8_t length) {
-    // data = [ command_id, channel_id, value_id, value_data ]
-    uint8_t *command_id        = &(data[0]);
-    uint8_t *channel_id        = &(data[1]);
-    uint8_t *value_id_and_data = &(data[2]);
-
-    if (*channel_id == id_custom_channel) {
-        switch (*command_id) {
-            case id_custom_set_value: {
-                apc_config_set_value(value_id_and_data);
-                break;
-            }
-            case id_custom_get_value: {
-                apc_config_get_value(value_id_and_data);
-                break;
-            }
-            case id_custom_save: {
-                apc_config_save();
-                break;
-            }
-            default: {
-                // Unhandled message.
-                *command_id = id_unhandled;
-                break;
-            }
-        }
-        return;
-    }
-
-    *command_id = id_unhandled;
-}
-
-// Initialize the thresholds
-void apc_init_thresholds(void) {
-    ecsm_config.ecsm_actuation_threshold = apc.actuation_threshold;
-    ecsm_config.ecsm_release_threshold   = apc.release_threshold;
-
-    // Update the ecsm_config
-    ecsm_update(&ecsm_config);
-}
-
-// Set the thresholds
-void apc_set_threshold(bool is_for_actuation) {
-    if (is_for_actuation) {
-        ecsm_config.ecsm_actuation_threshold = apc.actuation_threshold;
-
-    } else {
-        ecsm_config.ecsm_release_threshold = apc.release_threshold;
-    }
-    // Update the ecsm_config
-    ecsm_update(&ecsm_config);
-}
diff --git a/keyboards/cipulot/rf_r1_8_9xu/matrix.c b/keyboards/cipulot/rf_r1_8_9xu/matrix.c
deleted file mode 100644
index 1850acf2641..00000000000
--- a/keyboards/cipulot/rf_r1_8_9xu/matrix.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Copyright 2023 Cipulot
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "ec_switch_matrix.h"
-#include "matrix.h"
-
-/* matrix state(1:on, 0:off) */
-extern matrix_row_t raw_matrix[MATRIX_ROWS]; // raw values
-extern matrix_row_t matrix[MATRIX_ROWS];     // debounced values
-
-void matrix_init_custom(void) {
-    // Default values, overwritten by VIA if enabled later
-    ecsm_config.ecsm_actuation_threshold = DEFAULT_ACTUATION_LEVEL;
-    ecsm_config.ecsm_release_threshold   = DEFAULT_RELEASE_LEVEL;
-
-    ecsm_init(&ecsm_config);
-}
-
-bool matrix_scan_custom(matrix_row_t current_matrix[]) {
-    bool updated = ecsm_matrix_scan(current_matrix);
-
-// RAW matrix values on console
-#ifdef CONSOLE_ENABLE
-    static int cnt = 0;
-    if (cnt++ == 350) {
-        cnt = 0;
-        ecsm_print_matrix();
-    }
-#endif
-    return updated;
-}
diff --git a/keyboards/cipulot/rf_r1_8_9xu/mcuconf.h b/keyboards/cipulot/rf_r1_8_9xu/mcuconf.h
index d91f576bd48..fa3c955e0d8 100644
--- a/keyboards/cipulot/rf_r1_8_9xu/mcuconf.h
+++ b/keyboards/cipulot/rf_r1_8_9xu/mcuconf.h
@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/keyboards/cipulot/rf_r1_8_9xu/post_rules.mk b/keyboards/cipulot/rf_r1_8_9xu/post_rules.mk
new file mode 100644
index 00000000000..d726a112a8c
--- /dev/null
+++ b/keyboards/cipulot/rf_r1_8_9xu/post_rules.mk
@@ -0,0 +1,3 @@
+ifeq ($(strip $(VIA_ENABLE)), yes)
+    SRC += keyboards/cipulot/common/via_ec.c
+endif
diff --git a/keyboards/cipulot/rf_r1_8_9xu/readme.md b/keyboards/cipulot/rf_r1_8_9xu/readme.md
index 6e5a8c9f3eb..1491de12da0 100644
--- a/keyboards/cipulot/rf_r1_8_9xu/readme.md
+++ b/keyboards/cipulot/rf_r1_8_9xu/readme.md
@@ -20,8 +20,7 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to
 
 ## Bootloader
 
-Enter the bootloader in 3 ways:
+Enter the bootloader in 2 ways:
 
-* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
 * **Physical Boot0 pins**: Short the Boot0 pins on the back of the PCB while plugging in the keyboard
 * **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/cipulot/rf_r1_8_9xu/rules.mk b/keyboards/cipulot/rf_r1_8_9xu/rules.mk
index fc2dcf32ab1..ab6c37cad43 100644
--- a/keyboards/cipulot/rf_r1_8_9xu/rules.mk
+++ b/keyboards/cipulot/rf_r1_8_9xu/rules.mk
@@ -1,4 +1,4 @@
 CUSTOM_MATRIX = lite
-SRC += matrix.c ec_switch_matrix.c
-
 ANALOG_DRIVER_REQUIRED = yes
+SRC += keyboards/cipulot/common/matrix.c keyboards/cipulot/common/ec_board.c keyboards/cipulot/common/ec_switch_matrix.c
+OPT = 2
diff --git a/keyboards/clueboard/17/info.json b/keyboards/clueboard/17/info.json
index ef03bd11b16..d6aec9cfcc8 100644
--- a/keyboards/clueboard/17/info.json
+++ b/keyboards/clueboard/17/info.json
@@ -11,11 +11,9 @@
     "command": false,
     "console": true,
     "extrakey": true,
-    "midi": false,
     "mousekey": true,
     "nkro": true,
-    "rgblight": true,
-    "unicode": false
+    "rgblight": true
   },
   "matrix_pins": {
     "cols": ["F4", "E6", "B1", "D2"],
diff --git a/keyboards/clueboard/2x1800/2018/info.json b/keyboards/clueboard/2x1800/2018/info.json
index 49e0ae17a84..fe0b5210343 100644
--- a/keyboards/clueboard/2x1800/2018/info.json
+++ b/keyboards/clueboard/2x1800/2018/info.json
@@ -11,11 +11,9 @@
     "command": false,
     "console": true,
     "extrakey": true,
-    "midi": false,
     "mousekey": true,
     "nkro": true,
-    "rgblight": true,
-    "unicode": false
+    "rgblight": true
   },
   "indicators": {
     "num_lock": "B4",
diff --git a/keyboards/clueboard/2x1800/2019/info.json b/keyboards/clueboard/2x1800/2019/info.json
index fc613d61002..6f33a11ca75 100644
--- a/keyboards/clueboard/2x1800/2019/info.json
+++ b/keyboards/clueboard/2x1800/2019/info.json
@@ -12,11 +12,8 @@
     "console": true,
     "encoder": true,
     "extrakey": true,
-    "midi": false,
     "mousekey": true,
-    "nkro": true,
-    "rgblight": false,
-    "unicode": false
+    "nkro": true
   },
   "matrix_pins": {
     "cols": ["D2", "D3", "D4", "D5", "D7", "E0", "E1", "B0", "E6", "B3", "B2"],
diff --git a/keyboards/clueboard/60/info.json b/keyboards/clueboard/60/info.json
index 322f8426802..d0b4d34999e 100644
--- a/keyboards/clueboard/60/info.json
+++ b/keyboards/clueboard/60/info.json
@@ -9,7 +9,6 @@
   "diode_direction": "COL2ROW",
   "features": {
     "audio": true,
-    "backlight": false,
     "bootmagic": false,
     "command": false,
     "console": true,
diff --git a/keyboards/clueboard/66/rev1/info.json b/keyboards/clueboard/66/rev1/info.json
index fc186d9894c..ca1e3a6553b 100644
--- a/keyboards/clueboard/66/rev1/info.json
+++ b/keyboards/clueboard/66/rev1/info.json
@@ -6,18 +6,12 @@
   "bootloader": "atmel-dfu",
   "diode_direction": "COL2ROW",
   "features": {
-    "audio": false,
-    "backlight": false,
-    "bluetooth": false,
     "bootmagic": false,
     "command": false,
     "console": true,
     "extrakey": true,
-    "midi": false,
     "mousekey": true,
-    "nkro": true,
-    "rgblight": false,
-    "unicode": false
+    "nkro": true
   },
   "indicators": {
     "caps_lock": "F0"
diff --git a/keyboards/clueboard/66/rev2/info.json b/keyboards/clueboard/66/rev2/info.json
index e4a8c5a03b2..fea4f8d39bc 100644
--- a/keyboards/clueboard/66/rev2/info.json
+++ b/keyboards/clueboard/66/rev2/info.json
@@ -6,18 +6,13 @@
   "bootloader": "atmel-dfu",
   "diode_direction": "COL2ROW",
   "features": {
-    "audio": false,
-    "backlight": true,
-    "bluetooth": false,
     "bootmagic": false,
     "command": false,
     "console": true,
     "extrakey": true,
-    "midi": false,
     "mousekey": true,
     "nkro": true,
-    "rgblight": true,
-    "unicode": false
+    "rgblight": true
   },
   "indicators": {
     "caps_lock": "B4"
diff --git a/keyboards/clueboard/66/rev3/info.json b/keyboards/clueboard/66/rev3/info.json
index f0881e5be65..0aa3e7096fc 100644
--- a/keyboards/clueboard/66/rev3/info.json
+++ b/keyboards/clueboard/66/rev3/info.json
@@ -6,18 +6,14 @@
   "bootloader": "atmel-dfu",
   "diode_direction": "COL2ROW",
   "features": {
-    "audio": false,
     "backlight": true,
-    "bluetooth": false,
     "bootmagic": false,
     "command": false,
     "console": true,
     "extrakey": true,
-    "midi": false,
     "mousekey": true,
     "nkro": true,
-    "rgblight": true,
-    "unicode": false
+    "rgblight": true
   },
   "indicators": {
     "caps_lock": "B4"
diff --git a/keyboards/clueboard/66/rev4/info.json b/keyboards/clueboard/66/rev4/info.json
index e90ec9788e6..dbc1b94915d 100644
--- a/keyboards/clueboard/66/rev4/info.json
+++ b/keyboards/clueboard/66/rev4/info.json
@@ -8,17 +8,12 @@
   "diode_direction": "COL2ROW",
   "features": {
     "audio": true,
-    "backlight": false,
-    "bluetooth": false,
     "bootmagic": false,
     "command": false,
     "console": true,
     "extrakey": true,
-    "midi": false,
     "mousekey": true,
-    "nkro": true,
-    "rgblight": false,
-    "unicode": false
+    "nkro": true
   },
   "matrix_pins": {
     "cols": ["B10", "B2", "B1", "B0", "A7", "B4", "B3", "B5"],
diff --git a/keyboards/clueboard/66_hotswap/prototype/info.json b/keyboards/clueboard/66_hotswap/prototype/info.json
index 779540a8c4a..2ef1fbec1eb 100644
--- a/keyboards/clueboard/66_hotswap/prototype/info.json
+++ b/keyboards/clueboard/66_hotswap/prototype/info.json
@@ -8,16 +8,13 @@
   "features": {
     "audio": true,
     "backlight": true,
-    "bluetooth": false,
     "bootmagic": false,
     "command": false,
     "console": true,
     "extrakey": true,
-    "midi": false,
     "mousekey": false,
     "nkro": true,
-    "rgblight": true,
-    "unicode": false
+    "rgblight": true
   },
   "indicators": {
     "caps_lock": "B4"
diff --git a/keyboards/clueboard/card/info.json b/keyboards/clueboard/card/info.json
index 7799110ba6d..106b6f823da 100644
--- a/keyboards/clueboard/card/info.json
+++ b/keyboards/clueboard/card/info.json
@@ -9,16 +9,13 @@
   "features": {
     "audio": true,
     "backlight": true,
-    "bluetooth": false,
     "bootmagic": false,
     "command": false,
     "console": true,
     "extrakey": true,
-    "midi": false,
     "mousekey": true,
     "nkro": false,
-    "rgblight": true,
-    "unicode": false
+    "rgblight": true
   },
   "build": {
     "lto": true
diff --git a/keyboards/compensator/info.json b/keyboards/compensator/info.json
new file mode 100644
index 00000000000..ceaa1763338
--- /dev/null
+++ b/keyboards/compensator/info.json
@@ -0,0 +1,163 @@
+{
+    "keyboard_name": "Compensator",
+    "manufacturer": "Highleap",
+    "url": "https://lrfoster03.github.io/",
+    "maintainer": "Lrfoster03",
+    "usb": {
+        "vid": "0x564B",
+        "pid": "0x0001",
+        "device_version": "1.0.0"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "matrix_pins": {
+        "rows": ["B2", "F5", "F7", "F1", "B3", "F4", "F6", "F0"],
+        "cols": ["B0", "D4", "B7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "B1", "D5", "D3", "D2", "D1", "D0"]
+    },
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": false
+    },
+    "bootmagic": {
+        "matrix": [0, 5]
+    },
+    "dynamic_keymap": {
+        "layer_count": 3
+    },
+    "indicators": {
+        "caps_lock": "E6",
+        "on_state": 0
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [4, 0], "x": 2.25, "y": 0},
+                {"matrix": [4, 1], "x": 3.25, "y": 0},
+                {"matrix": [0, 2], "x": 4.25, "y": 0},
+                {"matrix": [0, 3], "x": 5.25, "y": 0},
+                {"matrix": [4, 2], "x": 6.5, "y": 0},
+                {"matrix": [4, 3], "x": 7.5, "y": 0},
+                {"matrix": [0, 4], "x": 8.5, "y": 0},
+                {"matrix": [0, 5], "x": 9.75, "y": 0, "w": 1.5},
+                {"matrix": [4, 4], "x": 11.25, "y": 0},
+                {"matrix": [4, 5], "x": 12.25, "y": 0},
+                {"matrix": [0, 6], "x": 13.25, "y": 0},
+                {"matrix": [0, 7], "x": 14.25, "y": 0},
+                {"matrix": [4, 6], "x": 15.25, "y": 0},
+                {"matrix": [4, 7], "x": 16.25, "y": 0},
+                {"matrix": [0, 8], "x": 17.25, "y": 0},
+                {"matrix": [0, 9], "x": 18.25, "y": 0},
+                {"matrix": [4, 8], "x": 19.25, "y": 0},
+                {"matrix": [4, 9], "x": 20.25, "y": 0},
+                {"matrix": [0, 10], "x": 21.25, "y": 0},
+                {"matrix": [0, 11], "x": 22.25, "y": 0},
+                {"matrix": [4, 10], "x": 23.25, "y": 0, "w": 1.5},
+                {"matrix": [4, 11], "x": 25, "y": 0},
+                {"matrix": [0, 12], "x": 26, "y": 0},
+                {"matrix": [0, 13], "x": 27, "y": 0},
+                {"matrix": [4, 12], "x": 28.25, "y": 0},
+                {"matrix": [4, 13], "x": 29.25, "y": 0},
+                {"matrix": [0, 14], "x": 30.25, "y": 0},
+                {"matrix": [0, 15], "x": 31.25, "y": 0},
+                {"matrix": [4, 14], "x": 32.5, "y": 0},
+                {"matrix": [4, 15], "x": 33.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [5, 0], "x": 2.25, "y": 1},
+                {"matrix": [5, 1], "x": 3.25, "y": 1},
+                {"matrix": [1, 2], "x": 4.25, "y": 1},
+                {"matrix": [1, 3], "x": 5.25, "y": 1},
+                {"matrix": [5, 2], "x": 6.5, "y": 1},
+                {"matrix": [5, 3], "x": 7.5, "y": 1},
+                {"matrix": [1, 4], "x": 8.5, "y": 1},
+                {"matrix": [1, 5], "x": 9.75, "y": 1, "w": 1.25},
+                {"matrix": [5, 4], "x": 11.5, "y": 1},
+                {"matrix": [5, 5], "x": 12.5, "y": 1},
+                {"matrix": [1, 6], "x": 13.5, "y": 1},
+                {"matrix": [1, 7], "x": 14.5, "y": 1},
+                {"matrix": [5, 6], "x": 15.5, "y": 1},
+                {"matrix": [5, 7], "x": 16.5, "y": 1},
+                {"matrix": [1, 8], "x": 17.5, "y": 1},
+                {"matrix": [1, 9], "x": 18.5, "y": 1},
+                {"matrix": [5, 8], "x": 19.5, "y": 1},
+                {"matrix": [5, 9], "x": 20.5, "y": 1},
+                {"matrix": [1, 10], "x": 21.5, "y": 1},
+                {"matrix": [1, 11], "x": 22.5, "y": 1, "w": 2.25},
+                {"matrix": [5, 11], "x": 25, "y": 1},
+                {"matrix": [1, 12], "x": 26, "y": 1},
+                {"matrix": [1, 13], "x": 27, "y": 1},
+                {"matrix": [5, 12], "x": 28.25, "y": 1},
+                {"matrix": [5, 13], "x": 29.25, "y": 1},
+                {"matrix": [1, 14], "x": 30.25, "y": 1},
+                {"matrix": [1, 15], "x": 31.25, "y": 1},
+                {"matrix": [5, 14], "x": 32.5, "y": 1},
+                {"matrix": [5, 15], "x": 33.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [6, 0], "x": 2.25, "y": 2},
+                {"matrix": [6, 1], "x": 3.25, "y": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [6, 2], "x": 6.5, "y": 2},
+                {"matrix": [6, 3], "x": 7.5, "y": 2},
+                {"matrix": [2, 4], "x": 8.5, "y": 2},
+                {"matrix": [2, 5], "x": 9.75, "y": 2, "w": 1.25},
+                {"matrix": [6, 4], "x": 11, "y": 2},
+                {"matrix": [6, 5], "x": 12, "y": 2},
+                {"matrix": [2, 6], "x": 13, "y": 2},
+                {"matrix": [2, 7], "x": 14, "y": 2},
+                {"matrix": [6, 6], "x": 15, "y": 2},
+                {"matrix": [6, 7], "x": 16, "y": 2},
+                {"matrix": [2, 8], "x": 17, "y": 2},
+                {"matrix": [2, 9], "x": 18, "y": 2},
+                {"matrix": [6, 8], "x": 19, "y": 2},
+                {"matrix": [6, 9], "x": 20, "y": 2},
+                {"matrix": [2, 10], "x": 21, "y": 2},
+                {"matrix": [2, 11], "x": 22, "y": 2, "w": 1.75},
+                {"matrix": [6, 10], "x": 23.75, "y": 2},
+                {"matrix": [6, 11], "x": 25, "y": 2},
+                {"matrix": [2, 12], "x": 26, "y": 2},
+                {"matrix": [2, 13], "x": 27, "y": 2},
+                {"matrix": [6, 12], "x": 28.25, "y": 2},
+                {"matrix": [6, 13], "x": 29.25, "y": 2},
+                {"matrix": [2, 14], "x": 30.25, "y": 2},
+                {"matrix": [2, 15], "x": 31.25, "y": 2},
+                {"matrix": [6, 14], "x": 32.5, "y": 2},
+                {"matrix": [6, 15], "x": 33.5, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [7, 0], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [3, 2], "x": 4.25, "y": 3},
+                {"matrix": [3, 3], "x": 5.25, "y": 3},
+                {"matrix": [7, 2], "x": 6.5, "y": 3},
+                {"matrix": [7, 3], "x": 7.5, "y": 3},
+                {"matrix": [3, 4], "x": 8.5, "y": 3},
+                {"matrix": [3, 5], "x": 9.75, "y": 3, "w": 1.5},
+                {"matrix": [3, 6], "x": 12.25, "y": 3, "w": 1.5},
+                {"matrix": [3, 7], "x": 13.75, "y": 3, "w": 2.75},
+                {"matrix": [3, 8], "x": 16.5, "y": 3, "w": 1.5},
+                {"matrix": [3, 9], "x": 18, "y": 3, "w": 2.75},
+                {"matrix": [3, 10], "x": 20.75, "y": 3, "w": 1.5},
+                {"matrix": [7, 10], "x": 23.25, "y": 3, "w": 1.5},
+                {"matrix": [7, 11], "x": 25, "y": 3},
+                {"matrix": [3, 12], "x": 26, "y": 3},
+                {"matrix": [3, 13], "x": 27, "y": 3},
+                {"matrix": [7, 12], "x": 28.25, "y": 3},
+                {"matrix": [7, 13], "x": 29.25, "y": 3},
+                {"matrix": [3, 14], "x": 30.25, "y": 3},
+                {"matrix": [3, 15], "x": 31.25, "y": 3},
+                {"matrix": [7, 14], "x": 32.5, "y": 3},
+                {"matrix": [7, 15], "x": 33.5, "y": 3}
+           ]
+        }
+    }
+}
diff --git a/keyboards/compensator/keymaps/default/keymap.c b/keyboards/compensator/keymaps/default/keymap.c
new file mode 100644
index 00000000000..5e39c20e72f
--- /dev/null
+++ b/keyboards/compensator/keymaps/default/keymap.c
@@ -0,0 +1,48 @@
+/* Copyright 2024 Lrfoster03
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+enum custom_keycodes {
+    KC_P00 = SAFE_RANGE
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT( /* Base -> XT:Num:Nav:Alphas:Nav:Num:Xt*/
+        KC_F1,  KC_F2,     KC_PPLS,  KC_P7, KC_P8, KC_P9,          KC_INS,  KC_HOME, KC_PGUP,          KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,                KC_INS,  KC_HOME, KC_PGUP,          KC_P7,   KC_P8,   KC_P9,   KC_PPLS,     KC_F1,  KC_F2,
+        KC_F3,  KC_F4,     KC_PMNS,  KC_P4, KC_P5, KC_P6,          KC_DEL,  KC_END,  KC_PGDN,          KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,                          KC_DEL,  KC_END,  KC_PGDN,          KC_P4,   KC_P5,   KC_P6,   KC_PMNS,     KC_F3,  KC_F4,
+        KC_F5,  KC_F6,     KC_PENT,  KC_P1, KC_P2, KC_P3,          KC_NO,   KC_UP,   KC_NO,            KC_LSFT, KC_BSLS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),                  KC_NO,   KC_UP,   KC_NO,            KC_P1,   KC_P2,   KC_P3,   KC_PENT,     KC_F5,  KC_F6,
+        KC_F7,  KC_F8,     KC_PMNS,  KC_PDOT, KC_P0, KC_P00,       KC_LEFT, KC_DOWN, KC_RIGHT,         KC_LCTL, KC_LALT, KC_SPC,  KC_SPC,  KC_SPC,  KC_LALT, KC_LCTL,                                                                               KC_LEFT, KC_DOWN, KC_RIGHT,         KC_P00,  KC_P0,  KC_PDOT,  KC_PMNS,     KC_F7,  KC_F8
+    ),
+
+    [1] = LAYOUT( /* MO(1) */
+        KC_TRNS,  KC_TRNS,     KC_TRNS,  KC_TRNS, KC_TRNS, KC_NUM,           KC_TRNS,  KC_TRNS, KC_TRNS,          KC_TRNS, KC_F1,   KC_F2,       KC_F3,     KC_F4,      KC_F5,      KC_F6,      KC_F7,      KC_F8,      KC_F9,    KC_F10,    KC_F11,   KC_F12,   KC_TRNS,                  KC_NUM,  KC_TRNS, KC_TRNS,          KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,     KC_TRNS,  KC_TRNS,
+        KC_TRNS,  KC_TRNS,     KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,  KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,                             KC_TRNS, KC_TRNS,  KC_TRNS,         KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,     KC_TRNS,  KC_TRNS,
+        KC_TRNS,  KC_TRNS,     KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,  KC_VOLU, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                       KC_TRNS, KC_VOLU, KC_TRNS,         KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,     KC_TRNS,  KC_TRNS,
+        KC_TRNS,  KC_TRNS,     KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,  KC_VOLD, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,                                                                                                        KC_TRNS, KC_VOLD, KC_TRNS,          KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,     KC_TRNS,  KC_TRNS
+    )
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    if (record->event.pressed) {
+        switch(keycode) {
+            case KC_P00:
+                tap_code(KC_P0);
+                tap_code(KC_P0);
+                return false;
+        }
+    }
+    return true;
+}
diff --git a/keyboards/compensator/keymaps/via/keymap.c b/keyboards/compensator/keymaps/via/keymap.c
new file mode 100644
index 00000000000..d9124a96aff
--- /dev/null
+++ b/keyboards/compensator/keymaps/via/keymap.c
@@ -0,0 +1,48 @@
+/* Copyright 2024 Lrfoster03
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+enum custom_keycodes {
+    KC_P00 = SAFE_RANGE
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT( /* Base -> XT:Num:Nav:Alphas:Nav:Num:Xt*/
+        KC_F1,  KC_F2,     KC_PPLS,  KC_P7, KC_P8, KC_P9,          KC_INS,  KC_HOME, KC_PGUP,          KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,                KC_INS,  KC_HOME, KC_PGUP,          KC_P7,   KC_P8,   KC_P9,   KC_PPLS,     KC_F1,  KC_F2,
+        KC_F3,  KC_F4,     KC_PMNS,  KC_P4, KC_P5, KC_P6,          KC_DEL,  KC_END,  KC_PGDN,          KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,                          KC_DEL,  KC_END,  KC_PGDN,          KC_P4,   KC_P5,   KC_P6,   KC_PMNS,     KC_F3,  KC_F4,
+        KC_F5,  KC_F6,     KC_PENT,  KC_P1, KC_P2, KC_P3,          KC_NO,   KC_UP,   KC_NO,            KC_LSFT, KC_BSLS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),                  KC_NO,   KC_UP,   KC_NO,            KC_P1,   KC_P2,   KC_P3,   KC_PENT,     KC_F5,  KC_F6,
+        KC_F7,  KC_F8,     KC_PMNS,  KC_PDOT, KC_P0, KC_P00,       KC_LEFT, KC_DOWN, KC_RIGHT,         KC_LCTL, KC_LALT, KC_SPC,  KC_SPC,  KC_SPC,  KC_LALT, KC_LCTL,                                                                               KC_LEFT, KC_DOWN, KC_RIGHT,         KC_P00,  KC_P0,  KC_PDOT,  KC_PMNS,     KC_F7,  KC_F8
+    ),
+
+    [1] = LAYOUT( /* MO(1) */
+        KC_TRNS,  KC_TRNS,     KC_TRNS,  KC_TRNS, KC_TRNS, KC_NUM,           KC_TRNS,  KC_TRNS, KC_TRNS,          KC_TRNS, KC_F1,   KC_F2,       KC_F3,     KC_F4,      KC_F5,      KC_F6,      KC_F7,      KC_F8,      KC_F9,    KC_F10,    KC_F11,   KC_F12,   KC_TRNS,                  KC_NUM,  KC_TRNS, KC_TRNS,          KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,     KC_TRNS,  KC_TRNS,
+        KC_TRNS,  KC_TRNS,     KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,  KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,                             KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,     KC_TRNS,  KC_TRNS,
+        KC_TRNS,  KC_TRNS,     KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,  KC_VOLU, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                       KC_TRNS, KC_VOLU, KC_TRNS,          KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,     KC_TRNS,  KC_TRNS,
+        KC_TRNS,  KC_TRNS,     KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,  KC_VOLD, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,                                                                                                        KC_TRNS, KC_VOLD, KC_TRNS,          KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,     KC_TRNS,  KC_TRNS
+    )
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    if (record->event.pressed) {
+        switch(keycode) {
+            case KC_P00:
+                tap_code(KC_P0);
+                tap_code(KC_P0);
+                return false;
+        }
+    }
+    return true;
+}
diff --git a/keyboards/primekb/prime_e/keymaps/gwillad/rules.mk b/keyboards/compensator/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/primekb/prime_e/keymaps/gwillad/rules.mk
rename to keyboards/compensator/keymaps/via/rules.mk
diff --git a/keyboards/compensator/matrix_diagram.md b/keyboards/compensator/matrix_diagram.md
new file mode 100644
index 00000000000..39eeec7b509
--- /dev/null
+++ b/keyboards/compensator/matrix_diagram.md
@@ -0,0 +1,25 @@
+# Matrix Diagram for Compensator
+
+```
+┌───────┐┌───────────────┐┌───────────┐┌───────────────────────────────────────────────────────────┐┌───────────┐┌───────────────┐┌───────┐
+│00 │01 ││02 │03 │04 │05 ││06 │07 │08 ││09   │0A │0B │0C │0D │0E │0F │0G │0H │0I │0J │0K │0L │0M   ││0N │0O │0P ││0Q │0R │0S │0T ││0U │0V │
+├───┼───┤├───┼───┼───┼───┤├───┼───┼───│├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤├───┼───┼───│├───┼───┼───┼───┤├───┼───┤
+│10 │11 ││12 │13 │14 │15 ││16 │17 │18 ││19    │1A │1B │1C │1D │1E │1F │1G │1H │1I │1J │1K │1L      ││1M │1N │1O ││1P │1Q │1R │1S ││1T │1U │
+├───┼───┤├───┼───┼───┼───┤└───┼───┼───┘├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤└───┼───┼───┘├───┼───┼───┼───┤├───┼───┤
+│20 │21 ││22 │23 │24 │25 │    │26 │    │27  │28 │29 │2A │2B │2C │2D │2E │2F │2G │2H │2I │2J    │2K │    │1L │    │2M │2N │2O │2P ││2Q │2R │
+├───┼───┤├───┼───┼───┼───┤┌───┼───┼───┐├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤┌───┼───┼───┐├───┼───┼───┼───┤├───┼───┤
+│31 │32 ││33 │34 │35 │36 ││37 │38 │39 ││3A   │   │3B   │3C                         │3D   │   │3E   ││3F │3G │3H ││3I │3J │3K │3L ││30 │31 │
+└───┴───┘└───┴───┴───┴───┘└───┴───┴───┘└─────┘   └─────┴───────────────────────────┴─────┘   └─────┘└───┴───┴───┘└───┴───┴───┴───┘└───┴───┘
+                 ┌───────┐             ┌────────┐                                       ┌──────────┐             ┌───────┐
+  2u Numpad Zero │36     │             │27      │ 2.25u LShift             2.75u RShift │2J        │             │3I     │ 2u Numpad Zero
+                 └───────┘             └────────┘                                       └──────────┘             └───────┘
+         ┌───┐                                    ┌───────────────────────────────────────┐                                  ┌───┐
+         │   │ 2u                                 │3C                                     │ 10u Space                        │   │ 2u
+         │02 │ Numpad                             └───────────────────────────────────────┘                                  │0T │ Numpad
+         │   │ Plus                                                                                                          │   │ Plus
+         ├───┤                                         ┌─────────┐┌─────┐┌─────────┐ 2.75 + 1.5 +                            ├───┤
+         │   │ 2u                                      |3C       ||3C   ||3C       | 2.75 Split                              │   │ 2u
+         │33 │ Numpad                                  └─────────┘└─────┘└─────────┘ Spacebar                                │3L │ Numpad
+         │   │ Enter                                                                                                         │   │ Enter
+         └───┘                                                                                                               └───┘
+```
diff --git a/keyboards/compensator/readme.md b/keyboards/compensator/readme.md
new file mode 100644
index 00000000000..13502ecad2d
--- /dev/null
+++ b/keyboards/compensator/readme.md
@@ -0,0 +1,24 @@
+# The Compensator
+
+[Compensator](https://i.imgur.com/fAB2SSTh.png)
+
+A 40% monstrosity with 10U spacebar support and a required 2 keycap sets to fill. It supports VIA. [Geekhack Post](https://geekhack.org/index.php?topic=122493.0)
+
+* Keyboard Maintainer: [Lrfoster03](https://lrfoster03.github.io/) and on [GitHub](https://github.com/Lrfoster03)
+* Hardware Supported: A 40% with 2 numpads, 2 nav clusters, and 2 XT columns with an ATMEGU32U4
+* Hardware Availability: Contact @victusss on discord. [vk.works Discord](https://discord.gg/7weV2kyqFB)
+
+## Instructions
+
+### Build
+
+Make example for this keyboard (after setting up your build environment):
+
+    make compensator:default
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+### Flash
+- Ensure PCB is plugged in and recognized by the computer
+- Hold Physical reset button on back of the PCB to enter bootloader mode
+- Flash using QMK Toolbox or CLI (`make compensator:<keymap>:flash`)
diff --git a/keyboards/compensator/rules.mk b/keyboards/compensator/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/compensator/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/crkbd/post_config.h b/keyboards/crkbd/post_config.h
index 133014b02ad..aaf405a5bf9 100644
--- a/keyboards/crkbd/post_config.h
+++ b/keyboards/crkbd/post_config.h
@@ -16,18 +16,18 @@
 
 #pragma once
 
-#ifndef BOOTMAGIC_LITE_ROW
-#    define BOOTMAGIC_LITE_ROW 0
+#ifndef BOOTMAGIC_ROW
+#    define BOOTMAGIC_ROW 0
 #endif
-#ifndef BOOTMAGIC_LITE_COLUMN
-#    define BOOTMAGIC_LITE_COLUMN 1
+#ifndef BOOTMAGIC_COLUMN
+#    define BOOTMAGIC_COLUMN 1
 #endif
 
-#ifndef BOOTMAGIC_LITE_ROW_RIGHT
-#    define BOOTMAGIC_LITE_ROW_RIGHT 4
+#ifndef BOOTMAGIC_ROW_RIGHT
+#    define BOOTMAGIC_ROW_RIGHT 4
 #endif
-#ifndef BOOTMAGIC_LITE_COLUMN_RIGHT
-#    define BOOTMAGIC_LITE_COLUMN_RIGHT 1
+#ifndef BOOTMAGIC_COLUMN_RIGHT
+#    define BOOTMAGIC_COLUMN_RIGHT 1
 #endif
 
 #ifdef RGBLIGHT_ENABLE
diff --git a/keyboards/crypt_macro/config.h b/keyboards/crypt_macro/config.h
index 4d9d9bf5c26..701ad8da86a 100644
--- a/keyboards/crypt_macro/config.h
+++ b/keyboards/crypt_macro/config.h
@@ -24,6 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define WS2812_PWM_DRIVER PWMD3
 #define WS2812_PWM_CHANNEL 1
 #define WS2812_PWM_PAL_MODE 1
-#define WS2812_DMA_STREAM STM32_DMA1_STREAM3
-#define WS2812_DMA_CHANNEL 3
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM3
+#define WS2812_PWM_DMA_CHANNEL 3
 #define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_RGB
diff --git a/keyboards/custommk/cmk11/config.h b/keyboards/custommk/cmk11/config.h
new file mode 100644
index 00000000000..122d32c5da5
--- /dev/null
+++ b/keyboards/custommk/cmk11/config.h
@@ -0,0 +1,29 @@
+// Copyright 2024 customMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+// FRAM configuration
+#define EXTERNAL_EEPROM_SPI_SLAVE_SELECT_PIN B7
+#define EXTERNAL_EEPROM_SPI_CLOCK_DIVISOR 4 // 48MHz / 4 = 12MHz; max supported by MB85R64 is 20MHz
+
+// SPI configuration
+#define SPI_DRIVER SPID1
+#define SPI_SCK_PIN B3
+#define SPI_MOSI_PIN B5
+#define SPI_MISO_PIN B4
+
+// Audio configuration
+#define AUDIO_PIN B8
+#define AUDIO_PWM_DRIVER PWMD4
+#define AUDIO_PWM_CHANNEL 3 
+#define AUDIO_PWM_PAL_MODE 2
+#define AUDIO_STATE_TIMER GPTD5
+#define AUDIO_INIT_DELAY
+
+// WS2812 configuration
+#define WS2812_PWM_DRIVER PWMD1
+#define WS2812_PWM_CHANNEL 3
+#define WS2812_PWM_PAL_MODE 1
+#define WS2812_DMA_STREAM STM32_DMA2_STREAM5
+#define WS2812_DMA_CHANNEL 6
diff --git a/keyboards/lfkeyboards/lfkpad/keymaps/pascalpfeil/config.h b/keyboards/custommk/cmk11/halconf.h
similarity index 73%
rename from keyboards/lfkeyboards/lfkpad/keymaps/pascalpfeil/config.h
rename to keyboards/custommk/cmk11/halconf.h
index 924da8d04d1..6791d829f9b 100644
--- a/keyboards/lfkeyboards/lfkpad/keymaps/pascalpfeil/config.h
+++ b/keyboards/custommk/cmk11/halconf.h
@@ -1,4 +1,4 @@
-/* Copyright 2021 Pascal Pfeil
+/* Copyright 2024 customMK
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,12 +16,15 @@
 
 #pragma once
 
-/* 1000Hz USB polling */
-#define USB_POLLING_INTERVAL_MS 1
+#define HAL_USE_PWM TRUE
 
-/* Force NKRO on boot up */
-#define FORCE_NKRO
+#define HAL_USE_SPI TRUE
 
-#define RGB_MATRIX_SLEEP
+#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
-#define RGB_MATRIX_TIMEOUT 900000
+#define SERIAL_BUFFERS_SIZE 256
+
+// This enables interrupt-driven mode
+#define SPI_USE_WAIT TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/custommk/cmk11/info.json b/keyboards/custommk/cmk11/info.json
new file mode 100644
index 00000000000..d831351aa78
--- /dev/null
+++ b/keyboards/custommk/cmk11/info.json
@@ -0,0 +1,121 @@
+{
+    "manufacturer": "customMK",
+    "keyboard_name": "CMK11",
+    "maintainer": "customMK",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "ROW2COL",
+    "dynamic_keymap": {
+        "layer_count": 32
+    },
+    "eeprom": {
+        "driver": "spi"
+    },
+    "features": {
+        "audio": true,
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "matrix_pins": {
+        "cols": ["B0", "A1", "A2", "A3", "A6", "B10"],
+        "rows": ["A5", "A4"]
+    },
+    "processor": "STM32F411",
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
+    "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_sat": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "band_val": true,
+            "breathing": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "cycle_up_down": true,
+            "digital_rain": true,
+            "dual_beacon": true,
+            "gradient_left_right": true,
+            "gradient_up_down": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "jellybean_raindrops": true,
+            "multisplash": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "pixel_rain": true,
+            "rainbow_beacon": true,
+            "rainbow_moving_chevron": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "solid_multisplash": true,
+            "solid_reactive": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_multinexus": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_wide": true,
+            "solid_splash": true,
+            "splash": true,
+            "typing_heatmap": true
+        },
+        "driver": "ws2812",
+        "layout": [
+            {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4},
+            {"matrix": [0, 1], "x": 45, "y": 0, "flags": 4},
+            {"matrix": [0, 2], "x": 90, "y": 0, "flags": 4},
+            {"matrix": [0, 3], "x": 134, "y": 0, "flags": 4},
+            {"matrix": [0, 4], "x": 179, "y": 0, "flags": 4},
+            {"matrix": [0, 5], "x": 224, "y": 0, "flags": 4},
+            {"matrix": [1, 0], "x": 23, "y": 64, "flags": 4},
+            {"matrix": [1, 1], "x": 68, "y": 64, "flags": 4},
+            {"matrix": [1, 2], "x": 112, "y": 64, "flags": 4},
+            {"matrix": [1, 3], "x": 157, "y": 64, "flags": 4},
+            {"matrix": [1, 4], "x": 202, "y": 64, "flags": 4}
+        ],
+        "max_brightness": 120,
+        "sat_steps": 8,
+        "speed_steps": 10,
+        "val_steps": 8
+    },
+    "url": "https://shop.custommk.com/collections/cmk11/products/ckm11",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0xFABA",
+        "vid": "0xF35B"
+    },
+    "ws2812": {
+        "driver": "pwm",
+        "pin": "A10"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [1, 0], "x": 0.5, "y": 1},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/custommk/cmk11/keymaps/default/keymap.c b/keyboards/custommk/cmk11/keymaps/default/keymap.c
new file mode 100644
index 00000000000..a6d6db48c94
--- /dev/null
+++ b/keyboards/custommk/cmk11/keymaps/default/keymap.c
@@ -0,0 +1,11 @@
+// Copyright 2024 customMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+        KC_ESC,  KC_C,    KC_V,   KC_VOLU, KC_VOLD, KC_DEL,
+        KC_LCTL, KC_PGUP, KC_SPC, KC_PGDN, KC_ENT
+    )
+};
diff --git a/keyboards/custommk/cmk11/keymaps/via/config.h b/keyboards/custommk/cmk11/keymaps/via/config.h
new file mode 100644
index 00000000000..c2dca382777
--- /dev/null
+++ b/keyboards/custommk/cmk11/keymaps/via/config.h
@@ -0,0 +1,6 @@
+// Copyright 2024 customMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define DYNAMIC_KEYMAP_MACRO_COUNT 128
diff --git a/keyboards/custommk/cmk11/keymaps/via/keymap.c b/keyboards/custommk/cmk11/keymaps/via/keymap.c
new file mode 100644
index 00000000000..a4ee324f3fb
--- /dev/null
+++ b/keyboards/custommk/cmk11/keymaps/via/keymap.c
@@ -0,0 +1,11 @@
+// Copyright 2024 customMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+        KC_ESC,  KC_C,    KC_V,   KC_VOLU, KC_VOLD, KC_DEL,
+        KC_LCTL, KC_PGUP, KC_SPC, KC_PGDN, MO(1)
+    )
+};
diff --git a/keyboards/geonworks/w1_at/keymaps/zq/rules.mk b/keyboards/custommk/cmk11/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/geonworks/w1_at/keymaps/zq/rules.mk
rename to keyboards/custommk/cmk11/keymaps/via/rules.mk
diff --git a/keyboards/keychron/q1v1/iso/keymaps/kubahorak/keymap_user.h b/keyboards/custommk/cmk11/mcuconf.h
similarity index 70%
rename from keyboards/keychron/q1v1/iso/keymaps/kubahorak/keymap_user.h
rename to keyboards/custommk/cmk11/mcuconf.h
index 728114d556f..8151abdcba3 100644
--- a/keyboards/keychron/q1v1/iso/keymaps/kubahorak/keymap_user.h
+++ b/keyboards/custommk/cmk11/mcuconf.h
@@ -1,4 +1,4 @@
-/* Copyright 2021 @ Grayson Carr
+/* Copyright 2024 customMK
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,13 +16,16 @@
 
 #pragma once
 
-// clang-format off
+#include_next <mcuconf.h>
 
-enum layers {
-    MAC_BASE,
-    MAC_FN,
-    WIN_BASE,
-    WIN_FN
-};
+// Used for audio
+#undef STM32_PWM_USE_TIM4
+#define STM32_PWM_USE_TIM4 TRUE
 
-// clang-format on
+// Used for FRAM
+#undef STM32_SPI_USE_SPI1
+#define STM32_SPI_USE_SPI1 TRUE
+
+// Used for RGB matrix
+#undef STM32_PWM_USE_TIM1
+#define STM32_PWM_USE_TIM1 TRUE
\ No newline at end of file
diff --git a/keyboards/custommk/cmk11/readme.md b/keyboards/custommk/cmk11/readme.md
new file mode 100644
index 00000000000..961261ac664
--- /dev/null
+++ b/keyboards/custommk/cmk11/readme.md
@@ -0,0 +1,27 @@
+# CMK11
+
+![cmk11](https://i.imgur.com/y8MEwXYh.jpeg)
+
+CMK11 supports eleven 1u keys (or eight 1u keys and one 3u key). The PCB is fully compatible with the Cary Works C11 macropad.
+
+* Keyboard Maintainer: [customMK](https://github.com/customMK)
+* Hardware Supported: CMK11
+* Hardware Availability: [customMK](https://shop.custommk.com/products/cmk11)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make custommk/cmk11:default
+
+Flashing example for this keyboard:
+
+    make custommk/cmk11:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (the key in the top left corner) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/custommk/cmk11/rules.mk b/keyboards/custommk/cmk11/rules.mk
new file mode 100644
index 00000000000..72f75f4367e
--- /dev/null
+++ b/keyboards/custommk/cmk11/rules.mk
@@ -0,0 +1 @@
+AUDIO_DRIVER = pwm_hardware
diff --git a/keyboards/custommk/evo70_r2/config.h b/keyboards/custommk/evo70_r2/config.h
index 62606cf1ee6..bd8744204c5 100644
--- a/keyboards/custommk/evo70_r2/config.h
+++ b/keyboards/custommk/evo70_r2/config.h
@@ -78,8 +78,8 @@
 #define WS2812_PWM_DRIVER PWMD1
 #define WS2812_PWM_CHANNEL 3
 #define WS2812_PWM_PAL_MODE 1
-#define WS2812_DMA_STREAM STM32_DMA2_STREAM5
-#define WS2812_DMA_CHANNEL 6
+#define WS2812_PWM_DMA_STREAM STM32_DMA2_STREAM5
+#define WS2812_PWM_DMA_CHANNEL 6
 
 #define TAP_CODE_DELAY 10
 
diff --git a/keyboards/dark/magnum_ergo_1/info.json b/keyboards/dark/magnum_ergo_1/info.json
index cdabceec7f9..1aecfe86305 100644
--- a/keyboards/dark/magnum_ergo_1/info.json
+++ b/keyboards/dark/magnum_ergo_1/info.json
@@ -17,16 +17,13 @@
         }
     },
     "features": {
-        "audio": false,
         "backlight": true,
         "bootmagic": true,
         "command": false,
         "console": false,
-        "encoder": false,
         "extrakey": true,
         "mousekey": false,
-        "nkro": true,
-        "rgblight": false
+        "nkro": true
     },
     "diode_direction": "COL2ROW",
     "backlight": {
diff --git a/keyboards/darkproject/kd83a_bfg_edition/kd83a_bfg_edition.c b/keyboards/darkproject/kd83a_bfg_edition/kd83a_bfg_edition.c
index 550520e790a..f21aeeb38d3 100644
--- a/keyboards/darkproject/kd83a_bfg_edition/kd83a_bfg_edition.c
+++ b/keyboards/darkproject/kd83a_bfg_edition/kd83a_bfg_edition.c
@@ -25,99 +25,99 @@ const aw20216s_led_t PROGMEM g_aw20216s_leds[AW20216S_LED_COUNT] = {
  *   |     |          G location
  *   |     |          |          B location
  *   |     |          |          | */
-    //{0, CS1_SW4,   CS2_SW4,   CS3_SW4},   //   0, k00, Esc
+    //{0, SW4_CS1,   SW4_CS2,   SW4_CS3},   //   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, SW1_CS1,   SW1_CS2,   SW1_CS3},   //   1, k13, Esc
+    {0, SW2_CS1,   SW2_CS2,   SW2_CS3},   //   2, k26, F1
+    {0, SW3_CS1,   SW3_CS2,   SW3_CS3},   //   3, k36, F2
+    {0, SW4_CS1,   SW4_CS2,   SW4_CS3},   //   4, k31, F3
+    {0, SW5_CS1,   SW5_CS2,   SW5_CS3},   //   5, k33, F4
+    {0, SW6_CS1,   SW6_CS2,   SW6_CS3},   //   6, k07, F5
+    {0, SW7_CS1,   SW7_CS2,   SW7_CS3},   //   7, k63, F6
+    {0, SW8_CS1,   SW8_CS2,   SW8_CS3},   //   8, k71, F7
+    {0, SW9_CS1,   SW9_CS2,   SW9_CS3},   //   9, k76, F8
+    {0, SW10_CS1,  SW10_CS2,  SW10_CS3},  //  10, ka6, F9
+    {0, SW11_CS1,  SW11_CS2,  SW11_CS3},  //  11, ka7, F10
+    {0, SW12_CS1,  SW12_CS2,  SW12_CS3},  //  12, ka3, F11
+    {1, SW1_CS1,   SW1_CS2,   SW1_CS3},   //  13, ka5, F12
+    {1, SW2_CS4,   SW2_CS5,   SW2_CS6},   //  14, k97, Printscreen
+    {1, SW5_CS4,   SW5_CS5,   SW5_CS6},   //  15, k02, Del
 
-    {0, 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, SW1_CS4,   SW1_CS5,   SW1_CS6},   //  16, k16, `
+    {0, SW2_CS4,   SW2_CS5,   SW2_CS6},   //  17, k17, 1
+    {0, SW3_CS4,   SW3_CS5,   SW3_CS6},   //  18, k27, 2
+    {0, SW4_CS4,   SW4_CS5,   SW4_CS6},   //  19, k37, 3
+    {0, SW5_CS4,   SW5_CS5,   SW5_CS6},   //  20, k47, 4
+    {0, SW6_CS4,   SW6_CS5,   SW6_CS6},   //  21, k46, 5
+    {0, SW7_CS4,   SW7_CS5,   SW7_CS6},   //  22, k56, 6
+    {0, SW8_CS4,   SW8_CS5,   SW8_CS6},   //  23, k57, 7
+    {0, SW9_CS4,   SW9_CS5,   SW9_CS6},   //  24, k67, 8
+    {0, SW10_CS4,  SW10_CS5,  SW10_CS6},  //  25, k77, 9
+    {0, SW11_CS4,  SW11_CS5,  SW11_CS6},  //  26, k87, 0
+    {0, SW12_CS4,  SW12_CS5,  SW12_CS6},  //  27, k86, -
+    {1, SW5_CS1,   SW5_CS2,   SW5_CS3},   //  28, k66, =
+    {1, SW7_CS1,   SW7_CS2,   SW7_CS3},   //  29, ka1, Backspace
+    {1, SW2_CS1,   SW2_CS2,   SW2_CS3},   //  30, kc6, Home
 
-    {0, 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, SW1_CS7,   SW1_CS8,   SW1_CS9},   //  31, k11, Tab
+    {0, SW2_CS7,   SW2_CS8,   SW2_CS9},   //  32, k10, Q
+    {0, SW3_CS7,   SW3_CS8,   SW3_CS9},   //  33, k20, W
+    {0, SW4_CS7,   SW4_CS8,   SW4_CS9},   //  34, k30, E
+    {0, SW5_CS7,   SW5_CS8,   SW5_CS9},   //  35, k40, R
+    {0, SW6_CS7,   SW6_CS8,   SW6_CS9},   //  36, k41, T
+    {0, SW7_CS7,   SW7_CS8,   SW7_CS9},   //  37, k51, Y
+    {0, SW8_CS7,   SW8_CS8,   SW8_CS9},   //  38, k50, U
+    {0, SW9_CS7,   SW9_CS8,   SW9_CS9},   //  39, k60, I
+    {0, SW10_CS7,  SW10_CS8,  SW10_CS9},  //  40, k70, O
+    {0, SW11_CS7,  SW11_CS8,  SW11_CS9},  //  41, k80, P
+    {0, SW12_CS7,  SW12_CS8,  SW12_CS9},  //  42, k81, [
+    {1, SW8_CS1,   SW8_CS2,   SW8_CS3},   //  43, k61, ]
+    {1, SW9_CS1,   SW9_CS2,   SW9_CS3},   //  44, ka2, "\\"
+    {1, SW3_CS4,   SW3_CS5,   SW3_CS6},   //  45, k65, End
 
-    {0, 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, SW1_CS10,  SW1_CS11,  SW1_CS12},  //  46, k21, Caps Lock
+    {0, SW2_CS10,  SW2_CS11,  SW2_CS12},  //  47, k12, A
+    {0, SW3_CS10,  SW3_CS11,  SW3_CS12},  //  48, k22, S
+    {0, SW4_CS10,  SW4_CS11,  SW4_CS12},  //  49, k32, D
+    {0, SW5_CS10,  SW5_CS11,  SW5_CS12},  //  50, k42, F
+    {0, SW6_CS10,  SW6_CS11,  SW6_CS12},  //  51, k43, G
+    {0, SW7_CS10,  SW7_CS11,  SW7_CS12},  //  52, k53, H
+    {0, SW8_CS10,  SW8_CS11,  SW8_CS12},  //  53, k52, J
+    {0, SW9_CS10,  SW9_CS11,  SW9_CS12},  //  54, k62, K
+    {0, SW10_CS10, SW10_CS11, SW10_CS12}, //  55, k72, L
+    {0, SW11_CS10, SW11_CS11, SW11_CS12}, //  56, k82, ;
+    {0, SW12_CS10, SW12_CS11, SW12_CS12}, //  57, k83, '
+    {1, SW11_CS1,  SW11_CS2,  SW11_CS3},  //  58, ka4, Enter
+    {1, SW4_CS4,   SW4_CS5,   SW4_CS6},   //  59, k15, PgUp
 
-    {0, 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, SW1_CS13,  SW1_CS14,  SW1_CS15},  //  60, k00, Shift_L
+    {0, SW2_CS13,  SW2_CS14,  SW2_CS15},  //  61, k14, Z
+    {0, SW3_CS13,  SW3_CS14,  SW3_CS15},  //  62, k24, X
+    {0, SW4_CS13,  SW4_CS14,  SW4_CS15},  //  63, k34, C
+    {0, SW5_CS13,  SW5_CS14,  SW5_CS15},  //  64, k44, V
+    {0, SW6_CS13,  SW6_CS14,  SW6_CS15},  //  65, k45, B
+    {0, SW7_CS13,  SW7_CS14,  SW7_CS15},  //  66, k55, N
+    {0, SW8_CS13,  SW8_CS14,  SW8_CS15},  //  67, k54, M
+    {0, SW9_CS13,  SW9_CS14,  SW9_CS15},  //  68, k64, ,
+    {0, SW10_CS13, SW10_CS14, SW10_CS15}, //  69, k74, .
+    {0, SW11_CS13, SW11_CS14, SW11_CS15}, //  70, k85, /
+    {1, SW8_CS4,   SW8_CS5,   SW8_CS6},   //  71, k91, Shift_R
+    {1, SW9_CS4,   SW9_CS5,   SW9_CS6},   //  72, k35, Up
+    {1, SW7_CS4,   SW7_CS5,   SW7_CS6},   //  73, k25, PgDn
 
-    {0, 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
+    {0, SW1_CS16,  SW1_CS17,  SW1_CS18},  //  74, k06, Ctrl_L
+    {0, SW2_CS16,  SW2_CS17,  SW2_CS18},  //  75, k90, Win_L
+    {0, SW3_CS16,  SW3_CS17,  SW3_CS18},  //  76, k93, Alt_L
+    {0, SW6_CS16,  SW6_CS17,  SW6_CS18},  //  77, k94, Space
+    {0, SW9_CS16,  SW9_CS17,  SW9_CS18},  //  78, k95, Alt_R
+    {0, SW10_CS16, SW10_CS17, SW10_CS18}, //  79, k92, FN
+    {0, SW12_CS16, SW12_CS17, SW12_CS18}, //  80, k04, Ctrl_R
+    {1, SW10_CS4,  SW10_CS5,  SW10_CS6},  //  81, k03, Left
+    {1, SW11_CS4,  SW11_CS5,  SW11_CS6},  //  82, k73, Down
+    {1, SW5_CS10,  SW5_CS11,  SW5_CS12},  //  83, k05, Right
 
-    {1, CS10_SW10, CS11_SW10, CS12_SW10}, //  84, kb0, Z1
-    {1, CS10_SW11, CS11_SW11, CS12_SW11}, //  85, kb1, Z2
+    {1, SW10_CS10, SW10_CS11, SW10_CS12}, //  84, kb0, Z1
+    {1, SW11_CS10, SW11_CS11, SW11_CS12}, //  85, kb1, Z2
 };
 
 #endif
diff --git a/keyboards/darkproject/kd87a_bfg_edition/kd87a_bfg_edition.c b/keyboards/darkproject/kd87a_bfg_edition/kd87a_bfg_edition.c
index 22d10488d2d..20a46e343ea 100644
--- a/keyboards/darkproject/kd87a_bfg_edition/kd87a_bfg_edition.c
+++ b/keyboards/darkproject/kd87a_bfg_edition/kd87a_bfg_edition.c
@@ -25,100 +25,100 @@ const aw20216s_led_t PROGMEM g_aw20216s_leds[AW20216S_LED_COUNT] = {
  *   |     |          G location
  *   |     |          |          B location
  *   |     |          |          | */
-    //{0, CS1_SW4,   CS2_SW4,   CS3_SW4},   //   0, Esc
+    //{0, SW4_CS1,   SW4_CS2,   SW4_CS3},   //   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, SW1_CS1,   SW1_CS2,   SW1_CS3},   //   1, Esc
+    {0, SW2_CS1,   SW2_CS2,   SW2_CS3},   //   2, F1
+    {0, SW3_CS1,   SW3_CS2,   SW3_CS3},   //   3, F2
+    {0, SW4_CS1,   SW4_CS2,   SW4_CS3},   //   4, F3
+    {0, SW5_CS1,   SW5_CS2,   SW5_CS3},   //   5, F4
+    {0, SW6_CS1,   SW6_CS2,   SW6_CS3},   //   6, F5
+    {0, SW7_CS1,   SW7_CS2,   SW7_CS3},   //   7, F6
+    {0, SW8_CS1,   SW8_CS2,   SW8_CS3},   //   8, F7
+    {0, SW9_CS1,   SW9_CS2,   SW9_CS3},   //   9, F8
+    {0, SW10_CS1,  SW10_CS2,  SW10_CS3},  //  10, F9
+    {0, SW11_CS1,  SW11_CS2,  SW11_CS3},  //  11, F10
+    {0, SW12_CS1,  SW12_CS2,  SW12_CS3},  //  12, F11
+    {1, SW1_CS1,   SW1_CS2,   SW1_CS3},   //  13, F12
+    {1, SW2_CS4,   SW2_CS5,   SW2_CS6},   //  14, Printscreen
+    {1, SW3_CS1,   SW3_CS2,   SW3_CS3},   //  15, Scroll Lock
+    {1, SW4_CS1,   SW4_CS2,   SW4_CS3},   //  16, Pause Break
 
-    {0, 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, SW1_CS4,   SW1_CS5,   SW1_CS6},   //  17, `
+    {0, SW2_CS4,   SW2_CS5,   SW2_CS6},   //  18, 1
+    {0, SW3_CS4,   SW3_CS5,   SW3_CS6},   //  19, 2
+    {0, SW4_CS4,   SW4_CS5,   SW4_CS6},   //  20, 3
+    {0, SW5_CS4,   SW5_CS5,   SW5_CS6},   //  21, 4
+    {0, SW6_CS4,   SW6_CS5,   SW6_CS6},   //  22, 5
+    {0, SW7_CS4,   SW7_CS5,   SW7_CS6},   //  23, 6
+    {0, SW8_CS4,   SW8_CS5,   SW8_CS6},   //  24, 7
+    {0, SW9_CS4,   SW9_CS5,   SW9_CS6},   //  25, 8
+    {0, SW10_CS4,  SW10_CS5,  SW10_CS6},  //  26, 9
+    {0, SW11_CS4,  SW11_CS5,  SW11_CS6},  //  27, 0
+    {0, SW12_CS4,  SW12_CS5,  SW12_CS6},  //  28, -
+    {1, SW5_CS1,   SW5_CS2,   SW5_CS3},   //  29, =
+    {1, SW7_CS1,   SW7_CS2,   SW7_CS3},   //  30, Backspace
+    {1, SW2_CS1,   SW2_CS2,   SW2_CS3},   //  31, Insert
+    {1, SW5_CS4,   SW5_CS5,   SW5_CS6},   //  32, Home
+    {1, SW4_CS4,   SW4_CS5,   SW4_CS6},   //  33, Page Up
 
-    {0, 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, SW1_CS7,   SW1_CS8,   SW1_CS9},   //  34, Tab
+    {0, SW2_CS7,   SW2_CS8,   SW2_CS9},   //  35, Q
+    {0, SW3_CS7,   SW3_CS8,   SW3_CS9},   //  36, W
+    {0, SW4_CS7,   SW4_CS8,   SW4_CS9},   //  37, E
+    {0, SW5_CS7,   SW5_CS8,   SW5_CS9},   //  38, R
+    {0, SW6_CS7,   SW6_CS8,   SW6_CS9},   //  39, T
+    {0, SW7_CS7,   SW7_CS8,   SW7_CS9},   //  40, Y
+    {0, SW8_CS7,   SW8_CS8,   SW8_CS9},   //  41, U
+    {0, SW9_CS7,   SW9_CS8,   SW9_CS9},   //  42, I
+    {0, SW10_CS7,  SW10_CS8,  SW10_CS9},  //  43, O
+    {0, SW11_CS7,  SW11_CS8,  SW11_CS9},  //  44, P
+    {0, SW12_CS7,  SW12_CS8,  SW12_CS9},  //  45, [
+    {1, SW8_CS1,   SW8_CS2,   SW8_CS3},   //  46, ]
+    {1, SW9_CS1,   SW9_CS2,   SW9_CS3},   //  47, "\\"
+    {1, SW3_CS4,   SW3_CS5,   SW3_CS6},   //  48, Delete
+    {1, SW6_CS4,   SW6_CS5,   SW6_CS6},   //  49, END
+    {1, SW7_CS4,   SW7_CS5,   SW7_CS6},   //  50, Page down
 
-    {0, 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, SW1_CS10,  SW1_CS11,  SW1_CS12},  //  51, Caps Lock
+    {0, SW2_CS10,  SW2_CS11,  SW2_CS12},  //  52, A
+    {0, SW3_CS10,  SW3_CS11,  SW3_CS12},  //  53, S
+    {0, SW4_CS10,  SW4_CS11,  SW4_CS12},  //  54, D
+    {0, SW5_CS10,  SW5_CS11,  SW5_CS12},  //  55, F
+    {0, SW6_CS10,  SW6_CS11,  SW6_CS12},  //  56, G
+    {0, SW7_CS10,  SW7_CS11,  SW7_CS12},  //  57, H
+    {0, SW8_CS10,  SW8_CS11,  SW8_CS12},  //  58, J
+    {0, SW9_CS10,  SW9_CS11,  SW9_CS12},  //  59, K
+    {0, SW10_CS10, SW10_CS11, SW10_CS12}, //  60, L
+    {0, SW11_CS10, SW11_CS11, SW11_CS12}, //  61, ;
+    {0, SW12_CS10, SW12_CS11, SW12_CS12}, //  62, '
+    {1, SW11_CS1,  SW11_CS2,  SW11_CS3},  //  63, Enter
     
-    {0, CS13_SW1,  CS14_SW1,  CS15_SW1},  //  64, Shift_L
-    {0, CS13_SW2,  CS14_SW2,  CS15_SW2},  //  65, Z
-    {0, CS13_SW3,  CS14_SW3,  CS15_SW3},  //  66, X
-    {0, CS13_SW4,  CS14_SW4,  CS15_SW4},  //  67, C
-    {0, CS13_SW5,  CS14_SW5,  CS15_SW5},  //  68, V
-    {0, CS13_SW6,  CS14_SW6,  CS15_SW6},  //  69, B
-    {0, CS13_SW7,  CS14_SW7,  CS15_SW7},  //  70, N
-    {0, CS13_SW8,  CS14_SW8,  CS15_SW8},  //  71, M
-    {0, CS13_SW9,  CS14_SW9,  CS15_SW9},  //  72, ,
-    {0, CS13_SW10, CS14_SW10, CS15_SW10}, //  73, .
-    {0, CS13_SW11, CS14_SW11, CS15_SW11}, //  74, /
-    {1, CS4_SW8,   CS5_SW8,   CS6_SW8},   //  75, Shift_R
-    {1, CS4_SW9,   CS5_SW9,   CS6_SW9},   //  76, Up
+    {0, SW1_CS13,  SW1_CS14,  SW1_CS15},  //  64, Shift_L
+    {0, SW2_CS13,  SW2_CS14,  SW2_CS15},  //  65, Z
+    {0, SW3_CS13,  SW3_CS14,  SW3_CS15},  //  66, X
+    {0, SW4_CS13,  SW4_CS14,  SW4_CS15},  //  67, C
+    {0, SW5_CS13,  SW5_CS14,  SW5_CS15},  //  68, V
+    {0, SW6_CS13,  SW6_CS14,  SW6_CS15},  //  69, B
+    {0, SW7_CS13,  SW7_CS14,  SW7_CS15},  //  70, N
+    {0, SW8_CS13,  SW8_CS14,  SW8_CS15},  //  71, M
+    {0, SW9_CS13,  SW9_CS14,  SW9_CS15},  //  72, ,
+    {0, SW10_CS13, SW10_CS14, SW10_CS15}, //  73, .
+    {0, SW11_CS13, SW11_CS14, SW11_CS15}, //  74, /
+    {1, SW8_CS4,   SW8_CS5,   SW8_CS6},   //  75, Shift_R
+    {1, SW9_CS4,   SW9_CS5,   SW9_CS6},   //  76, Up
     
-    {0, CS16_SW1,  CS17_SW1,  CS18_SW1},  //  77, Ctrl_L
-    {0, CS16_SW2,  CS17_SW2,  CS18_SW2},  //  78, Win_L
-    {0, CS16_SW3,  CS17_SW3,  CS18_SW3},  //  79, Alt_L
-    {0, CS16_SW6,  CS17_SW6,  CS18_SW6},  //  80, Space
-    {0, CS16_SW9,  CS17_SW9,  CS18_SW9},  //  81, Alt_R
-    {0, CS16_SW10, CS17_SW10, CS18_SW10}, //  82, FN
-    {0, CS16_SW11, CS17_SW11, CS18_SW11}, //  83, APP
-    {0, CS16_SW12, CS17_SW12, CS18_SW12}, //  84, Ctrl_R
-    {1, CS4_SW10,  CS5_SW10,  CS6_SW10},  //  85, Left
-    {1, CS4_SW11,  CS5_SW11,  CS6_SW11},  //  86, Down
-    {1, CS10_SW5,  CS11_SW5,  CS12_SW5},  //  87, Right
+    {0, SW1_CS16,  SW1_CS17,  SW1_CS18},  //  77, Ctrl_L
+    {0, SW2_CS16,  SW2_CS17,  SW2_CS18},  //  78, Win_L
+    {0, SW3_CS16,  SW3_CS17,  SW3_CS18},  //  79, Alt_L
+    {0, SW6_CS16,  SW6_CS17,  SW6_CS18},  //  80, Space
+    {0, SW9_CS16,  SW9_CS17,  SW9_CS18},  //  81, Alt_R
+    {0, SW10_CS16, SW10_CS17, SW10_CS18}, //  82, FN
+    {0, SW11_CS16, SW11_CS17, SW11_CS18}, //  83, APP
+    {0, SW12_CS16, SW12_CS17, SW12_CS18}, //  84, Ctrl_R
+    {1, SW10_CS4,  SW10_CS5,  SW10_CS6},  //  85, Left
+    {1, SW11_CS4,  SW11_CS5,  SW11_CS6},  //  86, Down
+    {1, SW5_CS10,  SW5_CS11,  SW5_CS12},  //  87, Right
 };
 
 #endif
diff --git a/keyboards/doio/kb38/info.json b/keyboards/doio/kb38/info.json
index 9a67e3ed5c9..a89c5951e39 100644
--- a/keyboards/doio/kb38/info.json
+++ b/keyboards/doio/kb38/info.json
@@ -12,8 +12,7 @@
         "extrakey": true,
         "mousekey": true,
         "nkro": true,
-        "rgb_matrix": true,
-        "rgblight": false
+        "rgb_matrix": true
     },
     "matrix_pins": {
         "cols": ["F5", "F4", "F1", "F0", "B7", "B6", "B5", "B4"],
diff --git a/keyboards/drop/alt/v2/v2.c b/keyboards/drop/alt/v2/v2.c
index d3bb78fd12c..49ed4bfc998 100644
--- a/keyboards/drop/alt/v2/v2.c
+++ b/keyboards/drop/alt/v2/v2.c
@@ -4,111 +4,111 @@
 #    include "rgb_matrix.h"
 
 const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
-     { 1, B_2, A_2, C_2 },
-     { 1, E_3, D_3, F_3 },
-     { 1, E_4, D_4, F_4 },
-     { 1, E_5, D_5, F_5 },
-     { 1, E_6, D_6, F_6 },
-     { 1, E_7, D_7, F_7 },
-     { 1, E_8, D_8, F_8 },
-     { 1, B_13, A_13, C_13 },
-     { 0, E_1, D_1, F_1 },
-     { 0, E_2, D_2, F_2 },
-     { 0, E_3, D_3, F_3 },
-     { 0, E_4, D_4, F_4 },
-     { 0, E_5, D_5, F_5 },
-     { 0, E_6, D_6, F_6 },
-     { 0, B_7, A_7, C_7 },
-     { 1, E_2, D_2, F_2 },
-     { 1, H_3, G_3, I_3 },
-     { 1, H_4, G_4, I_4 },
-     { 1, H_5, G_5, I_5 },
-     { 1, H_6, G_6, I_6 },
-     { 1, H_7, G_7, I_7 },
-     { 1, H_8, G_8, I_8 },
-     { 0, H_1, G_1, I_1 },
-     { 0, H_2, G_2, I_2 },
-     { 0, H_3, G_3, I_3 },
-     { 0, H_4, G_4, I_4 },
-     { 0, H_5, G_5, I_5 },
-     { 0, K_11, J_11, L_11 },
-     { 0, H_6, G_6, I_6 },
-     { 0, E_7, D_7, F_7 },
-     { 1, H_2, G_2, I_2 },
-     { 1, K_3, J_3, L_3 },
-     { 1, K_4, J_4, L_4 },
-     { 1, K_5, J_5, L_5 },
-     { 1, K_6, J_6, L_6 },
-     { 1, K_7, J_7, L_7 },
-     { 1, K_8, J_8, L_8 },
-     { 0, K_1, J_1, L_1 },
-     { 0, K_2, J_2, L_2 },
-     { 0, K_3, J_3, L_3 },
-     { 0, K_4, J_4, L_4 },
-     { 0, K_5, J_5, L_5 },
-     { 0, K_6, J_6, L_6 },
-     { 0, H_7, G_7, I_7 },
-     { 1, K_2, J_2, L_2 },
-     { 1, E_9, D_9, F_9 },
-     { 1, B_9, A_9, C_9 },
-     { 1, K_9, J_9, L_9 },
-     { 1, H_9, G_9, I_9 },
-     { 1, K_12, J_12, L_12 },
-     { 1, K_13, J_13, L_13 },
-     { 0, K_9, J_9, L_9 },
-     { 0, K_10, J_10, L_10 },
-     { 0, H_10, G_10, I_10 },
-     { 0, H_11, G_11, I_11 },
-     { 0, B_11, A_11, C_11 },
-     { 0, E_11, D_11, F_11 },
-     { 0, K_7, J_7, L_7 },
-     { 1, H_10, G_10, I_10 },
-     { 1, E_10, D_10, F_10 },
-     { 1, B_10, A_10, C_10 },
-     { 1, H_12, G_12, I_12 },
-     { 0, E_10, D_10, F_10 },
-     { 0, B_10, A_10, C_10 },
-     { 0, B_12, A_12, C_12 },
-     { 0, H_12, G_12, I_12 },
-     { 0, E_12, D_12, F_12 },
-     { 1, K_11, J_11, L_11 },
-     { 1, H_11, G_11, I_11 },
-     { 1, E_11, D_11, F_11 },
-     { 1, B_11, A_11, C_11 },
-     { 1, B_12, A_12, C_12 },
-     { 1, E_12, D_12, F_12 },
-     { 1, E_13, D_13, F_13 },
-     { 1, H_13, G_13, I_13 },
-     { 0, H_9, G_9, I_9 },
-     { 0, E_9, D_9, F_9 },
-     { 0, B_9, A_9, C_9 },
-     { 0, B_13, A_13, C_13 },
-     { 0, H_13, G_13, I_13 },
-     { 0, E_13, D_13, F_13 },
-     { 0, K_13, J_13, L_13 },
-     { 0, K_12, J_12, L_12 },
-     { 0, K_8, J_8, L_8 },
-     { 0, H_8, G_8, I_8 },
-     { 0, E_8, D_8, F_8 },
-     { 0, B_8, A_8, C_8 },
-     { 0, B_6, A_6, C_6 },
-     { 0, B_5, A_5, C_5 },
-     { 0, B_4, A_4, C_4 },
-     { 0, B_3, A_3, C_3 },
-     { 0, B_2, A_2, C_2 },
-     { 0, B_1, A_1, C_1 },
-     { 0, B_14, A_14, C_14 },
-     { 1, B_8, A_8, C_8 },
-     { 1, B_7, A_7, C_7 },
-     { 1, B_6, A_6, C_6 },
-     { 1, B_5, A_5, C_5 },
-     { 1, B_4, A_4, C_4 },
-     { 1, B_3, A_3, C_3 },
-     { 1, B_1, A_1, C_1 },
-     { 1, E_1, D_1, F_1 },
-     { 1, H_1, G_1, I_1 },
-     { 1, K_1, J_1, L_1 },
-     { 1, K_10, J_10, L_10 },
+     { 1, SW2_CS2, SW1_CS2, SW3_CS2 },
+     { 1, SW5_CS3, SW4_CS3, SW6_CS3 },
+     { 1, SW5_CS4, SW4_CS4, SW6_CS4 },
+     { 1, SW5_CS5, SW4_CS5, SW6_CS5 },
+     { 1, SW5_CS6, SW4_CS6, SW6_CS6 },
+     { 1, SW5_CS7, SW4_CS7, SW6_CS7 },
+     { 1, SW5_CS8, SW4_CS8, SW6_CS8 },
+     { 1, SW2_CS13, SW1_CS13, SW3_CS13 },
+     { 0, SW5_CS1, SW4_CS1, SW6_CS1 },
+     { 0, SW5_CS2, SW4_CS2, SW6_CS2 },
+     { 0, SW5_CS3, SW4_CS3, SW6_CS3 },
+     { 0, SW5_CS4, SW4_CS4, SW6_CS4 },
+     { 0, SW5_CS5, SW4_CS5, SW6_CS5 },
+     { 0, SW5_CS6, SW4_CS6, SW6_CS6 },
+     { 0, SW2_CS7, SW1_CS7, SW3_CS7 },
+     { 1, SW5_CS2, SW4_CS2, SW6_CS2 },
+     { 1, SW8_CS3, SW7_CS3, SW9_CS3 },
+     { 1, SW8_CS4, SW7_CS4, SW9_CS4 },
+     { 1, SW8_CS5, SW7_CS5, SW9_CS5 },
+     { 1, SW8_CS6, SW7_CS6, SW9_CS6 },
+     { 1, SW8_CS7, SW7_CS7, SW9_CS7 },
+     { 1, SW8_CS8, SW7_CS8, SW9_CS8 },
+     { 0, SW8_CS1, SW7_CS1, SW9_CS1 },
+     { 0, SW8_CS2, SW7_CS2, SW9_CS2 },
+     { 0, SW8_CS3, SW7_CS3, SW9_CS3 },
+     { 0, SW8_CS4, SW7_CS4, SW9_CS4 },
+     { 0, SW8_CS5, SW7_CS5, SW9_CS5 },
+     { 0, SW11_CS11, SW10_CS11, SW12_CS11 },
+     { 0, SW8_CS6, SW7_CS6, SW9_CS6 },
+     { 0, SW5_CS7, SW4_CS7, SW6_CS7 },
+     { 1, SW8_CS2, SW7_CS2, SW9_CS2 },
+     { 1, SW11_CS3, SW10_CS3, SW12_CS3 },
+     { 1, SW11_CS4, SW10_CS4, SW12_CS4 },
+     { 1, SW11_CS5, SW10_CS5, SW12_CS5 },
+     { 1, SW11_CS6, SW10_CS6, SW12_CS6 },
+     { 1, SW11_CS7, SW10_CS7, SW12_CS7 },
+     { 1, SW11_CS8, SW10_CS8, SW12_CS8 },
+     { 0, SW11_CS1, SW10_CS1, SW12_CS1 },
+     { 0, SW11_CS2, SW10_CS2, SW12_CS2 },
+     { 0, SW11_CS3, SW10_CS3, SW12_CS3 },
+     { 0, SW11_CS4, SW10_CS4, SW12_CS4 },
+     { 0, SW11_CS5, SW10_CS5, SW12_CS5 },
+     { 0, SW11_CS6, SW10_CS6, SW12_CS6 },
+     { 0, SW8_CS7, SW7_CS7, SW9_CS7 },
+     { 1, SW11_CS2, SW10_CS2, SW12_CS2 },
+     { 1, SW5_CS9, SW4_CS9, SW6_CS9 },
+     { 1, SW2_CS9, SW1_CS9, SW3_CS9 },
+     { 1, SW11_CS9, SW10_CS9, SW12_CS9 },
+     { 1, SW8_CS9, SW7_CS9, SW9_CS9 },
+     { 1, SW11_CS12, SW10_CS12, SW12_CS12 },
+     { 1, SW11_CS13, SW10_CS13, SW12_CS13 },
+     { 0, SW11_CS9, SW10_CS9, SW12_CS9 },
+     { 0, SW11_CS10, SW10_CS10, SW12_CS10 },
+     { 0, SW8_CS10, SW7_CS10, SW9_CS10 },
+     { 0, SW8_CS11, SW7_CS11, SW9_CS11 },
+     { 0, SW2_CS11, SW1_CS11, SW3_CS11 },
+     { 0, SW5_CS11, SW4_CS11, SW6_CS11 },
+     { 0, SW11_CS7, SW10_CS7, SW12_CS7 },
+     { 1, SW8_CS10, SW7_CS10, SW9_CS10 },
+     { 1, SW5_CS10, SW4_CS10, SW6_CS10 },
+     { 1, SW2_CS10, SW1_CS10, SW3_CS10 },
+     { 1, SW8_CS12, SW7_CS12, SW9_CS12 },
+     { 0, SW5_CS10, SW4_CS10, SW6_CS10 },
+     { 0, SW2_CS10, SW1_CS10, SW3_CS10 },
+     { 0, SW2_CS12, SW1_CS12, SW3_CS12 },
+     { 0, SW8_CS12, SW7_CS12, SW9_CS12 },
+     { 0, SW5_CS12, SW4_CS12, SW6_CS12 },
+     { 1, SW11_CS11, SW10_CS11, SW12_CS11 },
+     { 1, SW8_CS11, SW7_CS11, SW9_CS11 },
+     { 1, SW5_CS11, SW4_CS11, SW6_CS11 },
+     { 1, SW2_CS11, SW1_CS11, SW3_CS11 },
+     { 1, SW2_CS12, SW1_CS12, SW3_CS12 },
+     { 1, SW5_CS12, SW4_CS12, SW6_CS12 },
+     { 1, SW5_CS13, SW4_CS13, SW6_CS13 },
+     { 1, SW8_CS13, SW7_CS13, SW9_CS13 },
+     { 0, SW8_CS9, SW7_CS9, SW9_CS9 },
+     { 0, SW5_CS9, SW4_CS9, SW6_CS9 },
+     { 0, SW2_CS9, SW1_CS9, SW3_CS9 },
+     { 0, SW2_CS13, SW1_CS13, SW3_CS13 },
+     { 0, SW8_CS13, SW7_CS13, SW9_CS13 },
+     { 0, SW5_CS13, SW4_CS13, SW6_CS13 },
+     { 0, SW11_CS13, SW10_CS13, SW12_CS13 },
+     { 0, SW11_CS12, SW10_CS12, SW12_CS12 },
+     { 0, SW11_CS8, SW10_CS8, SW12_CS8 },
+     { 0, SW8_CS8, SW7_CS8, SW9_CS8 },
+     { 0, SW5_CS8, SW4_CS8, SW6_CS8 },
+     { 0, SW2_CS8, SW1_CS8, SW3_CS8 },
+     { 0, SW2_CS6, SW1_CS6, SW3_CS6 },
+     { 0, SW2_CS5, SW1_CS5, SW3_CS5 },
+     { 0, SW2_CS4, SW1_CS4, SW3_CS4 },
+     { 0, SW2_CS3, SW1_CS3, SW3_CS3 },
+     { 0, SW2_CS2, SW1_CS2, SW3_CS2 },
+     { 0, SW2_CS1, SW1_CS1, SW3_CS1 },
+     { 0, SW2_CS14, SW1_CS14, SW3_CS14 },
+     { 1, SW2_CS8, SW1_CS8, SW3_CS8 },
+     { 1, SW2_CS7, SW1_CS7, SW3_CS7 },
+     { 1, SW2_CS6, SW1_CS6, SW3_CS6 },
+     { 1, SW2_CS5, SW1_CS5, SW3_CS5 },
+     { 1, SW2_CS4, SW1_CS4, SW3_CS4 },
+     { 1, SW2_CS3, SW1_CS3, SW3_CS3 },
+     { 1, SW2_CS1, SW1_CS1, SW3_CS1 },
+     { 1, SW5_CS1, SW4_CS1, SW6_CS1 },
+     { 1, SW8_CS1, SW7_CS1, SW9_CS1 },
+     { 1, SW11_CS1, SW10_CS1, SW12_CS1 },
+     { 1, SW11_CS10, SW10_CS10, SW12_CS10 },
 };
 
 #endif
diff --git a/keyboards/drop/cstm65/cstm65.c b/keyboards/drop/cstm65/cstm65.c
index 1c8e6bb0bbc..dff7008f593 100644
--- a/keyboards/drop/cstm65/cstm65.c
+++ b/keyboards/drop/cstm65/cstm65.c
@@ -4,76 +4,76 @@
 #    include "rgb_matrix.h"
 
 const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
-    { 0, B_1,  A_1,  C_1  },
-    { 0, B_2,  A_2,  C_2  },
-    { 0, B_3,  A_3,  C_3  },
-    { 0, B_4,  A_4,  C_4  },
-    { 0, B_5,  A_5,  C_5  },
-    { 0, B_6,  A_6,  C_6  },
-    { 0, B_7,  A_7,  C_7  },
-    { 0, B_8,  A_8,  C_8  },
-    { 0, B_9,  A_9,  C_9  },
-    { 0, B_10, A_10, C_10 },
-    { 0, B_11, A_11, C_11 },
-    { 0, B_12, A_12, C_12 },
-    { 0, B_13, A_13, C_13 },
-    { 0, B_14, A_14, C_14 },
-    { 0, B_15, A_15, C_15 },
+    { 0, SW2_CS1,  SW1_CS1,  SW3_CS1  },
+    { 0, SW2_CS2,  SW1_CS2,  SW3_CS2  },
+    { 0, SW2_CS3,  SW1_CS3,  SW3_CS3  },
+    { 0, SW2_CS4,  SW1_CS4,  SW3_CS4  },
+    { 0, SW2_CS5,  SW1_CS5,  SW3_CS5  },
+    { 0, SW2_CS6,  SW1_CS6,  SW3_CS6  },
+    { 0, SW2_CS7,  SW1_CS7,  SW3_CS7  },
+    { 0, SW2_CS8,  SW1_CS8,  SW3_CS8  },
+    { 0, SW2_CS9,  SW1_CS9,  SW3_CS9  },
+    { 0, SW2_CS10, SW1_CS10, SW3_CS10 },
+    { 0, SW2_CS11, SW1_CS11, SW3_CS11 },
+    { 0, SW2_CS12, SW1_CS12, SW3_CS12 },
+    { 0, SW2_CS13, SW1_CS13, SW3_CS13 },
+    { 0, SW2_CS14, SW1_CS14, SW3_CS14 },
+    { 0, SW2_CS15, SW1_CS15, SW3_CS15 },
 
-    { 0, E_1,  D_1,  F_1  },
-    { 0, E_2,  D_2,  F_2  },
-    { 0, E_3,  D_3,  F_3  },
-    { 0, E_4,  D_4,  F_4  },
-    { 0, E_5,  D_5,  F_5  },
-    { 0, E_6,  D_6,  F_6  },
-    { 0, E_7,  D_7,  F_7  },
-    { 0, E_8,  D_8,  F_8  },
-    { 0, E_9,  D_9,  F_9  },
-    { 0, E_10, D_10, F_10 },
-    { 0, E_11, D_11, F_11 },
-    { 0, E_12, D_12, F_12 },
-    { 0, E_13, D_13, F_13 },
-    { 0, E_14, D_14, F_14 },
-    { 0, E_15, D_15, F_15 },
+    { 0, SW5_CS1,  SW4_CS1,  SW6_CS1  },
+    { 0, SW5_CS2,  SW4_CS2,  SW6_CS2  },
+    { 0, SW5_CS3,  SW4_CS3,  SW6_CS3  },
+    { 0, SW5_CS4,  SW4_CS4,  SW6_CS4  },
+    { 0, SW5_CS5,  SW4_CS5,  SW6_CS5  },
+    { 0, SW5_CS6,  SW4_CS6,  SW6_CS6  },
+    { 0, SW5_CS7,  SW4_CS7,  SW6_CS7  },
+    { 0, SW5_CS8,  SW4_CS8,  SW6_CS8  },
+    { 0, SW5_CS9,  SW4_CS9,  SW6_CS9  },
+    { 0, SW5_CS10, SW4_CS10, SW6_CS10 },
+    { 0, SW5_CS11, SW4_CS11, SW6_CS11 },
+    { 0, SW5_CS12, SW4_CS12, SW6_CS12 },
+    { 0, SW5_CS13, SW4_CS13, SW6_CS13 },
+    { 0, SW5_CS14, SW4_CS14, SW6_CS14 },
+    { 0, SW5_CS15, SW4_CS15, SW6_CS15 },
 
-    { 1, B_1,  A_1,  C_1  },
-    { 1, B_2,  A_2,  C_2  },
-    { 1, B_3,  A_3,  C_3  },
-    { 1, B_4,  A_4,  C_4  },
-    { 1, B_5,  A_5,  C_5  },
-    { 1, B_6,  A_6,  C_6  },
-    { 1, B_7,  A_7,  C_7  },
-    { 1, B_8,  A_8,  C_8  },
-    { 1, B_9,  A_9,  C_9  },
-    { 1, B_10, A_10, C_10 },
-    { 1, B_11, A_11, C_11 },
-    { 1, B_12, A_12, C_12 },
-    { 1, B_13, A_13, C_13 },
-    { 1, B_14, A_14, C_14 },
+    { 1, SW2_CS1,  SW1_CS1,  SW3_CS1  },
+    { 1, SW2_CS2,  SW1_CS2,  SW3_CS2  },
+    { 1, SW2_CS3,  SW1_CS3,  SW3_CS3  },
+    { 1, SW2_CS4,  SW1_CS4,  SW3_CS4  },
+    { 1, SW2_CS5,  SW1_CS5,  SW3_CS5  },
+    { 1, SW2_CS6,  SW1_CS6,  SW3_CS6  },
+    { 1, SW2_CS7,  SW1_CS7,  SW3_CS7  },
+    { 1, SW2_CS8,  SW1_CS8,  SW3_CS8  },
+    { 1, SW2_CS9,  SW1_CS9,  SW3_CS9  },
+    { 1, SW2_CS10, SW1_CS10, SW3_CS10 },
+    { 1, SW2_CS11, SW1_CS11, SW3_CS11 },
+    { 1, SW2_CS12, SW1_CS12, SW3_CS12 },
+    { 1, SW2_CS13, SW1_CS13, SW3_CS13 },
+    { 1, SW2_CS14, SW1_CS14, SW3_CS14 },
 
-    { 1, E_1,  D_1,  F_1  },
-    { 1, E_2,  D_2,  F_2  },
-    { 1, E_3,  D_3,  F_3  },
-    { 1, E_4,  D_4,  F_4  },
-    { 1, E_5,  D_5,  F_5  },
-    { 1, E_6,  D_6,  F_6  },
-    { 1, E_7,  D_7,  F_7  },
-    { 1, E_8,  D_8,  F_8  },
-    { 1, E_9,  D_9,  F_9  },
-    { 1, E_10, D_10, F_10 },
-    { 1, E_11, D_11, F_11 },
-    { 1, E_12, D_12, F_12 },
-    { 1, E_13, D_13, F_13 },
-    { 1, E_14, D_14, F_14 },
+    { 1, SW5_CS1,  SW4_CS1,  SW6_CS1  },
+    { 1, SW5_CS2,  SW4_CS2,  SW6_CS2  },
+    { 1, SW5_CS3,  SW4_CS3,  SW6_CS3  },
+    { 1, SW5_CS4,  SW4_CS4,  SW6_CS4  },
+    { 1, SW5_CS5,  SW4_CS5,  SW6_CS5  },
+    { 1, SW5_CS6,  SW4_CS6,  SW6_CS6  },
+    { 1, SW5_CS7,  SW4_CS7,  SW6_CS7  },
+    { 1, SW5_CS8,  SW4_CS8,  SW6_CS8  },
+    { 1, SW5_CS9,  SW4_CS9,  SW6_CS9  },
+    { 1, SW5_CS10, SW4_CS10, SW6_CS10 },
+    { 1, SW5_CS11, SW4_CS11, SW6_CS11 },
+    { 1, SW5_CS12, SW4_CS12, SW6_CS12 },
+    { 1, SW5_CS13, SW4_CS13, SW6_CS13 },
+    { 1, SW5_CS14, SW4_CS14, SW6_CS14 },
 
-    { 1, H_1,  G_1,  I_1  },
-    { 1, H_2,  G_2,  I_2  },
-    { 1, H_3,  G_3,  I_3  },
-    { 1, H_4,  G_4,  I_4  },
-    { 1, H_5,  G_5,  I_5  },
-    { 1, H_8,  G_8,  I_8  },
-    { 1, H_9,  G_9,  I_9  },
-    { 1, H_10, G_10, I_10  },
-    { 1, H_11, G_11, I_11  },
+    { 1, SW8_CS1,  SW7_CS1,  SW9_CS1  },
+    { 1, SW8_CS2,  SW7_CS2,  SW9_CS2  },
+    { 1, SW8_CS3,  SW7_CS3,  SW9_CS3  },
+    { 1, SW8_CS4,  SW7_CS4,  SW9_CS4  },
+    { 1, SW8_CS5,  SW7_CS5,  SW9_CS5  },
+    { 1, SW8_CS8,  SW7_CS8,  SW9_CS8  },
+    { 1, SW8_CS9,  SW7_CS9,  SW9_CS9  },
+    { 1, SW8_CS10, SW7_CS10, SW9_CS10  },
+    { 1, SW8_CS11, SW7_CS11, SW9_CS11  },
 };
 #endif
diff --git a/keyboards/drop/cstm80/cstm80.c b/keyboards/drop/cstm80/cstm80.c
index e99c7801e58..6350f3a32d6 100644
--- a/keyboards/drop/cstm80/cstm80.c
+++ b/keyboards/drop/cstm80/cstm80.c
@@ -4,93 +4,93 @@
 #    include "rgb_matrix.h"
 
 const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_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 },
+    { 0, SW5_CS1,  SW4_CS1,  SW6_CS1  },
+    { 0, SW5_CS2,  SW4_CS2,  SW6_CS2  },
+    { 0, SW5_CS3,  SW4_CS3,  SW6_CS3  },
+    { 0, SW5_CS4,  SW4_CS4,  SW6_CS4  },
+    { 0, SW5_CS5,  SW4_CS5,  SW6_CS5  },
+    { 0, SW5_CS6,  SW4_CS6,  SW6_CS6  },
+    { 0, SW5_CS7,  SW4_CS7,  SW6_CS7  },
+    { 0, SW5_CS8,  SW4_CS8,  SW6_CS8  },
+    { 0, SW5_CS9,  SW4_CS9,  SW6_CS9  },
+    { 0, SW5_CS10, SW4_CS10, SW6_CS10 },
+    { 0, SW5_CS11, SW4_CS11, SW6_CS11 },
+    { 0, SW5_CS12, SW4_CS12, SW6_CS12 },
+    { 0, SW5_CS13, SW4_CS13, SW6_CS13 },
+    { 0, SW5_CS14, SW4_CS14, SW6_CS14 },
+    { 0, SW5_CS15, SW4_CS15, SW6_CS15 },
+    { 0, SW5_CS16, SW4_CS16, SW6_CS16 },
+    { 0, SW8_CS1,  SW7_CS1,  SW9_CS1  },
+    { 0, SW8_CS2,  SW7_CS2,  SW9_CS2  },
+    { 0, SW8_CS3,  SW7_CS3,  SW9_CS3  },
+    { 0, SW8_CS4,  SW7_CS4,  SW9_CS4  },
+    { 0, SW8_CS5,  SW7_CS5,  SW9_CS5  },
+    { 0, SW8_CS6,  SW7_CS6,  SW9_CS6  },
+    { 0, SW8_CS7,  SW7_CS7,  SW9_CS7  },
+    { 0, SW8_CS8,  SW7_CS8,  SW9_CS8  },
+    { 0, SW8_CS9,  SW7_CS9,  SW9_CS9  },
+    { 0, SW8_CS10, SW7_CS10, SW9_CS10 },
+    { 0, SW8_CS11, SW7_CS11, SW9_CS11 },
+    { 0, SW8_CS12, SW7_CS12, SW9_CS12 },
+    { 0, SW8_CS13, SW7_CS13, SW9_CS13 },
+    { 0, SW8_CS14, SW7_CS14, SW9_CS14 },
+    { 0, SW8_CS15, SW7_CS15, SW9_CS15 },
+    { 0, SW8_CS16, SW7_CS16, SW9_CS16 },
+    { 0, SW11_CS1,  SW10_CS1,  SW12_CS1  },
+    { 0, SW11_CS2,  SW10_CS2,  SW12_CS2  },
+    { 0, SW11_CS3,  SW10_CS3,  SW12_CS3  },
+    { 0, SW11_CS4,  SW10_CS4,  SW12_CS4  },
+    { 0, SW11_CS5,  SW10_CS5,  SW12_CS5  },
+    { 0, SW11_CS6,  SW10_CS6,  SW12_CS6  },
+    { 0, SW11_CS7,  SW10_CS7,  SW12_CS7  },
+    { 0, SW11_CS8,  SW10_CS8,  SW12_CS8  },
+    { 0, SW11_CS9,  SW10_CS9,  SW12_CS9  },
+    { 0, SW11_CS10, SW10_CS10, SW12_CS10 },
+    { 0, SW11_CS11, SW10_CS11, SW12_CS11 },
+    { 0, SW11_CS12, SW10_CS12, SW12_CS12 },
+    { 0, SW11_CS13, SW10_CS13, SW12_CS13 },
+    { 0, SW11_CS14, SW10_CS14, SW12_CS14 },
+    { 0, SW11_CS15, SW10_CS15, SW12_CS15 },
+    { 0, SW11_CS16, SW10_CS16, SW12_CS16 },
+    { 1, SW2_CS1,  SW1_CS1,  SW3_CS1  },
+    { 1, SW2_CS2,  SW1_CS2,  SW3_CS2  },
+    { 1, SW2_CS3,  SW1_CS3,  SW3_CS3  },
+    { 1, SW2_CS4,  SW1_CS4,  SW3_CS4  },
+    { 1, SW2_CS5,  SW1_CS5,  SW3_CS5  },
+    { 1, SW2_CS6,  SW1_CS6,  SW3_CS6  },
+    { 1, SW2_CS7,  SW1_CS7,  SW3_CS7  },
+    { 1, SW2_CS8,  SW1_CS8,  SW3_CS8  },
+    { 1, SW2_CS9,  SW1_CS9,  SW3_CS9  },
+    { 1, SW2_CS10, SW1_CS10, SW3_CS10 },
+    { 1, SW2_CS11, SW1_CS11, SW3_CS11 },
+    { 1, SW2_CS12, SW1_CS12, SW3_CS12 },
+    { 1, SW2_CS13, SW1_CS13, SW3_CS13 },
+    { 1, SW2_CS14, SW1_CS14, SW3_CS14 },
+    { 1, SW2_CS15, SW1_CS15, SW3_CS15 },
+    { 1, SW2_CS16, SW1_CS16, SW3_CS16 },
+    { 1, SW5_CS1,  SW4_CS1,  SW6_CS1  },
+    { 1, SW5_CS2,  SW4_CS2,  SW6_CS2  },
+    { 1, SW5_CS3,  SW4_CS3,  SW6_CS3  },
+    { 1, SW5_CS4,  SW4_CS4,  SW6_CS4  },
+    { 1, SW5_CS5,  SW4_CS5,  SW6_CS5  },
+    { 1, SW5_CS6,  SW4_CS6,  SW6_CS6  },
+    { 1, SW5_CS7,  SW4_CS7,  SW6_CS7  },
+    { 1, SW5_CS8,  SW4_CS8,  SW6_CS8  },
+    { 1, SW5_CS9,  SW4_CS9,  SW6_CS9  },
+    { 1, SW5_CS10, SW4_CS10, SW6_CS10 },
+    { 1, SW5_CS11, SW4_CS11, SW6_CS11 },
+    { 1, SW5_CS12, SW4_CS12, SW6_CS12 },
+    { 1, SW5_CS13, SW4_CS13, SW6_CS13 },
+    { 1, SW8_CS1,  SW7_CS1,  SW9_CS1  },
+    { 1, SW8_CS2,  SW7_CS2,  SW9_CS2  },
+    { 1, SW8_CS3,  SW7_CS3,  SW9_CS3  },
+    { 1, SW8_CS4,  SW7_CS4,  SW9_CS4  },
+    { 1, SW8_CS5,  SW7_CS5,  SW9_CS5  },
+    { 1, SW8_CS6,  SW7_CS6,  SW9_CS6  },
+    { 1, SW8_CS7,  SW7_CS7,  SW9_CS7  },
+    { 1, SW8_CS8,  SW7_CS8,  SW9_CS8  },
+    { 1, SW8_CS9,  SW7_CS9,  SW9_CS9  },
+    { 1, SW8_CS10, SW7_CS10, SW9_CS10 },
+    { 1, SW8_CS11, SW7_CS11, SW9_CS11 },
 };
 #endif
diff --git a/keyboards/drop/ctrl/v2/v2.c b/keyboards/drop/ctrl/v2/v2.c
index 0c1d8210c63..81689dc78af 100644
--- a/keyboards/drop/ctrl/v2/v2.c
+++ b/keyboards/drop/ctrl/v2/v2.c
@@ -4,125 +4,125 @@
 #    include "rgb_matrix.h"
 
 const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
-     { 1, B_2, A_2, C_2 },
-     { 1, E_3, D_3, F_3 },
-     { 1, E_4, D_4, F_4 },
-     { 1, E_5, D_5, F_5 },
-     { 1, B_6, A_6, C_6 },
-     { 1, E_7, D_7, F_7 },
-     { 1, E_8, D_8, F_8 },
-     { 0, E_1, D_1, F_1 },
-     { 0, E_2, D_2, F_2 },
-     { 0, E_3, D_3, F_3 },
-     { 0, E_4, D_4, F_4 },
-     { 0, E_5, D_5, F_5 },
-     { 0, E_6, D_6, F_6 },
-     { 0, E_7, D_7, F_7 },
-     { 0, E_8, D_8, F_8 },
-     { 0, E_9, D_9, F_9 },
-     { 1, H_1, G_1, I_1 },
-     { 1, H_2, G_2, I_2 },
-     { 1, H_3, G_3, I_3 },
-     { 1, H_4, G_4, I_4 },
-     { 1, H_5, G_5, I_5 },
-     { 1, H_6, G_6, I_6 },
-     { 1, H_7, G_7, I_7 },
-     { 1, H_8, G_8, I_8 },
-     { 0, H_1, G_1, I_1 },
-     { 0, H_2, G_2, I_2 },
-     { 0, H_3, G_3, I_3 },
-     { 0, H_4, G_4, I_4 },
-     { 0, H_5, G_5, I_5 },
-     { 0, H_6, G_6, I_6 },
-     { 0, H_7, G_7, I_7 },
-     { 0, H_8, G_8, I_8 },
-     { 0, H_9, G_9, I_9 },
-     { 1, K_1, J_1, L_1 },
-     { 1, K_2, J_2, L_2 },
-     { 1, K_3, J_3, L_3 },
-     { 1, K_4, J_4, L_4 },
-     { 1, K_5, J_5, L_5 },
-     { 1, K_6, J_6, L_6 },
-     { 1, K_7, J_7, L_7 },
-     { 1, K_8, J_8, L_8 },
-     { 0, K_1, J_1, L_1 },
-     { 0, K_2, J_2, L_2 },
-     { 0, K_3, J_3, L_3 },
-     { 0, K_4, J_4, L_4 },
-     { 0, K_5, J_5, L_5 },
-     { 0, K_6, J_6, L_6 },
-     { 0, K_7, J_7, L_7 },
-     { 0, K_8, J_8, L_8 },
-     { 0, K_9, J_9, L_9 },
-     { 1, E_1, D_1, F_1 },
-     { 1, E_2, D_2, F_2 },
-     { 1, K_13, J_13, L_13 },
-     { 1, K_12, J_12, L_12 },
-     { 1, K_11, J_11, L_11 },
-     { 1, E_6, D_6, F_6 },
-     { 1, K_10, J_10, L_10 },
-     { 1, K_9, J_9, L_9 },
-     { 0, K_16, J_16, L_16 },
-     { 0, K_15, J_15, L_15 },
-     { 0, K_14, J_14, L_14 },
-     { 0, K_13, J_13, L_13 },
-     { 0, K_12, J_12, L_12 },
-     { 1, E_14, D_14, F_14 },
-     { 1, E_13, D_13, F_13 },
-     { 1, H_12, G_12, I_12 },
-     { 1, E_12, D_12, F_12 },
-     { 1, E_11, D_11, F_11 },
-     { 1, E_10, D_10, F_10 },
-     { 1, E_9, D_9, F_9 },
-     { 1, H_9, G_9, I_9 },
-     { 0, H_16, G_16, I_16 },
-     { 0, H_15, G_15, I_15 },
-     { 0, H_14, G_14, I_14 },
-     { 0, H_13, G_13, I_13 },
-     { 0, H_11, G_11, I_11 },
-     { 1, K_14, J_14, L_14 },
-     { 1, H_14, G_14, I_14 },
-     { 1, H_13, G_13, I_13 },
-     { 1, H_10, G_10, I_10 },
-     { 0, E_16, D_16, F_16 },
-     { 0, E_15, D_15, F_15 },
-     { 0, E_14, D_14, F_14 },
-     { 0, E_13, D_13, F_13 },
-     { 0, H_12, G_12, I_12 },
-     { 0, E_12, D_12, F_12 },
-     { 0, E_11, D_11, F_11 },
-     { 0, B_11, A_11, C_11 },
-     { 0, B_12, A_12, C_12 },
-     { 0, B_13, A_13, C_13 },
-     { 0, B_14, A_14, C_14 },
-     { 0, B_15, A_15, C_15 },
-     { 0, B_16, A_16, C_16 },
-     { 1, B_9, A_9, C_9 },
-     { 1, B_10, A_10, C_10 },
-     { 1, B_11, A_11, C_11 },
-     { 1, B_12, A_12, C_12 },
-     { 1, B_13, A_13, C_13 },
-     { 1, B_14, A_14, C_14 },
-     { 1, B_15, A_15, C_15 },
-     { 1, K_15, J_15, L_15 },
-     { 1, E_15, D_15, F_15 },
-     { 1, H_15, G_15, I_15 },
-     { 1, B_1, A_1, C_1 },
-     { 1, B_3, A_3, C_3 },
-     { 1, B_4, A_4, C_4 },
-     { 1, B_5, A_5, C_5 },
-     { 1, B_7, A_7, C_7 },
-     { 1, B_8, A_8, C_8 },
-     { 0, B_1, A_1, C_1 },
-     { 0, B_2, A_2, C_2 },
-     { 0, B_3, A_3, C_3 },
-     { 0, B_5, A_5, C_5 },
-     { 0, B_6, A_6, C_6 },
-     { 0, B_8, A_8, C_8 },
-     { 0, B_10, A_10, C_10 },
-     { 0, H_10, G_10, I_10 },
-     { 0, K_10, J_10, L_10 },
-     { 0, E_10, D_10, F_10 },
+     { 1, SW2_CS2, SW1_CS2, SW3_CS2 },
+     { 1, SW5_CS3, SW4_CS3, SW6_CS3 },
+     { 1, SW5_CS4, SW4_CS4, SW6_CS4 },
+     { 1, SW5_CS5, SW4_CS5, SW6_CS5 },
+     { 1, SW2_CS6, SW1_CS6, SW3_CS6 },
+     { 1, SW5_CS7, SW4_CS7, SW6_CS7 },
+     { 1, SW5_CS8, SW4_CS8, SW6_CS8 },
+     { 0, SW5_CS1, SW4_CS1, SW6_CS1 },
+     { 0, SW5_CS2, SW4_CS2, SW6_CS2 },
+     { 0, SW5_CS3, SW4_CS3, SW6_CS3 },
+     { 0, SW5_CS4, SW4_CS4, SW6_CS4 },
+     { 0, SW5_CS5, SW4_CS5, SW6_CS5 },
+     { 0, SW5_CS6, SW4_CS6, SW6_CS6 },
+     { 0, SW5_CS7, SW4_CS7, SW6_CS7 },
+     { 0, SW5_CS8, SW4_CS8, SW6_CS8 },
+     { 0, SW5_CS9, SW4_CS9, SW6_CS9 },
+     { 1, SW8_CS1, SW7_CS1, SW9_CS1 },
+     { 1, SW8_CS2, SW7_CS2, SW9_CS2 },
+     { 1, SW8_CS3, SW7_CS3, SW9_CS3 },
+     { 1, SW8_CS4, SW7_CS4, SW9_CS4 },
+     { 1, SW8_CS5, SW7_CS5, SW9_CS5 },
+     { 1, SW8_CS6, SW7_CS6, SW9_CS6 },
+     { 1, SW8_CS7, SW7_CS7, SW9_CS7 },
+     { 1, SW8_CS8, SW7_CS8, SW9_CS8 },
+     { 0, SW8_CS1, SW7_CS1, SW9_CS1 },
+     { 0, SW8_CS2, SW7_CS2, SW9_CS2 },
+     { 0, SW8_CS3, SW7_CS3, SW9_CS3 },
+     { 0, SW8_CS4, SW7_CS4, SW9_CS4 },
+     { 0, SW8_CS5, SW7_CS5, SW9_CS5 },
+     { 0, SW8_CS6, SW7_CS6, SW9_CS6 },
+     { 0, SW8_CS7, SW7_CS7, SW9_CS7 },
+     { 0, SW8_CS8, SW7_CS8, SW9_CS8 },
+     { 0, SW8_CS9, SW7_CS9, SW9_CS9 },
+     { 1, SW11_CS1, SW10_CS1, SW12_CS1 },
+     { 1, SW11_CS2, SW10_CS2, SW12_CS2 },
+     { 1, SW11_CS3, SW10_CS3, SW12_CS3 },
+     { 1, SW11_CS4, SW10_CS4, SW12_CS4 },
+     { 1, SW11_CS5, SW10_CS5, SW12_CS5 },
+     { 1, SW11_CS6, SW10_CS6, SW12_CS6 },
+     { 1, SW11_CS7, SW10_CS7, SW12_CS7 },
+     { 1, SW11_CS8, SW10_CS8, SW12_CS8 },
+     { 0, SW11_CS1, SW10_CS1, SW12_CS1 },
+     { 0, SW11_CS2, SW10_CS2, SW12_CS2 },
+     { 0, SW11_CS3, SW10_CS3, SW12_CS3 },
+     { 0, SW11_CS4, SW10_CS4, SW12_CS4 },
+     { 0, SW11_CS5, SW10_CS5, SW12_CS5 },
+     { 0, SW11_CS6, SW10_CS6, SW12_CS6 },
+     { 0, SW11_CS7, SW10_CS7, SW12_CS7 },
+     { 0, SW11_CS8, SW10_CS8, SW12_CS8 },
+     { 0, SW11_CS9, SW10_CS9, SW12_CS9 },
+     { 1, SW5_CS1, SW4_CS1, SW6_CS1 },
+     { 1, SW5_CS2, SW4_CS2, SW6_CS2 },
+     { 1, SW11_CS13, SW10_CS13, SW12_CS13 },
+     { 1, SW11_CS12, SW10_CS12, SW12_CS12 },
+     { 1, SW11_CS11, SW10_CS11, SW12_CS11 },
+     { 1, SW5_CS6, SW4_CS6, SW6_CS6 },
+     { 1, SW11_CS10, SW10_CS10, SW12_CS10 },
+     { 1, SW11_CS9, SW10_CS9, SW12_CS9 },
+     { 0, SW11_CS16, SW10_CS16, SW12_CS16 },
+     { 0, SW11_CS15, SW10_CS15, SW12_CS15 },
+     { 0, SW11_CS14, SW10_CS14, SW12_CS14 },
+     { 0, SW11_CS13, SW10_CS13, SW12_CS13 },
+     { 0, SW11_CS12, SW10_CS12, SW12_CS12 },
+     { 1, SW5_CS14, SW4_CS14, SW6_CS14 },
+     { 1, SW5_CS13, SW4_CS13, SW6_CS13 },
+     { 1, SW8_CS12, SW7_CS12, SW9_CS12 },
+     { 1, SW5_CS12, SW4_CS12, SW6_CS12 },
+     { 1, SW5_CS11, SW4_CS11, SW6_CS11 },
+     { 1, SW5_CS10, SW4_CS10, SW6_CS10 },
+     { 1, SW5_CS9, SW4_CS9, SW6_CS9 },
+     { 1, SW8_CS9, SW7_CS9, SW9_CS9 },
+     { 0, SW8_CS16, SW7_CS16, SW9_CS16 },
+     { 0, SW8_CS15, SW7_CS15, SW9_CS15 },
+     { 0, SW8_CS14, SW7_CS14, SW9_CS14 },
+     { 0, SW8_CS13, SW7_CS13, SW9_CS13 },
+     { 0, SW8_CS11, SW7_CS11, SW9_CS11 },
+     { 1, SW11_CS14, SW10_CS14, SW12_CS14 },
+     { 1, SW8_CS14, SW7_CS14, SW9_CS14 },
+     { 1, SW8_CS13, SW7_CS13, SW9_CS13 },
+     { 1, SW8_CS10, SW7_CS10, SW9_CS10 },
+     { 0, SW5_CS16, SW4_CS16, SW6_CS16 },
+     { 0, SW5_CS15, SW4_CS15, SW6_CS15 },
+     { 0, SW5_CS14, SW4_CS14, SW6_CS14 },
+     { 0, SW5_CS13, SW4_CS13, SW6_CS13 },
+     { 0, SW8_CS12, SW7_CS12, SW9_CS12 },
+     { 0, SW5_CS12, SW4_CS12, SW6_CS12 },
+     { 0, SW5_CS11, SW4_CS11, SW6_CS11 },
+     { 0, SW2_CS11, SW1_CS11, SW3_CS11 },
+     { 0, SW2_CS12, SW1_CS12, SW3_CS12 },
+     { 0, SW2_CS13, SW1_CS13, SW3_CS13 },
+     { 0, SW2_CS14, SW1_CS14, SW3_CS14 },
+     { 0, SW2_CS15, SW1_CS15, SW3_CS15 },
+     { 0, SW2_CS16, SW1_CS16, SW3_CS16 },
+     { 1, SW2_CS9, SW1_CS9, SW3_CS9 },
+     { 1, SW2_CS10, SW1_CS10, SW3_CS10 },
+     { 1, SW2_CS11, SW1_CS11, SW3_CS11 },
+     { 1, SW2_CS12, SW1_CS12, SW3_CS12 },
+     { 1, SW2_CS13, SW1_CS13, SW3_CS13 },
+     { 1, SW2_CS14, SW1_CS14, SW3_CS14 },
+     { 1, SW2_CS15, SW1_CS15, SW3_CS15 },
+     { 1, SW11_CS15, SW10_CS15, SW12_CS15 },
+     { 1, SW5_CS15, SW4_CS15, SW6_CS15 },
+     { 1, SW8_CS15, SW7_CS15, SW9_CS15 },
+     { 1, SW2_CS1, SW1_CS1, SW3_CS1 },
+     { 1, SW2_CS3, SW1_CS3, SW3_CS3 },
+     { 1, SW2_CS4, SW1_CS4, SW3_CS4 },
+     { 1, SW2_CS5, SW1_CS5, SW3_CS5 },
+     { 1, SW2_CS7, SW1_CS7, SW3_CS7 },
+     { 1, SW2_CS8, SW1_CS8, SW3_CS8 },
+     { 0, SW2_CS1, SW1_CS1, SW3_CS1 },
+     { 0, SW2_CS2, SW1_CS2, SW3_CS2 },
+     { 0, SW2_CS3, SW1_CS3, SW3_CS3 },
+     { 0, SW2_CS5, SW1_CS5, SW3_CS5 },
+     { 0, SW2_CS6, SW1_CS6, SW3_CS6 },
+     { 0, SW2_CS8, SW1_CS8, SW3_CS8 },
+     { 0, SW2_CS10, SW1_CS10, SW3_CS10 },
+     { 0, SW8_CS10, SW7_CS10, SW9_CS10 },
+     { 0, SW11_CS10, SW10_CS10, SW12_CS10 },
+     { 0, SW5_CS10, SW4_CS10, SW6_CS10 },
 };
 
 #endif
diff --git a/keyboards/drop/sense75/sense75.c b/keyboards/drop/sense75/sense75.c
index bbe5a3aa471..1130cf12790 100644
--- a/keyboards/drop/sense75/sense75.c
+++ b/keyboards/drop/sense75/sense75.c
@@ -5,131 +5,131 @@
 
 const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
 // top underglow sd2-sd17
-    { 0, B_2,  A_2,  C_2  },
-    { 0, B_3,  A_3,  C_3  },
-    { 0, B_5,  A_5,  C_5  },
-    { 0, B_6,  A_6,  C_6  },
-    { 0, B_7,  A_7,  C_7  },
-    { 0, B_9,  A_9,  C_9  },
-    { 0, B_10, A_10, C_10 },
-    { 0, B_12, A_12, C_12 },
-    { 0, B_13, A_13, C_13 },
-    { 0, B_14, A_14, C_14 },
-    { 0, B_16, A_16, C_16 },
-    { 1, B_12, A_12, C_12 },
+    { 0, SW2_CS2,  SW1_CS2,  SW3_CS2  },
+    { 0, SW2_CS3,  SW1_CS3,  SW3_CS3  },
+    { 0, SW2_CS5,  SW1_CS5,  SW3_CS5  },
+    { 0, SW2_CS6,  SW1_CS6,  SW3_CS6  },
+    { 0, SW2_CS7,  SW1_CS7,  SW3_CS7  },
+    { 0, SW2_CS9,  SW1_CS9,  SW3_CS9  },
+    { 0, SW2_CS10, SW1_CS10, SW3_CS10 },
+    { 0, SW2_CS12, SW1_CS12, SW3_CS12 },
+    { 0, SW2_CS13, SW1_CS13, SW3_CS13 },
+    { 0, SW2_CS14, SW1_CS14, SW3_CS14 },
+    { 0, SW2_CS16, SW1_CS16, SW3_CS16 },
+    { 1, SW2_CS12, SW1_CS12, SW3_CS12 },
 
 // sd1 + function + sd18
-    { 0, B_1,  A_1,  C_1  },
-    { 0, E_2,  D_2,  F_2  },
-    { 0, E_3,  D_3,  F_3  },
-    { 0, E_4,  D_4,  F_4  },
-    { 0, E_5,  D_5,  F_5  },
-    { 0, E_6,  D_6,  F_6  },
-    { 0, E_7,  D_7,  F_7  },
-    { 0, E_8,  D_8,  F_8  },
-    { 0, E_9,  D_9,  F_9  },
-    { 0, E_10, D_10, F_10 },
-    { 0, E_11, D_11, F_11 },
-    { 0, E_12, D_12, F_12 },
-    { 0, E_13, D_13, F_13 },
-    { 0, E_14, D_14, F_14 },
-    { 0, E_15, D_15, F_15 },
+    { 0, SW2_CS1,  SW1_CS1,  SW3_CS1  },
+    { 0, SW5_CS2,  SW4_CS2,  SW6_CS2  },
+    { 0, SW5_CS3,  SW4_CS3,  SW6_CS3  },
+    { 0, SW5_CS4,  SW4_CS4,  SW6_CS4  },
+    { 0, SW5_CS5,  SW4_CS5,  SW6_CS5  },
+    { 0, SW5_CS6,  SW4_CS6,  SW6_CS6  },
+    { 0, SW5_CS7,  SW4_CS7,  SW6_CS7  },
+    { 0, SW5_CS8,  SW4_CS8,  SW6_CS8  },
+    { 0, SW5_CS9,  SW4_CS9,  SW6_CS9  },
+    { 0, SW5_CS10, SW4_CS10, SW6_CS10 },
+    { 0, SW5_CS11, SW4_CS11, SW6_CS11 },
+    { 0, SW5_CS12, SW4_CS12, SW6_CS12 },
+    { 0, SW5_CS13, SW4_CS13, SW6_CS13 },
+    { 0, SW5_CS14, SW4_CS14, SW6_CS14 },
+    { 0, SW5_CS15, SW4_CS15, SW6_CS15 },
     // <enc gap>
-    { 1, B_13, A_13, C_13 },
+    { 1, SW2_CS13, SW1_CS13, SW3_CS13 },
 
 // sd45 + num + sd20
-    { 0, H_1,  G_1,  I_1  },
-    { 0, H_2,  G_2,  I_2  },
-    { 0, H_3,  G_3,  I_3  },
-    { 0, H_4,  G_4,  I_4  },
-    { 0, H_5,  G_5,  I_5  },
-    { 0, H_6,  G_6,  I_6  },
-    { 0, H_7,  G_7,  I_7  },
-    { 0, H_8,  G_8,  I_8  },
-    { 0, H_9,  G_9,  I_9  },
-    { 0, H_10, G_10, I_10 },
-    { 0, H_11, G_11, I_11 },
-    { 0, H_12, G_12, I_12 },
-    { 0, H_13, G_13, I_13 },
-    { 0, H_14, G_14, I_14 },
-    { 0, H_15, G_15, I_15 },
-    { 0, H_16, G_16, I_16 },
-    { 1, B_15, A_15, C_15 },
+    { 0, SW8_CS1,  SW7_CS1,  SW9_CS1  },
+    { 0, SW8_CS2,  SW7_CS2,  SW9_CS2  },
+    { 0, SW8_CS3,  SW7_CS3,  SW9_CS3  },
+    { 0, SW8_CS4,  SW7_CS4,  SW9_CS4  },
+    { 0, SW8_CS5,  SW7_CS5,  SW9_CS5  },
+    { 0, SW8_CS6,  SW7_CS6,  SW9_CS6  },
+    { 0, SW8_CS7,  SW7_CS7,  SW9_CS7  },
+    { 0, SW8_CS8,  SW7_CS8,  SW9_CS8  },
+    { 0, SW8_CS9,  SW7_CS9,  SW9_CS9  },
+    { 0, SW8_CS10, SW7_CS10, SW9_CS10 },
+    { 0, SW8_CS11, SW7_CS11, SW9_CS11 },
+    { 0, SW8_CS12, SW7_CS12, SW9_CS12 },
+    { 0, SW8_CS13, SW7_CS13, SW9_CS13 },
+    { 0, SW8_CS14, SW7_CS14, SW9_CS14 },
+    { 0, SW8_CS15, SW7_CS15, SW9_CS15 },
+    { 0, SW8_CS16, SW7_CS16, SW9_CS16 },
+    { 1, SW2_CS15, SW1_CS15, SW3_CS15 },
 
 // 44+ qwer 21
-    { 0, K_1,  J_1,  L_1  },
-    { 0, K_2,  J_2,  L_2  },
-    { 0, K_3,  J_3,  L_3  },
-    { 0, K_4,  J_4,  L_4  },
-    { 0, K_5,  J_5,  L_5  },
-    { 0, K_6,  J_6,  L_6  },
-    { 0, K_7,  J_7,  L_7  },
-    { 0, K_8,  J_8,  L_8  },
-    { 0, K_9,  J_9,  L_9  },
-    { 0, K_10, J_10, L_10 },
-    { 0, K_11, J_11, L_11 },
-    { 0, K_12, J_12, L_12 },
-    { 0, K_13, J_13, L_13 },
-    { 0, K_14, J_14, L_14 },
-    { 0, K_15, J_15, L_15 },
-    { 0, K_16, J_16, L_16 },
-    { 1, B_16, A_16, C_16 },
+    { 0, SW11_CS1,  SW10_CS1,  SW12_CS1  },
+    { 0, SW11_CS2,  SW10_CS2,  SW12_CS2  },
+    { 0, SW11_CS3,  SW10_CS3,  SW12_CS3  },
+    { 0, SW11_CS4,  SW10_CS4,  SW12_CS4  },
+    { 0, SW11_CS5,  SW10_CS5,  SW12_CS5  },
+    { 0, SW11_CS6,  SW10_CS6,  SW12_CS6  },
+    { 0, SW11_CS7,  SW10_CS7,  SW12_CS7  },
+    { 0, SW11_CS8,  SW10_CS8,  SW12_CS8  },
+    { 0, SW11_CS9,  SW10_CS9,  SW12_CS9  },
+    { 0, SW11_CS10, SW10_CS10, SW12_CS10 },
+    { 0, SW11_CS11, SW10_CS11, SW12_CS11 },
+    { 0, SW11_CS12, SW10_CS12, SW12_CS12 },
+    { 0, SW11_CS13, SW10_CS13, SW12_CS13 },
+    { 0, SW11_CS14, SW10_CS14, SW12_CS14 },
+    { 0, SW11_CS15, SW10_CS15, SW12_CS15 },
+    { 0, SW11_CS16, SW10_CS16, SW12_CS16 },
+    { 1, SW2_CS16, SW1_CS16, SW3_CS16 },
 
 // asdf
-    { 1, B_2,  A_2,  C_2  },
-    { 1, B_3,  A_3,  C_3  },
-    { 1, B_4,  A_4,  C_4  },
-    { 1, B_5,  A_5,  C_5  },
-    { 1, B_6,  A_6,  C_6  },
-    { 1, B_7,  A_7,  C_7  },
-    { 1, B_8,  A_8,  C_8  },
-    { 1, B_9,  A_9,  C_9  },
-    { 1, B_10, A_10, C_10 },
-    { 1, B_11, A_11, C_11 },
-    { 1, E_12, D_12, F_12 },
-    { 1, E_13, D_13, F_13 },
-    { 1, E_14, D_14, F_14 },
-    { 1, H_15, G_15, I_15 },
+    { 1, SW2_CS2,  SW1_CS2,  SW3_CS2  },
+    { 1, SW2_CS3,  SW1_CS3,  SW3_CS3  },
+    { 1, SW2_CS4,  SW1_CS4,  SW3_CS4  },
+    { 1, SW2_CS5,  SW1_CS5,  SW3_CS5  },
+    { 1, SW2_CS6,  SW1_CS6,  SW3_CS6  },
+    { 1, SW2_CS7,  SW1_CS7,  SW3_CS7  },
+    { 1, SW2_CS8,  SW1_CS8,  SW3_CS8  },
+    { 1, SW2_CS9,  SW1_CS9,  SW3_CS9  },
+    { 1, SW2_CS10, SW1_CS10, SW3_CS10 },
+    { 1, SW2_CS11, SW1_CS11, SW3_CS11 },
+    { 1, SW5_CS12, SW4_CS12, SW6_CS12 },
+    { 1, SW5_CS13, SW4_CS13, SW6_CS13 },
+    { 1, SW5_CS14, SW4_CS14, SW6_CS14 },
+    { 1, SW8_CS15, SW7_CS15, SW9_CS15 },
 
 // 43 + zxcv + 22
-    { 1, B_1,  A_1,  C_1  },
-    { 1, E_2,  D_2,  F_2  },
-    { 1, E_3,  D_3,  F_3  },
-    { 1, E_4,  D_4,  F_4  },
-    { 1, E_5,  D_5,  F_5  },
-    { 1, E_6,  D_6,  F_6  },
-    { 1, E_7,  D_7,  F_7  },
-    { 1, E_8,  D_8,  F_8  },
-    { 1, E_9,  D_9,  F_9  },
-    { 1, E_10, D_10, F_10 },
-    { 1, E_11, D_11, F_11 },
-    { 1, H_12, G_12, I_12 },
-    { 1, H_13, G_13, I_13 },
-    { 1, H_14, G_14, I_14 },
-    { 1, E_15, D_15, F_15 },
+    { 1, SW2_CS1,  SW1_CS1,  SW3_CS1  },
+    { 1, SW5_CS2,  SW4_CS2,  SW6_CS2  },
+    { 1, SW5_CS3,  SW4_CS3,  SW6_CS3  },
+    { 1, SW5_CS4,  SW4_CS4,  SW6_CS4  },
+    { 1, SW5_CS5,  SW4_CS5,  SW6_CS5  },
+    { 1, SW5_CS6,  SW4_CS6,  SW6_CS6  },
+    { 1, SW5_CS7,  SW4_CS7,  SW6_CS7  },
+    { 1, SW5_CS8,  SW4_CS8,  SW6_CS8  },
+    { 1, SW5_CS9,  SW4_CS9,  SW6_CS9  },
+    { 1, SW5_CS10, SW4_CS10, SW6_CS10 },
+    { 1, SW5_CS11, SW4_CS11, SW6_CS11 },
+    { 1, SW8_CS12, SW7_CS12, SW9_CS12 },
+    { 1, SW8_CS13, SW7_CS13, SW9_CS13 },
+    { 1, SW8_CS14, SW7_CS14, SW9_CS14 },
+    { 1, SW5_CS15, SW4_CS15, SW6_CS15 },
 
 // 41 + mods + 23
-    { 1, H_1,  G_1,  I_1  },
-    { 1, H_2,  G_2,  I_2  },
-    { 1, H_3,  G_3,  I_3  },
-    { 1, H_4,  G_4,  I_4  },
-    { 1, H_5,  G_5,  I_5  },
-    { 1, H_6,  G_6,  I_6  },
-    { 1, H_7,  G_7,  I_7  },
-    { 1, H_8,  G_8,  I_8  },
-    { 1, H_9,  G_9,  I_9  },
-    { 1, H_10, G_10, I_10 },
-    { 1, H_11, G_11, I_11 },
-    { 1, E_16, D_16, F_16 },
+    { 1, SW8_CS1,  SW7_CS1,  SW9_CS1  },
+    { 1, SW8_CS2,  SW7_CS2,  SW9_CS2  },
+    { 1, SW8_CS3,  SW7_CS3,  SW9_CS3  },
+    { 1, SW8_CS4,  SW7_CS4,  SW9_CS4  },
+    { 1, SW8_CS5,  SW7_CS5,  SW9_CS5  },
+    { 1, SW8_CS6,  SW7_CS6,  SW9_CS6  },
+    { 1, SW8_CS7,  SW7_CS7,  SW9_CS7  },
+    { 1, SW8_CS8,  SW7_CS8,  SW9_CS8  },
+    { 1, SW8_CS9,  SW7_CS9,  SW9_CS9  },
+    { 1, SW8_CS10, SW7_CS10, SW9_CS10 },
+    { 1, SW8_CS11, SW7_CS11, SW9_CS11 },
+    { 1, SW5_CS16, SW4_CS16, SW6_CS16 },
 
 // bottom underglow 24 - 39
-    { 1, K_2,  J_2,  L_2  },
-    { 1, K_3,  J_3,  L_3  },
-    { 1, K_4,  J_4,  L_4  },
-    { 1, K_6,  J_6,  L_6  },
-    { 1, K_10, J_10, L_10 },
-    { 1, K_13, J_13, L_13 },
-    { 1, K_15, J_15, L_15 },
-    { 1, H_16, G_16, I_16 }
+    { 1, SW11_CS2,  SW10_CS2,  SW12_CS2  },
+    { 1, SW11_CS3,  SW10_CS3,  SW12_CS3  },
+    { 1, SW11_CS4,  SW10_CS4,  SW12_CS4  },
+    { 1, SW11_CS6,  SW10_CS6,  SW12_CS6  },
+    { 1, SW11_CS10, SW10_CS10, SW12_CS10 },
+    { 1, SW11_CS13, SW10_CS13, SW12_CS13 },
+    { 1, SW11_CS15, SW10_CS15, SW12_CS15 },
+    { 1, SW8_CS16, SW7_CS16, SW9_CS16 }
 };
 #endif
diff --git a/keyboards/drop/shift/v2/v2.c b/keyboards/drop/shift/v2/v2.c
index cbfbeda4294..4715d7b81b5 100644
--- a/keyboards/drop/shift/v2/v2.c
+++ b/keyboards/drop/shift/v2/v2.c
@@ -5,172 +5,172 @@
 #    include "rgb_matrix.h"
 
 const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
-     { 0, K_1,  J_1,  L_1  },// LED1
-     { 0, K_2,  J_2,  L_2  },
-     { 0, K_3,  J_3,  L_3  },
-     { 0, K_4,  J_4,  L_4  },
-     { 0, K_5,  J_5,  L_5  },
-     { 0, K_7,  J_7,  L_7  },
-     { 0, K_8,  J_8,  L_8  },
-     { 0, K_9,  J_9,  L_9  },
-     { 0, K_10, J_10, L_10 },// LED9
-     { 1, K_1,  J_1,  L_1  },// LED10
-     { 1, K_2,  J_2,  L_2  },// LED11
-     { 1, K_3,  J_3,  L_3  },// LED12
-     { 1, K_4,  J_4,  L_4  },// LED13
-     { 1, K_9,  J_9,  L_9  },// LED18
-     { 1, K_5,  J_5,  L_5  },// LED15
-     { 1, K_6,  J_6,  L_6  },// LED19
-     { 1, K_7,  J_7,  L_7  },// LED16
-     { 1, K_8,  J_8,  L_8  },// LED20
-     { 0, H_1,  G_1,  I_1  },//start2
-     { 0, H_11, G_11, I_11 },
-     { 0, H_2,  G_2,  I_2  },
-     { 0, H_3,  G_3,  I_3  },
-     { 0, H_4,  G_4,  I_4  },
-     { 0, H_5,  G_5,  I_5  },
-     { 0, H_6,  G_6,  I_6  },
-     { 0, H_7,  G_7,  I_7  },
-     { 0, H_8,  G_8,  I_8  },
-     { 0, H_9,  G_9,  I_9  },
-     { 0, H_10, G_10, I_10 },
-     { 1, E_1,  D_1,  F_1  },
-     { 1, E_2,  D_2,  F_2  },
-     { 1, E_4,  D_4,  F_4  },
-     { 1, E_5,  D_5,  F_5  },
-     { 1, E_6,  D_6,  F_6  },
-     { 1, E_7,  D_7,  F_7  },
-     { 1, E_8,  D_8,  F_8  },
-     { 0, E_1,  D_1,  F_1  },
-     { 0, E_2,  D_2,  F_2  },
-     { 0, E_3,  D_3,  F_3  },
-     { 0, E_4,  D_4,  F_4  },
-     { 0, E_5,  D_5,  F_5  },
-     { 0, E_6,  D_6,  F_6  },
-     { 0, E_7,  D_7,  F_7  },
-     { 0, E_8,  D_8,  F_8  },
-     { 0, E_9,  D_9,  F_9  },
-     { 0, E_10, D_10, F_10 },
-     { 1, B_1,  A_1,  C_1  },
-     { 1, B_2,  A_2,  C_2  },
-     { 1, B_3,  A_3,  C_3  },
-     { 1, B_4,  A_4,  C_4  },
-     { 1, B_5,  A_5,  C_5  },
-     { 1, B_6,  A_6,  C_6  },
-     { 1, B_7,  A_7,  C_7  },
-     { 1, B_8,  A_8,  C_8  },
-     { 0, B_1,  A_1,  C_1  },
-     { 0, B_2,  A_2,  C_2  },
-     { 0, B_3,  A_3,  C_3  },
-     { 0, B_4,  A_4,  C_4  },
-     { 0, B_5,  A_5,  C_5  },
-     { 0, B_6,  A_6,  C_6  },
-     { 0, B_7,  A_7,  C_7  },
-     { 0, B_8,  A_8,  C_8  },
-     { 0, B_9,  A_9,  C_9  },
-     { 0, B_10, A_10, C_10 },
-     { 1, B_9,  A_9,  C_9  },
-     { 1, B_10, A_10, C_10 },
-     { 1, B_11, A_11, C_11 },
-     { 1, B_13, A_13, C_13 },
-     { 1, B_14, A_14, C_14 },
-     { 1, B_15, A_15, C_15 },
-     { 1, B_16, A_16, C_16 },
-     { 0, B_11, A_11, C_11 },
-     { 0, B_12, A_12, C_12 },
-     { 0, B_13, A_13, C_13 },
-     { 0, H_13, G_13, I_13 },
-     { 0, H_14, G_14, I_14 },
-     { 0, B_14, A_14, C_14 },
-     { 0, E_15, D_15, F_15 },
-     { 0, B_15, A_15, C_15 },
-     { 0, B_16, A_16, C_16 },
-     { 1, E_9,  D_9,  F_9  },
-     { 1, E_10, D_10, F_10 },
-     { 1, E_11, D_11, F_11 },
-     { 1, E_12, D_12, F_12 },
-     { 1, E_13, D_13, F_13 },
-     { 1, E_14, D_14, F_14 },
-     { 1, E_15, D_15, F_15 },
-     { 1, H_16, G_16, I_16 },
-     { 0, E_11, D_11, F_11 },//start6
-     { 0, E_12, D_12, F_12 },
-     { 0, E_13, D_13, F_13 },
-     { 0, E_14, D_14, F_14 },
-     { 1, H_9,  G_9,  I_9  },
-     { 1, H_10, G_10, I_10 },
-     { 1, H_11, G_11, I_11 },
-     { 1, H_12, G_12, I_12 },
-     { 1, H_13, G_13, I_13 },
-     { 1, H_14, G_14, I_14 },
-     { 1, H_15, G_15, I_15 },
-     { 2, H_1,  G_1,  I_1  },//start underglow
-     { 2, K_1,  J_1,  L_1  },
-     { 2, B_1,  A_1,  C_1  },
-     { 2, E_1,  D_1,  F_1  },
-     { 2, E_2,  D_2,  F_2  },
-     { 2, B_2,  A_2,  C_2  },
-     { 2, B_3,  A_3,  C_3  },
-     { 2, E_3,  D_3,  F_3  },
-     { 2, E_4,  D_4,  F_4  },
-     { 2, B_4,  A_4,  C_4  },
-     { 2, B_5,  A_5,  C_5  },
-     { 2, E_5,  D_5,  F_5  },
-     { 2, E_6,  D_6,  F_6  },
-     { 2, B_6,  A_6,  C_6  },
-     { 2, B_7,  A_7,  C_7  },
-     { 2, E_7,  D_7,  F_7  },
-     { 2, E_8,  D_8,  F_8  },
-     { 2, B_8,  A_8,  C_8  },
-     { 2, B_9,  A_9,  C_9  },
-     { 2, E_9,  D_9,  F_9  },
-     { 2, E_10, D_10, F_10 },
-     { 2, B_10, A_10, C_10 },
-     { 2, B_11, A_11, C_11 },//125
-     { 2, E_11, D_11, F_11 },
-     { 2, E_12, D_12, F_12 },
-     { 2, B_12, A_12, C_12 },
-     { 2, B_13, A_13, C_13 },
-     { 2, E_13, D_13, F_13 },
-     { 2, E_14, D_14, F_14 },
-     { 2, B_14, A_14, C_14 },
-     { 2, B_15, A_15, C_15 },
-     { 2, E_15, D_15, F_15 },
-     { 2, E_16, D_16, F_16 },
-     { 2, B_16, A_16, C_16 },
-     { 2, H_16, G_16, I_16 },
-     { 2, K_16, J_16, L_16 },
-     { 2, K_15, J_15, L_15 },
-     { 2, H_15, G_15, I_15 },
-     { 2, H_14, G_14, I_14 },
-     { 2, K_14, J_14, L_14 },
-     { 2, K_13, J_13, L_13 },
-     { 2, H_13, G_13, I_13 },
-     { 2, H_12, G_12, I_12 },
-     { 2, K_12, J_12, L_12 },
-     { 2, K_11, J_11, L_11 },
-     { 2, H_11, G_11, I_11 },
-     { 2, H_10, G_10, I_10 },
-     { 2, K_10, J_10, L_10 },
-     { 2, K_9,  J_9,  L_9  },
-     { 2, H_9,  G_9,  I_9  },
-     { 2, H_8,  G_8,  I_8  },
-     { 2, K_8,  J_8,  L_8  },
-     { 2, K_7,  J_7,  L_7  },
-     { 2, H_7,  G_7,  I_7  },
-     { 2, H_6,  G_6,  I_6  },
-     { 2, K_6,  J_6,  L_6  },
-     { 2, K_5,  J_5,  L_5  },
-     { 2, H_5,  G_5,  I_5  },
-     { 2, H_4,  G_4,  I_4  },
-     { 2, K_4,  J_4,  L_4  },
-     { 2, K_3,  J_3,  L_3  },
-     { 2, H_3,  G_3,  I_3  },
-     { 2, H_2,  G_2,  I_2  },
-     { 2, K_2,  J_2,  L_2  },
-     { 1, K_10, J_10, L_10 },
-     { 1, K_11, J_11, L_11 },
-     { 1, E_3,  D_3,  F_3  },
+     { 0, SW11_CS1,  SW10_CS1,  SW12_CS1  },// LED1
+     { 0, SW11_CS2,  SW10_CS2,  SW12_CS2  },
+     { 0, SW11_CS3,  SW10_CS3,  SW12_CS3  },
+     { 0, SW11_CS4,  SW10_CS4,  SW12_CS4  },
+     { 0, SW11_CS5,  SW10_CS5,  SW12_CS5  },
+     { 0, SW11_CS7,  SW10_CS7,  SW12_CS7  },
+     { 0, SW11_CS8,  SW10_CS8,  SW12_CS8  },
+     { 0, SW11_CS9,  SW10_CS9,  SW12_CS9  },
+     { 0, SW11_CS10, SW10_CS10, SW12_CS10 },// LED9
+     { 1, SW11_CS1,  SW10_CS1,  SW12_CS1  },// LED10
+     { 1, SW11_CS2,  SW10_CS2,  SW12_CS2  },// LED11
+     { 1, SW11_CS3,  SW10_CS3,  SW12_CS3  },// LED12
+     { 1, SW11_CS4,  SW10_CS4,  SW12_CS4  },// LED13
+     { 1, SW11_CS9,  SW10_CS9,  SW12_CS9  },// LED18
+     { 1, SW11_CS5,  SW10_CS5,  SW12_CS5  },// LED15
+     { 1, SW11_CS6,  SW10_CS6,  SW12_CS6  },// LED19
+     { 1, SW11_CS7,  SW10_CS7,  SW12_CS7  },// LED16
+     { 1, SW11_CS8,  SW10_CS8,  SW12_CS8  },// LED20
+     { 0, SW8_CS1,  SW7_CS1,  SW9_CS1  },//start2
+     { 0, SW8_CS11, SW7_CS11, SW9_CS11 },
+     { 0, SW8_CS2,  SW7_CS2,  SW9_CS2  },
+     { 0, SW8_CS3,  SW7_CS3,  SW9_CS3  },
+     { 0, SW8_CS4,  SW7_CS4,  SW9_CS4  },
+     { 0, SW8_CS5,  SW7_CS5,  SW9_CS5  },
+     { 0, SW8_CS6,  SW7_CS6,  SW9_CS6  },
+     { 0, SW8_CS7,  SW7_CS7,  SW9_CS7  },
+     { 0, SW8_CS8,  SW7_CS8,  SW9_CS8  },
+     { 0, SW8_CS9,  SW7_CS9,  SW9_CS9  },
+     { 0, SW8_CS10, SW7_CS10, SW9_CS10 },
+     { 1, SW5_CS1,  SW4_CS1,  SW6_CS1  },
+     { 1, SW5_CS2,  SW4_CS2,  SW6_CS2  },
+     { 1, SW5_CS4,  SW4_CS4,  SW6_CS4  },
+     { 1, SW5_CS5,  SW4_CS5,  SW6_CS5  },
+     { 1, SW5_CS6,  SW4_CS6,  SW6_CS6  },
+     { 1, SW5_CS7,  SW4_CS7,  SW6_CS7  },
+     { 1, SW5_CS8,  SW4_CS8,  SW6_CS8  },
+     { 0, SW5_CS1,  SW4_CS1,  SW6_CS1  },
+     { 0, SW5_CS2,  SW4_CS2,  SW6_CS2  },
+     { 0, SW5_CS3,  SW4_CS3,  SW6_CS3  },
+     { 0, SW5_CS4,  SW4_CS4,  SW6_CS4  },
+     { 0, SW5_CS5,  SW4_CS5,  SW6_CS5  },
+     { 0, SW5_CS6,  SW4_CS6,  SW6_CS6  },
+     { 0, SW5_CS7,  SW4_CS7,  SW6_CS7  },
+     { 0, SW5_CS8,  SW4_CS8,  SW6_CS8  },
+     { 0, SW5_CS9,  SW4_CS9,  SW6_CS9  },
+     { 0, SW5_CS10, SW4_CS10, SW6_CS10 },
+     { 1, SW2_CS1,  SW1_CS1,  SW3_CS1  },
+     { 1, SW2_CS2,  SW1_CS2,  SW3_CS2  },
+     { 1, SW2_CS3,  SW1_CS3,  SW3_CS3  },
+     { 1, SW2_CS4,  SW1_CS4,  SW3_CS4  },
+     { 1, SW2_CS5,  SW1_CS5,  SW3_CS5  },
+     { 1, SW2_CS6,  SW1_CS6,  SW3_CS6  },
+     { 1, SW2_CS7,  SW1_CS7,  SW3_CS7  },
+     { 1, SW2_CS8,  SW1_CS8,  SW3_CS8  },
+     { 0, SW2_CS1,  SW1_CS1,  SW3_CS1  },
+     { 0, SW2_CS2,  SW1_CS2,  SW3_CS2  },
+     { 0, SW2_CS3,  SW1_CS3,  SW3_CS3  },
+     { 0, SW2_CS4,  SW1_CS4,  SW3_CS4  },
+     { 0, SW2_CS5,  SW1_CS5,  SW3_CS5  },
+     { 0, SW2_CS6,  SW1_CS6,  SW3_CS6  },
+     { 0, SW2_CS7,  SW1_CS7,  SW3_CS7  },
+     { 0, SW2_CS8,  SW1_CS8,  SW3_CS8  },
+     { 0, SW2_CS9,  SW1_CS9,  SW3_CS9  },
+     { 0, SW2_CS10, SW1_CS10, SW3_CS10 },
+     { 1, SW2_CS9,  SW1_CS9,  SW3_CS9  },
+     { 1, SW2_CS10, SW1_CS10, SW3_CS10 },
+     { 1, SW2_CS11, SW1_CS11, SW3_CS11 },
+     { 1, SW2_CS13, SW1_CS13, SW3_CS13 },
+     { 1, SW2_CS14, SW1_CS14, SW3_CS14 },
+     { 1, SW2_CS15, SW1_CS15, SW3_CS15 },
+     { 1, SW2_CS16, SW1_CS16, SW3_CS16 },
+     { 0, SW2_CS11, SW1_CS11, SW3_CS11 },
+     { 0, SW2_CS12, SW1_CS12, SW3_CS12 },
+     { 0, SW2_CS13, SW1_CS13, SW3_CS13 },
+     { 0, SW8_CS13, SW7_CS13, SW9_CS13 },
+     { 0, SW8_CS14, SW7_CS14, SW9_CS14 },
+     { 0, SW2_CS14, SW1_CS14, SW3_CS14 },
+     { 0, SW5_CS15, SW4_CS15, SW6_CS15 },
+     { 0, SW2_CS15, SW1_CS15, SW3_CS15 },
+     { 0, SW2_CS16, SW1_CS16, SW3_CS16 },
+     { 1, SW5_CS9,  SW4_CS9,  SW6_CS9  },
+     { 1, SW5_CS10, SW4_CS10, SW6_CS10 },
+     { 1, SW5_CS11, SW4_CS11, SW6_CS11 },
+     { 1, SW5_CS12, SW4_CS12, SW6_CS12 },
+     { 1, SW5_CS13, SW4_CS13, SW6_CS13 },
+     { 1, SW5_CS14, SW4_CS14, SW6_CS14 },
+     { 1, SW5_CS15, SW4_CS15, SW6_CS15 },
+     { 1, SW8_CS16, SW7_CS16, SW9_CS16 },
+     { 0, SW5_CS11, SW4_CS11, SW6_CS11 },//start6
+     { 0, SW5_CS12, SW4_CS12, SW6_CS12 },
+     { 0, SW5_CS13, SW4_CS13, SW6_CS13 },
+     { 0, SW5_CS14, SW4_CS14, SW6_CS14 },
+     { 1, SW8_CS9,  SW7_CS9,  SW9_CS9  },
+     { 1, SW8_CS10, SW7_CS10, SW9_CS10 },
+     { 1, SW8_CS11, SW7_CS11, SW9_CS11 },
+     { 1, SW8_CS12, SW7_CS12, SW9_CS12 },
+     { 1, SW8_CS13, SW7_CS13, SW9_CS13 },
+     { 1, SW8_CS14, SW7_CS14, SW9_CS14 },
+     { 1, SW8_CS15, SW7_CS15, SW9_CS15 },
+     { 2, SW8_CS1,  SW7_CS1,  SW9_CS1  },//start underglow
+     { 2, SW11_CS1,  SW10_CS1,  SW12_CS1  },
+     { 2, SW2_CS1,  SW1_CS1,  SW3_CS1  },
+     { 2, SW5_CS1,  SW4_CS1,  SW6_CS1  },
+     { 2, SW5_CS2,  SW4_CS2,  SW6_CS2  },
+     { 2, SW2_CS2,  SW1_CS2,  SW3_CS2  },
+     { 2, SW2_CS3,  SW1_CS3,  SW3_CS3  },
+     { 2, SW5_CS3,  SW4_CS3,  SW6_CS3  },
+     { 2, SW5_CS4,  SW4_CS4,  SW6_CS4  },
+     { 2, SW2_CS4,  SW1_CS4,  SW3_CS4  },
+     { 2, SW2_CS5,  SW1_CS5,  SW3_CS5  },
+     { 2, SW5_CS5,  SW4_CS5,  SW6_CS5  },
+     { 2, SW5_CS6,  SW4_CS6,  SW6_CS6  },
+     { 2, SW2_CS6,  SW1_CS6,  SW3_CS6  },
+     { 2, SW2_CS7,  SW1_CS7,  SW3_CS7  },
+     { 2, SW5_CS7,  SW4_CS7,  SW6_CS7  },
+     { 2, SW5_CS8,  SW4_CS8,  SW6_CS8  },
+     { 2, SW2_CS8,  SW1_CS8,  SW3_CS8  },
+     { 2, SW2_CS9,  SW1_CS9,  SW3_CS9  },
+     { 2, SW5_CS9,  SW4_CS9,  SW6_CS9  },
+     { 2, SW5_CS10, SW4_CS10, SW6_CS10 },
+     { 2, SW2_CS10, SW1_CS10, SW3_CS10 },
+     { 2, SW2_CS11, SW1_CS11, SW3_CS11 },//125
+     { 2, SW5_CS11, SW4_CS11, SW6_CS11 },
+     { 2, SW5_CS12, SW4_CS12, SW6_CS12 },
+     { 2, SW2_CS12, SW1_CS12, SW3_CS12 },
+     { 2, SW2_CS13, SW1_CS13, SW3_CS13 },
+     { 2, SW5_CS13, SW4_CS13, SW6_CS13 },
+     { 2, SW5_CS14, SW4_CS14, SW6_CS14 },
+     { 2, SW2_CS14, SW1_CS14, SW3_CS14 },
+     { 2, SW2_CS15, SW1_CS15, SW3_CS15 },
+     { 2, SW5_CS15, SW4_CS15, SW6_CS15 },
+     { 2, SW5_CS16, SW4_CS16, SW6_CS16 },
+     { 2, SW2_CS16, SW1_CS16, SW3_CS16 },
+     { 2, SW8_CS16, SW7_CS16, SW9_CS16 },
+     { 2, SW11_CS16, SW10_CS16, SW12_CS16 },
+     { 2, SW11_CS15, SW10_CS15, SW12_CS15 },
+     { 2, SW8_CS15, SW7_CS15, SW9_CS15 },
+     { 2, SW8_CS14, SW7_CS14, SW9_CS14 },
+     { 2, SW11_CS14, SW10_CS14, SW12_CS14 },
+     { 2, SW11_CS13, SW10_CS13, SW12_CS13 },
+     { 2, SW8_CS13, SW7_CS13, SW9_CS13 },
+     { 2, SW8_CS12, SW7_CS12, SW9_CS12 },
+     { 2, SW11_CS12, SW10_CS12, SW12_CS12 },
+     { 2, SW11_CS11, SW10_CS11, SW12_CS11 },
+     { 2, SW8_CS11, SW7_CS11, SW9_CS11 },
+     { 2, SW8_CS10, SW7_CS10, SW9_CS10 },
+     { 2, SW11_CS10, SW10_CS10, SW12_CS10 },
+     { 2, SW11_CS9,  SW10_CS9,  SW12_CS9  },
+     { 2, SW8_CS9,  SW7_CS9,  SW9_CS9  },
+     { 2, SW8_CS8,  SW7_CS8,  SW9_CS8  },
+     { 2, SW11_CS8,  SW10_CS8,  SW12_CS8  },
+     { 2, SW11_CS7,  SW10_CS7,  SW12_CS7  },
+     { 2, SW8_CS7,  SW7_CS7,  SW9_CS7  },
+     { 2, SW8_CS6,  SW7_CS6,  SW9_CS6  },
+     { 2, SW11_CS6,  SW10_CS6,  SW12_CS6  },
+     { 2, SW11_CS5,  SW10_CS5,  SW12_CS5  },
+     { 2, SW8_CS5,  SW7_CS5,  SW9_CS5  },
+     { 2, SW8_CS4,  SW7_CS4,  SW9_CS4  },
+     { 2, SW11_CS4,  SW10_CS4,  SW12_CS4  },
+     { 2, SW11_CS3,  SW10_CS3,  SW12_CS3  },
+     { 2, SW8_CS3,  SW7_CS3,  SW9_CS3  },
+     { 2, SW8_CS2,  SW7_CS2,  SW9_CS2  },
+     { 2, SW11_CS2,  SW10_CS2,  SW12_CS2  },
+     { 1, SW11_CS10, SW10_CS10, SW12_CS10 },
+     { 1, SW11_CS11, SW10_CS11, SW12_CS11 },
+     { 1, SW5_CS3,  SW4_CS3,  SW6_CS3  },
 };
 
 bool rgb_matrix_indicators_kb(void) {
diff --git a/keyboards/durgod/dgk6x/galaxy/galaxy.c b/keyboards/durgod/dgk6x/galaxy/galaxy.c
index cd1f10c4f99..1cf2d712558 100644
--- a/keyboards/durgod/dgk6x/galaxy/galaxy.c
+++ b/keyboards/durgod/dgk6x/galaxy/galaxy.c
@@ -26,95 +26,95 @@ const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
  *   |  |       |       B location
  *   |  |       |       | */
 
-   {0, C_1,   B_1,   A_1},  // Esc
-   {0, C_2,   B_2,   A_2},  // F1
-   {0, C_3,   B_3,   A_3},  // F2
-   {0, C_4,   B_4,   A_4},  // F3
-   {0, C_5,   B_5,   A_5},  // F4
-   {0, C_6,   B_6,   A_6},  // F5
-   {0, C_7,   B_7,   A_7},  // F6
-   {0, C_8,   B_8,   A_8},  // F7
-   {0, C_9,   B_9,   A_9},  // F8
-   {0, C_10,  B_10,  A_10}, // F9
-   {0, C_11,  B_11,  A_11}, // F10
-   {0, C_12,  B_12,  A_12}, // F11
-   {0, C_13,  B_13,  A_13}, // F12
-   {0, C_14,  B_14,  A_14}, // PrtSc
-   {0, C_15,  B_15,  A_15}, // Pause
-   {0, C_16,  B_16,  A_16}, // Del
+   {0, SW3_CS1,   SW2_CS1,   SW1_CS1},  // Esc
+   {0, SW3_CS2,   SW2_CS2,   SW1_CS2},  // F1
+   {0, SW3_CS3,   SW2_CS3,   SW1_CS3},  // F2
+   {0, SW3_CS4,   SW2_CS4,   SW1_CS4},  // F3
+   {0, SW3_CS5,   SW2_CS5,   SW1_CS5},  // F4
+   {0, SW3_CS6,   SW2_CS6,   SW1_CS6},  // F5
+   {0, SW3_CS7,   SW2_CS7,   SW1_CS7},  // F6
+   {0, SW3_CS8,   SW2_CS8,   SW1_CS8},  // F7
+   {0, SW3_CS9,   SW2_CS9,   SW1_CS9},  // F8
+   {0, SW3_CS10,  SW2_CS10,  SW1_CS10}, // F9
+   {0, SW3_CS11,  SW2_CS11,  SW1_CS11}, // F10
+   {0, SW3_CS12,  SW2_CS12,  SW1_CS12}, // F11
+   {0, SW3_CS13,  SW2_CS13,  SW1_CS13}, // F12
+   {0, SW3_CS14,  SW2_CS14,  SW1_CS14}, // PrtSc
+   {0, SW3_CS15,  SW2_CS15,  SW1_CS15}, // Pause
+   {0, SW3_CS16,  SW2_CS16,  SW1_CS16}, // Del
 
-   {0, F_1,   E_1,   D_1},  // `
-   {0, F_2,   E_2,   D_2},  // 1
-   {0, F_3,   E_3,   D_3},  // 2
-   {0, F_4,   E_4,   D_4},  // 3
-   {0, F_5,   E_5,   D_5},  // 4
-   {0, F_6,   E_6,   D_6},  // 5
-   {0, F_7,   E_7,   D_7},  // 6
-   {0, F_8,   E_8,   D_8},  // 7
-   {0, F_9,   E_9,   D_9},  // 8
-   {0, F_10,  E_10,  D_10}, // 9
-   {0, F_11,  E_11,  D_11}, // 0
-   {0, F_12,  E_12,  D_12}, // -
-   {0, F_13,  E_13,  D_13}, // =
-   {0, F_14,  E_14,  D_14}, // Bksp
-   {0, F_15,  E_15,  D_15}, // Home
+   {0, SW6_CS1,   SW5_CS1,   SW4_CS1},  // `
+   {0, SW6_CS2,   SW5_CS2,   SW4_CS2},  // 1
+   {0, SW6_CS3,   SW5_CS3,   SW4_CS3},  // 2
+   {0, SW6_CS4,   SW5_CS4,   SW4_CS4},  // 3
+   {0, SW6_CS5,   SW5_CS5,   SW4_CS5},  // 4
+   {0, SW6_CS6,   SW5_CS6,   SW4_CS6},  // 5
+   {0, SW6_CS7,   SW5_CS7,   SW4_CS7},  // 6
+   {0, SW6_CS8,   SW5_CS8,   SW4_CS8},  // 7
+   {0, SW6_CS9,   SW5_CS9,   SW4_CS9},  // 8
+   {0, SW6_CS10,  SW5_CS10,  SW4_CS10}, // 9
+   {0, SW6_CS11,  SW5_CS11,  SW4_CS11}, // 0
+   {0, SW6_CS12,  SW5_CS12,  SW4_CS12}, // -
+   {0, SW6_CS13,  SW5_CS13,  SW4_CS13}, // =
+   {0, SW6_CS14,  SW5_CS14,  SW4_CS14}, // Bksp
+   {0, SW6_CS15,  SW5_CS15,  SW4_CS15}, // Home
 
-   {0, I_1,   H_1,   G_1},  // Tab
-   {0, I_2,   H_2,   G_2},  // Q
-   {0, I_3,   H_3,   G_3},  // W
-   {0, I_4,   H_4,   G_4},  // E
-   {0, I_5,   H_5,   G_5},  // R
-   {0, I_6,   H_6,   G_6},  // T
-   {0, I_7,   H_7,   G_7},  // Y
-   {0, I_8,   H_8,   G_8},  // U
-   {0, I_9,   H_9,   G_9},  // I
-   {0, I_10,  H_10,  G_10}, // O
-   {0, I_11,  H_11,  G_11}, // P
-   {0, I_12,  H_12,  G_12}, // [
-   {0, I_13,  H_13,  G_13}, // ]
-   {0, I_14,  H_14,  G_14}, // Pipe
-   {0, I_15,  H_15,  G_15}, // End
+   {0, SW9_CS1,   SW8_CS1,   SW7_CS1},  // Tab
+   {0, SW9_CS2,   SW8_CS2,   SW7_CS2},  // Q
+   {0, SW9_CS3,   SW8_CS3,   SW7_CS3},  // W
+   {0, SW9_CS4,   SW8_CS4,   SW7_CS4},  // E
+   {0, SW9_CS5,   SW8_CS5,   SW7_CS5},  // R
+   {0, SW9_CS6,   SW8_CS6,   SW7_CS6},  // T
+   {0, SW9_CS7,   SW8_CS7,   SW7_CS7},  // Y
+   {0, SW9_CS8,   SW8_CS8,   SW7_CS8},  // U
+   {0, SW9_CS9,   SW8_CS9,   SW7_CS9},  // I
+   {0, SW9_CS10,  SW8_CS10,  SW7_CS10}, // O
+   {0, SW9_CS11,  SW8_CS11,  SW7_CS11}, // P
+   {0, SW9_CS12,  SW8_CS12,  SW7_CS12}, // [
+   {0, SW9_CS13,  SW8_CS13,  SW7_CS13}, // ]
+   {0, SW9_CS14,  SW8_CS14,  SW7_CS14}, // Pipe
+   {0, SW9_CS15,  SW8_CS15,  SW7_CS15}, // End
 
-   {0, L_1,   K_1,   J_1},  // Caps
-   {0, L_2,   K_2,   J_2},  // A
-   {0, L_3,   K_3,   J_3},  // S
-   {0, L_4,   K_4,   J_4},  // D
-   {0, L_5,   K_5,   J_5},  // F
-   {0, L_6,   K_6,   J_6},  // G
-   {0, L_7,   K_7,   J_7},  // H
-   {0, L_8,   K_8,   J_8},  // J
-   {0, L_9,   K_9,   J_9},  // K
-   {0, L_10,  K_10,  J_10}, // L
-   {0, L_11,  K_11,  J_11}, // :
-   {0, L_12,  K_12,  J_12}, // '
-   {0, L_14,  K_14,  J_14}, // Enter
-   {0, L_15,  K_15,  J_15}, // PgUp
+   {0, SW12_CS1,   SW11_CS1,   SW10_CS1},  // Caps
+   {0, SW12_CS2,   SW11_CS2,   SW10_CS2},  // A
+   {0, SW12_CS3,   SW11_CS3,   SW10_CS3},  // S
+   {0, SW12_CS4,   SW11_CS4,   SW10_CS4},  // D
+   {0, SW12_CS5,   SW11_CS5,   SW10_CS5},  // F
+   {0, SW12_CS6,   SW11_CS6,   SW10_CS6},  // G
+   {0, SW12_CS7,   SW11_CS7,   SW10_CS7},  // H
+   {0, SW12_CS8,   SW11_CS8,   SW10_CS8},  // J
+   {0, SW12_CS9,   SW11_CS9,   SW10_CS9},  // K
+   {0, SW12_CS10,  SW11_CS10,  SW10_CS10}, // L
+   {0, SW12_CS11,  SW11_CS11,  SW10_CS11}, // :
+   {0, SW12_CS12,  SW11_CS12,  SW10_CS12}, // '
+   {0, SW12_CS14,  SW11_CS14,  SW10_CS14}, // Enter
+   {0, SW12_CS15,  SW11_CS15,  SW10_CS15}, // PgUp
 
-   {1, C_1,   B_1,   A_1},  // LShift
-   {1, C_3,   B_3,   A_3},  // Z
-   {1, C_4,   B_4,   A_4},  // X
-   {1, C_5,   B_5,   A_5},  // C
-   {1, C_6,   B_6,   A_6},  // V
-   {1, C_7,   B_7,   A_7},  // B
-   {1, C_8,   B_8,   A_8},  // N
-   {1, C_9,   B_9,   A_9},  // M
-   {1, C_10,  B_10,  A_10}, // <
-   {1, C_11,  B_11,  A_11}, // >
-   {1, C_12,  B_12,  A_12}, // ?
-   {1, C_13,  B_13,  A_13}, // RShift
-   {1, C_14,  B_14,  A_14}, // Up
-   {1, C_15,  B_15,  A_15}, // PgDn
+   {1, SW3_CS1,   SW2_CS1,   SW1_CS1},  // LShift
+   {1, SW3_CS3,   SW2_CS3,   SW1_CS3},  // Z
+   {1, SW3_CS4,   SW2_CS4,   SW1_CS4},  // X
+   {1, SW3_CS5,   SW2_CS5,   SW1_CS5},  // C
+   {1, SW3_CS6,   SW2_CS6,   SW1_CS6},  // V
+   {1, SW3_CS7,   SW2_CS7,   SW1_CS7},  // B
+   {1, SW3_CS8,   SW2_CS8,   SW1_CS8},  // N
+   {1, SW3_CS9,   SW2_CS9,   SW1_CS9},  // M
+   {1, SW3_CS10,  SW2_CS10,  SW1_CS10}, // <
+   {1, SW3_CS11,  SW2_CS11,  SW1_CS11}, // >
+   {1, SW3_CS12,  SW2_CS12,  SW1_CS12}, // ?
+   {1, SW3_CS13,  SW2_CS13,  SW1_CS13}, // RShift
+   {1, SW3_CS14,  SW2_CS14,  SW1_CS14}, // Up
+   {1, SW3_CS15,  SW2_CS15,  SW1_CS15}, // PgDn
 
-   {1, F_1,   E_1,   D_1},  // LCtrl
-   {1, F_2,   E_2,   D_2},  // LAlt
-   {1, F_3,   E_3,   D_3},  // LGUI
-   {1, F_7,   E_7,   D_7},  // Space
-   {1, F_10,  E_10,  D_10}, // RAlt
-   {1, F_11,  E_11,  D_11}, // Fn1
-   {1, F_12,  E_12,  D_12}, // Fn2
-   {1, F_13,  E_13,  D_13}, // Left
-   {1, F_14,  E_14,  D_14}, // Down
-   {1, F_15,  E_15,  D_15}  // Right
+   {1, SW6_CS1,   SW5_CS1,   SW4_CS1},  // LCtrl
+   {1, SW6_CS2,   SW5_CS2,   SW4_CS2},  // LAlt
+   {1, SW6_CS3,   SW5_CS3,   SW4_CS3},  // LGUI
+   {1, SW6_CS7,   SW5_CS7,   SW4_CS7},  // Space
+   {1, SW6_CS10,  SW5_CS10,  SW4_CS10}, // RAlt
+   {1, SW6_CS11,  SW5_CS11,  SW4_CS11}, // Fn1
+   {1, SW6_CS12,  SW5_CS12,  SW4_CS12}, // Fn2
+   {1, SW6_CS13,  SW5_CS13,  SW4_CS13}, // Left
+   {1, SW6_CS14,  SW5_CS14,  SW4_CS14}, // Down
+   {1, SW6_CS15,  SW5_CS15,  SW4_CS15}  // Right
 };
 
 led_config_t g_led_config = {{
diff --git a/keyboards/durgod/dgk6x/hades_ansi/hades_ansi.c b/keyboards/durgod/dgk6x/hades_ansi/hades_ansi.c
index 225a7c13ddf..e984c36d911 100644
--- a/keyboards/durgod/dgk6x/hades_ansi/hades_ansi.c
+++ b/keyboards/durgod/dgk6x/hades_ansi/hades_ansi.c
@@ -27,78 +27,78 @@ const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
  *   |  |       |       B location
  *   |  |       |       | */
 
-   {0, C_1,   B_1,   A_1},  // Esc
-   {0, C_2,   B_2,   A_2},  // 1
-   {0, C_3,   B_3,   A_3},  // 2
-   {0, C_4,   B_4,   A_4},  // 3
-   {0, C_5,   B_5,   A_5},  // 4
-   {0, C_6,   B_6,   A_6},  // 5
-   {0, C_7,   B_7,   A_7},  // 6
-   {0, C_8,   B_8,   A_8},  // 7
-   {0, C_9,   B_9,   A_9},  // 8
-   {0, C_10,  B_10,  A_10}, // 9
-   {0, C_11,  B_11,  A_11}, // 0
-   {0, C_12,  B_12,  A_12}, // -
-   {0, C_13,  B_13,  A_13}, // =
-   {0, C_14,  B_14,  A_14}, // Bksp
-   {0, C_15,  B_15,  A_15}, // Del
+   {0, SW3_CS1,   SW2_CS1,   SW1_CS1},  // Esc
+   {0, SW3_CS2,   SW2_CS2,   SW1_CS2},  // 1
+   {0, SW3_CS3,   SW2_CS3,   SW1_CS3},  // 2
+   {0, SW3_CS4,   SW2_CS4,   SW1_CS4},  // 3
+   {0, SW3_CS5,   SW2_CS5,   SW1_CS5},  // 4
+   {0, SW3_CS6,   SW2_CS6,   SW1_CS6},  // 5
+   {0, SW3_CS7,   SW2_CS7,   SW1_CS7},  // 6
+   {0, SW3_CS8,   SW2_CS8,   SW1_CS8},  // 7
+   {0, SW3_CS9,   SW2_CS9,   SW1_CS9},  // 8
+   {0, SW3_CS10,  SW2_CS10,  SW1_CS10}, // 9
+   {0, SW3_CS11,  SW2_CS11,  SW1_CS11}, // 0
+   {0, SW3_CS12,  SW2_CS12,  SW1_CS12}, // -
+   {0, SW3_CS13,  SW2_CS13,  SW1_CS13}, // =
+   {0, SW3_CS14,  SW2_CS14,  SW1_CS14}, // Bksp
+   {0, SW3_CS15,  SW2_CS15,  SW1_CS15}, // Del
 
-   {0, F_1,   E_1,   D_1},  // Tab
-   {0, F_2,   E_2,   D_2},  // Q
-   {0, F_3,   E_3,   D_3},  // W
-   {0, F_4,   E_4,   D_4},  // E
-   {0, F_5,   E_5,   D_5},  // R
-   {0, F_6,   E_6,   D_6},  // T
-   {0, F_7,   E_7,   D_7},  // Y
-   {0, F_8,   E_8,   D_8},  // U
-   {0, F_9,   E_9,   D_9},  // I
-   {0, F_10,  E_10,  D_10}, // O
-   {0, F_11,  E_11,  D_11}, // P
-   {0, F_12,  E_12,  D_12}, // [
-   {0, F_13,  E_13,  D_13}, // ]
-   {0, F_14,  E_14,  D_14}, // Pipe
-   {0, F_15,  E_15,  D_15}, // Home
+   {0, SW6_CS1,   SW5_CS1,   SW4_CS1},  // Tab
+   {0, SW6_CS2,   SW5_CS2,   SW4_CS2},  // Q
+   {0, SW6_CS3,   SW5_CS3,   SW4_CS3},  // W
+   {0, SW6_CS4,   SW5_CS4,   SW4_CS4},  // E
+   {0, SW6_CS5,   SW5_CS5,   SW4_CS5},  // R
+   {0, SW6_CS6,   SW5_CS6,   SW4_CS6},  // T
+   {0, SW6_CS7,   SW5_CS7,   SW4_CS7},  // Y
+   {0, SW6_CS8,   SW5_CS8,   SW4_CS8},  // U
+   {0, SW6_CS9,   SW5_CS9,   SW4_CS9},  // I
+   {0, SW6_CS10,  SW5_CS10,  SW4_CS10}, // O
+   {0, SW6_CS11,  SW5_CS11,  SW4_CS11}, // P
+   {0, SW6_CS12,  SW5_CS12,  SW4_CS12}, // [
+   {0, SW6_CS13,  SW5_CS13,  SW4_CS13}, // ]
+   {0, SW6_CS14,  SW5_CS14,  SW4_CS14}, // Pipe
+   {0, SW6_CS15,  SW5_CS15,  SW4_CS15}, // Home
 
-   {0, I_1,   H_1,   G_1},  // Caps
-   {0, I_2,   H_2,   G_2},  // A
-   {0, I_3,   H_3,   G_3},  // S
-   {0, I_4,   H_4,   G_4},  // D
-   {0, I_5,   H_5,   G_5},  // F
-   {0, I_6,   H_6,   G_6},  // G
-   {0, I_7,   H_7,   G_7},  // H
-   {0, I_8,   H_8,   G_8},  // J
-   {0, I_9,   H_9,   G_9},  // K
-   {0, I_10,  H_10,  G_10}, // L
-   {0, I_11,  H_11,  G_11}, // :
-   {0, I_12,  H_12,  G_12}, // '
-   {0, I_14,  H_14,  G_14}, // Enter
-   {0, I_15,  H_15,  G_15}, // PgUp
+   {0, SW9_CS1,   SW8_CS1,   SW7_CS1},  // Caps
+   {0, SW9_CS2,   SW8_CS2,   SW7_CS2},  // A
+   {0, SW9_CS3,   SW8_CS3,   SW7_CS3},  // S
+   {0, SW9_CS4,   SW8_CS4,   SW7_CS4},  // D
+   {0, SW9_CS5,   SW8_CS5,   SW7_CS5},  // F
+   {0, SW9_CS6,   SW8_CS6,   SW7_CS6},  // G
+   {0, SW9_CS7,   SW8_CS7,   SW7_CS7},  // H
+   {0, SW9_CS8,   SW8_CS8,   SW7_CS8},  // J
+   {0, SW9_CS9,   SW8_CS9,   SW7_CS9},  // K
+   {0, SW9_CS10,  SW8_CS10,  SW7_CS10}, // L
+   {0, SW9_CS11,  SW8_CS11,  SW7_CS11}, // :
+   {0, SW9_CS12,  SW8_CS12,  SW7_CS12}, // '
+   {0, SW9_CS14,  SW8_CS14,  SW7_CS14}, // Enter
+   {0, SW9_CS15,  SW8_CS15,  SW7_CS15}, // PgUp
 
-   {0, L_1,   K_1,   J_1},  // LShift
-   {0, L_2,   K_2,   J_2},  // Z
-   {0, L_3,   K_3,   J_3},  // X
-   {0, L_4,   K_4,   J_4},  // C
-   {0, L_5,   K_5,   J_5},  // V
-   {0, L_6,   K_6,   J_6},  // B
-   {0, L_7,   K_7,   J_7},  // N
-   {0, L_8,   K_8,   J_8},  // M
-   {0, L_9,   K_9,   J_9},  // <
-   {0, L_10,  K_10,  J_10}, // >
-   {0, L_11,  K_11,  J_11}, // ?
-   {0, L_12,  K_12,  J_12}, // RShift
-   {0, L_14,  K_14,  J_14}, // Up
-   {0, L_15,  K_15,  J_15}, // PgOn
+   {0, SW12_CS1,   SW11_CS1,   SW10_CS1},  // LShift
+   {0, SW12_CS2,   SW11_CS2,   SW10_CS2},  // Z
+   {0, SW12_CS3,   SW11_CS3,   SW10_CS3},  // X
+   {0, SW12_CS4,   SW11_CS4,   SW10_CS4},  // C
+   {0, SW12_CS5,   SW11_CS5,   SW10_CS5},  // V
+   {0, SW12_CS6,   SW11_CS6,   SW10_CS6},  // B
+   {0, SW12_CS7,   SW11_CS7,   SW10_CS7},  // N
+   {0, SW12_CS8,   SW11_CS8,   SW10_CS8},  // M
+   {0, SW12_CS9,   SW11_CS9,   SW10_CS9},  // <
+   {0, SW12_CS10,  SW11_CS10,  SW10_CS10}, // >
+   {0, SW12_CS11,  SW11_CS11,  SW10_CS11}, // ?
+   {0, SW12_CS12,  SW11_CS12,  SW10_CS12}, // RShift
+   {0, SW12_CS14,  SW11_CS14,  SW10_CS14}, // Up
+   {0, SW12_CS15,  SW11_CS15,  SW10_CS15}, // PgOn
 
-   {1, C_1,   B_1,   A_1},  // LCtrl
-   {1, C_2,   B_2,   A_2},  // LAlt
-   {1, C_3,   B_3,   A_3},  // Windows
-   {1, C_6,   B_6,   A_6},  // Space
-   {1, C_10,  B_10,  A_10}, // Fn1/RAlt hades/venus
-   {1, C_11,  B_11,  A_11}, // Fn2/Fn1
-   {1, C_12,  B_12,  A_12}, // RCtrl/Fn2
-   {1, C_13,  B_13,  A_13}, // LEFT/RCtrl
-   {1, C_14,  B_14,  A_14}, // DOWN
-   {1, C_15,  B_15,  A_15}  // RIGHT
+   {1, SW3_CS1,   SW2_CS1,   SW1_CS1},  // LCtrl
+   {1, SW3_CS2,   SW2_CS2,   SW1_CS2},  // LAlt
+   {1, SW3_CS3,   SW2_CS3,   SW1_CS3},  // Windows
+   {1, SW3_CS6,   SW2_CS6,   SW1_CS6},  // Space
+   {1, SW3_CS10,  SW2_CS10,  SW1_CS10}, // Fn1/RAlt hades/venus
+   {1, SW3_CS11,  SW2_CS11,  SW1_CS11}, // Fn2/Fn1
+   {1, SW3_CS12,  SW2_CS12,  SW1_CS12}, // RCtrl/Fn2
+   {1, SW3_CS13,  SW2_CS13,  SW1_CS13}, // LEFT/RCtrl
+   {1, SW3_CS14,  SW2_CS14,  SW1_CS14}, // DOWN
+   {1, SW3_CS15,  SW2_CS15,  SW1_CS15}  // RIGHT
 };
 
 led_config_t g_led_config = {{
diff --git a/keyboards/durgod/dgk6x/hades_iso/hades_iso.c b/keyboards/durgod/dgk6x/hades_iso/hades_iso.c
index 6dd732c454b..5ccc60e841e 100644
--- a/keyboards/durgod/dgk6x/hades_iso/hades_iso.c
+++ b/keyboards/durgod/dgk6x/hades_iso/hades_iso.c
@@ -27,79 +27,79 @@ const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
  *   |  |       |       B location
  *   |  |       |       | */
 
-   {0, C_1,   B_1,   A_1},  // Esc
-   {0, C_2,   B_2,   A_2},  // 1
-   {0, C_3,   B_3,   A_3},  // 2
-   {0, C_4,   B_4,   A_4},  // 3
-   {0, C_5,   B_5,   A_5},  // 4
-   {0, C_6,   B_6,   A_6},  // 5
-   {0, C_7,   B_7,   A_7},  // 6
-   {0, C_8,   B_8,   A_8},  // 7
-   {0, C_9,   B_9,   A_9},  // 8
-   {0, C_10,  B_10,  A_10}, // 9
-   {0, C_11,  B_11,  A_11}, // 0
-   {0, C_12,  B_12,  A_12}, // -
-   {0, C_13,  B_13,  A_13}, // =
-   {0, C_14,  B_14,  A_14}, // Bksp
-   {0, C_15,  B_15,  A_15}, // Del
+   {0, SW3_CS1,   SW2_CS1,   SW1_CS1},  // Esc
+   {0, SW3_CS2,   SW2_CS2,   SW1_CS2},  // 1
+   {0, SW3_CS3,   SW2_CS3,   SW1_CS3},  // 2
+   {0, SW3_CS4,   SW2_CS4,   SW1_CS4},  // 3
+   {0, SW3_CS5,   SW2_CS5,   SW1_CS5},  // 4
+   {0, SW3_CS6,   SW2_CS6,   SW1_CS6},  // 5
+   {0, SW3_CS7,   SW2_CS7,   SW1_CS7},  // 6
+   {0, SW3_CS8,   SW2_CS8,   SW1_CS8},  // 7
+   {0, SW3_CS9,   SW2_CS9,   SW1_CS9},  // 8
+   {0, SW3_CS10,  SW2_CS10,  SW1_CS10}, // 9
+   {0, SW3_CS11,  SW2_CS11,  SW1_CS11}, // 0
+   {0, SW3_CS12,  SW2_CS12,  SW1_CS12}, // -
+   {0, SW3_CS13,  SW2_CS13,  SW1_CS13}, // =
+   {0, SW3_CS14,  SW2_CS14,  SW1_CS14}, // Bksp
+   {0, SW3_CS15,  SW2_CS15,  SW1_CS15}, // Del
 
-   {0, F_1,   E_1,   D_1},  // Tab
-   {0, F_2,   E_2,   D_2},  // Q
-   {0, F_3,   E_3,   D_3},  // W
-   {0, F_4,   E_4,   D_4},  // E
-   {0, F_5,   E_5,   D_5},  // R
-   {0, F_6,   E_6,   D_6},  // T
-   {0, F_7,   E_7,   D_7},  // Y
-   {0, F_8,   E_8,   D_8},  // U
-   {0, F_9,   E_9,   D_9},  // I
-   {0, F_10,  E_10,  D_10}, // O
-   {0, F_11,  E_11,  D_11}, // P
-   {0, F_12,  E_12,  D_12}, // [
-   {0, F_13,  E_13,  D_13}, // ]
-   {0, F_15,  E_15,  D_15}, // Home
+   {0, SW6_CS1,   SW5_CS1,   SW4_CS1},  // Tab
+   {0, SW6_CS2,   SW5_CS2,   SW4_CS2},  // Q
+   {0, SW6_CS3,   SW5_CS3,   SW4_CS3},  // W
+   {0, SW6_CS4,   SW5_CS4,   SW4_CS4},  // E
+   {0, SW6_CS5,   SW5_CS5,   SW4_CS5},  // R
+   {0, SW6_CS6,   SW5_CS6,   SW4_CS6},  // T
+   {0, SW6_CS7,   SW5_CS7,   SW4_CS7},  // Y
+   {0, SW6_CS8,   SW5_CS8,   SW4_CS8},  // U
+   {0, SW6_CS9,   SW5_CS9,   SW4_CS9},  // I
+   {0, SW6_CS10,  SW5_CS10,  SW4_CS10}, // O
+   {0, SW6_CS11,  SW5_CS11,  SW4_CS11}, // P
+   {0, SW6_CS12,  SW5_CS12,  SW4_CS12}, // [
+   {0, SW6_CS13,  SW5_CS13,  SW4_CS13}, // ]
+   {0, SW6_CS15,  SW5_CS15,  SW4_CS15}, // Home
 
-   {0, I_1,   H_1,   G_1},  // Caps
-   {0, I_2,   H_2,   G_2},  // A
-   {0, I_3,   H_3,   G_3},  // S
-   {0, I_4,   H_4,   G_4},  // D
-   {0, I_5,   H_5,   G_5},  // F
-   {0, I_6,   H_6,   G_6},  // G
-   {0, I_7,   H_7,   G_7},  // H
-   {0, I_8,   H_8,   G_8},  // J
-   {0, I_9,   H_9,   G_9},  // K
-   {0, I_10,  H_10,  G_10}, // L
-   {0, I_11,  H_11,  G_11}, // :
-   {0, I_12,  H_12,  G_12}, // '
-   {0, I_13,  H_13,  G_13}, // NUHS
-   {0, I_14,  H_14,  G_14}, // Enter
-   {0, I_15,  H_15,  G_15}, // PgUp
+   {0, SW9_CS1,   SW8_CS1,   SW7_CS1},  // Caps
+   {0, SW9_CS2,   SW8_CS2,   SW7_CS2},  // A
+   {0, SW9_CS3,   SW8_CS3,   SW7_CS3},  // S
+   {0, SW9_CS4,   SW8_CS4,   SW7_CS4},  // D
+   {0, SW9_CS5,   SW8_CS5,   SW7_CS5},  // F
+   {0, SW9_CS6,   SW8_CS6,   SW7_CS6},  // G
+   {0, SW9_CS7,   SW8_CS7,   SW7_CS7},  // H
+   {0, SW9_CS8,   SW8_CS8,   SW7_CS8},  // J
+   {0, SW9_CS9,   SW8_CS9,   SW7_CS9},  // K
+   {0, SW9_CS10,  SW8_CS10,  SW7_CS10}, // L
+   {0, SW9_CS11,  SW8_CS11,  SW7_CS11}, // :
+   {0, SW9_CS12,  SW8_CS12,  SW7_CS12}, // '
+   {0, SW9_CS13,  SW8_CS13,  SW7_CS13}, // NUHS
+   {0, SW9_CS14,  SW8_CS14,  SW7_CS14}, // Enter
+   {0, SW9_CS15,  SW8_CS15,  SW7_CS15}, // PgUp
 
-   {0, L_1,   K_1,   J_1},  // LShift
-   {0, L_2,   K_2,   J_2},  // NUBS
-   {0, L_3,   K_3,   J_3},  // Z
-   {0, L_4,   K_4,   J_4},  // X
-   {0, L_5,   K_5,   J_5},  // C
-   {0, L_6,   K_6,   J_6},  // V
-   {0, L_7,   K_7,   J_7},  // B
-   {0, L_8,   K_8,   J_8},  // N
-   {0, L_9,   K_9,   J_9},  // M
-   {0, L_10,  K_10,  J_10}, // <
-   {0, L_11,  K_11,  J_11}, // >
-   {0, L_12,  K_12,  J_12}, // ?
-   {0, L_13,  K_13,  J_13}, // RShift
-   {0, L_14,  K_14,  J_14}, // Up
-   {0, L_15,  K_15,  J_15}, // PgOn
+   {0, SW12_CS1,   SW11_CS1,   SW10_CS1},  // LShift
+   {0, SW12_CS2,   SW11_CS2,   SW10_CS2},  // NUBS
+   {0, SW12_CS3,   SW11_CS3,   SW10_CS3},  // Z
+   {0, SW12_CS4,   SW11_CS4,   SW10_CS4},  // X
+   {0, SW12_CS5,   SW11_CS5,   SW10_CS5},  // C
+   {0, SW12_CS6,   SW11_CS6,   SW10_CS6},  // V
+   {0, SW12_CS7,   SW11_CS7,   SW10_CS7},  // B
+   {0, SW12_CS8,   SW11_CS8,   SW10_CS8},  // N
+   {0, SW12_CS9,   SW11_CS9,   SW10_CS9},  // M
+   {0, SW12_CS10,  SW11_CS10,  SW10_CS10}, // <
+   {0, SW12_CS11,  SW11_CS11,  SW10_CS11}, // >
+   {0, SW12_CS12,  SW11_CS12,  SW10_CS12}, // ?
+   {0, SW12_CS13,  SW11_CS13,  SW10_CS13}, // RShift
+   {0, SW12_CS14,  SW11_CS14,  SW10_CS14}, // Up
+   {0, SW12_CS15,  SW11_CS15,  SW10_CS15}, // PgOn
 
-   {1, C_1,   B_1,   A_1},  // LCtrl
-   {1, C_2,   B_2,   A_2},  // LAlt
-   {1, C_3,   B_3,   A_3},  // Windows
-   {1, C_6,   B_6,   A_6},  // Space
-   {1, C_10,  B_10,  A_10}, // Fn1/RAlt hades/venus
-   {1, C_11,  B_11,  A_11}, // Fn2/Fn1
-   {1, C_12,  B_12,  A_12}, // RCtrl/Fn2
-   {1, C_13,  B_13,  A_13}, // LEFT/RCtrl
-   {1, C_14,  B_14,  A_14}, // DOWN
-   {1, C_15,  B_15,  A_15}  // RIGHT
+   {1, SW3_CS1,   SW2_CS1,   SW1_CS1},  // LCtrl
+   {1, SW3_CS2,   SW2_CS2,   SW1_CS2},  // LAlt
+   {1, SW3_CS3,   SW2_CS3,   SW1_CS3},  // Windows
+   {1, SW3_CS6,   SW2_CS6,   SW1_CS6},  // Space
+   {1, SW3_CS10,  SW2_CS10,  SW1_CS10}, // Fn1/RAlt hades/venus
+   {1, SW3_CS11,  SW2_CS11,  SW1_CS11}, // Fn2/Fn1
+   {1, SW3_CS12,  SW2_CS12,  SW1_CS12}, // RCtrl/Fn2
+   {1, SW3_CS13,  SW2_CS13,  SW1_CS13}, // LEFT/RCtrl
+   {1, SW3_CS14,  SW2_CS14,  SW1_CS14}, // DOWN
+   {1, SW3_CS15,  SW2_CS15,  SW1_CS15}  // RIGHT
 };
 
 #endif /* RGB_MATRIX_ENABLE */
diff --git a/keyboards/durgod/dgk6x/venus/venus.c b/keyboards/durgod/dgk6x/venus/venus.c
index 9de5f2e63d5..9bde901374b 100644
--- a/keyboards/durgod/dgk6x/venus/venus.c
+++ b/keyboards/durgod/dgk6x/venus/venus.c
@@ -26,71 +26,71 @@ const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
  *   |  |       |       B location
  *   |  |       |       | */
 
-   {0, C_1,   B_1,   A_1},  // Esc
-   {0, C_2,   B_2,   A_2},  // 1
-   {0, C_3,   B_3,   A_3},  // 2
-   {0, C_4,   B_4,   A_4},  // 3
-   {0, C_5,   B_5,   A_5},  // 4
-   {0, C_6,   B_6,   A_6},  // 5
-   {0, C_7,   B_7,   A_7},  // 6
-   {0, C_8,   B_8,   A_8},  // 7
-   {0, C_9,   B_9,   A_9},  // 8
-   {0, C_10,  B_10,  A_10}, // 9
-   {0, C_11,  B_11,  A_11}, // 0
-   {0, C_12,  B_12,  A_12}, // -
-   {0, C_13,  B_13,  A_13}, // =
-   {0, C_14,  B_14,  A_14}, // Bksp
+   {0, SW3_CS1,   SW2_CS1,   SW1_CS1},  // Esc
+   {0, SW3_CS2,   SW2_CS2,   SW1_CS2},  // 1
+   {0, SW3_CS3,   SW2_CS3,   SW1_CS3},  // 2
+   {0, SW3_CS4,   SW2_CS4,   SW1_CS4},  // 3
+   {0, SW3_CS5,   SW2_CS5,   SW1_CS5},  // 4
+   {0, SW3_CS6,   SW2_CS6,   SW1_CS6},  // 5
+   {0, SW3_CS7,   SW2_CS7,   SW1_CS7},  // 6
+   {0, SW3_CS8,   SW2_CS8,   SW1_CS8},  // 7
+   {0, SW3_CS9,   SW2_CS9,   SW1_CS9},  // 8
+   {0, SW3_CS10,  SW2_CS10,  SW1_CS10}, // 9
+   {0, SW3_CS11,  SW2_CS11,  SW1_CS11}, // 0
+   {0, SW3_CS12,  SW2_CS12,  SW1_CS12}, // -
+   {0, SW3_CS13,  SW2_CS13,  SW1_CS13}, // =
+   {0, SW3_CS14,  SW2_CS14,  SW1_CS14}, // Bksp
 
-   {0, F_1,   E_1,   D_1},  // Tab
-   {0, F_2,   E_2,   D_2},  // Q
-   {0, F_3,   E_3,   D_3},  // W
-   {0, F_4,   E_4,   D_4},  // E
-   {0, F_5,   E_5,   D_5},  // R
-   {0, F_6,   E_6,   D_6},  // T
-   {0, F_7,   E_7,   D_7},  // Y
-   {0, F_8,   E_8,   D_8},  // U
-   {0, F_9,   E_9,   D_9},  // I
-   {0, F_10,  E_10,  D_10}, // O
-   {0, F_11,  E_11,  D_11}, // P
-   {0, F_12,  E_12,  D_12}, // [
-   {0, F_13,  E_13,  D_13}, // ]
-   {0, F_14,  E_14,  D_14}, // Pipe
+   {0, SW6_CS1,   SW5_CS1,   SW4_CS1},  // Tab
+   {0, SW6_CS2,   SW5_CS2,   SW4_CS2},  // Q
+   {0, SW6_CS3,   SW5_CS3,   SW4_CS3},  // W
+   {0, SW6_CS4,   SW5_CS4,   SW4_CS4},  // E
+   {0, SW6_CS5,   SW5_CS5,   SW4_CS5},  // R
+   {0, SW6_CS6,   SW5_CS6,   SW4_CS6},  // T
+   {0, SW6_CS7,   SW5_CS7,   SW4_CS7},  // Y
+   {0, SW6_CS8,   SW5_CS8,   SW4_CS8},  // U
+   {0, SW6_CS9,   SW5_CS9,   SW4_CS9},  // I
+   {0, SW6_CS10,  SW5_CS10,  SW4_CS10}, // O
+   {0, SW6_CS11,  SW5_CS11,  SW4_CS11}, // P
+   {0, SW6_CS12,  SW5_CS12,  SW4_CS12}, // [
+   {0, SW6_CS13,  SW5_CS13,  SW4_CS13}, // ]
+   {0, SW6_CS14,  SW5_CS14,  SW4_CS14}, // Pipe
 
-   {0, I_1,   H_1,   G_1},  // Caps
-   {0, I_2,   H_2,   G_2},  // A
-   {0, I_3,   H_3,   G_3},  // S
-   {0, I_4,   H_4,   G_4},  // D
-   {0, I_5,   H_5,   G_5},  // F
-   {0, I_6,   H_6,   G_6},  // G
-   {0, I_7,   H_7,   G_7},  // H
-   {0, I_8,   H_8,   G_8},  // J
-   {0, I_9,   H_9,   G_9},  // K
-   {0, I_10,  H_10,  G_10}, // L
-   {0, I_11,  H_11,  G_11}, // :
-   {0, I_12,  H_12,  G_12}, // '
-   {0, I_14,  H_14,  G_14}, // Enter
+   {0, SW9_CS1,   SW8_CS1,   SW7_CS1},  // Caps
+   {0, SW9_CS2,   SW8_CS2,   SW7_CS2},  // A
+   {0, SW9_CS3,   SW8_CS3,   SW7_CS3},  // S
+   {0, SW9_CS4,   SW8_CS4,   SW7_CS4},  // D
+   {0, SW9_CS5,   SW8_CS5,   SW7_CS5},  // F
+   {0, SW9_CS6,   SW8_CS6,   SW7_CS6},  // G
+   {0, SW9_CS7,   SW8_CS7,   SW7_CS7},  // H
+   {0, SW9_CS8,   SW8_CS8,   SW7_CS8},  // J
+   {0, SW9_CS9,   SW8_CS9,   SW7_CS9},  // K
+   {0, SW9_CS10,  SW8_CS10,  SW7_CS10}, // L
+   {0, SW9_CS11,  SW8_CS11,  SW7_CS11}, // :
+   {0, SW9_CS12,  SW8_CS12,  SW7_CS12}, // '
+   {0, SW9_CS14,  SW8_CS14,  SW7_CS14}, // Enter
 
-   {0, L_1,   K_1,   J_1},  // LShift
-   {0, L_2,   K_2,   J_2},  // Z
-   {0, L_3,   K_3,   J_3},  // X
-   {0, L_4,   K_4,   J_4},  // C
-   {0, L_5,   K_5,   J_5},  // V
-   {0, L_6,   K_6,   J_6},  // B
-   {0, L_7,   K_7,   J_7},  // N
-   {0, L_8,   K_8,   J_8},  // M
-   {0, L_9,   K_9,   J_9},  // <
-   {0, L_10,  K_10,  J_10}, // >
-   {0, L_11,  K_11,  J_11}, // ?
-   {0, L_12,  K_12,  J_12}, // RShift
+   {0, SW12_CS1,   SW11_CS1,   SW10_CS1},  // LShift
+   {0, SW12_CS2,   SW11_CS2,   SW10_CS2},  // Z
+   {0, SW12_CS3,   SW11_CS3,   SW10_CS3},  // X
+   {0, SW12_CS4,   SW11_CS4,   SW10_CS4},  // C
+   {0, SW12_CS5,   SW11_CS5,   SW10_CS5},  // V
+   {0, SW12_CS6,   SW11_CS6,   SW10_CS6},  // B
+   {0, SW12_CS7,   SW11_CS7,   SW10_CS7},  // N
+   {0, SW12_CS8,   SW11_CS8,   SW10_CS8},  // M
+   {0, SW12_CS9,   SW11_CS9,   SW10_CS9},  // <
+   {0, SW12_CS10,  SW11_CS10,  SW10_CS10}, // >
+   {0, SW12_CS11,  SW11_CS11,  SW10_CS11}, // ?
+   {0, SW12_CS12,  SW11_CS12,  SW10_CS12}, // RShift
 
-   {1, C_1,   B_1,   A_1},  // LCtrl
-   {1, C_2,   B_2,   A_2},  // LAlt
-   {1, C_3,   B_3,   A_3},  // Windows
-   {1, C_6,   B_6,   A_6},  // Space
-   {1, C_10,  B_10,  A_10}, // Fn1/RAlt hades/venus
-   {1, C_11,  B_11,  A_11}, // Fn2/Fn1
-   {1, C_12,  B_12,  A_12}, // RCtrl/Fn2
-   {1, C_13,  B_13,  A_13}, // LEFT/RCtrl
+   {1, SW3_CS1,   SW2_CS1,   SW1_CS1},  // LCtrl
+   {1, SW3_CS2,   SW2_CS2,   SW1_CS2},  // LAlt
+   {1, SW3_CS3,   SW2_CS3,   SW1_CS3},  // Windows
+   {1, SW3_CS6,   SW2_CS6,   SW1_CS6},  // Space
+   {1, SW3_CS10,  SW2_CS10,  SW1_CS10}, // Fn1/RAlt hades/venus
+   {1, SW3_CS11,  SW2_CS11,  SW1_CS11}, // Fn2/Fn1
+   {1, SW3_CS12,  SW2_CS12,  SW1_CS12}, // RCtrl/Fn2
+   {1, SW3_CS13,  SW2_CS13,  SW1_CS13}, // LEFT/RCtrl
 };
 
 led_config_t g_led_config = { {
diff --git a/keyboards/dz60/keymaps/iso_de_andys8/README.md b/keyboards/dz60/keymaps/iso_de_andys8/README.md
deleted file mode 100644
index 504726adf51..00000000000
--- a/keyboards/dz60/keymaps/iso_de_andys8/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# ISO DE layout
-
-This layout is ISO-DE and similar to a standard 60 ISO layout. There are vim style arrow keys on the function layer. The bottom right is the expected default.
diff --git a/keyboards/dz60/keymaps/iso_de_andys8/keymap.c b/keyboards/dz60/keymaps/iso_de_andys8/keymap.c
deleted file mode 100644
index dfd5e75b541..00000000000
--- a/keyboards/dz60/keymaps/iso_de_andys8/keymap.c
+++ /dev/null
@@ -1,38 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /* ISO 60 layout by andys8 (ISO German keyboard layout shown)
-   *
-   * This layout starts from a standard ISO 60% layout, and adds a function layer.
-   *
-   * ,-----------------------------------------------------------------------------------------.
-   * | Esc | 1 ! | 2 " | 3 § | 4 $ | 5 % | 6 & | 7 / | 8 ( | 9 ) | 0 = | ß ? | ´ ` | Backspace |
-   * |-----------------------------------------------------------------------------------------|
-   * | Tab    |  Q  |  W  |  E  |  R  |  T  |  Z  |  U  |  I  |  O  |  P  |  Ä  | + * | Enter  |
-   * |----------------------------------------------------------------------------------       |
-   * | Layer_1 |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  Ö  |  Ü  | # ' |       |
-   * |-----------------------------------------------------------------------------------------|
-   * | Shift | < > |  Y  |  X  |  C  |  V  |  B  |  N  |  M  | , ; | . : | - _ | Shift         |
-   * |-----------------------------------------------------------------------------------------|
-   * | LCtl  | LGUI  | LAlt  |            Space                  | RAlt  | RGUI  | App  | RCtl |
-   * `-----------------------------------------------------------------------------------------'
-   */
-  LAYOUT_60_iso(
-    KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
-    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,
-    MO(1),   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,
-    KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-    KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                      KC_RALT, KC_RGUI, KC_APP,   KC_RCTL
-  ),
-
-
-  LAYOUT_60_iso(
-    KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
-    KC_NO,   KC_NO,   KC_NO,   KC_NO,   QK_BOOT, KC_NO,   KC_HOME, KC_PGDN, KC_PGUP, KC_END,  KC_PSCR, KC_NO,   KC_NO,
-    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_END,  KC_DEL,  KC_NO,   KC_NO,
-    KC_LSFT, BL_TOGG, KC_APP,  KC_PAUS, KC_INS,  KC_NO,   KC_MPLY, KC_MSTP, KC_MUTE, KC_VOLD, KC_VOLU, KC_NO,   KC_RSFT,
-    KC_LCTL, KC_LGUI, KC_LALT,                   KC_BSPC,                                     KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-  ),
-
-};
diff --git a/keyboards/dz60/keymaps/iso_de_andys8/rules.mk b/keyboards/dz60/keymaps/iso_de_andys8/rules.mk
deleted file mode 100644
index 0aa5b794605..00000000000
--- a/keyboards/dz60/keymaps/iso_de_andys8/rules.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# Build Options
-#   comment out to disable the options.
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no	# Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes	# Audio control and System control(+450)
-CONSOLE_ENABLE = no	# Console for debug(+400)
-COMMAND_ENABLE = no    # Commands for debug and configuration
-SLEEP_LED_ENABLE = no  # Breathing sleep LED during USB suspend
-NKRO_ENABLE = yes		# USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no  # Enable keyboard backlight functionality
-AUDIO_ENABLE = no
-RGBLIGHT_ENABLE = no
-AUTO_SHIFT_ENABLE = no # If the time depressed is greater than or equal to the AUTO_SHIFT_TIMEOUT, then a shifted version of the key is emitted. If the time is less than the AUTO_SHIFT_TIMEOUT time, then the normal state is emitted
-TAP_DANCE_ENABLE = no
diff --git a/keyboards/dz60/keymaps/iso_de_arrow_0x544d/keymap.c b/keyboards/dz60/keymaps/iso_de_arrow_0x544d/keymap.c
deleted file mode 100644
index 76a93b50be4..00000000000
--- a/keyboards/dz60/keymaps/iso_de_arrow_0x544d/keymap.c
+++ /dev/null
@@ -1,96 +0,0 @@
-/* Copyright 2021 Tobias Minn (@0x544D) 
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-  */ 
-
-#include QMK_KEYBOARD_H
-
-enum layers_idx{
-  _BL = 0, // base layer
-  _FN1,    // function layer 1
-  _FN2     // function layer 2
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-   /* ISO 60 layout by 0x544D (ISO German keyboard layout shown)
-   *
-   * Keyboard uses a HW layout with dedicated arrow keys. To accomplish that, the key on the
-   * left of the "UP arrow" key serves a dual purpose as "-_" when pressed short and as "RShift" key
-   * when you hold the key. To trigger the "underscore" you need to hold LShift and press "-_".
-   *
-   * ,-----------------------------------------------------------------------------------------.
-   * | Esc | 1 ! | 2 " | 3 § | 4 $ | 5 % | 6 & | 7 / | 8 ( | 9 ) | 0 = | ß ? | ´ ` | Backspace |
-   * |-----------------------------------------------------------------------------------------|
-   * | Tab    |  Q  |  W  |  E  |  R  |  T  |  Z  |  U  |  I  |  O  |  P  |  Ü  | + * | Enter  |
-   * |----------------------------------------------------------------------------------       |
-   * | MO(2)   |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  Ö  |  Ä  | # ' |       |
-   * |-----------------------------------------------------------------------------------------|
-   * | Shift | < > |  Y  |  X  |  C  |  V  |  B  |  N  |  M  | , ; | .: |-_ /Shift |  Up | Del |
-   * |-----------------------------------------------------------------------------------------|
-   * | LCtl  | LGUI  | LAlt  |            Space                  |RAlt| MO(1)| Lft | Dwn | Rgh |
-   * `-----------------------------------------------------------------------------------------'
-   */
-    [_BL] = LAYOUT_60_iso_arrow_one_bksp(
-        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,         KC_EQL,  KC_BSPC,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,         KC_RBRC,
-        MO(2),   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,         KC_BSLS, KC_ENT,
-        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  RSFT_T(KC_SLSH), KC_UP,   KC_DEL,
-        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, MO(1),   KC_LEFT,         KC_DOWN, KC_RGHT
-    ),
-
-   /* Funtion Layer 1: Media Controls with arrow keys / RShift (Play Pause), F keys,
-   *                   RGB backlight control
-   * ,-----------------------------------------------------------------------------------------.
-   * | °^  | F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9  | F10 | F11 | F12 |   Delete  |
-   * |-----------------------------------------------------------------------------------------|
-   * |        |     |     |     |     |     |     |     |     |     |     |     |     |        |
-   * |----------------------------------------------------------------------------------       |
-   * |         |     |     |     |     |     |     |     |     |     |     |     |     |       |
-   * |-----------------------------------------------------------------------------------------|
-   * |       |     |     |     |     | RGB-|RGB_T| RGB+|     |     |     |  MPlay  |Vol_U|     |
-   * |-----------------------------------------------------------------------------------------|
-   * |       |       |       |                                   |     |Trans| MPrv|Vol_D| MNxt|
-   * `-----------------------------------------------------------------------------------------'
-   */
-    [_FN1] = LAYOUT_60_iso_arrow_one_bksp(
-        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,          KC_F12,  KC_DEL,
-        KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,           KC_NO,
-        KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,           KC_NO,   KC_NO,
-        KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   RGB_RMOD,RGB_TOG, RGB_MOD, KC_NO,   KC_NO,   KC_NO,   KC_MPLY,         KC_VOLU, KC_NO,
-        KC_NO,   KC_NO,   KC_NO,                              KC_NO,                     KC_NO,   KC_TRNS, KC_MPRV,         KC_VOLD, KC_MNXT
-    ),
-    
-
-   /* Funtion Layer 2: Media Controls left hand, F keys, Page up/down, Home/end, Program/QK_BOOT
-   * ,-----------------------------------------------------------------------------------------.
-   * | °^  | F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9  | F10 | F11 | F12 |   Delete  |
-   * |-----------------------------------------------------------------------------------------|
-   * |        |     |Vol_D|Vol_U|     |     |     |     |     |     |QK_BOOT|     |     |        |
-   * |----------------------------------------------------------------------------------       |
-   * |  Trans  |MPrv |MPlay| MNxt|     |     |     |     |     |     |     |     |     |       |
-   * |-----------------------------------------------------------------------------------------|
-   * |       |     |     |     |     |     |     |     |     |     |     |         |PGUP |     |
-   * |-----------------------------------------------------------------------------------------|
-   * |       |       |       |                                   |     |     | Home|PGDN | End |
-   * `-----------------------------------------------------------------------------------------'
-   */
-    [_FN2] = LAYOUT_60_iso_arrow_one_bksp(
-        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,          KC_F12,  KC_DEL,
-        KC_NO,   KC_NO,   KC_VOLD, KC_VOLU, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   QK_BOOT,   KC_NO,           KC_NO,
-        KC_TRNS, KC_MRWD, KC_MPLY, KC_MNXT, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,           KC_NO,   KC_NO,
-        KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,           KC_PGUP, KC_NO,
-        KC_NO,   KC_NO,   KC_NO,                              KC_NO,                     KC_NO,   KC_NO,   KC_HOME,         KC_PGDN, KC_END
-    )
-};
\ No newline at end of file
diff --git a/keyboards/dz60/keymaps/iso_de_arrow_0x544d/readme.md b/keyboards/dz60/keymaps/iso_de_arrow_0x544d/readme.md
deleted file mode 100644
index a3d58c159fc..00000000000
--- a/keyboards/dz60/keymaps/iso_de_arrow_0x544d/readme.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# DZ60 - ISO DE Arrow Layout
-
-![DZ60 ISO DE Arrow Layout Image](https://i.imgur.com/rfQRr7n.png)
-
-This is a modified version of the ISO DE layout for the DZ60 board. It has dedicated
-arrow keys and standard spacebar and backspace keys.
-
-The keyboard uses a hardware layout with dedicated arrow keys. To accomplish that, the key on the
-left of the "UP arrow" key serves a dual purpose as "-\_" when pressed short and as "RShift" key
-when you hold the key. To trigger the "underscore" you need to hold LShift and press "-\_".
diff --git a/keyboards/dztech/dz60rgb/dz60rgb.c b/keyboards/dztech/dz60rgb/dz60rgb.c
index 593b2d96ff3..207fccd4f97 100644
--- a/keyboards/dztech/dz60rgb/dz60rgb.c
+++ b/keyboards/dztech/dz60rgb/dz60rgb.c
@@ -2,73 +2,73 @@
 
 #ifdef RGB_MATRIX_ENABLE
 const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
-    { 0, K_14, J_14, L_14 },
-    { 0, K_13, J_13, L_13 },
-    { 0, K_12, J_12, L_12 },
-    { 0, K_11, J_11, L_11 },
-    { 0, K_10, J_10, L_10 },
-    { 0, K_9,  J_9,  L_9 },
-    { 0, K_8,  J_8,  L_8 },
-    { 0, K_7,  J_7,  L_7 },
-    { 0, K_6,  J_6,  L_6 },
-    { 0, K_5,  J_5,  L_5 },
-    { 0, K_4,  J_4,  L_4 },
-    { 0, K_3,  J_3,  L_3 },
-    { 0, K_2,  J_2,  L_2 },
-    { 0, K_1,  J_1,  L_1 },
+    { 0, SW11_CS14, SW10_CS14, SW12_CS14 },
+    { 0, SW11_CS13, SW10_CS13, SW12_CS13 },
+    { 0, SW11_CS12, SW10_CS12, SW12_CS12 },
+    { 0, SW11_CS11, SW10_CS11, SW12_CS11 },
+    { 0, SW11_CS10, SW10_CS10, SW12_CS10 },
+    { 0, SW11_CS9,  SW10_CS9,  SW12_CS9 },
+    { 0, SW11_CS8,  SW10_CS8,  SW12_CS8 },
+    { 0, SW11_CS7,  SW10_CS7,  SW12_CS7 },
+    { 0, SW11_CS6,  SW10_CS6,  SW12_CS6 },
+    { 0, SW11_CS5,  SW10_CS5,  SW12_CS5 },
+    { 0, SW11_CS4,  SW10_CS4,  SW12_CS4 },
+    { 0, SW11_CS3,  SW10_CS3,  SW12_CS3 },
+    { 0, SW11_CS2,  SW10_CS2,  SW12_CS2 },
+    { 0, SW11_CS1,  SW10_CS1,  SW12_CS1 },
 
-    { 0, H_14, G_14, I_14 },
-    { 0, H_13, G_13, I_13 },
-    { 0, H_12, G_12, I_12 },
-    { 0, H_11, G_11, I_11 },
-    { 0, H_10, G_10, I_10 },
-    { 0, H_9,  G_9,  I_9 },
-    { 0, H_8,  G_8,  I_8 },
-    { 0, H_7,  G_7,  I_7 },
-    { 0, H_6,  G_6,  I_6 },
-    { 0, H_5,  G_5,  I_5 },
-    { 0, H_4,  G_4,  I_4 },
-    { 0, H_3,  G_3,  I_3 },
-    { 0, H_2,  G_2,  I_2 },
-    { 0, H_1,  G_1,  I_1 },
+    { 0, SW8_CS14, SW7_CS14, SW9_CS14 },
+    { 0, SW8_CS13, SW7_CS13, SW9_CS13 },
+    { 0, SW8_CS12, SW7_CS12, SW9_CS12 },
+    { 0, SW8_CS11, SW7_CS11, SW9_CS11 },
+    { 0, SW8_CS10, SW7_CS10, SW9_CS10 },
+    { 0, SW8_CS9,  SW7_CS9,  SW9_CS9 },
+    { 0, SW8_CS8,  SW7_CS8,  SW9_CS8 },
+    { 0, SW8_CS7,  SW7_CS7,  SW9_CS7 },
+    { 0, SW8_CS6,  SW7_CS6,  SW9_CS6 },
+    { 0, SW8_CS5,  SW7_CS5,  SW9_CS5 },
+    { 0, SW8_CS4,  SW7_CS4,  SW9_CS4 },
+    { 0, SW8_CS3,  SW7_CS3,  SW9_CS3 },
+    { 0, SW8_CS2,  SW7_CS2,  SW9_CS2 },
+    { 0, SW8_CS1,  SW7_CS1,  SW9_CS1 },
 
-    { 0, E_14, D_14, F_14 },
-    { 0, E_12, D_12, F_12 },
-    { 0, E_11, D_11, F_11 },
-    { 0, E_10, D_10, F_10 },
-    { 0, E_9,  D_9,  F_9 },
-    { 0, E_8,  D_8,  F_8 },
-    { 0, E_7,  D_7,  F_7 },
-    { 0, E_6,  D_6,  F_6 },
-    { 0, E_5,  D_5,  F_5 },
-    { 0, E_4,  D_4,  F_4 },
-    { 0, E_3,  D_3,  F_3 },
-    { 0, E_2,  D_2,  F_2 },
-    { 0, E_1,  D_1,  F_1 },
+    { 0, SW5_CS14, SW4_CS14, SW6_CS14 },
+    { 0, SW5_CS12, SW4_CS12, SW6_CS12 },
+    { 0, SW5_CS11, SW4_CS11, SW6_CS11 },
+    { 0, SW5_CS10, SW4_CS10, SW6_CS10 },
+    { 0, SW5_CS9,  SW4_CS9,  SW6_CS9 },
+    { 0, SW5_CS8,  SW4_CS8,  SW6_CS8 },
+    { 0, SW5_CS7,  SW4_CS7,  SW6_CS7 },
+    { 0, SW5_CS6,  SW4_CS6,  SW6_CS6 },
+    { 0, SW5_CS5,  SW4_CS5,  SW6_CS5 },
+    { 0, SW5_CS4,  SW4_CS4,  SW6_CS4 },
+    { 0, SW5_CS3,  SW4_CS3,  SW6_CS3 },
+    { 0, SW5_CS2,  SW4_CS2,  SW6_CS2 },
+    { 0, SW5_CS1,  SW4_CS1,  SW6_CS1 },
 
-    { 0, B_14, A_14, C_14 },
-    { 0, B_13, A_13, C_13 },
-    { 0, B_11, A_11, C_11 },
-    { 0, B_10, A_10, C_10 },
-    { 0, B_9,  A_9,  C_9 },
-    { 0, B_8,  A_8,  C_8 },
-    { 0, B_7,  A_7,  C_7 },
-    { 0, B_6,  A_6,  C_6 },
-    { 0, B_5,  A_5,  C_5 },
-    { 0, B_4,  A_4,  C_4 },
-    { 0, B_3,  A_3,  C_3 },
-    { 0, B_2,  A_2,  C_2 },
-    { 0, B_1,  A_1,  C_1 },
+    { 0, SW2_CS14, SW1_CS14, SW3_CS14 },
+    { 0, SW2_CS13, SW1_CS13, SW3_CS13 },
+    { 0, SW2_CS11, SW1_CS11, SW3_CS11 },
+    { 0, SW2_CS10, SW1_CS10, SW3_CS10 },
+    { 0, SW2_CS9,  SW1_CS9,  SW3_CS9 },
+    { 0, SW2_CS8,  SW1_CS8,  SW3_CS8 },
+    { 0, SW2_CS7,  SW1_CS7,  SW3_CS7 },
+    { 0, SW2_CS6,  SW1_CS6,  SW3_CS6 },
+    { 0, SW2_CS5,  SW1_CS5,  SW3_CS5 },
+    { 0, SW2_CS4,  SW1_CS4,  SW3_CS4 },
+    { 0, SW2_CS3,  SW1_CS3,  SW3_CS3 },
+    { 0, SW2_CS2,  SW1_CS2,  SW3_CS2 },
+    { 0, SW2_CS1,  SW1_CS1,  SW3_CS1 },
 
-    { 0, B_15, A_15, C_15 },
-    { 0, E_13, D_13, F_13 },
-    { 0, B_12, A_12, C_12 },
-    { 0, E_15, D_15, F_15 },
-    { 0, H_15, G_15, I_15 },
-    { 0, B_16, A_16, C_16 },
-    { 0, E_16, D_16, F_16 },
-    { 0, H_16, G_16, I_16 },
-    { 0, K_16, J_16, L_16 }
+    { 0, SW2_CS15, SW1_CS15, SW3_CS15 },
+    { 0, SW5_CS13, SW4_CS13, SW6_CS13 },
+    { 0, SW2_CS12, SW1_CS12, SW3_CS12 },
+    { 0, SW5_CS15, SW4_CS15, SW6_CS15 },
+    { 0, SW8_CS15, SW7_CS15, SW9_CS15 },
+    { 0, SW2_CS16, SW1_CS16, SW3_CS16 },
+    { 0, SW5_CS16, SW4_CS16, SW6_CS16 },
+    { 0, SW8_CS16, SW7_CS16, SW9_CS16 },
+    { 0, SW11_CS16, SW10_CS16, SW12_CS16 }
 };
 
 led_config_t g_led_config = {
diff --git a/keyboards/dztech/dz60rgb_ansi/dz60rgb_ansi.c b/keyboards/dztech/dz60rgb_ansi/dz60rgb_ansi.c
index a4cfd2551ec..cdc5148e115 100644
--- a/keyboards/dztech/dz60rgb_ansi/dz60rgb_ansi.c
+++ b/keyboards/dztech/dz60rgb_ansi/dz60rgb_ansi.c
@@ -2,71 +2,71 @@
 
 #ifdef RGB_MATRIX_ENABLE
 const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
-    { 0, K_14, J_14, L_14 },
-    { 0, K_13, J_13, L_13 },
-    { 0, K_12, J_12, L_12 },
-    { 0, K_11, J_11, L_11 },
-    { 0, K_10, J_10, L_10 },
-    { 0, K_9,  J_9,  L_9 },
-    { 0, K_8,  J_8,  L_8 },
-    { 0, K_7,  J_7,  L_7 },
-    { 0, K_6,  J_6,  L_6 },
-    { 0, K_5,  J_5,  L_5 },
-    { 0, K_4,  J_4,  L_4 },
-    { 0, K_3,  J_3,  L_3 },
-    { 0, K_2,  J_2,  L_2 },
-    { 0, K_1,  J_1,  L_1 },
+    { 0, SW11_CS14, SW10_CS14, SW12_CS14 },
+    { 0, SW11_CS13, SW10_CS13, SW12_CS13 },
+    { 0, SW11_CS12, SW10_CS12, SW12_CS12 },
+    { 0, SW11_CS11, SW10_CS11, SW12_CS11 },
+    { 0, SW11_CS10, SW10_CS10, SW12_CS10 },
+    { 0, SW11_CS9,  SW10_CS9,  SW12_CS9 },
+    { 0, SW11_CS8,  SW10_CS8,  SW12_CS8 },
+    { 0, SW11_CS7,  SW10_CS7,  SW12_CS7 },
+    { 0, SW11_CS6,  SW10_CS6,  SW12_CS6 },
+    { 0, SW11_CS5,  SW10_CS5,  SW12_CS5 },
+    { 0, SW11_CS4,  SW10_CS4,  SW12_CS4 },
+    { 0, SW11_CS3,  SW10_CS3,  SW12_CS3 },
+    { 0, SW11_CS2,  SW10_CS2,  SW12_CS2 },
+    { 0, SW11_CS1,  SW10_CS1,  SW12_CS1 },
 
-    { 0, H_14, G_14, I_14 },
-    { 0, H_13, G_13, I_13 },
-    { 0, H_12, G_12, I_12 },
-    { 0, H_11, G_11, I_11 },
-    { 0, H_10, G_10, I_10 },
-    { 0, H_9,  G_9,  I_9 },
-    { 0, H_8,  G_8,  I_8 },
-    { 0, H_7,  G_7,  I_7 },
-    { 0, H_6,  G_6,  I_6 },
-    { 0, H_5,  G_5,  I_5 },
-    { 0, H_4,  G_4,  I_4 },
-    { 0, H_3,  G_3,  I_3 },
-    { 0, H_2,  G_2,  I_2 },
-    { 0, H_1,  G_1,  I_1 },
+    { 0, SW8_CS14, SW7_CS14, SW9_CS14 },
+    { 0, SW8_CS13, SW7_CS13, SW9_CS13 },
+    { 0, SW8_CS12, SW7_CS12, SW9_CS12 },
+    { 0, SW8_CS11, SW7_CS11, SW9_CS11 },
+    { 0, SW8_CS10, SW7_CS10, SW9_CS10 },
+    { 0, SW8_CS9,  SW7_CS9,  SW9_CS9 },
+    { 0, SW8_CS8,  SW7_CS8,  SW9_CS8 },
+    { 0, SW8_CS7,  SW7_CS7,  SW9_CS7 },
+    { 0, SW8_CS6,  SW7_CS6,  SW9_CS6 },
+    { 0, SW8_CS5,  SW7_CS5,  SW9_CS5 },
+    { 0, SW8_CS4,  SW7_CS4,  SW9_CS4 },
+    { 0, SW8_CS3,  SW7_CS3,  SW9_CS3 },
+    { 0, SW8_CS2,  SW7_CS2,  SW9_CS2 },
+    { 0, SW8_CS1,  SW7_CS1,  SW9_CS1 },
 
-    { 0, E_14, D_14, F_14 },
-    { 0, E_12, D_12, F_12 },
-    { 0, E_11, D_11, F_11 },
-    { 0, E_10, D_10, F_10 },
-    { 0, E_9,  D_9,  F_9 },
-    { 0, E_8,  D_8,  F_8 },
-    { 0, E_7,  D_7,  F_7 },
-    { 0, E_6,  D_6,  F_6 },
-    { 0, E_5,  D_5,  F_5 },
-    { 0, E_4,  D_4,  F_4 },
-    { 0, E_3,  D_3,  F_3 },
-    { 0, E_2,  D_2,  F_2 },
-    { 0, E_1,  D_1,  F_1 },
+    { 0, SW5_CS14, SW4_CS14, SW6_CS14 },
+    { 0, SW5_CS12, SW4_CS12, SW6_CS12 },
+    { 0, SW5_CS11, SW4_CS11, SW6_CS11 },
+    { 0, SW5_CS10, SW4_CS10, SW6_CS10 },
+    { 0, SW5_CS9,  SW4_CS9,  SW6_CS9 },
+    { 0, SW5_CS8,  SW4_CS8,  SW6_CS8 },
+    { 0, SW5_CS7,  SW4_CS7,  SW6_CS7 },
+    { 0, SW5_CS6,  SW4_CS6,  SW6_CS6 },
+    { 0, SW5_CS5,  SW4_CS5,  SW6_CS5 },
+    { 0, SW5_CS4,  SW4_CS4,  SW6_CS4 },
+    { 0, SW5_CS3,  SW4_CS3,  SW6_CS3 },
+    { 0, SW5_CS2,  SW4_CS2,  SW6_CS2 },
+    { 0, SW5_CS1,  SW4_CS1,  SW6_CS1 },
 
-    { 0, B_13, A_13, C_13 },
-    { 0, B_11, A_11, C_11 },
-    { 0, B_10, A_10, C_10 },
-    { 0, B_9,  A_9,  C_9 },
-    { 0, B_8,  A_8,  C_8 },
-    { 0, B_7,  A_7,  C_7 },
-    { 0, B_6,  A_6,  C_6 },
-    { 0, B_5,  A_5,  C_5 },
-    { 0, B_4,  A_4,  C_4 },
-    { 0, B_3,  A_3,  C_3 },
-    { 0, B_2,  A_2,  C_2 },
-    { 0, B_1,  A_1,  C_1 },
+    { 0, SW2_CS13, SW1_CS13, SW3_CS13 },
+    { 0, SW2_CS11, SW1_CS11, SW3_CS11 },
+    { 0, SW2_CS10, SW1_CS10, SW3_CS10 },
+    { 0, SW2_CS9,  SW1_CS9,  SW3_CS9 },
+    { 0, SW2_CS8,  SW1_CS8,  SW3_CS8 },
+    { 0, SW2_CS7,  SW1_CS7,  SW3_CS7 },
+    { 0, SW2_CS6,  SW1_CS6,  SW3_CS6 },
+    { 0, SW2_CS5,  SW1_CS5,  SW3_CS5 },
+    { 0, SW2_CS4,  SW1_CS4,  SW3_CS4 },
+    { 0, SW2_CS3,  SW1_CS3,  SW3_CS3 },
+    { 0, SW2_CS2,  SW1_CS2,  SW3_CS2 },
+    { 0, SW2_CS1,  SW1_CS1,  SW3_CS1 },
 
-    { 0, B_15, A_15, C_15 },
-    { 0, E_13, D_13, F_13 },
-    { 0, B_12, A_12, C_12 },
-    { 0, E_15, D_15, F_15 },
-    { 0, B_16, A_16, C_16 },
-    { 0, E_16, D_16, F_16 },
-    { 0, H_16, G_16, I_16 },
-    { 0, K_16, J_16, L_16 }
+    { 0, SW2_CS15, SW1_CS15, SW3_CS15 },
+    { 0, SW5_CS13, SW4_CS13, SW6_CS13 },
+    { 0, SW2_CS12, SW1_CS12, SW3_CS12 },
+    { 0, SW5_CS15, SW4_CS15, SW6_CS15 },
+    { 0, SW2_CS16, SW1_CS16, SW3_CS16 },
+    { 0, SW5_CS16, SW4_CS16, SW6_CS16 },
+    { 0, SW8_CS16, SW7_CS16, SW9_CS16 },
+    { 0, SW11_CS16, SW10_CS16, SW12_CS16 }
 };
 
 led_config_t g_led_config = {
diff --git a/keyboards/dztech/dz60rgb_wkl/dz60rgb_wkl.c b/keyboards/dztech/dz60rgb_wkl/dz60rgb_wkl.c
index 4326b6f9afd..b5af34be38e 100644
--- a/keyboards/dztech/dz60rgb_wkl/dz60rgb_wkl.c
+++ b/keyboards/dztech/dz60rgb_wkl/dz60rgb_wkl.c
@@ -2,72 +2,72 @@
 
 #ifdef RGB_MATRIX_ENABLE
 const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
-    { 0, H_15, G_15, I_15 },
-    { 0, K_14, J_14, L_14 },
-    { 0, K_13, J_13, L_13 },
-    { 0, K_12, J_12, L_12 },
-    { 0, K_11, J_11, L_11 },
-    { 0, K_10, J_10, L_10 },
-    { 0, K_9,  J_9,  L_9 },
-    { 0, K_8,  J_8,  L_8 },
-    { 0, K_7,  J_7,  L_7 },
-    { 0, K_6,  J_6,  L_6 },
-    { 0, K_5,  J_5,  L_5 },
-    { 0, K_4,  J_4,  L_4 },
-    { 0, K_3,  J_3,  L_3 },
-    { 0, K_2,  J_2,  L_2 },
-    { 0, K_1,  J_1,  L_1 },
+    { 0, SW8_CS15, SW7_CS15, SW9_CS15 },
+    { 0, SW11_CS14, SW10_CS14, SW12_CS14 },
+    { 0, SW11_CS13, SW10_CS13, SW12_CS13 },
+    { 0, SW11_CS12, SW10_CS12, SW12_CS12 },
+    { 0, SW11_CS11, SW10_CS11, SW12_CS11 },
+    { 0, SW11_CS10, SW10_CS10, SW12_CS10 },
+    { 0, SW11_CS9,  SW10_CS9,  SW12_CS9 },
+    { 0, SW11_CS8,  SW10_CS8,  SW12_CS8 },
+    { 0, SW11_CS7,  SW10_CS7,  SW12_CS7 },
+    { 0, SW11_CS6,  SW10_CS6,  SW12_CS6 },
+    { 0, SW11_CS5,  SW10_CS5,  SW12_CS5 },
+    { 0, SW11_CS4,  SW10_CS4,  SW12_CS4 },
+    { 0, SW11_CS3,  SW10_CS3,  SW12_CS3 },
+    { 0, SW11_CS2,  SW10_CS2,  SW12_CS2 },
+    { 0, SW11_CS1,  SW10_CS1,  SW12_CS1 },
 
-    { 0, H_14, G_14, I_14 },
-    { 0, H_13, G_13, I_13 },
-    { 0, H_12, G_12, I_12 },
-    { 0, H_11, G_11, I_11 },
-    { 0, H_10, G_10, I_10 },
-    { 0, H_9,  G_9,  I_9 },
-    { 0, H_8,  G_8,  I_8 },
-    { 0, H_7,  G_7,  I_7 },
-    { 0, H_6,  G_6,  I_6 },
-    { 0, H_5,  G_5,  I_5 },
-    { 0, H_4,  G_4,  I_4 },
-    { 0, H_3,  G_3,  I_3 },
-    { 0, H_2,  G_2,  I_2 },
-    { 0, H_1,  G_1,  I_1 },
+    { 0, SW8_CS14, SW7_CS14, SW9_CS14 },
+    { 0, SW8_CS13, SW7_CS13, SW9_CS13 },
+    { 0, SW8_CS12, SW7_CS12, SW9_CS12 },
+    { 0, SW8_CS11, SW7_CS11, SW9_CS11 },
+    { 0, SW8_CS10, SW7_CS10, SW9_CS10 },
+    { 0, SW8_CS9,  SW7_CS9,  SW9_CS9 },
+    { 0, SW8_CS8,  SW7_CS8,  SW9_CS8 },
+    { 0, SW8_CS7,  SW7_CS7,  SW9_CS7 },
+    { 0, SW8_CS6,  SW7_CS6,  SW9_CS6 },
+    { 0, SW8_CS5,  SW7_CS5,  SW9_CS5 },
+    { 0, SW8_CS4,  SW7_CS4,  SW9_CS4 },
+    { 0, SW8_CS3,  SW7_CS3,  SW9_CS3 },
+    { 0, SW8_CS2,  SW7_CS2,  SW9_CS2 },
+    { 0, SW8_CS1,  SW7_CS1,  SW9_CS1 },
 
-    { 0, E_14, D_14, F_14 },
-    { 0, E_12, D_12, F_12 },
-    { 0, E_11, D_11, F_11 },
-    { 0, E_10, D_10, F_10 },
-    { 0, E_9,  D_9,  F_9 },
-    { 0, E_8,  D_8,  F_8 },
-    { 0, E_7,  D_7,  F_7 },
-    { 0, E_6,  D_6,  F_6 },
-    { 0, E_5,  D_5,  F_5 },
-    { 0, E_4,  D_4,  F_4 },
-    { 0, E_3,  D_3,  F_3 },
-    { 0, E_2,  D_2,  F_2 },
-    { 0, E_1,  D_1,  F_1 },
+    { 0, SW5_CS14, SW4_CS14, SW6_CS14 },
+    { 0, SW5_CS12, SW4_CS12, SW6_CS12 },
+    { 0, SW5_CS11, SW4_CS11, SW6_CS11 },
+    { 0, SW5_CS10, SW4_CS10, SW6_CS10 },
+    { 0, SW5_CS9,  SW4_CS9,  SW6_CS9 },
+    { 0, SW5_CS8,  SW4_CS8,  SW6_CS8 },
+    { 0, SW5_CS7,  SW4_CS7,  SW6_CS7 },
+    { 0, SW5_CS6,  SW4_CS6,  SW6_CS6 },
+    { 0, SW5_CS5,  SW4_CS5,  SW6_CS5 },
+    { 0, SW5_CS4,  SW4_CS4,  SW6_CS4 },
+    { 0, SW5_CS3,  SW4_CS3,  SW6_CS3 },
+    { 0, SW5_CS2,  SW4_CS2,  SW6_CS2 },
+    { 0, SW5_CS1,  SW4_CS1,  SW6_CS1 },
 
-    { 0, B_14, A_14, C_14 },
-    { 0, B_13, A_13, C_13 },
-    { 0, B_11, A_11, C_11 },
-    { 0, B_10, A_10, C_10 },
-    { 0, B_9,  A_9,  C_9 },
-    { 0, B_8,  A_8,  C_8 },
-    { 0, B_7,  A_7,  C_7 },
-    { 0, B_6,  A_6,  C_6 },
-    { 0, B_5,  A_5,  C_5 },
-    { 0, B_4,  A_4,  C_4 },
-    { 0, B_3,  A_3,  C_3 },
-    { 0, B_2,  A_2,  C_2 },
-    { 0, B_1,  A_1,  C_1 },
+    { 0, SW2_CS14, SW1_CS14, SW3_CS14 },
+    { 0, SW2_CS13, SW1_CS13, SW3_CS13 },
+    { 0, SW2_CS11, SW1_CS11, SW3_CS11 },
+    { 0, SW2_CS10, SW1_CS10, SW3_CS10 },
+    { 0, SW2_CS9,  SW1_CS9,  SW3_CS9 },
+    { 0, SW2_CS8,  SW1_CS8,  SW3_CS8 },
+    { 0, SW2_CS7,  SW1_CS7,  SW3_CS7 },
+    { 0, SW2_CS6,  SW1_CS6,  SW3_CS6 },
+    { 0, SW2_CS5,  SW1_CS5,  SW3_CS5 },
+    { 0, SW2_CS4,  SW1_CS4,  SW3_CS4 },
+    { 0, SW2_CS3,  SW1_CS3,  SW3_CS3 },
+    { 0, SW2_CS2,  SW1_CS2,  SW3_CS2 },
+    { 0, SW2_CS1,  SW1_CS1,  SW3_CS1 },
 
-    { 0, B_15, A_15, C_15 },
-    { 0, E_13, D_13, F_13 },
-    { 0, B_12, A_12, C_12 },
-    { 0, B_16, A_16, C_16 },
-    { 0, E_16, D_16, F_16 },
-    { 0, H_16, G_16, I_16 },
-    { 0, K_16, J_16, L_16 }
+    { 0, SW2_CS15, SW1_CS15, SW3_CS15 },
+    { 0, SW5_CS13, SW4_CS13, SW6_CS13 },
+    { 0, SW2_CS12, SW1_CS12, SW3_CS12 },
+    { 0, SW2_CS16, SW1_CS16, SW3_CS16 },
+    { 0, SW5_CS16, SW4_CS16, SW6_CS16 },
+    { 0, SW8_CS16, SW7_CS16, SW9_CS16 },
+    { 0, SW11_CS16, SW10_CS16, SW12_CS16 }
 };
 
 led_config_t g_led_config = {
diff --git a/keyboards/dztech/dz64rgb/dz64rgb.c b/keyboards/dztech/dz64rgb/dz64rgb.c
index 09a535ab474..e2512c72a57 100644
--- a/keyboards/dztech/dz64rgb/dz64rgb.c
+++ b/keyboards/dztech/dz64rgb/dz64rgb.c
@@ -18,74 +18,74 @@
 
 #ifdef RGB_MATRIX_ENABLE
 const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
-    { 0, K_14, J_14, L_14 },
-    { 0, K_13, J_13, L_13 },
-    { 0, K_12, J_12, L_12 },
-    { 0, K_11, J_11, L_11 },
-    { 0, K_10, J_10, L_10 },
-    { 0, K_9,  J_9,  L_9 },
-    { 0, K_8,  J_8,  L_8 },
-    { 0, K_7,  J_7,  L_7 },
-    { 0, K_6,  J_6,  L_6 },
-    { 0, K_5,  J_5,  L_5 },
-    { 0, K_4,  J_4,  L_4 },
-    { 0, K_3,  J_3,  L_3 },
-    { 0, K_2,  J_2,  L_2 },
-    { 0, K_1,  J_1,  L_1 },
+    { 0, SW11_CS14, SW10_CS14, SW12_CS14 },
+    { 0, SW11_CS13, SW10_CS13, SW12_CS13 },
+    { 0, SW11_CS12, SW10_CS12, SW12_CS12 },
+    { 0, SW11_CS11, SW10_CS11, SW12_CS11 },
+    { 0, SW11_CS10, SW10_CS10, SW12_CS10 },
+    { 0, SW11_CS9,  SW10_CS9,  SW12_CS9 },
+    { 0, SW11_CS8,  SW10_CS8,  SW12_CS8 },
+    { 0, SW11_CS7,  SW10_CS7,  SW12_CS7 },
+    { 0, SW11_CS6,  SW10_CS6,  SW12_CS6 },
+    { 0, SW11_CS5,  SW10_CS5,  SW12_CS5 },
+    { 0, SW11_CS4,  SW10_CS4,  SW12_CS4 },
+    { 0, SW11_CS3,  SW10_CS3,  SW12_CS3 },
+    { 0, SW11_CS2,  SW10_CS2,  SW12_CS2 },
+    { 0, SW11_CS1,  SW10_CS1,  SW12_CS1 },
 
-    { 0, H_14, G_14, I_14 },
-    { 0, H_13, G_13, I_13 },
-    { 0, H_12, G_12, I_12 },
-    { 0, H_11, G_11, I_11 },
-    { 0, H_10, G_10, I_10 },
-    { 0, H_9,  G_9,  I_9 },
-    { 0, H_8,  G_8,  I_8 },
-    { 0, H_7,  G_7,  I_7 },
-    { 0, H_6,  G_6,  I_6 },
-    { 0, H_5,  G_5,  I_5 },
-    { 0, H_4,  G_4,  I_4 },
-    { 0, H_3,  G_3,  I_3 },
-    { 0, H_2,  G_2,  I_2 },
-    { 0, H_1,  G_1,  I_1 },
+    { 0, SW8_CS14, SW7_CS14, SW9_CS14 },
+    { 0, SW8_CS13, SW7_CS13, SW9_CS13 },
+    { 0, SW8_CS12, SW7_CS12, SW9_CS12 },
+    { 0, SW8_CS11, SW7_CS11, SW9_CS11 },
+    { 0, SW8_CS10, SW7_CS10, SW9_CS10 },
+    { 0, SW8_CS9,  SW7_CS9,  SW9_CS9 },
+    { 0, SW8_CS8,  SW7_CS8,  SW9_CS8 },
+    { 0, SW8_CS7,  SW7_CS7,  SW9_CS7 },
+    { 0, SW8_CS6,  SW7_CS6,  SW9_CS6 },
+    { 0, SW8_CS5,  SW7_CS5,  SW9_CS5 },
+    { 0, SW8_CS4,  SW7_CS4,  SW9_CS4 },
+    { 0, SW8_CS3,  SW7_CS3,  SW9_CS3 },
+    { 0, SW8_CS2,  SW7_CS2,  SW9_CS2 },
+    { 0, SW8_CS1,  SW7_CS1,  SW9_CS1 },
 
-    { 0, E_14, D_14, F_14 },
-    { 0, E_12, D_12, F_12 },
-    { 0, E_11, D_11, F_11 },
-    { 0, E_10, D_10, F_10 },
-    { 0, E_9,  D_9,  F_9 },
-    { 0, E_8,  D_8,  F_8 },
-    { 0, E_7,  D_7,  F_7 },
-    { 0, E_6,  D_6,  F_6 },
-    { 0, E_5,  D_5,  F_5 },
-    { 0, E_4,  D_4,  F_4 },
-    { 0, E_3,  D_3,  F_3 },
-    { 0, E_2,  D_2,  F_2 },
-    { 0, E_1,  D_1,  F_1 },
+    { 0, SW5_CS14, SW4_CS14, SW6_CS14 },
+    { 0, SW5_CS12, SW4_CS12, SW6_CS12 },
+    { 0, SW5_CS11, SW4_CS11, SW6_CS11 },
+    { 0, SW5_CS10, SW4_CS10, SW6_CS10 },
+    { 0, SW5_CS9,  SW4_CS9,  SW6_CS9 },
+    { 0, SW5_CS8,  SW4_CS8,  SW6_CS8 },
+    { 0, SW5_CS7,  SW4_CS7,  SW6_CS7 },
+    { 0, SW5_CS6,  SW4_CS6,  SW6_CS6 },
+    { 0, SW5_CS5,  SW4_CS5,  SW6_CS5 },
+    { 0, SW5_CS4,  SW4_CS4,  SW6_CS4 },
+    { 0, SW5_CS3,  SW4_CS3,  SW6_CS3 },
+    { 0, SW5_CS2,  SW4_CS2,  SW6_CS2 },
+    { 0, SW5_CS1,  SW4_CS1,  SW6_CS1 },
 
-    { 0, B_14, A_14, C_14 },
-    { 0, B_13, A_13, C_13 },
-    { 0, B_12, A_12, C_12 },
-    { 0, B_11, A_11, C_11 },
-    { 0, B_10, A_10, C_10 },
-    { 0, B_9,  A_9,  C_9 },
-    { 0, B_8,  A_8,  C_8 },
-    { 0, B_7,  A_7,  C_7 },
-    { 0, B_6,  A_6,  C_6 },
-    { 0, B_5,  A_5,  C_5 },
-    { 0, B_4,  A_4,  C_4 },
-    { 0, B_3,  A_3,  C_3 },
-    { 0, B_2,  A_2,  C_2 },
-    { 0, B_1,  A_1,  C_1 },
+    { 0, SW2_CS14, SW1_CS14, SW3_CS14 },
+    { 0, SW2_CS13, SW1_CS13, SW3_CS13 },
+    { 0, SW2_CS12, SW1_CS12, SW3_CS12 },
+    { 0, SW2_CS11, SW1_CS11, SW3_CS11 },
+    { 0, SW2_CS10, SW1_CS10, SW3_CS10 },
+    { 0, SW2_CS9,  SW1_CS9,  SW3_CS9 },
+    { 0, SW2_CS8,  SW1_CS8,  SW3_CS8 },
+    { 0, SW2_CS7,  SW1_CS7,  SW3_CS7 },
+    { 0, SW2_CS6,  SW1_CS6,  SW3_CS6 },
+    { 0, SW2_CS5,  SW1_CS5,  SW3_CS5 },
+    { 0, SW2_CS4,  SW1_CS4,  SW3_CS4 },
+    { 0, SW2_CS3,  SW1_CS3,  SW3_CS3 },
+    { 0, SW2_CS2,  SW1_CS2,  SW3_CS2 },
+    { 0, SW2_CS1,  SW1_CS1,  SW3_CS1 },
 
-    { 0, B_15, A_15, C_15 },
-    { 0, E_13, D_13, F_13 },
-    { 0, K_15, J_15, L_15 },
-    { 0, E_15, D_15, F_15 },
-    { 0, H_15, G_15, I_15 },
-    { 0, B_16, A_16, C_16 },
-    { 0, E_16, D_16, F_16 },
-    { 0, H_16, G_16, I_16 },
-    { 0, K_16, J_16, L_16 }
+    { 0, SW2_CS15, SW1_CS15, SW3_CS15 },
+    { 0, SW5_CS13, SW4_CS13, SW6_CS13 },
+    { 0, SW11_CS15, SW10_CS15, SW12_CS15 },
+    { 0, SW5_CS15, SW4_CS15, SW6_CS15 },
+    { 0, SW8_CS15, SW7_CS15, SW9_CS15 },
+    { 0, SW2_CS16, SW1_CS16, SW3_CS16 },
+    { 0, SW5_CS16, SW4_CS16, SW6_CS16 },
+    { 0, SW8_CS16, SW7_CS16, SW9_CS16 },
+    { 0, SW11_CS16, SW10_CS16, SW12_CS16 }
 };
 
 led_config_t g_led_config = {
diff --git a/keyboards/dztech/dz65rgb/v3/v3.c b/keyboards/dztech/dz65rgb/v3/v3.c
index 2055e6e3c2f..bf54a8cdfc5 100755
--- a/keyboards/dztech/dz65rgb/v3/v3.c
+++ b/keyboards/dztech/dz65rgb/v3/v3.c
@@ -19,78 +19,78 @@
 #ifdef RGB_MATRIX_ENABLE
 
 const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
-    {0, CS21_SW1, CS20_SW1, CS19_SW1},
-    {0, CS21_SW2, CS20_SW2, CS19_SW2},
-    {0, CS21_SW3, CS20_SW3, CS19_SW3},
-    {0, CS21_SW4, CS20_SW4, CS19_SW4},
-    {0, CS21_SW5, CS20_SW5, CS19_SW5},
-    {0, CS21_SW6, CS20_SW6, CS19_SW6},
-    {0, CS21_SW7, CS20_SW7, CS19_SW7},
-    {0, CS21_SW8, CS20_SW8, CS19_SW8},
-    {0, CS24_SW1, CS23_SW1, CS22_SW1},
-    {0, CS24_SW2, CS23_SW2, CS22_SW2},
-    {0, CS24_SW3, CS23_SW3, CS22_SW3},
-    {0, CS24_SW4, CS23_SW4, CS22_SW4},
-    {0, CS24_SW5, CS23_SW5, CS22_SW5},
-    {0, CS24_SW6, CS23_SW6, CS22_SW6},
-    {0, CS24_SW7, CS23_SW7, CS22_SW7},
+    {0, SW1_CS21, SW1_CS20, SW1_CS19},
+    {0, SW2_CS21, SW2_CS20, SW2_CS19},
+    {0, SW3_CS21, SW3_CS20, SW3_CS19},
+    {0, SW4_CS21, SW4_CS20, SW4_CS19},
+    {0, SW5_CS21, SW5_CS20, SW5_CS19},
+    {0, SW6_CS21, SW6_CS20, SW6_CS19},
+    {0, SW7_CS21, SW7_CS20, SW7_CS19},
+    {0, SW8_CS21, SW8_CS20, SW8_CS19},
+    {0, SW1_CS24, SW1_CS23, SW1_CS22},
+    {0, SW2_CS24, SW2_CS23, SW2_CS22},
+    {0, SW3_CS24, SW3_CS23, SW3_CS22},
+    {0, SW4_CS24, SW4_CS23, SW4_CS22},
+    {0, SW5_CS24, SW5_CS23, SW5_CS22},
+    {0, SW6_CS24, SW6_CS23, SW6_CS22},
+    {0, SW7_CS24, SW7_CS23, SW7_CS22},
 
-    {0, CS15_SW1, CS14_SW1, CS13_SW1},
-    {0, CS15_SW2, CS14_SW2, CS13_SW2},
-    {0, CS15_SW3, CS14_SW3, CS13_SW3},
-    {0, CS15_SW4, CS14_SW4, CS13_SW4},
-    {0, CS15_SW5, CS14_SW5, CS13_SW5},
-    {0, CS15_SW6, CS14_SW6, CS13_SW6},
-    {0, CS15_SW7, CS14_SW7, CS13_SW7},
-    {0, CS15_SW8, CS14_SW8, CS13_SW8},
-    {0, CS30_SW1, CS29_SW1, CS28_SW1},
-    {0, CS30_SW2, CS29_SW2, CS28_SW2},
-    {0, CS30_SW3, CS29_SW3, CS28_SW3},
-    {0, CS30_SW4, CS29_SW4, CS28_SW4},
-    {0, CS30_SW5, CS29_SW5, CS28_SW5},
-    {0, CS30_SW6, CS29_SW6, CS28_SW6},
-    {0, CS30_SW7, CS29_SW7, CS28_SW7},
+    {0, SW1_CS15, SW1_CS14, SW1_CS13},
+    {0, SW2_CS15, SW2_CS14, SW2_CS13},
+    {0, SW3_CS15, SW3_CS14, SW3_CS13},
+    {0, SW4_CS15, SW4_CS14, SW4_CS13},
+    {0, SW5_CS15, SW5_CS14, SW5_CS13},
+    {0, SW6_CS15, SW6_CS14, SW6_CS13},
+    {0, SW7_CS15, SW7_CS14, SW7_CS13},
+    {0, SW8_CS15, SW8_CS14, SW8_CS13},
+    {0, SW1_CS30, SW1_CS29, SW1_CS28},
+    {0, SW2_CS30, SW2_CS29, SW2_CS28},
+    {0, SW3_CS30, SW3_CS29, SW3_CS28},
+    {0, SW4_CS30, SW4_CS29, SW4_CS28},
+    {0, SW5_CS30, SW5_CS29, SW5_CS28},
+    {0, SW6_CS30, SW6_CS29, SW6_CS28},
+    {0, SW7_CS30, SW7_CS29, SW7_CS28},
 
-    {0, CS12_SW1, CS11_SW1, CS10_SW1},
-    {0, CS12_SW2, CS11_SW2, CS10_SW2},
-    {0, CS12_SW3, CS11_SW3, CS10_SW3},
-    {0, CS12_SW4, CS11_SW4, CS10_SW4},
-    {0, CS12_SW5, CS11_SW5, CS10_SW5},
-    {0, CS12_SW6, CS11_SW6, CS10_SW6},
-    {0, CS12_SW7, CS11_SW7, CS10_SW7},
-    {0, CS12_SW8, CS11_SW8, CS10_SW8},
-    {0, CS33_SW1, CS32_SW1, CS31_SW1},
-    {0, CS33_SW2, CS32_SW2, CS31_SW2},
-    {0, CS33_SW3, CS32_SW3, CS31_SW3},
-    {0, CS33_SW4, CS32_SW4, CS31_SW4},
-    {0, CS33_SW5, CS32_SW5, CS31_SW5},
-    {0, CS33_SW7, CS32_SW7, CS31_SW7},
+    {0, SW1_CS12, SW1_CS11, SW1_CS10},
+    {0, SW2_CS12, SW2_CS11, SW2_CS10},
+    {0, SW3_CS12, SW3_CS11, SW3_CS10},
+    {0, SW4_CS12, SW4_CS11, SW4_CS10},
+    {0, SW5_CS12, SW5_CS11, SW5_CS10},
+    {0, SW6_CS12, SW6_CS11, SW6_CS10},
+    {0, SW7_CS12, SW7_CS11, SW7_CS10},
+    {0, SW8_CS12, SW8_CS11, SW8_CS10},
+    {0, SW1_CS33, SW1_CS32, SW1_CS31},
+    {0, SW2_CS33, SW2_CS32, SW2_CS31},
+    {0, SW3_CS33, SW3_CS32, SW3_CS31},
+    {0, SW4_CS33, SW4_CS32, SW4_CS31},
+    {0, SW5_CS33, SW5_CS32, SW5_CS31},
+    {0, SW7_CS33, SW7_CS32, SW7_CS31},
 
-    {0, CS9_SW1, CS8_SW1, CS7_SW1},
-    {0, CS9_SW2, CS8_SW2, CS7_SW2},
-    {0, CS9_SW3, CS8_SW3, CS7_SW3},
-    {0, CS9_SW4, CS8_SW4, CS7_SW4},
-    {0, CS9_SW5, CS8_SW5, CS7_SW5},
-    {0, CS9_SW6, CS8_SW6, CS7_SW6},
-    {0, CS9_SW7, CS8_SW7, CS7_SW7},
-    {0, CS9_SW8, CS8_SW8, CS7_SW8},
-    {0, CS36_SW1, CS35_SW1, CS34_SW1},
-    {0, CS36_SW2, CS35_SW2, CS34_SW2},
-    {0, CS36_SW3, CS35_SW3, CS34_SW3},
-    {0, CS36_SW4, CS35_SW4, CS34_SW4},
-    {0, CS36_SW5, CS35_SW5, CS34_SW5},
-    {0, CS36_SW7, CS35_SW7, CS34_SW7},
+    {0, SW1_CS9, SW1_CS8, SW1_CS7},
+    {0, SW2_CS9, SW2_CS8, SW2_CS7},
+    {0, SW3_CS9, SW3_CS8, SW3_CS7},
+    {0, SW4_CS9, SW4_CS8, SW4_CS7},
+    {0, SW5_CS9, SW5_CS8, SW5_CS7},
+    {0, SW6_CS9, SW6_CS8, SW6_CS7},
+    {0, SW7_CS9, SW7_CS8, SW7_CS7},
+    {0, SW8_CS9, SW8_CS8, SW8_CS7},
+    {0, SW1_CS36, SW1_CS35, SW1_CS34},
+    {0, SW2_CS36, SW2_CS35, SW2_CS34},
+    {0, SW3_CS36, SW3_CS35, SW3_CS34},
+    {0, SW4_CS36, SW4_CS35, SW4_CS34},
+    {0, SW5_CS36, SW5_CS35, SW5_CS34},
+    {0, SW7_CS36, SW7_CS35, SW7_CS34},
 
-    {0, CS3_SW1, CS2_SW1, CS1_SW1},
-    {0, CS3_SW2, CS2_SW2, CS1_SW2},
-    {0, CS3_SW3, CS2_SW3, CS1_SW3},
-    {0, CS3_SW6, CS2_SW6, CS1_SW6},
-    {0, CS39_SW1, CS38_SW1, CS37_SW1},
-    {0, CS39_SW2, CS38_SW2, CS37_SW2},
-    {0, CS39_SW3, CS38_SW3, CS37_SW3},
-    {0, CS39_SW4, CS38_SW4, CS37_SW4},
-    {0, CS39_SW5, CS38_SW5, CS37_SW5},
-    {0, CS39_SW7, CS38_SW7, CS37_SW7}
+    {0, SW1_CS3, SW1_CS2, SW1_CS1},
+    {0, SW2_CS3, SW2_CS2, SW2_CS1},
+    {0, SW3_CS3, SW3_CS2, SW3_CS1},
+    {0, SW6_CS3, SW6_CS2, SW6_CS1},
+    {0, SW1_CS39, SW1_CS38, SW1_CS37},
+    {0, SW2_CS39, SW2_CS38, SW2_CS37},
+    {0, SW3_CS39, SW3_CS38, SW3_CS37},
+    {0, SW4_CS39, SW4_CS38, SW4_CS37},
+    {0, SW5_CS39, SW5_CS38, SW5_CS37},
+    {0, SW7_CS39, SW7_CS38, SW7_CS37}
 
 };
 led_config_t g_led_config = { {
diff --git a/keyboards/dztech/tofu/ii/v1/v1.c b/keyboards/dztech/tofu/ii/v1/v1.c
index dd18f86bf89..15589096df5 100644
--- a/keyboards/dztech/tofu/ii/v1/v1.c
+++ b/keyboards/dztech/tofu/ii/v1/v1.c
@@ -18,76 +18,76 @@
 #ifdef RGB_MATRIX_ENABLE
 
 const is31fl3737_led_t PROGMEM g_is31fl3737_leds[IS31FL3737_LED_COUNT] = {
-    { 1, K_12, J_12, L_12 },
-    { 1, K_11, J_11, L_11 },
-    { 1, K_10, J_10, L_10 },
-    { 1, K_9,  J_9,  L_9 },
-    { 1, K_8,  J_8,  L_8 },
-    { 1, K_7,  J_7,  L_7 },
-    { 1, K_6,  J_6,  L_6 },
-    { 1, K_5,  J_5,  L_5 },
-    { 1, K_4,  J_4,  L_4 },
-    { 1, K_3,  J_3,  L_3 },
-    { 1, K_2,  J_2,  L_2 },
-    { 1, K_1,  J_1,  L_1 },
-    { 1, H_1,  G_1,  I_1 },
-    { 1, H_2,  G_2,  I_2 },
-    { 1, H_3,  G_3,  I_3 },
+    { 1, SW11_CS12, SW10_CS12, SW12_CS12 },
+    { 1, SW11_CS11, SW10_CS11, SW12_CS11 },
+    { 1, SW11_CS10, SW10_CS10, SW12_CS10 },
+    { 1, SW11_CS9,  SW10_CS9,  SW12_CS9 },
+    { 1, SW11_CS8,  SW10_CS8,  SW12_CS8 },
+    { 1, SW11_CS7,  SW10_CS7,  SW12_CS7 },
+    { 1, SW11_CS6,  SW10_CS6,  SW12_CS6 },
+    { 1, SW11_CS5,  SW10_CS5,  SW12_CS5 },
+    { 1, SW11_CS4,  SW10_CS4,  SW12_CS4 },
+    { 1, SW11_CS3,  SW10_CS3,  SW12_CS3 },
+    { 1, SW11_CS2,  SW10_CS2,  SW12_CS2 },
+    { 1, SW11_CS1,  SW10_CS1,  SW12_CS1 },
+    { 1, SW8_CS1,  SW7_CS1,  SW9_CS1 },
+    { 1, SW8_CS2,  SW7_CS2,  SW9_CS2 },
+    { 1, SW8_CS3,  SW7_CS3,  SW9_CS3 },
 
-    { 0, B_12, A_12, C_12 },
-    { 0, B_11, A_11, C_11 },
-    { 0, B_10, A_10, C_10 },
-    { 0, B_9,  A_9,  C_9 },
-    { 0, B_8,  A_8,  C_8 },
-    { 0, B_7,  A_7,  C_7 },
-    { 0, B_6,  A_6,  C_6 },
-    { 0, B_5,  A_5,  C_5 },
-    { 0, B_4,  A_4,  C_4 },
-    { 0, B_3,  A_3,  C_3 },
-    { 0, B_2,  A_2,  C_2 },
-    { 0, B_1,  A_1,  C_1 },
-    { 1, H_6,  G_6,  I_6 },
-    { 1, H_5,  G_5,  I_5 },
-    { 1, H_4,  G_4,  I_4 },
+    { 0, SW2_CS12, SW1_CS12, SW3_CS12 },
+    { 0, SW2_CS11, SW1_CS11, SW3_CS11 },
+    { 0, SW2_CS10, SW1_CS10, SW3_CS10 },
+    { 0, SW2_CS9,  SW1_CS9,  SW3_CS9 },
+    { 0, SW2_CS8,  SW1_CS8,  SW3_CS8 },
+    { 0, SW2_CS7,  SW1_CS7,  SW3_CS7 },
+    { 0, SW2_CS6,  SW1_CS6,  SW3_CS6 },
+    { 0, SW2_CS5,  SW1_CS5,  SW3_CS5 },
+    { 0, SW2_CS4,  SW1_CS4,  SW3_CS4 },
+    { 0, SW2_CS3,  SW1_CS3,  SW3_CS3 },
+    { 0, SW2_CS2,  SW1_CS2,  SW3_CS2 },
+    { 0, SW2_CS1,  SW1_CS1,  SW3_CS1 },
+    { 1, SW8_CS6,  SW7_CS6,  SW9_CS6 },
+    { 1, SW8_CS5,  SW7_CS5,  SW9_CS5 },
+    { 1, SW8_CS4,  SW7_CS4,  SW9_CS4 },
 
-    { 0, E_12, D_12, F_12 },
-    { 0, E_11, D_11, F_11 },
-    { 0, E_10, D_10, F_10 },
-    { 0, E_9,  D_9,  F_9 },
-    { 0, E_8,  D_8,  F_8 },
-    { 0, E_7,  D_7,  F_7 },
-    { 0, E_6,  D_6,  F_6 },
-    { 0, E_5,  D_5,  F_5 },
-    { 0, E_4,  D_4,  F_4 },
-    { 0, E_3,  D_3,  F_3 },
-    { 0, E_2,  D_2,  F_2 },
-    { 0, E_1,  D_1,  F_1 },
-    { 1, H_7,  G_7,  I_7 },
-    { 1, H_8,  G_8,  I_8 },
+    { 0, SW5_CS12, SW4_CS12, SW6_CS12 },
+    { 0, SW5_CS11, SW4_CS11, SW6_CS11 },
+    { 0, SW5_CS10, SW4_CS10, SW6_CS10 },
+    { 0, SW5_CS9,  SW4_CS9,  SW6_CS9 },
+    { 0, SW5_CS8,  SW4_CS8,  SW6_CS8 },
+    { 0, SW5_CS7,  SW4_CS7,  SW6_CS7 },
+    { 0, SW5_CS6,  SW4_CS6,  SW6_CS6 },
+    { 0, SW5_CS5,  SW4_CS5,  SW6_CS5 },
+    { 0, SW5_CS4,  SW4_CS4,  SW6_CS4 },
+    { 0, SW5_CS3,  SW4_CS3,  SW6_CS3 },
+    { 0, SW5_CS2,  SW4_CS2,  SW6_CS2 },
+    { 0, SW5_CS1,  SW4_CS1,  SW6_CS1 },
+    { 1, SW8_CS7,  SW7_CS7,  SW9_CS7 },
+    { 1, SW8_CS8,  SW7_CS8,  SW9_CS8 },
 
-    { 0, H_12, G_12, I_12 },
-    { 0, H_11, G_11, I_11 },
-    { 0, H_10, G_10, I_10 },
-    { 0, H_9,  G_9,  I_9 },
-    { 0, H_8,  G_8,  I_8 },
-    { 0, H_7,  G_7,  I_7 },
-    { 0, H_6,  G_6,  I_6 },
-    { 0, H_5,  G_5,  I_5 },
-    { 0, H_4,  G_4,  I_4 },
-    { 0, H_3,  G_3,  I_3 },
-    { 0, H_2,  G_2,  I_2 },
-    { 0, H_1,  G_1,  I_1 },
-    { 0, K_9,  J_9,  L_9 },
+    { 0, SW8_CS12, SW7_CS12, SW9_CS12 },
+    { 0, SW8_CS11, SW7_CS11, SW9_CS11 },
+    { 0, SW8_CS10, SW7_CS10, SW9_CS10 },
+    { 0, SW8_CS9,  SW7_CS9,  SW9_CS9 },
+    { 0, SW8_CS8,  SW7_CS8,  SW9_CS8 },
+    { 0, SW8_CS7,  SW7_CS7,  SW9_CS7 },
+    { 0, SW8_CS6,  SW7_CS6,  SW9_CS6 },
+    { 0, SW8_CS5,  SW7_CS5,  SW9_CS5 },
+    { 0, SW8_CS4,  SW7_CS4,  SW9_CS4 },
+    { 0, SW8_CS3,  SW7_CS3,  SW9_CS3 },
+    { 0, SW8_CS2,  SW7_CS2,  SW9_CS2 },
+    { 0, SW8_CS1,  SW7_CS1,  SW9_CS1 },
+    { 0, SW11_CS9,  SW10_CS9,  SW12_CS9 },
 
-    { 0, K_12, J_12, L_12 },
-    { 0, K_11, J_11, L_11 },
-    { 0, K_10, J_10, L_10 },
-    { 0, K_7,  J_7,  L_7 },
-    { 0, K_4,  J_4,  L_4 },
-    { 0, K_2,  J_2,  L_2 },
-    { 0, K_1,  J_1,  L_1 },
-    { 0, K_6,  J_6,  L_6 },
-    { 0, K_5,  J_5,  L_5 },
+    { 0, SW11_CS12, SW10_CS12, SW12_CS12 },
+    { 0, SW11_CS11, SW10_CS11, SW12_CS11 },
+    { 0, SW11_CS10, SW10_CS10, SW12_CS10 },
+    { 0, SW11_CS7,  SW10_CS7,  SW12_CS7 },
+    { 0, SW11_CS4,  SW10_CS4,  SW12_CS4 },
+    { 0, SW11_CS2,  SW10_CS2,  SW12_CS2 },
+    { 0, SW11_CS1,  SW10_CS1,  SW12_CS1 },
+    { 0, SW11_CS6,  SW10_CS6,  SW12_CS6 },
+    { 0, SW11_CS5,  SW10_CS5,  SW12_CS5 },
 };
 
 bool rgb_matrix_indicators_kb(void) {
diff --git a/keyboards/dztech/tofu/jr/v1/v1.c b/keyboards/dztech/tofu/jr/v1/v1.c
index 46b16317ac7..046c46458eb 100644
--- a/keyboards/dztech/tofu/jr/v1/v1.c
+++ b/keyboards/dztech/tofu/jr/v1/v1.c
@@ -19,78 +19,78 @@
 #ifdef RGB_MATRIX_ENABLE
 
 const is31fl3737_led_t PROGMEM g_is31fl3737_leds[IS31FL3737_LED_COUNT] = {
-    { 1, K_12, J_12, L_12 },
-    { 1, K_11, J_11, L_11 },
-    { 1, K_10, J_10, L_10 },
-    { 1, K_9,  J_9,  L_9 },
-    { 1, K_8,  J_8,  L_8 },
-    { 1, K_7,  J_7,  L_7 },
-    { 1, K_6,  J_6,  L_6 },
-    { 1, K_5,  J_5,  L_5 },
-    { 1, K_4,  J_4,  L_4 },
-    { 1, K_3,  J_3,  L_3 },
-    { 1, K_2,  J_2,  L_2 },
-    { 1, K_1,  J_1,  L_1 },
-    { 1, H_1,  G_1,  I_1 },
-    { 1, H_2,  G_2,  I_2 },
-    { 1, H_3,  G_3,  I_3 },
+    { 1, SW11_CS12, SW10_CS12, SW12_CS12 },
+    { 1, SW11_CS11, SW10_CS11, SW12_CS11 },
+    { 1, SW11_CS10, SW10_CS10, SW12_CS10 },
+    { 1, SW11_CS9,  SW10_CS9,  SW12_CS9 },
+    { 1, SW11_CS8,  SW10_CS8,  SW12_CS8 },
+    { 1, SW11_CS7,  SW10_CS7,  SW12_CS7 },
+    { 1, SW11_CS6,  SW10_CS6,  SW12_CS6 },
+    { 1, SW11_CS5,  SW10_CS5,  SW12_CS5 },
+    { 1, SW11_CS4,  SW10_CS4,  SW12_CS4 },
+    { 1, SW11_CS3,  SW10_CS3,  SW12_CS3 },
+    { 1, SW11_CS2,  SW10_CS2,  SW12_CS2 },
+    { 1, SW11_CS1,  SW10_CS1,  SW12_CS1 },
+    { 1, SW8_CS1,  SW7_CS1,  SW9_CS1 },
+    { 1, SW8_CS2,  SW7_CS2,  SW9_CS2 },
+    { 1, SW8_CS3,  SW7_CS3,  SW9_CS3 },
 
-    { 0, B_12, A_12, C_12 },
-    { 0, B_11, A_11, C_11 },
-    { 0, B_10, A_10, C_10 },
-    { 0, B_9,  A_9,  C_9 },
-    { 0, B_8,  A_8,  C_8 },
-    { 0, B_7,  A_7,  C_7 },
-    { 0, B_6,  A_6,  C_6 },
-    { 0, B_5,  A_5,  C_5 },
-    { 0, B_4,  A_4,  C_4 },
-    { 0, B_3,  A_3,  C_3 },
-    { 0, B_2,  A_2,  C_2 },
-    { 0, B_1,  A_1,  C_1 },
-    { 1, H_6,  G_6,  I_6 },
-    { 1, H_5,  G_5,  I_5 },
-    { 1, H_4,  G_4,  I_4 },
+    { 0, SW2_CS12, SW1_CS12, SW3_CS12 },
+    { 0, SW2_CS11, SW1_CS11, SW3_CS11 },
+    { 0, SW2_CS10, SW1_CS10, SW3_CS10 },
+    { 0, SW2_CS9,  SW1_CS9,  SW3_CS9 },
+    { 0, SW2_CS8,  SW1_CS8,  SW3_CS8 },
+    { 0, SW2_CS7,  SW1_CS7,  SW3_CS7 },
+    { 0, SW2_CS6,  SW1_CS6,  SW3_CS6 },
+    { 0, SW2_CS5,  SW1_CS5,  SW3_CS5 },
+    { 0, SW2_CS4,  SW1_CS4,  SW3_CS4 },
+    { 0, SW2_CS3,  SW1_CS3,  SW3_CS3 },
+    { 0, SW2_CS2,  SW1_CS2,  SW3_CS2 },
+    { 0, SW2_CS1,  SW1_CS1,  SW3_CS1 },
+    { 1, SW8_CS6,  SW7_CS6,  SW9_CS6 },
+    { 1, SW8_CS5,  SW7_CS5,  SW9_CS5 },
+    { 1, SW8_CS4,  SW7_CS4,  SW9_CS4 },
 
-    { 0, E_12, D_12, F_12 },
-    { 0, E_11, D_11, F_11 },
-    { 0, E_10, D_10, F_10 },
-    { 0, E_9,  D_9,  F_9 },
-    { 0, E_8,  D_8,  F_8 },
-    { 0, E_7,  D_7,  F_7 },
-    { 0, E_6,  D_6,  F_6 },
-    { 0, E_5,  D_5,  F_5 },
-    { 0, E_4,  D_4,  F_4 },
-    { 0, E_3,  D_3,  F_3 },
-    { 0, E_2,  D_2,  F_2 },
-    { 0, E_1,  D_1,  F_1 },
-    { 1, H_7,  G_7,  I_7 },
-    { 1, H_8,  G_8,  I_8 },
+    { 0, SW5_CS12, SW4_CS12, SW6_CS12 },
+    { 0, SW5_CS11, SW4_CS11, SW6_CS11 },
+    { 0, SW5_CS10, SW4_CS10, SW6_CS10 },
+    { 0, SW5_CS9,  SW4_CS9,  SW6_CS9 },
+    { 0, SW5_CS8,  SW4_CS8,  SW6_CS8 },
+    { 0, SW5_CS7,  SW4_CS7,  SW6_CS7 },
+    { 0, SW5_CS6,  SW4_CS6,  SW6_CS6 },
+    { 0, SW5_CS5,  SW4_CS5,  SW6_CS5 },
+    { 0, SW5_CS4,  SW4_CS4,  SW6_CS4 },
+    { 0, SW5_CS3,  SW4_CS3,  SW6_CS3 },
+    { 0, SW5_CS2,  SW4_CS2,  SW6_CS2 },
+    { 0, SW5_CS1,  SW4_CS1,  SW6_CS1 },
+    { 1, SW8_CS7,  SW7_CS7,  SW9_CS7 },
+    { 1, SW8_CS8,  SW7_CS8,  SW9_CS8 },
 
-    { 0, H_12, G_12, I_12 },
-    { 0, H_11, G_11, I_11 },
-    { 0, H_10, G_10, I_10 },
-    { 0, H_9,  G_9,  I_9 },
-    { 0, H_8,  G_8,  I_8 },
-    { 0, H_7,  G_7,  I_7 },
-    { 0, H_6,  G_6,  I_6 },
-    { 0, H_5,  G_5,  I_5 },
-    { 0, H_4,  G_4,  I_4 },
-    { 0, H_3,  G_3,  I_3 },
-    { 0, H_2,  G_2,  I_2 },
-    { 0, H_1,  G_1,  I_1 },
-    { 0, K_9,  J_9,  L_9 },
-    { 0, K_8,  J_8,  L_8 },
+    { 0, SW8_CS12, SW7_CS12, SW9_CS12 },
+    { 0, SW8_CS11, SW7_CS11, SW9_CS11 },
+    { 0, SW8_CS10, SW7_CS10, SW9_CS10 },
+    { 0, SW8_CS9,  SW7_CS9,  SW9_CS9 },
+    { 0, SW8_CS8,  SW7_CS8,  SW9_CS8 },
+    { 0, SW8_CS7,  SW7_CS7,  SW9_CS7 },
+    { 0, SW8_CS6,  SW7_CS6,  SW9_CS6 },
+    { 0, SW8_CS5,  SW7_CS5,  SW9_CS5 },
+    { 0, SW8_CS4,  SW7_CS4,  SW9_CS4 },
+    { 0, SW8_CS3,  SW7_CS3,  SW9_CS3 },
+    { 0, SW8_CS2,  SW7_CS2,  SW9_CS2 },
+    { 0, SW8_CS1,  SW7_CS1,  SW9_CS1 },
+    { 0, SW11_CS9,  SW10_CS9,  SW12_CS9 },
+    { 0, SW11_CS8,  SW10_CS8,  SW12_CS8 },
 
-    { 0, K_12, J_12, L_12 },
-    { 0, K_11, J_11, L_11 },
-    { 0, K_10, J_10, L_10 },
-    { 0, K_7,  J_7,  L_7 },
-    { 0, K_4,  J_4,  L_4 },
-    { 0, K_3,  J_3,  L_3 },
-    { 0, K_2,  J_2,  L_2 },
-    { 0, K_1,  J_1,  L_1 },
-    { 0, K_6,  J_6,  L_6 },
-    { 0, K_5,  J_5,  L_5 },
+    { 0, SW11_CS12, SW10_CS12, SW12_CS12 },
+    { 0, SW11_CS11, SW10_CS11, SW12_CS11 },
+    { 0, SW11_CS10, SW10_CS10, SW12_CS10 },
+    { 0, SW11_CS7,  SW10_CS7,  SW12_CS7 },
+    { 0, SW11_CS4,  SW10_CS4,  SW12_CS4 },
+    { 0, SW11_CS3,  SW10_CS3,  SW12_CS3 },
+    { 0, SW11_CS2,  SW10_CS2,  SW12_CS2 },
+    { 0, SW11_CS1,  SW10_CS1,  SW12_CS1 },
+    { 0, SW11_CS6,  SW10_CS6,  SW12_CS6 },
+    { 0, SW11_CS5,  SW10_CS5,  SW12_CS5 },
 };
 
 bool rgb_matrix_indicators_kb(void) {
diff --git a/keyboards/ebastler/isometria_75/rev1/config.h b/keyboards/ebastler/isometria_75/rev1/config.h
index 0fc8019a1dd..19a79c9df6e 100644
--- a/keyboards/ebastler/isometria_75/rev1/config.h
+++ b/keyboards/ebastler/isometria_75/rev1/config.h
@@ -26,8 +26,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #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 WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM2
+#define WS2812_PWM_DMA_CHANNEL 2
 
 /* ADC - will be used for battery monitoring once BT support is added */
 /* #define ADC_PIN B0 */
diff --git a/keyboards/edi/hardlight/mk2/config.h b/keyboards/edi/hardlight/mk2/config.h
index 73f4b2baaed..52636c6484e 100644
--- a/keyboards/edi/hardlight/mk2/config.h
+++ b/keyboards/edi/hardlight/mk2/config.h
@@ -28,8 +28,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define WS2812_PWM_DRIVER PWMD1
 #define WS2812_PWM_CHANNEL 3
 #define WS2812_PWM_PAL_MODE 2
-#define WS2812_DMA_STREAM STM32_DMA1_STREAM5
-#define WS2812_DMA_CHANNEL 3
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM5
+#define WS2812_PWM_DMA_CHANNEL 3
 #define WS2812_EXTERNAL_PULLUP
 
 /* I2C driver overrides */
diff --git a/keyboards/evyd13/atom47/rev5/rev5.c b/keyboards/evyd13/atom47/rev5/rev5.c
index 6dad8466142..b8ea0688cd9 100644
--- a/keyboards/evyd13/atom47/rev5/rev5.c
+++ b/keyboards/evyd13/atom47/rev5/rev5.c
@@ -24,57 +24,57 @@ const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
  *   |  |      G location
  *   |  |      |      B location
  *   |  |      |      | */
-    {0, B_1,   C_1,   A_1},
-    {0, B_2,   C_2,   A_2},
-    {0, B_3,   C_3,   A_3},
-    {0, B_4,   C_4,   A_4},
-    {0, B_5,   C_5,   A_5},
-    {0, B_6,   C_6,   A_6},
-    {0, B_7,   C_7,   A_7},
-    {0, B_8,   C_8,   A_8},
-    {0, B_9,   C_9,   A_9},
-    {0, B_10,  C_10,  A_10},
-    {0, B_11,  C_11,  A_11},
-    {0, B_12,  C_12,  A_12},
-    {0, B_13,  C_13,  A_13},
+    {0, SW2_CS1,   SW3_CS1,   SW1_CS1},
+    {0, SW2_CS2,   SW3_CS2,   SW1_CS2},
+    {0, SW2_CS3,   SW3_CS3,   SW1_CS3},
+    {0, SW2_CS4,   SW3_CS4,   SW1_CS4},
+    {0, SW2_CS5,   SW3_CS5,   SW1_CS5},
+    {0, SW2_CS6,   SW3_CS6,   SW1_CS6},
+    {0, SW2_CS7,   SW3_CS7,   SW1_CS7},
+    {0, SW2_CS8,   SW3_CS8,   SW1_CS8},
+    {0, SW2_CS9,   SW3_CS9,   SW1_CS9},
+    {0, SW2_CS10,  SW3_CS10,  SW1_CS10},
+    {0, SW2_CS11,  SW3_CS11,  SW1_CS11},
+    {0, SW2_CS12,  SW3_CS12,  SW1_CS12},
+    {0, SW2_CS13,  SW3_CS13,  SW1_CS13},
 
-    {0, E_1,   F_1,   D_1},
-    {0, E_2,   F_2,   D_2},
-    {0, E_3,   F_3,   D_3},
-    {0, E_4,   F_4,   D_4},
-    {0, E_5,   F_5,   D_5},
-    {0, E_6,   F_6,   D_6},
-    {0, E_7,   F_7,   D_7},
-    {0, E_8,   F_8,   D_8},
-    {0, E_9,   F_9,   D_9},
-    {0, E_10,  F_10,  D_10},
-    {0, E_11,  F_11,  D_11},
-    {0, E_13,  F_13,  D_13},
+    {0, SW5_CS1,   SW6_CS1,   SW4_CS1},
+    {0, SW5_CS2,   SW6_CS2,   SW4_CS2},
+    {0, SW5_CS3,   SW6_CS3,   SW4_CS3},
+    {0, SW5_CS4,   SW6_CS4,   SW4_CS4},
+    {0, SW5_CS5,   SW6_CS5,   SW4_CS5},
+    {0, SW5_CS6,   SW6_CS6,   SW4_CS6},
+    {0, SW5_CS7,   SW6_CS7,   SW4_CS7},
+    {0, SW5_CS8,   SW6_CS8,   SW4_CS8},
+    {0, SW5_CS9,   SW6_CS9,   SW4_CS9},
+    {0, SW5_CS10,  SW6_CS10,  SW4_CS10},
+    {0, SW5_CS11,  SW6_CS11,  SW4_CS11},
+    {0, SW5_CS13,  SW6_CS13,  SW4_CS13},
 
-    {0, H_1,   I_1,   G_1},
-    {0, H_2,   I_2,   G_2},
-    {0, H_3,   I_3,   G_3},
-    {0, H_4,   I_4,   G_4},
-    {0, H_5,   I_5,   G_5},
-    {0, H_6,   I_6,   G_6},
-    {0, H_7,   I_7,   G_7},
-    {0, H_8,   I_8,   G_8},
-    {0, H_9,   I_9,   G_9},
-    {0, H_10,  I_10,  G_10},
-    {0, H_11,  I_11,  G_11},
-    {0, H_12,  I_12,  G_12},
-    {0, H_13,  I_13,  G_13},
+    {0, SW8_CS1,   SW9_CS1,   SW7_CS1},
+    {0, SW8_CS2,   SW9_CS2,   SW7_CS2},
+    {0, SW8_CS3,   SW9_CS3,   SW7_CS3},
+    {0, SW8_CS4,   SW9_CS4,   SW7_CS4},
+    {0, SW8_CS5,   SW9_CS5,   SW7_CS5},
+    {0, SW8_CS6,   SW9_CS6,   SW7_CS6},
+    {0, SW8_CS7,   SW9_CS7,   SW7_CS7},
+    {0, SW8_CS8,   SW9_CS8,   SW7_CS8},
+    {0, SW8_CS9,   SW9_CS9,   SW7_CS9},
+    {0, SW8_CS10,  SW9_CS10,  SW7_CS10},
+    {0, SW8_CS11,  SW9_CS11,  SW7_CS11},
+    {0, SW8_CS12,  SW9_CS12,  SW7_CS12},
+    {0, SW8_CS13,  SW9_CS13,  SW7_CS13},
 
-    {0, K_1,   L_1,   J_1},
-    {0, K_2,   L_2,   J_2},
-    {0, K_3,   L_3,   J_3},
-    {0, K_4,   L_4,   J_4},
-    {0, K_6,   L_6,   J_6},
-    {0, K_8,   L_8,   J_8},
-    {0, K_10,  L_10,  J_10},
-    {0, K_11,  L_11,  J_11},
-    {0, K_12,  L_12,  J_12},
-    {0, K_13,  L_13,  J_13}
+    {0, SW11_CS1,   SW12_CS1,   SW10_CS1},
+    {0, SW11_CS2,   SW12_CS2,   SW10_CS2},
+    {0, SW11_CS3,   SW12_CS3,   SW10_CS3},
+    {0, SW11_CS4,   SW12_CS4,   SW10_CS4},
+    {0, SW11_CS6,   SW12_CS6,   SW10_CS6},
+    {0, SW11_CS8,   SW12_CS8,   SW10_CS8},
+    {0, SW11_CS10,  SW12_CS10,  SW10_CS10},
+    {0, SW11_CS11,  SW12_CS11,  SW10_CS11},
+    {0, SW11_CS12,  SW12_CS12,  SW10_CS12},
+    {0, SW11_CS13,  SW12_CS13,  SW10_CS13}
 };
 
 led_config_t g_led_config = { {
diff --git a/keyboards/evyd13/gh80_3700/keymaps/rgb/config.h b/keyboards/evyd13/gh80_3700/keymaps/rgb/config.h
index c0a6bf5976e..f0ae6b07ee6 100644
--- a/keyboards/evyd13/gh80_3700/keymaps/rgb/config.h
+++ b/keyboards/evyd13/gh80_3700/keymaps/rgb/config.h
@@ -17,7 +17,7 @@
 #pragma once
 
 #define WS2812_DI_PIN B2
-#define RGBLED_NUM 8
+#define RGBLIGHT_LED_COUNT 8
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/evyd13/plain60/keymaps/rgb/config.h b/keyboards/evyd13/plain60/keymaps/rgb/config.h
index e34715a7737..43c4f021976 100644
--- a/keyboards/evyd13/plain60/keymaps/rgb/config.h
+++ b/keyboards/evyd13/plain60/keymaps/rgb/config.h
@@ -11,7 +11,7 @@
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 20    			// limit to 20 otherwise brownouts
+#define RGBLIGHT_LED_COUNT 20    			// limit to 20 otherwise brownouts
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/exclusive/e6_rgb/e6_rgb.c b/keyboards/exclusive/e6_rgb/e6_rgb.c
index 203e96d64ee..19dd96a073d 100644
--- a/keyboards/exclusive/e6_rgb/e6_rgb.c
+++ b/keyboards/exclusive/e6_rgb/e6_rgb.c
@@ -9,86 +9,86 @@ const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
  *   |  |       |       B location
  *   |  |       |       | */
 //cs1
-    {0, K_1,    J_1,    L_1},
-    {0, H_1,    G_1,    I_1},
-    {0, E_1,    D_1,    F_1},
-    {0, B_1,    A_1,    C_1},
+    {0, SW11_CS1,    SW10_CS1,    SW12_CS1},
+    {0, SW8_CS1,    SW7_CS1,    SW9_CS1},
+    {0, SW5_CS1,    SW4_CS1,    SW6_CS1},
+    {0, SW2_CS1,    SW1_CS1,    SW3_CS1},
 
 //cs2
-    {0, K_2,    J_2,    L_2},
-    {0, H_2,    G_2,    I_2},
-    {0, E_2,    D_2,    F_2},
-    {0, B_2,    A_2,    C_2},
+    {0, SW11_CS2,    SW10_CS2,    SW12_CS2},
+    {0, SW8_CS2,    SW7_CS2,    SW9_CS2},
+    {0, SW5_CS2,    SW4_CS2,    SW6_CS2},
+    {0, SW2_CS2,    SW1_CS2,    SW3_CS2},
 //cs3
-    {0, K_3,    J_3,    L_3},
-    {0, H_3,    G_3,    I_3},
-    {0, E_3,    D_3,    F_3},
-    {0, B_3,    A_3,    C_3},
+    {0, SW11_CS3,    SW10_CS3,    SW12_CS3},
+    {0, SW8_CS3,    SW7_CS3,    SW9_CS3},
+    {0, SW5_CS3,    SW4_CS3,    SW6_CS3},
+    {0, SW2_CS3,    SW1_CS3,    SW3_CS3},
 //cs4
-    {0, K_4,    J_4,    L_4},
-    {0, H_4,    G_4,    I_4},
-    {0, E_4,    D_4,    F_4},
-    {0, B_4,    A_4,    C_4},
+    {0, SW11_CS4,    SW10_CS4,    SW12_CS4},
+    {0, SW8_CS4,    SW7_CS4,    SW9_CS4},
+    {0, SW5_CS4,    SW4_CS4,    SW6_CS4},
+    {0, SW2_CS4,    SW1_CS4,    SW3_CS4},
 //cs5
-    {0, K_5,    J_5,    L_5},
-    {0, H_5,    G_5,    I_5},
-    {0, E_5,    D_5,    F_5},
-    {0, B_5,    A_5,    C_5},
+    {0, SW11_CS5,    SW10_CS5,    SW12_CS5},
+    {0, SW8_CS5,    SW7_CS5,    SW9_CS5},
+    {0, SW5_CS5,    SW4_CS5,    SW6_CS5},
+    {0, SW2_CS5,    SW1_CS5,    SW3_CS5},
 //cs6
-    {0, K_6,    J_6,    L_6},
-    {0, H_6,    G_6,    I_6},
-    {0, E_6,    D_6,    F_6},
-    {0, B_6,    A_6,    C_6},
+    {0, SW11_CS6,    SW10_CS6,    SW12_CS6},
+    {0, SW8_CS6,    SW7_CS6,    SW9_CS6},
+    {0, SW5_CS6,    SW4_CS6,    SW6_CS6},
+    {0, SW2_CS6,    SW1_CS6,    SW3_CS6},
 //cs7
-    {0, K_7,    J_7,    L_7},
-    {0, H_7,    G_7,    I_7},
-    {0, E_7,    D_7,    F_7},
-    {0, B_7,    A_7,    C_7},
+    {0, SW11_CS7,    SW10_CS7,    SW12_CS7},
+    {0, SW8_CS7,    SW7_CS7,    SW9_CS7},
+    {0, SW5_CS7,    SW4_CS7,    SW6_CS7},
+    {0, SW2_CS7,    SW1_CS7,    SW3_CS7},
 //cs8
-    {0, K_8,    J_8,    L_8},
-    {0, H_8,    G_8,    I_8},
-    {0, E_8,    D_8,    F_8},
-    {0, B_8,    A_8,    C_8},
+    {0, SW11_CS8,    SW10_CS8,    SW12_CS8},
+    {0, SW8_CS8,    SW7_CS8,    SW9_CS8},
+    {0, SW5_CS8,    SW4_CS8,    SW6_CS8},
+    {0, SW2_CS8,    SW1_CS8,    SW3_CS8},
 //cs9
-    {0, K_9,    J_9,    L_9},
-    {0, H_9,    G_9,    I_9},
-    {0, E_9,    D_9,    F_9},
-    {0, B_9,    A_9,    C_9},
+    {0, SW11_CS9,    SW10_CS9,    SW12_CS9},
+    {0, SW8_CS9,    SW7_CS9,    SW9_CS9},
+    {0, SW5_CS9,    SW4_CS9,    SW6_CS9},
+    {0, SW2_CS9,    SW1_CS9,    SW3_CS9},
 //cs10
-    {0, K_10,   J_10,   L_10},
-    {0, H_10,   G_10,   I_10},
-    {0, E_10,   D_10,   F_10},
-    {0, B_10,   A_10,   C_10},
+    {0, SW11_CS10,   SW10_CS10,   SW12_CS10},
+    {0, SW8_CS10,   SW7_CS10,   SW9_CS10},
+    {0, SW5_CS10,   SW4_CS10,   SW6_CS10},
+    {0, SW2_CS10,   SW1_CS10,   SW3_CS10},
 //cs11
-    {0, K_11,   J_11,   L_11},
-    {0, H_11,   G_11,   I_11},
-    {0, E_11,   D_11,   F_11},
-    {0, B_11,   A_11,   C_11},
+    {0, SW11_CS11,   SW10_CS11,   SW12_CS11},
+    {0, SW8_CS11,   SW7_CS11,   SW9_CS11},
+    {0, SW5_CS11,   SW4_CS11,   SW6_CS11},
+    {0, SW2_CS11,   SW1_CS11,   SW3_CS11},
 //cs12
-    {0, K_12,   J_12,   L_12},
-    {0, H_12,   G_12,   I_12},
-    {0, E_12,   D_12,   F_12},
-    {0, B_12,   A_12,   C_12},
+    {0, SW11_CS12,   SW10_CS12,   SW12_CS12},
+    {0, SW8_CS12,   SW7_CS12,   SW9_CS12},
+    {0, SW5_CS12,   SW4_CS12,   SW6_CS12},
+    {0, SW2_CS12,   SW1_CS12,   SW3_CS12},
 //cs13
-    {0, K_13,   J_13,   L_13},
-    {0, H_13,   G_13,   I_13},
-    {0, E_13,   D_13,   F_13},
-    {0, B_13,   A_13,   C_13},
+    {0, SW11_CS13,   SW10_CS13,   SW12_CS13},
+    {0, SW8_CS13,   SW7_CS13,   SW9_CS13},
+    {0, SW5_CS13,   SW4_CS13,   SW6_CS13},
+    {0, SW2_CS13,   SW1_CS13,   SW3_CS13},
 //cs14
-    {0, K_14,   J_14,   L_14},
-    {0, H_14,   G_14,   I_14},
-    {0, E_14,   D_14,   F_14},
-    {0, B_14,   A_14,   C_14},
+    {0, SW11_CS14,   SW10_CS14,   SW12_CS14},
+    {0, SW8_CS14,   SW7_CS14,   SW9_CS14},
+    {0, SW5_CS14,   SW4_CS14,   SW6_CS14},
+    {0, SW2_CS14,   SW1_CS14,   SW3_CS14},
 //cs15
-    {0, K_15,   J_15,   L_15},
+    {0, SW11_CS15,   SW10_CS15,   SW12_CS15},
 
-    {0, E_15,   D_15,   F_15},
-    {0, B_15,   A_15,   C_15},
+    {0, SW5_CS15,   SW4_CS15,   SW6_CS15},
+    {0, SW2_CS15,   SW1_CS15,   SW3_CS15},
 //cs16
-    {0, K_16,   J_16,   L_16},
-    {0, H_16,   G_16,   I_16},
-    {0, E_16,   D_16,   F_16},
-    {0, B_16,   A_16,   C_16},
+    {0, SW11_CS16,   SW10_CS16,   SW12_CS16},
+    {0, SW8_CS16,   SW7_CS16,   SW9_CS16},
+    {0, SW5_CS16,   SW4_CS16,   SW6_CS16},
+    {0, SW2_CS16,   SW1_CS16,   SW3_CS16},
 };
 
 led_config_t g_led_config = { {
diff --git a/keyboards/fancytech/fancyalice66/info.json b/keyboards/fancytech/fancyalice66/info.json
index b2e219c1c90..869ebe74651 100644
--- a/keyboards/fancytech/fancyalice66/info.json
+++ b/keyboards/fancytech/fancyalice66/info.json
@@ -14,7 +14,6 @@
     },
     "features": {
         "bootmagic": true,
-        "encoder": false,
         "extrakey": true,
         "mousekey": true,
         "nkro": true,
diff --git a/keyboards/feker/ik75/ik75.c b/keyboards/feker/ik75/ik75.c
index e6424491bd1..c4da77a8448 100644
--- a/keyboards/feker/ik75/ik75.c
+++ b/keyboards/feker/ik75/ik75.c
@@ -25,141 +25,141 @@ const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
  *   |  |     B location
  *   |  |     |     R location
  *   |  |     |     | */
-    {0, A_1,  C_1,  B_1},  // 0,   `~,              K10
-    {0, A_2,  C_2,  B_2},  // 1,   1!,              K11
-    {0, A_3,  C_3,  B_3},  // 2,   2@,              K12
-    {0, A_4,  C_4,  B_4},  // 3,   3#,              K13
-    {0, A_5,  C_5,  B_5},  // 4,   4$,              K14
-    {0, A_6,  C_6,  B_6},  // 5,   5%,              K15
-    {0, A_7,  C_7,  B_7},  // 6,   6^,              K16
-    {0, A_8,  C_8,  B_8},  // 7,   7&,              K17
-    {0, A_9,  C_9,  B_9},  // 8,   8*,              K18
-    {0, A_10, C_10, B_10}, // 9,   9(,              K19
-    {0, A_11, C_11, B_11}, // 10,  0),              K1A
-    {0, A_12, C_12, B_12}, // 11,  -_,              K1B
-    {0, A_13, C_13, B_13}, // 12,  =+,              K1C
-    {0, A_14, C_14, B_14}, // 13,  Backspace,       K1D
-    {0, A_15, C_15, B_15}, // 14,  Left Alt,        K52
-    {0, A_16, C_16, B_16}, // 15,  Space,           K56
+    {0, SW1_CS1,  SW3_CS1,  SW2_CS1},  // 0,   `~,              K10
+    {0, SW1_CS2,  SW3_CS2,  SW2_CS2},  // 1,   1!,              K11
+    {0, SW1_CS3,  SW3_CS3,  SW2_CS3},  // 2,   2@,              K12
+    {0, SW1_CS4,  SW3_CS4,  SW2_CS4},  // 3,   3#,              K13
+    {0, SW1_CS5,  SW3_CS5,  SW2_CS5},  // 4,   4$,              K14
+    {0, SW1_CS6,  SW3_CS6,  SW2_CS6},  // 5,   5%,              K15
+    {0, SW1_CS7,  SW3_CS7,  SW2_CS7},  // 6,   6^,              K16
+    {0, SW1_CS8,  SW3_CS8,  SW2_CS8},  // 7,   7&,              K17
+    {0, SW1_CS9,  SW3_CS9,  SW2_CS9},  // 8,   8*,              K18
+    {0, SW1_CS10, SW3_CS10, SW2_CS10}, // 9,   9(,              K19
+    {0, SW1_CS11, SW3_CS11, SW2_CS11}, // 10,  0),              K1A
+    {0, SW1_CS12, SW3_CS12, SW2_CS12}, // 11,  -_,              K1B
+    {0, SW1_CS13, SW3_CS13, SW2_CS13}, // 12,  =+,              K1C
+    {0, SW1_CS14, SW3_CS14, SW2_CS14}, // 13,  Backspace,       K1D
+    {0, SW1_CS15, SW3_CS15, SW2_CS15}, // 14,  Left Alt,        K52
+    {0, SW1_CS16, SW3_CS16, SW2_CS16}, // 15,  Space,           K56
 
-    {0, D_1,  F_1,  E_1},  // 16,  Tab,             K20
-    {0, D_2,  F_2,  E_2},  // 17,  Q,               K21
-    {0, D_3,  F_3,  E_3},  // 18,  W,               K22
-    {0, D_4,  F_4,  E_4},  // 19,  E,               K23
-    {0, D_5,  F_5,  E_5},  // 20,  R,               K24
-    {0, D_6,  F_6,  E_6},  // 21,  T,               K25
-    {0, D_7,  F_7,  E_7},  // 22,  Y,               K26
-    {0, D_8,  F_8,  E_8},  // 23,  U,               K27
-    {0, D_9,  F_9,  E_9},  // 24,  I,               K28
-    {0, D_10, F_10, E_10}, // 25,  O,               K29
-    {0, D_11, F_11, E_11}, // 26,  P,               K2A
-    {0, D_12, F_12, E_12}, // 27,  [{,              K2B
-    {0, D_13, F_13, E_13}, // 28,  ]},              K2C
-    {0, D_14, F_14, E_14}, // 29,  \|,              K2D
-    {0, D_15, F_15, E_15}, // 30,  Right Ctrl,      K5C
-    {0, D_16, F_16, E_16}, // 31,  Function,        K5A
+    {0, SW4_CS1,  SW6_CS1,  SW5_CS1},  // 16,  Tab,             K20
+    {0, SW4_CS2,  SW6_CS2,  SW5_CS2},  // 17,  Q,               K21
+    {0, SW4_CS3,  SW6_CS3,  SW5_CS3},  // 18,  W,               K22
+    {0, SW4_CS4,  SW6_CS4,  SW5_CS4},  // 19,  E,               K23
+    {0, SW4_CS5,  SW6_CS5,  SW5_CS5},  // 20,  R,               K24
+    {0, SW4_CS6,  SW6_CS6,  SW5_CS6},  // 21,  T,               K25
+    {0, SW4_CS7,  SW6_CS7,  SW5_CS7},  // 22,  Y,               K26
+    {0, SW4_CS8,  SW6_CS8,  SW5_CS8},  // 23,  U,               K27
+    {0, SW4_CS9,  SW6_CS9,  SW5_CS9},  // 24,  I,               K28
+    {0, SW4_CS10, SW6_CS10, SW5_CS10}, // 25,  O,               K29
+    {0, SW4_CS11, SW6_CS11, SW5_CS11}, // 26,  P,               K2A
+    {0, SW4_CS12, SW6_CS12, SW5_CS12}, // 27,  [{,              K2B
+    {0, SW4_CS13, SW6_CS13, SW5_CS13}, // 28,  ]},              K2C
+    {0, SW4_CS14, SW6_CS14, SW5_CS14}, // 29,  \|,              K2D
+    {0, SW4_CS15, SW6_CS15, SW5_CS15}, // 30,  Right Ctrl,      K5C
+    {0, SW4_CS16, SW6_CS16, SW5_CS16}, // 31,  Function,        K5A
 
-    {0, G_1,  I_1,  H_1},  // 32,  Caps Lock,       K30
-    {0, G_2,  I_2,  H_2},  // 33,  A,               K31
-    {0, G_3,  I_3,  H_3},  // 34,  S,               K32
-    {0, G_4,  I_4,  H_4},  // 35,  D,               K33
-    {0, G_5,  I_5,  H_5},  // 36,  F,               K34
-    {0, G_6,  I_6,  H_6},  // 37,  G,               K35
-    {0, G_7,  I_7,  H_7},  // 38,  H,               K36
-    {0, G_8,  I_8,  H_8},  // 39,  J,               K37
-    {0, G_9,  I_9,  H_9},  // 40,  K,               K38
-    {0, G_10, I_10, H_10}, // 41,  L,               K39
-    {0, G_11, I_11, H_11}, // 42,  ;:,              K3A
-    {0, G_12, I_12, H_12}, // 43,  '",              K3B
-    {0, G_13, I_13, H_13}, // 44,  Enter,           K3D
-    {0, G_14, I_14, H_14}, // 45,  Up,              K4E
-    {0, G_15, I_15, H_15}, // 46,  Num Lock LED
-    {0, G_16, I_16, H_16}, // 47,  Right Alt,       K59
+    {0, SW7_CS1,  SW9_CS1,  SW8_CS1},  // 32,  Caps Lock,       K30
+    {0, SW7_CS2,  SW9_CS2,  SW8_CS2},  // 33,  A,               K31
+    {0, SW7_CS3,  SW9_CS3,  SW8_CS3},  // 34,  S,               K32
+    {0, SW7_CS4,  SW9_CS4,  SW8_CS4},  // 35,  D,               K33
+    {0, SW7_CS5,  SW9_CS5,  SW8_CS5},  // 36,  F,               K34
+    {0, SW7_CS6,  SW9_CS6,  SW8_CS6},  // 37,  G,               K35
+    {0, SW7_CS7,  SW9_CS7,  SW8_CS7},  // 38,  H,               K36
+    {0, SW7_CS8,  SW9_CS8,  SW8_CS8},  // 39,  J,               K37
+    {0, SW7_CS9,  SW9_CS9,  SW8_CS9},  // 40,  K,               K38
+    {0, SW7_CS10, SW9_CS10, SW8_CS10}, // 41,  L,               K39
+    {0, SW7_CS11, SW9_CS11, SW8_CS11}, // 42,  ;:,              K3A
+    {0, SW7_CS12, SW9_CS12, SW8_CS12}, // 43,  '",              K3B
+    {0, SW7_CS13, SW9_CS13, SW8_CS13}, // 44,  Enter,           K3D
+    {0, SW7_CS14, SW9_CS14, SW8_CS14}, // 45,  Up,              K4E
+    {0, SW7_CS15, SW9_CS15, SW8_CS15}, // 46,  Num Lock LED
+    {0, SW7_CS16, SW9_CS16, SW8_CS16}, // 47,  Right Alt,       K59
 
-    {0, J_1,  L_1,  K_1},  // 48,  Left Shift,      K40
-//  {0, J_2,  L_2,  K_2},  //      Unused LED
-    {0, J_3,  L_3,  K_3},  // 49,  Z,               K42
-    {0, J_4,  L_4,  K_4},  // 50,  X,               K43
-    {0, J_5,  L_5,  K_5},  // 51,  C,               K44
-    {0, J_6,  L_6,  K_6},  // 52,  V,               K45
-    {0, J_7,  L_7,  K_7},  // 53,  B,               K46
-    {0, J_8,  L_8,  K_8},  // 54,  N,               K47
-    {0, J_9,  L_9,  K_9},  // 55,  M,               K48
-    {0, J_10, L_10, K_10}, // 56,  ,<,              K49
-    {0, J_11, L_11, K_11}, // 57,  .>,              K4A
-    {0, J_12, L_12, K_12}, // 58,  /?,              K4B
-    {0, J_13, L_13, K_13}, // 59,  Right Shift,     K4D
-    {0, J_14, L_14, K_14}, // 60,  Left,            K5D
-    {0, J_15, L_15, K_15}, // 61,  Down,            K5E
-    {0, J_16, L_16, K_16}, // 62,  Right,           K5F
+    {0, SW10_CS1,  SW12_CS1,  SW11_CS1},  // 48,  Left Shift,      K40
+//  {0, SW10_CS2,  SW12_CS2,  SW11_CS2},  //      Unused LED
+    {0, SW10_CS3,  SW12_CS3,  SW11_CS3},  // 49,  Z,               K42
+    {0, SW10_CS4,  SW12_CS4,  SW11_CS4},  // 50,  X,               K43
+    {0, SW10_CS5,  SW12_CS5,  SW11_CS5},  // 51,  C,               K44
+    {0, SW10_CS6,  SW12_CS6,  SW11_CS6},  // 52,  V,               K45
+    {0, SW10_CS7,  SW12_CS7,  SW11_CS7},  // 53,  B,               K46
+    {0, SW10_CS8,  SW12_CS8,  SW11_CS8},  // 54,  N,               K47
+    {0, SW10_CS9,  SW12_CS9,  SW11_CS9},  // 55,  M,               K48
+    {0, SW10_CS10, SW12_CS10, SW11_CS10}, // 56,  ,<,              K49
+    {0, SW10_CS11, SW12_CS11, SW11_CS11}, // 57,  .>,              K4A
+    {0, SW10_CS12, SW12_CS12, SW11_CS12}, // 58,  /?,              K4B
+    {0, SW10_CS13, SW12_CS13, SW11_CS13}, // 59,  Right Shift,     K4D
+    {0, SW10_CS14, SW12_CS14, SW11_CS14}, // 60,  Left,            K5D
+    {0, SW10_CS15, SW12_CS15, SW11_CS15}, // 61,  Down,            K5E
+    {0, SW10_CS16, SW12_CS16, SW11_CS16}, // 62,  Right,           K5F
 
-    {1, A_1,  C_1,  B_1},  // 63,  Underglow 20
-    {1, A_2,  C_2,  B_2},  // 64,  Underglow 19
-    {1, A_3,  C_3,  B_3},  // 65,  Underglow 18
-    {1, A_4,  C_4,  B_4},  // 66,  Underglow 17
-    {1, A_5,  C_5,  B_5},  // 67,  Underglow 16
-    {1, A_6,  C_6,  B_6},  // 68,  Underglow 15
-    {1, A_7,  C_7,  B_7},  // 69,  Underglow 14
-    {1, A_8,  C_8,  B_8},  // 70,  Underglow 13
-    {1, A_9,  C_9,  B_9},  // 71,  Underglow 12
-    {1, A_10, C_10, B_10}, // 72,  Underglow 11
-    {1, A_11, C_11, B_11}, // 73,  Underglow 10
-    {1, A_12, C_12, B_12}, // 74,  Underglow 9
-    {1, A_13, C_13, B_13}, // 75,  Underglow 8
-    {1, A_14, C_14, B_14}, // 76,  Underglow 7
-    {1, A_15, C_15, B_15}, // 77,  Underglow 6
-    {1, A_16, C_16, B_16}, // 78,  Underglow 5
+    {1, SW1_CS1,  SW3_CS1,  SW2_CS1},  // 63,  Underglow 20
+    {1, SW1_CS2,  SW3_CS2,  SW2_CS2},  // 64,  Underglow 19
+    {1, SW1_CS3,  SW3_CS3,  SW2_CS3},  // 65,  Underglow 18
+    {1, SW1_CS4,  SW3_CS4,  SW2_CS4},  // 66,  Underglow 17
+    {1, SW1_CS5,  SW3_CS5,  SW2_CS5},  // 67,  Underglow 16
+    {1, SW1_CS6,  SW3_CS6,  SW2_CS6},  // 68,  Underglow 15
+    {1, SW1_CS7,  SW3_CS7,  SW2_CS7},  // 69,  Underglow 14
+    {1, SW1_CS8,  SW3_CS8,  SW2_CS8},  // 70,  Underglow 13
+    {1, SW1_CS9,  SW3_CS9,  SW2_CS9},  // 71,  Underglow 12
+    {1, SW1_CS10, SW3_CS10, SW2_CS10}, // 72,  Underglow 11
+    {1, SW1_CS11, SW3_CS11, SW2_CS11}, // 73,  Underglow 10
+    {1, SW1_CS12, SW3_CS12, SW2_CS12}, // 74,  Underglow 9
+    {1, SW1_CS13, SW3_CS13, SW2_CS13}, // 75,  Underglow 8
+    {1, SW1_CS14, SW3_CS14, SW2_CS14}, // 76,  Underglow 7
+    {1, SW1_CS15, SW3_CS15, SW2_CS15}, // 77,  Underglow 6
+    {1, SW1_CS16, SW3_CS16, SW2_CS16}, // 78,  Underglow 5
 
-    {1, D_1,  F_1,  E_1},  // 79,  Esc,             K00
-    {1, D_2,  F_2,  E_2},  // 80,  F1,              K01
-    {1, D_3,  F_3,  E_3},  // 81,  F2,              K02
-    {1, D_4,  F_4,  E_4},  // 82,  F3,              K03
-    {1, D_5,  F_5,  E_5},  // 83,  F4,              K04
-    {1, D_6,  F_6,  E_6},  // 84,  F5,              K05
-    {1, D_7,  F_7,  E_7},  // 85,  F6,              K06
-    {1, D_8,  F_8,  E_8},  // 86,  F7,              K07
-    {1, D_9,  F_9,  E_9},  // 87,  F8,              K08
-    {1, D_10, F_10, E_10}, // 88,  F9,              K09
-    {1, D_11, F_11, E_11}, // 89,  F10,             K0A
-    {1, D_12, F_12, E_12}, // 90,  F11,             K0B
-    {1, D_13, F_13, E_13}, // 91,  F12,             K0C
-    {1, D_14, F_14, E_14}, // 92,  Delete,          K0D
-    {1, D_15, F_15, E_15}, // 93,  Left Ctrl,       K50
-    {1, D_16, F_16, E_16}, // 94,  Left Windows,    K51
+    {1, SW4_CS1,  SW6_CS1,  SW5_CS1},  // 79,  Esc,             K00
+    {1, SW4_CS2,  SW6_CS2,  SW5_CS2},  // 80,  F1,              K01
+    {1, SW4_CS3,  SW6_CS3,  SW5_CS3},  // 81,  F2,              K02
+    {1, SW4_CS4,  SW6_CS4,  SW5_CS4},  // 82,  F3,              K03
+    {1, SW4_CS5,  SW6_CS5,  SW5_CS5},  // 83,  F4,              K04
+    {1, SW4_CS6,  SW6_CS6,  SW5_CS6},  // 84,  F5,              K05
+    {1, SW4_CS7,  SW6_CS7,  SW5_CS7},  // 85,  F6,              K06
+    {1, SW4_CS8,  SW6_CS8,  SW5_CS8},  // 86,  F7,              K07
+    {1, SW4_CS9,  SW6_CS9,  SW5_CS9},  // 87,  F8,              K08
+    {1, SW4_CS10, SW6_CS10, SW5_CS10}, // 88,  F9,              K09
+    {1, SW4_CS11, SW6_CS11, SW5_CS11}, // 89,  F10,             K0A
+    {1, SW4_CS12, SW6_CS12, SW5_CS12}, // 90,  F11,             K0B
+    {1, SW4_CS13, SW6_CS13, SW5_CS13}, // 91,  F12,             K0C
+    {1, SW4_CS14, SW6_CS14, SW5_CS14}, // 92,  Delete,          K0D
+    {1, SW4_CS15, SW6_CS15, SW5_CS15}, // 93,  Left Ctrl,       K50
+    {1, SW4_CS16, SW6_CS16, SW5_CS16}, // 94,  Left Windows,    K51
 
-    {1, G_1,  I_1,  H_1},  // 95,  Underglow 21
-    {1, G_2,  I_2,  H_2},  // 96,  Underglow 22
-    {1, G_3,  I_3,  H_3},  // 97,  Underglow 23
-    {1, G_4,  I_4,  H_4},  // 98,  Underglow 24
-    {1, G_5,  I_5,  H_5},  // 99,  Knob LED 3,      K53
-    {1, G_6,  I_6,  H_6},  // 100, Knob LED 2,      K54
-    {1, G_7,  I_7,  H_7},  // 101, Knob LED 1,      K4F
-    {1, G_8,  I_8,  H_8},  // 102, Insert,          K1F
-    {1, G_9,  I_9,  H_9},  // 103, Page Up,         K3E
-    {1, G_10, I_10, H_10}, // 104, Caps/Win/Scr LED
-    {1, G_11, I_11, H_11}, // 105, End,             K2F
-    {1, G_12, I_12, H_12}, // 106, Page Down,       K3F
-    {1, G_13, I_13, H_13}, // 107, Underglow 1
-    {1, G_14, I_14, H_14}, // 108, Underglow 2
-    {1, G_15, I_15, H_15}, // 109, Underglow 3
-    {1, G_16, I_16, H_16}, // 110, Underglow 4
+    {1, SW7_CS1,  SW9_CS1,  SW8_CS1},  // 95,  Underglow 21
+    {1, SW7_CS2,  SW9_CS2,  SW8_CS2},  // 96,  Underglow 22
+    {1, SW7_CS3,  SW9_CS3,  SW8_CS3},  // 97,  Underglow 23
+    {1, SW7_CS4,  SW9_CS4,  SW8_CS4},  // 98,  Underglow 24
+    {1, SW7_CS5,  SW9_CS5,  SW8_CS5},  // 99,  Knob LED 3,      K53
+    {1, SW7_CS6,  SW9_CS6,  SW8_CS6},  // 100, Knob LED 2,      K54
+    {1, SW7_CS7,  SW9_CS7,  SW8_CS7},  // 101, Knob LED 1,      K4F
+    {1, SW7_CS8,  SW9_CS8,  SW8_CS8},  // 102, Insert,          K1F
+    {1, SW7_CS9,  SW9_CS9,  SW8_CS9},  // 103, Page Up,         K3E
+    {1, SW7_CS10, SW9_CS10, SW8_CS10}, // 104, Caps/Win/Scr LED
+    {1, SW7_CS11, SW9_CS11, SW8_CS11}, // 105, End,             K2F
+    {1, SW7_CS12, SW9_CS12, SW8_CS12}, // 106, Page Down,       K3F
+    {1, SW7_CS13, SW9_CS13, SW8_CS13}, // 107, Underglow 1
+    {1, SW7_CS14, SW9_CS14, SW8_CS14}, // 108, Underglow 2
+    {1, SW7_CS15, SW9_CS15, SW8_CS15}, // 109, Underglow 3
+    {1, SW7_CS16, SW9_CS16, SW8_CS16}, // 110, Underglow 4
 
-    {1, J_1,  L_1,  K_1},  // 111, Underglow 25
-    {1, J_2,  L_2,  K_2},  // 112, Underglow 26
-    {1, J_3,  L_3,  K_3},  // 113, Underglow 27
-    {1, J_4,  L_4,  K_4},  // 114, Underglow 28
-    {1, J_5,  L_5,  K_5},  // 115, Underglow 29
-    {1, J_6,  L_6,  K_6},  // 116, Underglow 30
-    {1, J_7,  L_7,  K_7},  // 117, Underglow 31
-    {1, J_8,  L_8,  K_8},  // 118, Underglow 32
-    {1, J_9,  L_9,  K_9},  // 119, Underglow 33
-    {1, J_10, L_10, K_10}, // 120, Underglow 34
-    {1, J_11, L_11, K_11}, // 121, Underglow 35
-    {1, J_12, L_12, K_12}, // 122, Underglow 36
-    {1, J_13, L_13, K_13}, // 123, Underglow 37
-    {1, J_14, L_14, K_14}, // 124, Underglow 38
-    {1, J_15, L_15, K_15}, // 125, Underglow 39
-    {1, J_16, L_16, K_16}, // 126, Underglow 40
+    {1, SW10_CS1,  SW12_CS1,  SW11_CS1},  // 111, Underglow 25
+    {1, SW10_CS2,  SW12_CS2,  SW11_CS2},  // 112, Underglow 26
+    {1, SW10_CS3,  SW12_CS3,  SW11_CS3},  // 113, Underglow 27
+    {1, SW10_CS4,  SW12_CS4,  SW11_CS4},  // 114, Underglow 28
+    {1, SW10_CS5,  SW12_CS5,  SW11_CS5},  // 115, Underglow 29
+    {1, SW10_CS6,  SW12_CS6,  SW11_CS6},  // 116, Underglow 30
+    {1, SW10_CS7,  SW12_CS7,  SW11_CS7},  // 117, Underglow 31
+    {1, SW10_CS8,  SW12_CS8,  SW11_CS8},  // 118, Underglow 32
+    {1, SW10_CS9,  SW12_CS9,  SW11_CS9},  // 119, Underglow 33
+    {1, SW10_CS10, SW12_CS10, SW11_CS10}, // 120, Underglow 34
+    {1, SW10_CS11, SW12_CS11, SW11_CS11}, // 121, Underglow 35
+    {1, SW10_CS12, SW12_CS12, SW11_CS12}, // 122, Underglow 36
+    {1, SW10_CS13, SW12_CS13, SW11_CS13}, // 123, Underglow 37
+    {1, SW10_CS14, SW12_CS14, SW11_CS14}, // 124, Underglow 38
+    {1, SW10_CS15, SW12_CS15, SW11_CS15}, // 125, Underglow 39
+    {1, SW10_CS16, SW12_CS16, SW11_CS16}, // 126, Underglow 40
 };
 
 led_config_t g_led_config = { {
diff --git a/keyboards/flashquark/horizon_z/horizon_z.c b/keyboards/flashquark/horizon_z/horizon_z.c
index 5ab6e22434d..79bd503ff68 100755
--- a/keyboards/flashquark/horizon_z/horizon_z.c
+++ b/keyboards/flashquark/horizon_z/horizon_z.c
@@ -18,67 +18,67 @@
 
 #ifdef RGB_MATRIX_ENABLE
 const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
-    {0, B_1,    A_1,    C_1},
-    {0, B_2,    A_2,    C_2},
-    {0, B_3,    A_3,    C_3},
-    {0, B_4,    A_4,    C_4},
-    {0, B_5,    A_5,    C_5},
-    {0, B_6,    A_6,    C_6},
-    {0, B_7,    A_7,    C_7},
-    {0, B_8,    A_8,    C_8},
-    {0, B_9,    A_9,    C_9},
-    {0, B_10,   A_10,   C_10},
-    {0, B_11,   A_11,   C_11},
-    {0, B_12,   A_12,   C_12},
-    {0, B_13,   A_13,   C_13},
-    {0, B_14,   A_14,   C_14},
-    {0, E_1,    D_1,    F_1},
-    {0, E_2,    D_2,    F_2},
-    {0, E_3,    D_3,    F_3},
-    {0, E_4,    D_4,    F_4},
-    {0, E_5,    D_5,    F_5},
-    {0, E_6,    D_6,    F_6},
-    {0, E_7,    D_7,    F_7},
-    {0, E_8,    D_8,    F_8},
-    {0, E_9,    D_9,    F_9},
-    {0, E_10,   D_10,   F_10},
-    {0, E_11,   D_11,   F_11},
-    {0, E_12,   D_12,   F_12},
-    {0, E_13,   D_13,   F_13},
-    {0, E_14,   D_14,   F_14},
-    {0, H_1,    G_1,    I_1},
-    {0, H_2,    G_2,    I_2},
-    {0, H_3,    G_3,    I_3},
-    {0, H_4,    G_4,    I_4},
-    {0, H_5,    G_5,    I_5},
-    {0, H_6,    G_6,    I_6},
-    {0, H_7,    G_7,    I_7},
-    {0, H_8,    G_8,    I_8},
-    {0, H_9,    G_9,    I_9},
-    {0, H_10,   G_10,   I_10},
-    {0, H_11,   G_11,   I_11},
-    {0, H_12,   G_12,   I_12},
-    {0, H_13,   G_13,   I_13},
-    {0, K_1,    J_1,    L_1},
-    {0, K_2,    J_2,    L_2},
-    {0, K_3,    J_3,    L_3},
-    {0, K_4,    J_4,    L_4},
-    {0, K_5,    J_5,    L_5},
-    {0, K_6,    J_6,    L_6},
-    {0, K_7,    J_7,    L_7},
-    {0, K_8,    J_8,    L_8},
-    {0, K_9,    J_9,    L_9},
-    {0, K_10,   J_10,   L_10},
-    {0, K_11,   J_11,   L_11},
-    {0, K_14,   J_14,   L_14},
-    {0, B_16,   A_16,   C_16},
-    {0, E_16,   D_16,   F_16},
-    {0, H_16,   G_16,   I_16},
-    {0, K_16,   J_16,   L_16},
-    {0, K_15,   J_15,   L_15},
-    {0, K_12,   J_12,   L_12},
-    {0, K_13,   J_13,   L_13},
-    {0, H_14,   G_14,   I_14},
+    {0, SW2_CS1,    SW1_CS1,    SW3_CS1},
+    {0, SW2_CS2,    SW1_CS2,    SW3_CS2},
+    {0, SW2_CS3,    SW1_CS3,    SW3_CS3},
+    {0, SW2_CS4,    SW1_CS4,    SW3_CS4},
+    {0, SW2_CS5,    SW1_CS5,    SW3_CS5},
+    {0, SW2_CS6,    SW1_CS6,    SW3_CS6},
+    {0, SW2_CS7,    SW1_CS7,    SW3_CS7},
+    {0, SW2_CS8,    SW1_CS8,    SW3_CS8},
+    {0, SW2_CS9,    SW1_CS9,    SW3_CS9},
+    {0, SW2_CS10,   SW1_CS10,   SW3_CS10},
+    {0, SW2_CS11,   SW1_CS11,   SW3_CS11},
+    {0, SW2_CS12,   SW1_CS12,   SW3_CS12},
+    {0, SW2_CS13,   SW1_CS13,   SW3_CS13},
+    {0, SW2_CS14,   SW1_CS14,   SW3_CS14},
+    {0, SW5_CS1,    SW4_CS1,    SW6_CS1},
+    {0, SW5_CS2,    SW4_CS2,    SW6_CS2},
+    {0, SW5_CS3,    SW4_CS3,    SW6_CS3},
+    {0, SW5_CS4,    SW4_CS4,    SW6_CS4},
+    {0, SW5_CS5,    SW4_CS5,    SW6_CS5},
+    {0, SW5_CS6,    SW4_CS6,    SW6_CS6},
+    {0, SW5_CS7,    SW4_CS7,    SW6_CS7},
+    {0, SW5_CS8,    SW4_CS8,    SW6_CS8},
+    {0, SW5_CS9,    SW4_CS9,    SW6_CS9},
+    {0, SW5_CS10,   SW4_CS10,   SW6_CS10},
+    {0, SW5_CS11,   SW4_CS11,   SW6_CS11},
+    {0, SW5_CS12,   SW4_CS12,   SW6_CS12},
+    {0, SW5_CS13,   SW4_CS13,   SW6_CS13},
+    {0, SW5_CS14,   SW4_CS14,   SW6_CS14},
+    {0, SW8_CS1,    SW7_CS1,    SW9_CS1},
+    {0, SW8_CS2,    SW7_CS2,    SW9_CS2},
+    {0, SW8_CS3,    SW7_CS3,    SW9_CS3},
+    {0, SW8_CS4,    SW7_CS4,    SW9_CS4},
+    {0, SW8_CS5,    SW7_CS5,    SW9_CS5},
+    {0, SW8_CS6,    SW7_CS6,    SW9_CS6},
+    {0, SW8_CS7,    SW7_CS7,    SW9_CS7},
+    {0, SW8_CS8,    SW7_CS8,    SW9_CS8},
+    {0, SW8_CS9,    SW7_CS9,    SW9_CS9},
+    {0, SW8_CS10,   SW7_CS10,   SW9_CS10},
+    {0, SW8_CS11,   SW7_CS11,   SW9_CS11},
+    {0, SW8_CS12,   SW7_CS12,   SW9_CS12},
+    {0, SW8_CS13,   SW7_CS13,   SW9_CS13},
+    {0, SW11_CS1,    SW10_CS1,    SW12_CS1},
+    {0, SW11_CS2,    SW10_CS2,    SW12_CS2},
+    {0, SW11_CS3,    SW10_CS3,    SW12_CS3},
+    {0, SW11_CS4,    SW10_CS4,    SW12_CS4},
+    {0, SW11_CS5,    SW10_CS5,    SW12_CS5},
+    {0, SW11_CS6,    SW10_CS6,    SW12_CS6},
+    {0, SW11_CS7,    SW10_CS7,    SW12_CS7},
+    {0, SW11_CS8,    SW10_CS8,    SW12_CS8},
+    {0, SW11_CS9,    SW10_CS9,    SW12_CS9},
+    {0, SW11_CS10,   SW10_CS10,   SW12_CS10},
+    {0, SW11_CS11,   SW10_CS11,   SW12_CS11},
+    {0, SW11_CS14,   SW10_CS14,   SW12_CS14},
+    {0, SW2_CS16,   SW1_CS16,   SW3_CS16},
+    {0, SW5_CS16,   SW4_CS16,   SW6_CS16},
+    {0, SW8_CS16,   SW7_CS16,   SW9_CS16},
+    {0, SW11_CS16,   SW10_CS16,   SW12_CS16},
+    {0, SW11_CS15,   SW10_CS15,   SW12_CS15},
+    {0, SW11_CS12,   SW10_CS12,   SW12_CS12},
+    {0, SW11_CS13,   SW10_CS13,   SW12_CS13},
+    {0, SW8_CS14,   SW7_CS14,   SW9_CS14},
 };
 
 
diff --git a/keyboards/frobiac/blackbowl/info.json b/keyboards/frobiac/blackbowl/info.json
index 3d5d8483dd9..2e99c5806b2 100644
--- a/keyboards/frobiac/blackbowl/info.json
+++ b/keyboards/frobiac/blackbowl/info.json
@@ -7,17 +7,13 @@
     "processor": "atmega32u4",
     "diode_direction": "ROW2COL",
     "features": {
-        "audio": false,
-        "backlight": false,
         "bootmagic": false,
         "command": false,
         "console": false,
         "dynamic_macro": true,
         "extrakey": true,
         "mousekey": true,
-        "nkro": false,
-        "unicode": false,
-        "rgblight": false
+        "nkro": false
     },
     "build": {
         "lto": true
diff --git a/keyboards/frobiac/blackflat/info.json b/keyboards/frobiac/blackflat/info.json
index 2227f698df8..086d90d8f8b 100644
--- a/keyboards/frobiac/blackflat/info.json
+++ b/keyboards/frobiac/blackflat/info.json
@@ -7,17 +7,13 @@
     "processor": "atmega32u4",
     "diode_direction": "COL2ROW",
     "features": {
-        "audio": false,
-        "backlight": false,
         "bootmagic": false,
         "command": false,
         "console": false,
         "dynamic_macro": true,
         "extrakey": true,
         "mousekey": true,
-        "nkro": false,
-        "unicode": false,
-        "rgblight": false
+        "nkro": false
     },
     "build": {
         "lto": true
diff --git a/keyboards/frobiac/hypernano/info.json b/keyboards/frobiac/hypernano/info.json
index b06b2815657..403beed952f 100644
--- a/keyboards/frobiac/hypernano/info.json
+++ b/keyboards/frobiac/hypernano/info.json
@@ -7,17 +7,13 @@
     "processor": "atmega32u4",
     "diode_direction": "COL2ROW",
     "features": {
-        "audio": false,
-        "backlight": false,
         "bootmagic": false,
         "command": false,
         "console": false,
         "dynamic_macro": true,
         "extrakey": true,
         "mousekey": true,
-        "nkro": false,
-        "unicode": false,
-        "rgblight": false
+        "nkro": false
     },
     "build": {
         "lto": true
diff --git a/keyboards/frobiac/redtilt/info.json b/keyboards/frobiac/redtilt/info.json
index 633ca1d32d9..f3cbd96e1c3 100644
--- a/keyboards/frobiac/redtilt/info.json
+++ b/keyboards/frobiac/redtilt/info.json
@@ -7,17 +7,13 @@
     "processor": "atmega32u4",
     "diode_direction": "COL2ROW",
     "features": {
-        "audio": false,
-        "backlight": false,
         "bootmagic": false,
         "command": false,
         "console": false,
         "dynamic_macro": true,
         "extrakey": true,
         "mousekey": true,
-        "nkro": false,
-        "unicode": false,
-        "rgblight": false
+        "nkro": false
     },
     "build": {
         "lto": true
diff --git a/keyboards/frooastboard/walnut/walnut.c b/keyboards/frooastboard/walnut/walnut.c
index e3205e07f3c..0de3467ae46 100644
--- a/keyboards/frooastboard/walnut/walnut.c
+++ b/keyboards/frooastboard/walnut/walnut.c
@@ -12,54 +12,54 @@ const is31fl3737_led_t PROGMEM g_is31fl3737_leds[IS31FL3737_LED_COUNT] = {
  *   |  |        G location
  *   |  |        |        B location
  *   |  |        |        | */
-    {0, K_1,     J_1,     L_1},
-    {0, K_2,     J_2,     L_2},
-    {0, K_3,     J_3,     L_3},
-    {0, K_4,     J_4,     L_4},
-    {0, K_5,     J_5,     L_5},
-    {0, K_6,     J_6,     L_6},
-    {0, K_7,     J_7,     L_7},
-    {0, K_8,     J_8,     L_8},
-    {0, K_9,     J_9,     L_9},
-    {0, K_10,    J_10,    L_10},
-    {0, K_11,    J_11,    L_11},
-    {0, K_12,    J_12,    L_12},
-    {0, H_1,     G_1,     I_1},
-    {0, H_2,     G_2,     I_2},
-    {0, H_3,     G_3,     I_3},
-    {0, H_4,     G_4,     I_4},
-    {0, H_5,     G_5,     I_5},
-    {0, H_6,     G_6,     I_6},
-    {0, H_7,     G_7,     I_7},
-    {0, H_8,     G_8,     I_8},
-    {0, H_9,     G_9,     I_9},
-    {0, H_10,    G_10,    I_10},
-    {0, H_11,    G_11,    I_11},
-    {0, H_12,    G_12,    I_12},
-    {0, E_1,     D_1,     F_1},
-    {0, E_2,     D_2,     F_2},
-    {0, E_3,     D_3,     F_3},
-    {0, E_4,     D_4,     F_4},
-    {0, E_5,     D_5,     F_5},
-    {0, E_6,     D_6,     F_6},
-    {0, E_7,     D_7,     F_7},
-    {0, E_8,     D_8,     F_8},
-    {0, E_9,     D_9,     F_9},
-    {0, E_10,    D_10,    F_10},
-    {0, E_11,    D_11,    F_11},
-    {0, E_12,    D_12,    F_12},
-    {0, B_1,     A_1,     C_1},
-    {0, B_2,     A_2,     C_2},
-    {0, B_3,     A_3,     C_3},
-    {0, B_4,     A_4,     C_4},
-    {0, B_5,     A_5,     C_5},
-    {0, B_6,     A_6,     C_6},
-    {0, B_7,     A_7,     C_7},
-    {0, B_8,     A_8,     C_8},
-    {0, B_9,     A_9,     C_9},
-    {0, B_10,    A_10,    C_10},
-    {0, B_11,    A_11,    C_11},
-    {0, B_12,    A_12,    C_12}
+    {0, SW11_CS1,     SW10_CS1,     SW12_CS1},
+    {0, SW11_CS2,     SW10_CS2,     SW12_CS2},
+    {0, SW11_CS3,     SW10_CS3,     SW12_CS3},
+    {0, SW11_CS4,     SW10_CS4,     SW12_CS4},
+    {0, SW11_CS5,     SW10_CS5,     SW12_CS5},
+    {0, SW11_CS6,     SW10_CS6,     SW12_CS6},
+    {0, SW11_CS7,     SW10_CS7,     SW12_CS7},
+    {0, SW11_CS8,     SW10_CS8,     SW12_CS8},
+    {0, SW11_CS9,     SW10_CS9,     SW12_CS9},
+    {0, SW11_CS10,    SW10_CS10,    SW12_CS10},
+    {0, SW11_CS11,    SW10_CS11,    SW12_CS11},
+    {0, SW11_CS12,    SW10_CS12,    SW12_CS12},
+    {0, SW8_CS1,     SW7_CS1,     SW9_CS1},
+    {0, SW8_CS2,     SW7_CS2,     SW9_CS2},
+    {0, SW8_CS3,     SW7_CS3,     SW9_CS3},
+    {0, SW8_CS4,     SW7_CS4,     SW9_CS4},
+    {0, SW8_CS5,     SW7_CS5,     SW9_CS5},
+    {0, SW8_CS6,     SW7_CS6,     SW9_CS6},
+    {0, SW8_CS7,     SW7_CS7,     SW9_CS7},
+    {0, SW8_CS8,     SW7_CS8,     SW9_CS8},
+    {0, SW8_CS9,     SW7_CS9,     SW9_CS9},
+    {0, SW8_CS10,    SW7_CS10,    SW9_CS10},
+    {0, SW8_CS11,    SW7_CS11,    SW9_CS11},
+    {0, SW8_CS12,    SW7_CS12,    SW9_CS12},
+    {0, SW5_CS1,     SW4_CS1,     SW6_CS1},
+    {0, SW5_CS2,     SW4_CS2,     SW6_CS2},
+    {0, SW5_CS3,     SW4_CS3,     SW6_CS3},
+    {0, SW5_CS4,     SW4_CS4,     SW6_CS4},
+    {0, SW5_CS5,     SW4_CS5,     SW6_CS5},
+    {0, SW5_CS6,     SW4_CS6,     SW6_CS6},
+    {0, SW5_CS7,     SW4_CS7,     SW6_CS7},
+    {0, SW5_CS8,     SW4_CS8,     SW6_CS8},
+    {0, SW5_CS9,     SW4_CS9,     SW6_CS9},
+    {0, SW5_CS10,    SW4_CS10,    SW6_CS10},
+    {0, SW5_CS11,    SW4_CS11,    SW6_CS11},
+    {0, SW5_CS12,    SW4_CS12,    SW6_CS12},
+    {0, SW2_CS1,     SW1_CS1,     SW3_CS1},
+    {0, SW2_CS2,     SW1_CS2,     SW3_CS2},
+    {0, SW2_CS3,     SW1_CS3,     SW3_CS3},
+    {0, SW2_CS4,     SW1_CS4,     SW3_CS4},
+    {0, SW2_CS5,     SW1_CS5,     SW3_CS5},
+    {0, SW2_CS6,     SW1_CS6,     SW3_CS6},
+    {0, SW2_CS7,     SW1_CS7,     SW3_CS7},
+    {0, SW2_CS8,     SW1_CS8,     SW3_CS8},
+    {0, SW2_CS9,     SW1_CS9,     SW3_CS9},
+    {0, SW2_CS10,    SW1_CS10,    SW3_CS10},
+    {0, SW2_CS11,    SW1_CS11,    SW3_CS11},
+    {0, SW2_CS12,    SW1_CS12,    SW3_CS12}
 };
 
 led_config_t g_led_config = {
diff --git a/keyboards/gboards/gergoplex/keymaps/georgepetri/combos.def b/keyboards/gboards/gergoplex/keymaps/georgepetri/combos.def
deleted file mode 100644
index a9205c028a0..00000000000
--- a/keyboards/gboards/gergoplex/keymaps/georgepetri/combos.def
+++ /dev/null
@@ -1,11 +0,0 @@
-// List any combo dictionaries you want loaded to your device below!
-
-// QMK wide includes
-//#include "combos/germ-vim-helpers.def"
-#include "combos/germ-mouse-keys.def"
-
-// User includes
-#include "gergoplex.def"
-
-// Word completion
-// #include "combos/eng-combos.def"
diff --git a/keyboards/gboards/gergoplex/keymaps/georgepetri/config.h b/keyboards/gboards/gergoplex/keymaps/georgepetri/config.h
deleted file mode 100644
index e2c27583fab..00000000000
--- a/keyboards/gboards/gergoplex/keymaps/georgepetri/config.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2013 Oleg Kostyuk <cub.uanic@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-// Copy and worked on with love from the EZ team
-
-#pragma once
-
-#define HOLD_ON_OTHER_KEY_PRESS_PER_KEY
-
-#undef DEBOUNCE
-#define DEBOUNCE 25
-
-#define COMBO_ALLOW_ACTION_KEYS
-#define COMBO_VARIABLE_LEN
-
-#define TAPPING_TERM_PER_KEY
diff --git a/keyboards/gboards/gergoplex/keymaps/georgepetri/gergoplex.def b/keyboards/gboards/gergoplex/keymaps/georgepetri/gergoplex.def
deleted file mode 100644
index d50d431c8b7..00000000000
--- a/keyboards/gboards/gergoplex/keymaps/georgepetri/gergoplex.def
+++ /dev/null
@@ -1,7 +0,0 @@
-// Gergoplex specfic combos
-
-COMB(hjEnt,         KC_ENT,         KC_H, KC_J)
-COMB(loDel,         KC_DEL,         KC_L, KC_O)
-COMB(pscBspace,     KC_BSPC,        KC_P, KC_SCLN)
-COMB(sdEsc,         KC_ESC,         KC_D, KC_F)
-COMB(fgEsc,         KC_ESC,         KC_F, KC_G)
diff --git a/keyboards/gboards/gergoplex/keymaps/georgepetri/keymap.c b/keyboards/gboards/gergoplex/keymaps/georgepetri/keymap.c
deleted file mode 100644
index 44c570b42cd..00000000000
--- a/keyboards/gboards/gergoplex/keymaps/georgepetri/keymap.c
+++ /dev/null
@@ -1,212 +0,0 @@
-/* Copyright 2021 Jane Bernhardt
-  *
-  * This program is free software: you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-  * the Free Software Foundation, either version 2 of the License, or
-  * (at your option) any later version.
-  *
-  * This program is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  * GNU General Public License for more details.
-  *
-  * You should have received a copy of the GNU General Public License
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */
-
-/* Good on you for modifying your layout! if you don't have
- * time to read the QMK docs, a list of keycodes can be found at
- * https://github.com/qmk/qmk_firmware/blob/master/docs/keycodes.md
- */
-
-#include QMK_KEYBOARD_H
-#include "g/keymap_combo.h"
-
-enum {
-    _ALPHA,   // default
-    _GAME,    // gaming
-    _SPECIAL, // special characters
-    _NUMBERS  // numbers/function/motion
-};
-
-typedef enum {
-    TD_NONE,
-    TD_UNKNOWN,
-    TD_SINGLE_TAP,
-    TD_DOUBLE_TAP,
-    TD_TRIPLE_TAP
-} td_state_t;
-
-typedef struct {
-    bool is_press_action;
-    td_state_t state;
-} td_tap_t;
-
-enum {
-    GAME
-};
-
-td_state_t cur_dance(tap_dance_state_t *state);
-
-void ql_finished(tap_dance_state_t *state, void *user_data);
-void ql_reset(tap_dance_state_t *state, void *user_data);
-
-#define KC_CTL_A  MT(MOD_LCTL, KC_A)     // Tap for A, hold for Control
-#define KC_SFT_Z  MT(MOD_RSFT, KC_Z)     // Tap for Z, hold for Shift
-#define KC_SFT_SL MT(MOD_RSFT, KC_SLSH)  // Tap for slash, hold for Shift
-#define KC_SPE_SPC LT(_SPECIAL, KC_SPC)  // Tap for Space, hold for Special layer
-#define KC_NUM_SPC LT(_NUMBERS, KC_SPC)  // Tap for Space, hold for Numbers layer
-
-    /* Combomap
-     *
-     * ,-------------------------------.      ,-------------------------------.
-     * |       |     |     |     |     |      |     |     |     |     |       |
-     * |-------+-----+-----+-----+-----|      |-----+-----+-----+-DEL-+-BSPC--|
-     * |       |     |    ESC   ESC    |      |    ENT    |     |     |       |
-     * |-------+-----+-----+-RMB-+-LMB-|      |-----+-----+-----+-----+-------|
-     * |       |     |     |     |     |      |     |     |     |     |       |
-     * `-------------------------------'      `-------------------------------'
-     *            .-----------------.            .-----------------.
-     *            |     |     |     |            |     |     |     |
-     *            '-----------------'            '-----------------'
-     */
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Alpha layer
-     *
-     * ,-------------------------------.      ,-------------------------------.
-     * |     Q |  W  |  E  |  R  |  T  |      |  Y  |  U  |  I  |  O  |   P   |
-     * |-------+-----+-----+-----+-----|      |-----+-----+-----+-----+-------|
-     * | CTRL A|  S  |  D  |  F  |  G  |      |  H  |  J  |  K  |  L  |   ;   |
-     * |-------+-----+-----+-----+-----|      |-----+-----+-----+-----+-------|
-     * | SHFT Z|  X  |  C  |  V  |  B  |      |  N  |  M  |  ,  |  .  |SHFT / |
-     * `-------------------------------'      `-------------------------------'
-     *       .----------------------.           .----------------------.
-     *       | META | ALT | SPC SPE |           | SPC NUM | TAB | SHFT |
-     *       '----------------------'           '----------------------'
-     */
-    [_ALPHA] = LAYOUT_split_3x5_3(
-         KC_Q,     KC_W,   KC_E,   KC_R,   KC_T,          KC_Y,   KC_U,   KC_I,     KC_O,   KC_P,
-         KC_CTL_A, KC_S,   KC_D,   KC_F,   KC_G,          KC_H,   KC_J,   KC_K,     KC_L,   KC_SCLN,
-         KC_SFT_Z, KC_X,   KC_C,   KC_V,   KC_B,          KC_N,   KC_M,   TD(GAME), KC_DOT, KC_SFT_SL,
-                   KC_LGUI, KC_LALT, KC_SPE_SPC,          KC_NUM_SPC, KC_TAB, KC_RSFT),
-
-    /* Gaming layer
-     *
-     * ,-------------------------------.      ,-------------------------------.
-     * |   ~   |  Q  |  W  |  E  |  R  |      |  Y  |  U  |  I  |  O  |   P   |
-     * |-------+-----+-----+-----+-----|      |-----+-----+-----+-----+-------|
-     * |  CTRL |  A  |  S  |  D  |  F  |      |  H  |  J  |  K  |  L  |   ;   |
-     * |-------+-----+-----+-----+-----|      |-----+-----+-----+-----+-------|
-     * |  SHFT |  Z  |  X  |  C  |  V  |      |  N  |  M  |  ,  |  .  |SHFT / |
-     * `-------------------------------'      `-------------------------------'
-     *           .------------------.           .----------------------.
-     *           | META | ALT | SPC |           | SPC NUM | TAB | SHFT |
-     *           '------------------'           '----------------------'
-     */
-    [_GAME] = LAYOUT_split_3x5_3(
-         KC_TILD,  KC_Q,   KC_W,   KC_E,   KC_R,          KC_Y,   KC_U,   KC_I,     KC_O,   KC_P,
-         KC_LCTL , KC_A,   KC_S,   KC_D,   KC_F,          KC_H,   KC_J,   KC_K,     KC_L,   KC_SCLN,
-         KC_LSFT,  KC_Z,   KC_X,   KC_C,   KC_V,          KC_N,   KC_M,   TD(GAME), KC_DOT, KC_SFT_SL,
-                       KC_LGUI, KC_LALT, KC_SPC,          KC_NUM_SPC, KC_TAB, KC_RSFT),
-
-    /* Special characters layer
-     *
-     * ,-------------------------------.      ,-------------------------------.
-     * |    !  |  @  |  {  |  }  |  |  |      |  `  |  -  |  =  |  /  |   \   |
-     * |-------+-----+-----+-----+-----|      |-----+-----+-----+-----+-------|
-     * |    #  |  $  |  (  |  )  |     |      | LFT | DWN | UP  | RGT |   '   |
-     * |-------+-----+-----+-----+-----|      |-----+-----+-----+-----+-------|
-     * |    %  |  ^  |  [  |  ]  |     |      |  &  |  ~  |  +  |  *  |       |
-     * `-------------------------------'      `-------------------------------'
-     *           .-------------------.          .-----------------.
-     *           |       |     |     |          |     |  "  |  _  |
-     *           '-------------------'          '-----------------'
-     */
-    [_SPECIAL] = LAYOUT_split_3x5_3(
-         KC_EXLM, KC_AT,   KC_LCBR, KC_RCBR, KC_PIPE,          KC_GRV,  KC_MINS, KC_EQL , KC_SLSH, KC_BSLS,
-         KC_HASH, KC_DLR,  KC_LPRN, KC_RPRN, KC_TRNS,          KC_LEFT, KC_DOWN, KC_UP  , KC_RGHT, KC_QUOT,
-         KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_TRNS,          KC_AMPR, KC_TILD, KC_PLUS, KC_ASTR, KC_TRNS,
-                           KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, LSFT(KC_QUOTE), LSFT(KC_MINS)),
-
-    /* Numbers/Function/Motion layer
-     *
-     * ,-------------------------------.      ,-------------------------------.
-     * |   1   |  2  |  3  |  4  |  5  |      |  6  |  7  |  8  |  9  |   0   |
-     * |-------+-----+-----+-----+-----|      |-----+-----+-----+-----+-------|
-     * |  F1   | F2  | F3  | F4  | F5  |      |     |     |     |     |       |
-     * |-------+-----+-----+-----+-----|      |-----+-----+-----+-----+-------|
-     * |  F6   | F7  | F8  | F9  | F10 |      | MLFT| MDWN| MUP | MRGT|       |
-     * `-------------------------------'      `-------------------------------'
-     *             .-----------------.          .-----------------.
-     *             | F11 | F12 |     |          |     |     |     |
-     *             '-----------------'          '-----------------'
-     */
-    [_NUMBERS] = LAYOUT_split_3x5_3(
-         KC_1,  KC_2,  KC_3,  KC_4,  KC_5,           KC_6,    KC_7,    KC_8,    KC_9,    KC_0,
-         KC_F1, KC_F2, KC_F3, KC_F4, KC_F5,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-         KC_F6, KC_F7, KC_F8, KC_F9, KC_F10,         KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_TRNS,
-                    KC_F11, KC_F12, KC_TRNS,         KC_TRNS, KC_TRNS, KC_TRNS)
-};
-
-bool get_hold_on_other_key_press(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case KC_CTL_A:
-            return false;
-        default:
-            return true;
-    }
-}
-
-td_state_t cur_dance(tap_dance_state_t *state) {
-    if (state->count == 1)
-        return TD_SINGLE_TAP;
-    if (state->count == 2)
-        return TD_DOUBLE_TAP;
-    else if (state->count == 3)
-	return TD_TRIPLE_TAP;
-    return TD_UNKNOWN;
-}
-
-static td_tap_t ql_tap_state = {
-    .is_press_action = true,
-    .state = TD_NONE
-};
-
-void ql_finished(tap_dance_state_t *state, void *user_data) {
-    ql_tap_state.state = cur_dance(state);
-    switch (ql_tap_state.state) {
-        case TD_SINGLE_TAP:
-            tap_code(KC_COMMA);
-            break;
-        case TD_DOUBLE_TAP:
-            tap_code(KC_COMMA);
-            tap_code(KC_COMMA);
-            break;
-        case TD_TRIPLE_TAP:
-            if (layer_state_is(_GAME))
-                layer_off(_GAME);
-            else
-                layer_on(_GAME);
-            break;
-        default:
-            break;
-    }
-}
-
-void ql_reset(tap_dance_state_t *state, void *user_data) {
-    ql_tap_state.state = TD_NONE;
-}
-
-tap_dance_action_t tap_dance_actions[] = {
-    [GAME] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, ql_finished, ql_reset)
-};
-
-uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case QK_TAP_DANCE ... QK_TAP_DANCE_MAX:
-            return 275;
-        default:
-            return TAPPING_TERM;
-    }
-}
diff --git a/keyboards/gboards/gergoplex/keymaps/georgepetri/readme.md b/keyboards/gboards/gergoplex/keymaps/georgepetri/readme.md
deleted file mode 100644
index 7c8a6f20234..00000000000
--- a/keyboards/gboards/gergoplex/keymaps/georgepetri/readme.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# George Petri's Gergoplex layout
-Vim and programming focused layout.
-```
-qmk compile -kb gboards/gergoplex -km georgepetri
-qmk flash -kb gboards/gergoplex -km georgepetri
-```
diff --git a/keyboards/gboards/gergoplex/keymaps/georgepetri/rules.mk b/keyboards/gboards/gergoplex/keymaps/georgepetri/rules.mk
deleted file mode 100644
index 74d02c23bd5..00000000000
--- a/keyboards/gboards/gergoplex/keymaps/georgepetri/rules.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-#----------------------------------------------------------------------------
-# make gboards/gergoplex:default:flash
-# Make sure you have dfu-programmer installed!
-#----------------------------------------------------------------------------
-
-#Debug options
-VERBOSE                = no
-DEBUG_MATRIX_SCAN_RATE = no
-DEBUG_MATRIX           = no
-CONSOLE_ENABLE         = no
-
-#Combos!
-COMBO_ENABLE = yes
-VPATH                  +=  keyboards/gboards/
-
-ifeq ($(strip $(DEBUG_MATRIX)), yes)
-    OPT_DEFS += -DDEBUG_MATRIX
-endif
-
-TAP_DANCE_ENABLE = yes
diff --git a/keyboards/gboards/gergoplex/keymaps/tgrosinger/combos.def b/keyboards/gboards/gergoplex/keymaps/tgrosinger/combos.def
deleted file mode 100644
index ef953d53f59..00000000000
--- a/keyboards/gboards/gergoplex/keymaps/tgrosinger/combos.def
+++ /dev/null
@@ -1,11 +0,0 @@
-// List any combo dictionaries you want loaded to your device below!
-
-// QMK wide includes
-//#include "combos/germ-vim-helpers.def"
-//#include "combos/germ-mouse-keys.def"
-
-// User includes
-#include "gergoplex.def"
-
-// Word completion
-// #include "combos/eng-combos.def"
diff --git a/keyboards/gboards/gergoplex/keymaps/tgrosinger/config.h b/keyboards/gboards/gergoplex/keymaps/tgrosinger/config.h
deleted file mode 100644
index 1b30cc73b3d..00000000000
--- a/keyboards/gboards/gergoplex/keymaps/tgrosinger/config.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#pragma once
-
-#define COMBO_ALLOW_ACTION_KEYS
-#define COMBO_VARIABLE_LEN
diff --git a/keyboards/gboards/gergoplex/keymaps/tgrosinger/gergoplex.def b/keyboards/gboards/gergoplex/keymaps/tgrosinger/gergoplex.def
deleted file mode 100644
index c7a93ed294e..00000000000
--- a/keyboards/gboards/gergoplex/keymaps/tgrosinger/gergoplex.def
+++ /dev/null
@@ -1,17 +0,0 @@
-// Gergoplex specfic combos
-
-COMB(qwGrav,      KC_GRV,           KC_W, KC_Q)
-COMB(wsEsc,       KC_ESC,           KC_W, KC_S)
-COMB(sdBackspace, KC_BSPC,          KC_S, KC_D)
-COMB(dfTab,       KC_TAB,           KC_D, KC_F)
-COMB(cvEnter,     KC_ENT,           KC_C, KC_V)
-
-COMB(ioMinus,     KC_MINS,          KC_I, KC_O)
-COMB(opBackslash, KC_BSLS,          KC_O, KC_P)
-COMB(hjLess,      KC_LT,            KC_H, KC_J)
-COMB(klGreat,     KC_GT,            KC_K, KC_L)
-COMB(jkColon,     KC_COLN,          KC_J, KC_K)
-COMB(mcUnder,     KC_UNDS,          KC_M, KC_COMM)
-COMB(nmQuote,     KC_QUOT,          KC_N, KC_M)
-
-SUBS(pasta,       "I'd just like to interject for a moment.",       KC_H, KC_J, KC_K, KC_L)
diff --git a/keyboards/gboards/gergoplex/keymaps/tgrosinger/keymap.c b/keyboards/gboards/gergoplex/keymaps/tgrosinger/keymap.c
deleted file mode 100644
index 74c0899fdb1..00000000000
--- a/keyboards/gboards/gergoplex/keymaps/tgrosinger/keymap.c
+++ /dev/null
@@ -1,286 +0,0 @@
-/* Copyright 2022 Tony Grosinger
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-#include "g/keymap_combo.h"
-
-enum {
-  _ALPHA,  // Default
-  _SYMB,   // Symbols
-  _NUMB,   // Numbers
-  _ARROWS, // Arrows and OS
-  _TMUX,   // TMUX Nav layer
-  _POPOS,  // Gnome Shell, aka PopOS
-};
-
-
-// Macros
-enum custom_keycodes {
-  TMUX_NEW = SAFE_RANGE,
-  TMUX_ZOOM,
-  TMUX_SCROLL,
-  TMUX_PN_LT,
-  TMUX_PN_UP,
-  TMUX_PN_DN,
-  TMUX_PN_RT,
-  TMUX_WN_LT,
-  TMUX_WN_RT,
-  TMUX_SP_VT,
-  TMUX_SP_HZ,
-  VIM_CLIP_CP,
-  VIM_CLIP_PST,
-  VIM_MACRO,
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case TMUX_NEW:
-      if (record->event.pressed) {
-        tap_code16(C(KC_B));
-        SEND_STRING("c");
-      }
-      break;
-    case TMUX_ZOOM:
-      if (record->event.pressed) {
-        tap_code16(C(KC_B));
-        SEND_STRING("z");
-      }
-      break;
-    case TMUX_SCROLL:
-      if (record->event.pressed) {
-        tap_code16(C(KC_B));
-        SEND_STRING("[");
-      }
-      break;
-    case TMUX_PN_LT:
-      if (record->event.pressed) {
-        tap_code16(C(KC_B));
-        tap_code(KC_LEFT);
-      }
-      break;
-    case TMUX_PN_DN:
-      if (record->event.pressed) {
-        tap_code16(C(KC_B));
-        tap_code(KC_DOWN);
-      }
-      break;
-    case TMUX_PN_UP:
-      if (record->event.pressed) {
-        tap_code16(C(KC_B));
-        tap_code(KC_UP);
-      }
-      break;
-    case TMUX_PN_RT:
-      if (record->event.pressed) {
-        tap_code16(C(KC_B));
-        tap_code(KC_RIGHT);
-      }
-      break;
-    case TMUX_WN_LT:
-      if (record->event.pressed) {
-        tap_code16(C(KC_B));
-        SEND_STRING("p");
-      }
-      break;
-    case TMUX_WN_RT:
-      if (record->event.pressed) {
-        tap_code16(C(KC_B));
-        SEND_STRING("n");
-      }
-      break;
-    case TMUX_SP_VT:
-      if (record->event.pressed) {
-        tap_code16(C(KC_B));
-        SEND_STRING("%");
-      }
-      break;
-    case TMUX_SP_HZ:
-      if (record->event.pressed) {
-        tap_code16(C(KC_B));
-        SEND_STRING("\"");
-      }
-      break;
-    case VIM_CLIP_CP:
-      if (record->event.pressed) {
-        tap_code16(S(KC_QUOTE));
-        tap_code16(S(KC_EQUAL));
-        tap_code(KC_Y);
-      }
-      break;
-    case VIM_CLIP_PST:
-      if (record->event.pressed) {
-        tap_code16(S(KC_QUOTE));
-        tap_code16(S(KC_EQUAL));
-        tap_code(KC_P);
-      }
-      break;
-    case VIM_MACRO:
-      if (record->event.pressed) {
-        tap_code16(S(KC_2));
-        tap_code(KC_Q);
-      }
-      break;
-    /*
-    case LAYRMOD:
-      // Act as a mod key if held, or toggle a layer if tapped
-      // replace KC_LCTL with desired mod, and _TARGET with desired layer name / number
-      if (record->event.pressed) {
-        uint8_t key_timer = timer_read();
-        register_mods(MOD_BIT(KC_LCTL));
-      } else {
-        unregister_mods(MOD_BIT(KC_LCTL));
-        if (timer_elapsed(key_timer) < 200) {
-          layer_invert(_TARGET);
-        }
-      }
-      return false;
-      break;
-    */
-  }
-  return true;
-}
-
-/* Combos
- *
- * ,-----------------------------.      ,-----------------------------.
- * |     `     |     |     |     |      |     |    MINS   |    BSLH   |
- * |-----+----ESC----+-----+-----|      |-----+-----+-----+-----------|
- * |     |   BSPC   TAB    |     |      |    LES   COLN  GRT    |     |
- * |-----+-----+-----+--RMB+-LMB-|      |-----+-----+-----+-----------|
- * |     |     |    ENT    |     |      |    QUO   UNDR   |     |     |
- * `-----+-----+-----+-----+-----'      `-----------------------------'
- *     .-------------------------.           .-------------------.
- *     |        |       |        |           |        |    |     |
- *     '-------------------------'           '-------------------'
- */
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap 0: Default layer
-  * ,------------------------------.      ,----------------------------------.
-  * |  Q   |  W  |  E  |  R  |  T  |      |  Y  |  U  |  I  |   O   |    P   |
-  * |------+-----+-----+-----+-----|      |-----+-----+-----+-------+--------|
-  * |CTRL/A|  S  |  D  |  F  |  G  |      |  H  |  J  |  K  |   L   | CTRL/; |
-  * |------+-----+-----+-----+-----|      |-----+-----+-----+-------+--------|
-  * |SHFT/Z|ALT/X|  C  |  V  |  B  |      |  N  |  M  |  <  | ALT/> | SHFT/? |
-  * `------+-----+-----+------+----'      `----------------------------------'
-  *           .-----------------.             .----------------------.
-  *           |   |GUI |SPC(NUM)|             |SPC(SYM)|TMUX | PopOS |
-  *           '-----------------'             '----------------------'
-  */
-  [_ALPHA] = LAYOUT_split_3x5_3(
-      KC_Q,              KC_W,               KC_E, KC_R, KC_T,    KC_Y, KC_U, KC_I,    KC_O,   KC_P, 
-      MT(MOD_LCTL, KC_A),KC_S,               KC_D, KC_F, KC_G,    KC_H, KC_J, KC_K,    KC_L,   MT(MOD_LCTL, KC_SCLN),
-      MT(MOD_LSFT, KC_Z),MT(MOD_LALT, KC_X), KC_C, KC_V, KC_B,    KC_N, KC_M, KC_COMM, MT(MOD_LALT, KC_DOT), MT(MOD_RSFT, KC_SLSH),
-              
-      KC_NO,   KC_LGUI, LT(_NUMB, KC_SPC),       // Left
-      LT(_SYMB, KC_SPC), MO(_TMUX), MO(_POPOS)   // Right
-      ),
-
-  /* Keymap 1: Symbols layer
-  * ,------------------------------.      ,-------------------------------.
-  * |  !   |  @  |  #  |  $  |  %  |      |  ^  |  &  |  *  |  +  |   =   |
-  * |------+-----+-----+-----+-----|      |-----+-----+-----+-----+-------|
-  * |  F1  | F2  | F3  | F4  | F5  |      | F6  | F7  | F8  | F9  |  F10  |
-  * |------+-----+-----+-----+-----|      |-----+-----+-----+-----+-------|
-  * |      |     |     |     |     |      |     |     |     | F11 |  F12  |
-  * `------+-----+-----+-----+-----'      `-------------------------------'
-  *        .-----------------.                  .-----------------.
-  *        |     | DEL | MO3 |                  | HLD | SPC |     |
-  *        '-----------------'                  '-----------------'
-  */
-  [_SYMB] = LAYOUT_split_3x5_3(
-      KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,   KC_CIRC, KC_AMPR, KC_ASTR, KC_PLUS, KC_EQL,
-      KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,     KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,
-      KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,     KC_NO,   KC_NO,   KC_NO,   KC_F11,  KC_F12,
-                KC_NO, KC_DEL, MO(_ARROWS),                 KC_TRNS,  KC_SPC, KC_NO
-      ),
-
-  /* Keymap 2: Number layer
-  * ,------------------------------.      ,-------------------------------.
-  * |  1   |  2  |  3  |  4  |  5  |      |  6  |  7  |  8  |  9  |   0   |
-  * |------+-----+-----+-----+-----|      |-----+-----+-----+-----+-------|
-  * | CTRL |     |  (  |  )  |     |      |     |  4  |  7  |  6  |       |
-  * |------+-----+-----+-----+-----|      |-----+-----+-----+-----+-------|
-  * | SHFT |     |  [  |  ]  |     |      |     |  1  |  2  |  3  |   .   |
-  * `------+-----+-----+-----+-----'      `-------------------------------'
-  *        .-----------------.                  .-----------------.
-  *        |     |     | HLD |                  | MO3 |  0  |     |
-  *        '-----------------'                  '-----------------'
-  */
-  [_NUMB] = LAYOUT_split_3x5_3(
-      KC_1,    KC_2,  KC_3,    KC_4,    KC_5,       KC_6,  KC_7, KC_8, KC_9,  KC_0,
-      KC_LCTL, KC_NO, KC_LPRN, KC_RPRN, KC_NO,      KC_NO, KC_4, KC_5, KC_6,  KC_NO,
-      KC_LSFT, KC_NO, KC_LBRC, KC_RBRC, KC_NO,      KC_NO, KC_1, KC_2, KC_3,  KC_DOT,
-                  KC_NO,KC_NO,KC_TRNS,                   MO(_ARROWS),KC_0,KC_NO
-      ),
-
-  /* Keymap 3: Arrows and OS
-  * ,------------------------------.      ,------------------------------------.
-  * |      |     |     |     |     |      |       |       |      |       |     |
-  * |------+-----+-----+-----+-----|      |-------+-------+------+-------+-----|
-  * | CTRL |HOME | PUP |     |     |      | LEFT  | DOWN  |  UP  | RIGHT |     |
-  * |------+-----+-----+-----+-----|      |-------+-------+------+-------+-----|
-  * | SHFT |END  | PDN |     |     |      |       |       |      |       |     |
-  * `------+-----+-----+-----+-----'      `------------------------------------'
-  *        .-----------------.                   .-----------------.
-  *        |     |     | HLD |                   | HLD |     |     |
-  *        '-----------------'                   '-----------------'
-  */
-  [_ARROWS] = LAYOUT_split_3x5_3(
-      KC_NO,   KC_NO,   KC_NO,   KC_NO, KC_NO,     KC_NO,        KC_NO,         KC_NO,         KC_NO,         KC_NO,
-      KC_LCTL, KC_HOME, KC_PGUP, KC_NO, KC_NO,     KC_LEFT,      KC_DOWN,       KC_UP,         KC_RGHT,       KC_NO,
-      KC_LSFT, KC_END,  KC_PGDN, KC_NO, KC_NO,     KC_NO,        KC_NO,         KC_NO,         KC_NO,         KC_NO,
-                  KC_NO,KC_NO,KC_TRNS,                   KC_TRNS,KC_NO,KC_NO
-      ),
-      
-  /* Keymap 4: Tmux navigation layer
-  * ,----------------------------------.      ,---------------------------------------.
-  * | Vi Mcr |     |     |     | SP VT |      | Vi Ynk|       |       |       | Vi PT |
-  * |--------+-----+-----+-----+-------|      |-------+-------+-------+-------+-------|
-  * |        | SCRL|     |     |       |      | PN LT | PN DN | PN UP | PN RT | SP HZ |
-  * |--------+-----+-----+-----+-------|      |-------+-------+-------+-------+-------|
-  * |  ZOOM  | KILL| NEW |     |       |      | W LT  |       |       | W RT  |       |
-  * `--------+-----+-----+-----+-------'      `---------------------------------------'
-  *          .-----------------.                   .-----------------.
-  *          |     |     |     |                   |     | HLD |     |
-  *          '-----------------'                   '-----------------'
-  */
-  [_TMUX] = LAYOUT_split_3x5_3(
-      VIM_MACRO, KC_NO,       KC_NO,    KC_NO, TMUX_SP_VT,      VIM_CLIP_CP, KC_NO,      KC_NO,      KC_NO,      VIM_CLIP_PST,
-      KC_NO,     TMUX_SCROLL, KC_NO,    KC_NO, KC_NO,           TMUX_PN_LT,  TMUX_PN_DN, TMUX_PN_UP, TMUX_PN_RT, TMUX_SP_HZ,
-      TMUX_ZOOM, KC_NO,       TMUX_NEW, KC_NO, KC_NO,           TMUX_WN_LT,  KC_NO,      KC_NO,      TMUX_WN_RT, KC_NO,
-                  KC_NO,KC_NO,KC_NO,                              KC_NO,KC_TRNS,KC_NO
-      ),
-
-  /* Keymap 5: Gnome Shell (PopOS)
-  * ,------------------------------.      ,--------------------------------------.
-  * |      |     |     |     |     |      | MV-DWN| D-DWN | D-UP  | MV-UP | Flip |
-  * |------+-----+-----+-----+-----|      |-------+-------+-------+-------+------|
-  * |      |     |     |     |     |      |  W-L  | W-DWN | W-UP  | W-R   |      |
-  * |------+-----+-----+-----+-----|      |-------+-------+-------+-------+------|
-  * |      |     |     |     |     |      | Scrns | Apps  | Close |       |      |
-  * `------+-----+-----+-----+-----'      `--------------------------------------'
-  *        .-----------------.                   .-----------------.
-  *        |     |     |     |                   |     |     | HLD |
-  *        '-----------------'                   '-----------------'
-  */
-  [_POPOS] = LAYOUT_split_3x5_3(
-      KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,     SGUI(KC_J), LCTL(LGUI(KC_J)), LCTL(LGUI(KC_K)), SGUI(KC_K), LGUI(KC_O),
-      KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,     LGUI(KC_H), LGUI(KC_J),       LGUI(KC_K),       LGUI(KC_L), KC_NO,
-      KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,     LGUI(KC_D), LGUI(KC_A),       LGUI(KC_Q),       KC_NO,      KC_NO,
-                  KC_NO,KC_NO,KC_NO,                   KC_NO,KC_NO,KC_TRNS
-      ),
-};
diff --git a/keyboards/gboards/gergoplex/keymaps/tgrosinger/readme.md b/keyboards/gboards/gergoplex/keymaps/tgrosinger/readme.md
deleted file mode 100644
index 0a53aa1cbfa..00000000000
--- a/keyboards/gboards/gergoplex/keymaps/tgrosinger/readme.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# GergoPlex
-
-This keymap I created for the GergoPlex with a focus on:
-
-- Keeping keys close to their normal locations when possible (number/symbol rows)
-- Work well for vim, tmux, and Ubuntu default desktop shortcuts
-- Work okay for OSx shortcuts
-
-## Firmware Building
-
-    util/docker_build.sh gboards/gergoplex:tgrosinger
-    util/docker_build.sh gboards/gergoplex:tgrosinger:flash
diff --git a/keyboards/gboards/gergoplex/keymaps/tgrosinger/rules.mk b/keyboards/gboards/gergoplex/keymaps/tgrosinger/rules.mk
deleted file mode 100644
index 620cab16c03..00000000000
--- a/keyboards/gboards/gergoplex/keymaps/tgrosinger/rules.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-#----------------------------------------------------------------------------
-# make gboards/gergoplex:default:flash
-# Make sure you have dfu-programmer installed!
-#----------------------------------------------------------------------------
-
-#Debug options
-VERBOSE                = no
-DEBUG_MATRIX_SCAN_RATE = no
-DEBUG_MATRIX           = no
-CONSOLE_ENABLE         = no
-
-#Combos!
-COMBO_ENABLE = yes
-VPATH                  +=  keyboards/gboards/
-
-ifeq ($(strip $(DEBUG_MATRIX)), yes)
-    OPT_DEFS += -DDEBUG_MATRIX
-endif
diff --git a/keyboards/geekboards/macropad_v2/config.h b/keyboards/geekboards/macropad_v2/config.h
index 6aed50ec2f6..dca98f0c954 100644
--- a/keyboards/geekboards/macropad_v2/config.h
+++ b/keyboards/geekboards/macropad_v2/config.h
@@ -19,7 +19,7 @@
 #define WS2812_PWM_DRIVER PWMD3
 #define WS2812_PWM_CHANNEL 2
 #define WS2812_PWM_PAL_MODE 1
-#define WS2812_DMA_STREAM STM32_DMA1_STREAM3
-#define WS2812_DMA_CHANNEL 3
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM3
+#define WS2812_PWM_DMA_CHANNEL 3
 
 #define WAIT_FOR_USB
diff --git a/keyboards/geistmaschine/geist/info.json b/keyboards/geistmaschine/geist/info.json
index 571740b7163..079dd8d6d9a 100644
--- a/keyboards/geistmaschine/geist/info.json
+++ b/keyboards/geistmaschine/geist/info.json
@@ -9,7 +9,7 @@
         "command": false,
         "console": false,
         "extrakey": true,
-        "mousekey": false,
+        "mousekey": true,
         "nkro": true,
         "encoder": true
     },
diff --git a/keyboards/geistmaschine/geist/keymaps/default/keymap.c b/keyboards/geistmaschine/geist/keymaps/default/keymap.c
index 6d96c572ba3..19b4ba2210d 100644
--- a/keyboards/geistmaschine/geist/keymaps/default/keymap.c
+++ b/keyboards/geistmaschine/geist/keymaps/default/keymap.c
@@ -19,14 +19,14 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = LAYOUT_all(
-        LT(2, KC_MUTE), KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,        KC_EQL,  KC_BSPC, KC_TRNS, KC_DEL,
+        LT(2, KC_MUTE), KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,        KC_EQL,  KC_BSPC, KC_BSPC, KC_DEL,
                         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,        KC_RBRC, KC_BSLS,          KC_HOME,
                         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,        KC_NUHS, KC_ENT,  KC_ENT,  KC_PGUP,
                         KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,        KC_RSFT, KC_UP,            KC_PGDN,
                         KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,           KC_SPC,           KC_SPC,           KC_RALT, LT(1, KC_RGUI), KC_LEFT, KC_DOWN, KC_RGHT
     ),
     [1] = LAYOUT_all(
-        KC_MPLY,        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_TRNS, KC_INS,
+        KC_MPLY,        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_DEL,  KC_INS,
                         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_PSCR,
                         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME,
                         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_ON,   NK_OFF,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_END,
diff --git a/keyboards/geistmaschine/geist/keymaps/via/keymap.c b/keyboards/geistmaschine/geist/keymaps/via/keymap.c
index 068f500fb01..f4d07036bda 100644
--- a/keyboards/geistmaschine/geist/keymaps/via/keymap.c
+++ b/keyboards/geistmaschine/geist/keymaps/via/keymap.c
@@ -19,14 +19,14 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = LAYOUT_all(
-        LT(2, KC_MUTE), KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,        KC_EQL,  KC_BSPC, KC_TRNS, KC_DEL,
+        LT(2, KC_MUTE), KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,        KC_EQL,  KC_BSPC, KC_BSPC, KC_DEL,
                         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,        KC_RBRC, KC_BSLS,          KC_HOME,
                         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,        KC_NUHS, KC_ENT,  KC_ENT,  KC_PGUP,
                         KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,        KC_RSFT, KC_UP,            KC_PGDN,
                         KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,           KC_SPC,           KC_SPC,           KC_RALT, LT(1, KC_RGUI), KC_LEFT, KC_DOWN, KC_RGHT
     ),
     [1] = LAYOUT_all(
-        KC_MPLY,        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_TRNS, KC_INS,
+        KC_MPLY,        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_DEL,  KC_INS,
                         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_PSCR,
                         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME,
                         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_ON,   NK_OFF,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_END,
diff --git a/keyboards/geonworks/w1_at/keymaps/zq/keymap.c b/keyboards/geonworks/w1_at/keymaps/zq/keymap.c
deleted file mode 100644
index eba9aedb8f2..00000000000
--- a/keyboards/geonworks/w1_at/keymaps/zq/keymap.c
+++ /dev/null
@@ -1,119 +0,0 @@
-/* Copyright 2021 Zhi Quan
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-
-enum custom_keycodes {
-    KC_P00 = SAFE_RANGE
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[0] = LAYOUT_all( /* Base */
-    KC_F1,   KC_F2,      KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,     TG(2),   KC_PSLS, KC_PAST, KC_PMNS,
-    KC_F3,   KC_F4,      KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,             KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
-    KC_F5,   KC_F6,      KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,              KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
-    KC_F7,   KC_F8,      KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),               KC_P1,   KC_P2,   KC_P3,   KC_PENT,
-    KC_F9,   KC_F10,     KC_LCTL,          KC_LCMD,                            KC_SPC,                                      KC_ROPT,          MO(1),               KC_P0,   KC_P00,  KC_PDOT, KC_PENT),
-
-[1] = LAYOUT_all( /* FN */
-    KC_TRNS, KC_TRNS,    KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_TRNS,    KC_TRNS, KC_MPRV, KC_MNXT, KC_VOLD,
-    KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_TRNS, KC_TRNS, QK_BOOT,             KC_HOME, KC_UP,   KC_PGUP, KC_VOLU,
-    KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,             KC_LEFT, KC_MUTE, KC_RGHT, KC_VOLU,
-    KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_END,  KC_DOWN, KC_PGDN, KC_MPLY,
-    KC_TRNS, KC_TRNS,    KC_TRNS,          KC_TRNS,                            KC_TRNS,                                     KC_TRNS,          KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY),
-
-[2] = LAYOUT_all( /* Numpad */
-    KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_HOME, KC_UP,   KC_PGUP, KC_TRNS,
-    KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,             KC_LEFT, XXXXXXX, KC_RGHT, KC_TRNS,
-    KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_END,  KC_DOWN, KC_PGDN, KC_TRNS,
-    KC_TRNS, KC_TRNS,    KC_TRNS,          KC_TRNS,                            KC_TRNS,                                     KC_TRNS,          KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-
-[3] = LAYOUT_all( /* Empty for dynamic keymaps */
-    KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS,    KC_TRNS,          KC_TRNS,                            KC_TRNS,                                     KC_TRNS,          KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch(keycode) {
-        case KC_P00:
-            if (record->event.pressed) {
-                tap_code(KC_P0);
-                tap_code(KC_P0);
-            }
-            return false;
-            break;
-        case KC_ESC:
-            if (record->event.pressed) {
-                // Turn on capslock indicator.
-                writePin(LED_CAPS_LOCK_PIN, LED_PIN_ON_STATE);
-            } else {
-                // Turn off capslock indicator.
-                writePin(LED_CAPS_LOCK_PIN, !LED_PIN_ON_STATE);
-            }
-    }
-    return true;
-}
-
-// Customized function so that numlock and capslock indicator are no longer controlled by the host.
-bool led_update_user(led_t led_state) {
-#if defined(LED_NUM_LOCK_PIN) || defined(LED_CAPS_LOCK_PIN) || defined(LED_SCROLL_LOCK_PIN) || defined(LED_COMPOSE_PIN) || defined(LED_KANA_PIN)
-#    if LED_PIN_ON_STATE == 0
-        // invert the whole thing to avoid having to conditionally !led_state.x later
-        led_state.raw = ~led_state.raw;
-#    endif
-
-// #    ifdef LED_NUM_LOCK_PIN
-//         writePin(LED_NUM_LOCK_PIN, led_state.num_lock);
-// #    endif
-// #    ifdef LED_CAPS_LOCK_PIN
-//         writePin(LED_CAPS_LOCK_PIN, led_state.caps_lock);
-// #    endif
-#    ifdef LED_SCROLL_LOCK_PIN
-        writePin(LED_SCROLL_LOCK_PIN, led_state.scroll_lock);
-#    endif
-#    ifdef LED_COMPOSE_PIN
-        writePin(LED_COMPOSE_PIN, led_state.compose);
-#    endif
-#    ifdef LED_KANA_PIN
-        writePin(LED_KANA_PIN, led_state.kana);
-#    endif
-#endif
-
-    // Return false to let led_update_kb fall through.
-    return false;
-}
-
-// Customized function to manage numlock indicator based on layer.
-layer_state_t layer_state_set_user(layer_state_t state) {
-    switch (get_highest_layer(state)) {
-        // Base layer
-        case 0:
-            // Turn on numlock indicator.
-            writePin(LED_NUM_LOCK_PIN, LED_PIN_ON_STATE);
-            break;
-
-        // Numpad navigation layer
-        case 2:
-            // Turn off numlock indicator.
-            writePin(LED_NUM_LOCK_PIN, !LED_PIN_ON_STATE);
-            break;
-    }
-
-    return state;
-}
\ No newline at end of file
diff --git a/keyboards/geonworks/w1_at/keymaps/zq/readme.md b/keyboards/geonworks/w1_at/keymaps/zq/readme.md
deleted file mode 100644
index 103130b161a..00000000000
--- a/keyboards/geonworks/w1_at/keymaps/zq/readme.md
+++ /dev/null
@@ -1,21 +0,0 @@
-# Personal W1-AT keymap
-The main highlights are as follows:
-* VIA support enabled
-* Enter bootloader mode using Fn + \
-* Grave key (` and ~) in place of Esc key
-* Esc in place of CapsLock key
-* Use NumLock LED indicator on layers: ON in layer 0, OFF in layer 2 (workaround for macOS since there is no NumLock key)
-* Use CapsLock LED indicator on Esc key
-
-
-## Layer 0 (Base)
----
-![Layer 0](https://i.imgur.com/l1OKSBB.png)
-
-## Layer 1 (Function)
----
-![Layer 1](https://i.imgur.com/RdzVyvb.png)
-
-## Layer 2 (Numpad Navigation)
----
-![Layer 2](https://i.imgur.com/xKVnQaK.png)
\ No newline at end of file
diff --git a/keyboards/giabalanai/info.json b/keyboards/giabalanai/info.json
index b10cbe943ec..953e0bebc37 100644
--- a/keyboards/giabalanai/info.json
+++ b/keyboards/giabalanai/info.json
@@ -36,9 +36,7 @@
         "bootmagic": false,
         "console": false,
         "mousekey": false,
-        "nkro": false,
-        "rgblight": false,
-        "audio": false
+        "nkro": false
     },
     "encoder": {
         "rotary": []
diff --git a/keyboards/giabalanai/keymaps/giabarinaix2led/config.h b/keyboards/giabalanai/keymaps/giabarinaix2led/config.h
index dd10d213a0b..01ad55eec0f 100644
--- a/keyboards/giabalanai/keymaps/giabarinaix2led/config.h
+++ b/keyboards/giabalanai/keymaps/giabarinaix2led/config.h
@@ -22,8 +22,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    undef MATRIX_COL_PINS_RIGHT
 
 #    ifdef RGBLIGHT_ENABLE
-#        undef RGBLED_NUM
-#        define RGBLED_NUM 120
+#        undef RGBLIGHT_LED_COUNT
+#        define RGBLIGHT_LED_COUNT 120
 #        undef RGBLIGHT_LED_MAP
 #        define RGBLIGHT_LED_MAP { \
            108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, \
diff --git a/keyboards/gmmk/gmmk2/p65/ansi/ansi.c b/keyboards/gmmk/gmmk2/p65/ansi/ansi.c
index 7c43f8d5eca..d1f01fc8cb5 100644
--- a/keyboards/gmmk/gmmk2/p65/ansi/ansi.c
+++ b/keyboards/gmmk/gmmk2/p65/ansi/ansi.c
@@ -25,98 +25,98 @@ const aw20216s_led_t PROGMEM g_aw20216s_leds[AW20216S_LED_COUNT] = {
  *   |     |          G location
  *   |     |          |          B location
  *   |     |          |          | */
-    {0, CS1_SW1,   CS2_SW1,   CS3_SW1  },  //  0  Esc
-    {0, CS4_SW2,   CS5_SW2,   CS6_SW2  },  //  1  1
-    {0, CS4_SW3,   CS5_SW3,   CS6_SW3  },  //  2  2
-    {0, CS4_SW4,   CS5_SW4,   CS6_SW4  },  //  3  3
-    {0, CS4_SW5,   CS5_SW5,   CS6_SW5  },  //  4  4
-    {0, CS4_SW6,   CS5_SW6,   CS6_SW6  },  //  5  5
-    {0, CS4_SW7,   CS5_SW7,   CS6_SW7  },  //  6  6
-    {0, CS4_SW8,   CS5_SW8,   CS6_SW8  },  //  7  7
-    {0, CS4_SW9,   CS5_SW9,   CS6_SW9  },  //  8  8
-    {0, CS4_SW10,  CS5_SW10,  CS6_SW10 },  //  9  9
-    {0, CS4_SW11,  CS5_SW11,  CS6_SW11 },  //  10 0
-    {0, CS4_SW12,  CS5_SW12,  CS6_SW12 },  //  11 -
-    {1, CS1_SW5,   CS2_SW5,   CS3_SW5  },  //  12 =
-    {1, CS1_SW7,   CS2_SW7,   CS3_SW7  },  //  13 Backspace
-    {1, CS4_SW4,   CS5_SW4,   CS6_SW4  },  //  14 Del
+    {0, SW1_CS1,   SW1_CS2,   SW1_CS3  },  //  0  Esc
+    {0, SW2_CS4,   SW2_CS5,   SW2_CS6  },  //  1  1
+    {0, SW3_CS4,   SW3_CS5,   SW3_CS6  },  //  2  2
+    {0, SW4_CS4,   SW4_CS5,   SW4_CS6  },  //  3  3
+    {0, SW5_CS4,   SW5_CS5,   SW5_CS6  },  //  4  4
+    {0, SW6_CS4,   SW6_CS5,   SW6_CS6  },  //  5  5
+    {0, SW7_CS4,   SW7_CS5,   SW7_CS6  },  //  6  6
+    {0, SW8_CS4,   SW8_CS5,   SW8_CS6  },  //  7  7
+    {0, SW9_CS4,   SW9_CS5,   SW9_CS6  },  //  8  8
+    {0, SW10_CS4,  SW10_CS5,  SW10_CS6 },  //  9  9
+    {0, SW11_CS4,  SW11_CS5,  SW11_CS6 },  //  10 0
+    {0, SW12_CS4,  SW12_CS5,  SW12_CS6 },  //  11 -
+    {1, SW5_CS1,   SW5_CS2,   SW5_CS3  },  //  12 =
+    {1, SW7_CS1,   SW7_CS2,   SW7_CS3  },  //  13 Backspace
+    {1, SW4_CS4,   SW4_CS5,   SW4_CS6  },  //  14 Del
 
-    {0, CS7_SW1,   CS8_SW1,   CS9_SW1  },  //  15 Tab
-    {0, CS7_SW2,   CS8_SW2,   CS9_SW2  },  //  16 Q
-    {0, CS7_SW3,   CS8_SW3,   CS9_SW3  },  //  17 W
-    {0, CS7_SW4,   CS8_SW4,   CS9_SW4  },  //  18 E
-    {0, CS7_SW5,   CS8_SW5,   CS9_SW5  },  //  19 R
-    {0, CS7_SW6,   CS8_SW6,   CS9_SW6  },  //  20 T
-    {0, CS7_SW7,   CS8_SW7,   CS9_SW7  },  //  21 Y
-    {0, CS7_SW8,   CS8_SW8,   CS9_SW8  },  //  22 U
-    {0, CS7_SW9,   CS8_SW9,   CS9_SW9  },  //  23 I
-    {0, CS7_SW10,  CS8_SW10,  CS9_SW10 },  //  24 O
-    {0, CS7_SW11,  CS8_SW11,  CS9_SW11 },  //  25 P
-    {0, CS7_SW12,  CS8_SW12,  CS9_SW12 },  //  26 [
-    {1, CS1_SW8,   CS2_SW8,   CS3_SW8  },  //  27 ]
-    {1, CS1_SW9,   CS2_SW9,   CS3_SW9  },  //  28 \|
-    {1, CS4_SW7,   CS5_SW7,   CS6_SW7  },  //  29 PgUp
+    {0, SW1_CS7,   SW1_CS8,   SW1_CS9  },  //  15 Tab
+    {0, SW2_CS7,   SW2_CS8,   SW2_CS9  },  //  16 Q
+    {0, SW3_CS7,   SW3_CS8,   SW3_CS9  },  //  17 W
+    {0, SW4_CS7,   SW4_CS8,   SW4_CS9  },  //  18 E
+    {0, SW5_CS7,   SW5_CS8,   SW5_CS9  },  //  19 R
+    {0, SW6_CS7,   SW6_CS8,   SW6_CS9  },  //  20 T
+    {0, SW7_CS7,   SW7_CS8,   SW7_CS9  },  //  21 Y
+    {0, SW8_CS7,   SW8_CS8,   SW8_CS9  },  //  22 U
+    {0, SW9_CS7,   SW9_CS8,   SW9_CS9  },  //  23 I
+    {0, SW10_CS7,  SW10_CS8,  SW10_CS9 },  //  24 O
+    {0, SW11_CS7,  SW11_CS8,  SW11_CS9 },  //  25 P
+    {0, SW12_CS7,  SW12_CS8,  SW12_CS9 },  //  26 [
+    {1, SW8_CS1,   SW8_CS2,   SW8_CS3  },  //  27 ]
+    {1, SW9_CS1,   SW9_CS2,   SW9_CS3  },  //  28 \|
+    {1, SW7_CS4,   SW7_CS5,   SW7_CS6  },  //  29 PgUp
 
-    {0, CS10_SW1,  CS11_SW1,  CS12_SW1 },  //  30 Caps Lock
-    {0, CS10_SW2,  CS11_SW2,  CS12_SW2 },  //  31 A
-    {0, CS10_SW3,  CS11_SW3,  CS12_SW3 },  //  32 S
-    {0, CS10_SW4,  CS11_SW4,  CS12_SW4 },  //  33 D
-    {0, CS10_SW5,  CS11_SW5,  CS12_SW5 },  //  34 F
-    {0, CS10_SW6,  CS11_SW6,  CS12_SW6 },  //  35 G
-    {0, CS10_SW7,  CS11_SW7,  CS12_SW7 },  //  36 H
-    {0, CS10_SW8,  CS11_SW8,  CS12_SW8 },  //  37 J
-    {0, CS10_SW9,  CS11_SW9,  CS12_SW9 },  //  38 K
-    {0, CS10_SW10, CS11_SW10, CS12_SW10},  //  39 L
-    {0, CS10_SW11, CS11_SW11, CS12_SW11},  //  40 ;
-    {0, CS10_SW12, CS11_SW12, CS12_SW12},  //  41 '
-    {1, CS1_SW11,  CS2_SW11,  CS3_SW11 },  //  42 Enter
-    {1, CS4_SW5,   CS5_SW5,   CS6_SW5  },  //  43 PgDn
+    {0, SW1_CS10,  SW1_CS11,  SW1_CS12 },  //  30 Caps Lock
+    {0, SW2_CS10,  SW2_CS11,  SW2_CS12 },  //  31 A
+    {0, SW3_CS10,  SW3_CS11,  SW3_CS12 },  //  32 S
+    {0, SW4_CS10,  SW4_CS11,  SW4_CS12 },  //  33 D
+    {0, SW5_CS10,  SW5_CS11,  SW5_CS12 },  //  34 F
+    {0, SW6_CS10,  SW6_CS11,  SW6_CS12 },  //  35 G
+    {0, SW7_CS10,  SW7_CS11,  SW7_CS12 },  //  36 H
+    {0, SW8_CS10,  SW8_CS11,  SW8_CS12 },  //  37 J
+    {0, SW9_CS10,  SW9_CS11,  SW9_CS12 },  //  38 K
+    {0, SW10_CS10, SW10_CS11, SW10_CS12},  //  39 L
+    {0, SW11_CS10, SW11_CS11, SW11_CS12},  //  40 ;
+    {0, SW12_CS10, SW12_CS11, SW12_CS12},  //  41 '
+    {1, SW11_CS1,  SW11_CS2,  SW11_CS3 },  //  42 Enter
+    {1, SW5_CS4,   SW5_CS5,   SW5_CS6  },  //  43 PgDn
 
-    {0, CS13_SW1,  CS14_SW1,  CS15_SW1 },  //  44 Shift_L
-    {0, CS13_SW3,  CS14_SW3,  CS15_SW3 },  //  45 Z
-    {0, CS13_SW4,  CS14_SW4,  CS15_SW4 },  //  46 X
-    {0, CS13_SW5,  CS14_SW5,  CS15_SW5 },  //  47 C
-    {0, CS13_SW6,  CS14_SW6,  CS15_SW6 },  //  48 V
-    {0, CS13_SW7,  CS14_SW7,  CS15_SW7 },  //  49 B
-    {0, CS13_SW8,  CS14_SW8,  CS15_SW8 },  //  50 N
-    {0, CS13_SW9,  CS14_SW9,  CS15_SW9 },  //  51 M
-    {0, CS13_SW10, CS14_SW10, CS15_SW10},  //  52 ,
-    {0, CS13_SW11, CS14_SW11, CS15_SW11},  //  53 .
-    {0, CS13_SW12, CS14_SW12, CS15_SW12},  //  54 /
-    {1, CS4_SW8,   CS5_SW8,   CS6_SW8  },  //  55 Shift_R
-    {1, CS4_SW9,   CS5_SW9,   CS6_SW9  },  //  56 Up
-    {1, CS4_SW6,   CS5_SW6,   CS6_SW6  },  //  57 END
+    {0, SW1_CS13,  SW1_CS14,  SW1_CS15 },  //  44 Shift_L
+    {0, SW3_CS13,  SW3_CS14,  SW3_CS15 },  //  45 Z
+    {0, SW4_CS13,  SW4_CS14,  SW4_CS15 },  //  46 X
+    {0, SW5_CS13,  SW5_CS14,  SW5_CS15 },  //  47 C
+    {0, SW6_CS13,  SW6_CS14,  SW6_CS15 },  //  48 V
+    {0, SW7_CS13,  SW7_CS14,  SW7_CS15 },  //  49 B
+    {0, SW8_CS13,  SW8_CS14,  SW8_CS15 },  //  50 N
+    {0, SW9_CS13,  SW9_CS14,  SW9_CS15 },  //  51 M
+    {0, SW10_CS13, SW10_CS14, SW10_CS15},  //  52 ,
+    {0, SW11_CS13, SW11_CS14, SW11_CS15},  //  53 .
+    {0, SW12_CS13, SW12_CS14, SW12_CS15},  //  54 /
+    {1, SW8_CS4,   SW8_CS5,   SW8_CS6  },  //  55 Shift_R
+    {1, SW9_CS4,   SW9_CS5,   SW9_CS6  },  //  56 Up
+    {1, SW6_CS4,   SW6_CS5,   SW6_CS6  },  //  57 END
 
-    {0, CS16_SW1,  CS17_SW1,  CS18_SW1 },  //  58 Ctrl_L
-    {0, CS16_SW2,  CS17_SW2,  CS18_SW2 },  //  59 Win_L
-    {0, CS16_SW3,  CS17_SW3,  CS18_SW3 },  //  60 Alt_L
-    {0, CS16_SW6,  CS17_SW6,  CS18_SW6 },  //  61 Space
-    {0, CS16_SW9,  CS17_SW9,  CS18_SW9 },  //  62 Alt_R
-    {0, CS16_SW10, CS17_SW10, CS18_SW10},  //  63 FN
-    {1, CS4_SW10,  CS5_SW10,  CS6_SW10 },  //  64 Left
-    {1, CS4_SW11,  CS5_SW11,  CS6_SW11 },  //  65 Down
-    {1, CS4_SW12,  CS5_SW12,  CS6_SW12 },  //  66 Right
+    {0, SW1_CS16,  SW1_CS17,  SW1_CS18 },  //  58 Ctrl_L
+    {0, SW2_CS16,  SW2_CS17,  SW2_CS18 },  //  59 Win_L
+    {0, SW3_CS16,  SW3_CS17,  SW3_CS18 },  //  60 Alt_L
+    {0, SW6_CS16,  SW6_CS17,  SW6_CS18 },  //  61 Space
+    {0, SW9_CS16,  SW9_CS17,  SW9_CS18 },  //  62 Alt_R
+    {0, SW10_CS16, SW10_CS17, SW10_CS18},  //  63 FN
+    {1, SW10_CS4,  SW10_CS5,  SW10_CS6 },  //  64 Left
+    {1, SW11_CS4,  SW11_CS5,  SW11_CS6 },  //  65 Down
+    {1, SW12_CS4,  SW12_CS5,  SW12_CS6 },  //  66 Right
 
-    {1, CS13_SW1,  CS14_SW1,  CS15_SW1 },  //  69 LED 1
-    {1, CS13_SW2,  CS14_SW2,  CS15_SW2 },  //  70 LED 2
-    {1, CS13_SW3,  CS14_SW3,  CS15_SW3 },  //  71 LED 3
-    {1, CS13_SW4,  CS14_SW4,  CS15_SW4 },  //  72 LED 4
-    {1, CS13_SW5,  CS14_SW5,  CS15_SW5 },  //  73 LED 5
-    {1, CS13_SW6,  CS14_SW6,  CS15_SW6 },  //  74 LED 6
-    {1, CS13_SW7,  CS14_SW7,  CS15_SW7 },  //  75 LED 7
-    {1, CS13_SW8,  CS14_SW8,  CS15_SW8 },  //  76 LED 8
-    {1, CS13_SW9,  CS14_SW9,  CS15_SW9 },  //  77 LED 9
-    {1, CS13_SW10, CS14_SW10, CS15_SW10},  //  78 LED 10
-    {1, CS16_SW1,  CS17_SW1,  CS18_SW1 },  //  79 LED 11
-    {1, CS16_SW2,  CS17_SW2,  CS18_SW2 },  //  80 LED 12
-    {1, CS16_SW3,  CS17_SW3,  CS18_SW3 },  //  81 LED 13
-    {1, CS16_SW4,  CS17_SW4,  CS18_SW4 },  //  82 LED 14
-    {1, CS16_SW5,  CS17_SW5,  CS18_SW5 },  //  83 LED 15
-    {1, CS16_SW6,  CS17_SW6,  CS18_SW6 },  //  84 LED 16
-    {1, CS16_SW7,  CS17_SW7,  CS18_SW7 },  //  85 LED 17
-    {1, CS16_SW8,  CS17_SW8,  CS18_SW8 },  //  86 LED 18
-    {1, CS16_SW9,  CS17_SW9,  CS18_SW9 },  //  87 LED 19
-    {1, CS16_SW10, CS17_SW10, CS18_SW10}   //  88 LED 20
+    {1, SW1_CS13,  SW1_CS14,  SW1_CS15 },  //  69 LED 1
+    {1, SW2_CS13,  SW2_CS14,  SW2_CS15 },  //  70 LED 2
+    {1, SW3_CS13,  SW3_CS14,  SW3_CS15 },  //  71 LED 3
+    {1, SW4_CS13,  SW4_CS14,  SW4_CS15 },  //  72 LED 4
+    {1, SW5_CS13,  SW5_CS14,  SW5_CS15 },  //  73 LED 5
+    {1, SW6_CS13,  SW6_CS14,  SW6_CS15 },  //  74 LED 6
+    {1, SW7_CS13,  SW7_CS14,  SW7_CS15 },  //  75 LED 7
+    {1, SW8_CS13,  SW8_CS14,  SW8_CS15 },  //  76 LED 8
+    {1, SW9_CS13,  SW9_CS14,  SW9_CS15 },  //  77 LED 9
+    {1, SW10_CS13, SW10_CS14, SW10_CS15},  //  78 LED 10
+    {1, SW1_CS16,  SW1_CS17,  SW1_CS18 },  //  79 LED 11
+    {1, SW2_CS16,  SW2_CS17,  SW2_CS18 },  //  80 LED 12
+    {1, SW3_CS16,  SW3_CS17,  SW3_CS18 },  //  81 LED 13
+    {1, SW4_CS16,  SW4_CS17,  SW4_CS18 },  //  82 LED 14
+    {1, SW5_CS16,  SW5_CS17,  SW5_CS18 },  //  83 LED 15
+    {1, SW6_CS16,  SW6_CS17,  SW6_CS18 },  //  84 LED 16
+    {1, SW7_CS16,  SW7_CS17,  SW7_CS18 },  //  85 LED 17
+    {1, SW8_CS16,  SW8_CS17,  SW8_CS18 },  //  86 LED 18
+    {1, SW9_CS16,  SW9_CS17,  SW9_CS18 },  //  87 LED 19
+    {1, SW10_CS16, SW10_CS17, SW10_CS18}   //  88 LED 20
 };
 
 #define __ NO_LED
diff --git a/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/keymap.c b/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/keymap.c
deleted file mode 100644
index 8ca676273be..00000000000
--- a/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/keymap.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Copyright 2022 Eugenio Pastoral
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-// The underscores don't mean anything - you can have a layer called STUFF or any other name.
-enum custom_layers {
-    _BL,
-    _FL,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap _BL: Base Layer (Default Layer)
-   */
-[_BL] = LAYOUT(
-  QK_GESC,  KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_HOME,
-  KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,  KC_END,
-  KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_ENT,             KC_PGUP,
-  KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,  KC_UP,    KC_PGDN,
-  KC_LCTL,  KC_LALT,  KC_LGUI,                                KC_SPC,                                 KC_RALT,  MO(1),    KC_LEFT,  KC_DOWN,  KC_RGHT),
-
-  /* Keymap _FL: Function Layer
-   */
-[_FL] = LAYOUT(
-  KC_GRV,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,    KC_DEL,  RGB_TOG,
-  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_PSCR,  KC_SCRL,  KC_PAUS,   _______,  _______,
-  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,             _______,
-  _______,  _______,  RGB_HUI,  RGB_HUD,  RGB_SPD,  RGB_SPI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,  _______,   RGB_VAI,  _______,
-  EE_CLR,  _______,  _______,                                 QK_BOOT,                                _______,  _______,  RGB_RMOD,  RGB_VAD,  RGB_MOD)
-};
-
-// Turns side LEDs to white for caps lock and layer indicators.
-bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
-    if (host_keyboard_led_state().caps_lock || get_highest_layer(layer_state | default_layer_state)) {
-        for (uint8_t i = led_min; i < led_max; i++) {
-            if (HAS_FLAGS(g_led_config.flags[i], 0x02)) { // 0x02 == LED_FLAG_UNDERGLOW
-                rgb_matrix_set_color(i, 0xff, 0xff, 0xff);
-            }
-        }
-    }
-    return false;
-};
diff --git a/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/readme.md b/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/readme.md
deleted file mode 100644
index 4f80a5b9566..00000000000
--- a/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# ANSI GMMKV2 65% Layout
diff --git a/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/rgb_matrix_user.inc b/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/rgb_matrix_user.inc
deleted file mode 100644
index 2966fe25862..00000000000
--- a/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/rgb_matrix_user.inc
+++ /dev/null
@@ -1,72 +0,0 @@
- /* Copyright 2022 Eugenio Pastoral
-  *
-  * This program is free software: you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-  * the Free Software Foundation, either version 2 of the License, or
-  * (at your option) any later version.
-  *
-  * This program is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  * GNU General Public License for more details.
-  *
-  * You should have received a copy of the GNU General Public License
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */
-
-RGB_MATRIX_EFFECT(SOLID_UNDERGLOW)
-RGB_MATRIX_EFFECT(HOLOGRAPHICS_UNDERGLOW)
-
-#ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-
-// This is a side lights only configuration where the solid color is following the current HSV setting.
-static bool SOLID_UNDERGLOW(effect_params_t* params) {
-    RGB_MATRIX_USE_LIMITS(led_min, led_max);
-
-    RGB rgb = rgb_matrix_hsv_to_rgb(rgb_matrix_config.hsv);
-    for (uint8_t i = led_min; i < led_max; i++) {
-        if (HAS_FLAGS(g_led_config.flags[i], 0x02)) { // 0x02 == LED_FLAG_UNDERGLOW
-            rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
-        } else {
-            rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
-        }
-    }
-    return rgb_matrix_check_finished_leds(led_max);
-}
-
-// This is a side lights only configuration where the color is set to a static gradient.
-static bool HOLOGRAPHICS_UNDERGLOW(effect_params_t* params) {
-    RGB_MATRIX_USE_LIMITS(led_min, led_max);
-
-    for (uint8_t i = led_min; i < led_max; i++) {
-        if (HAS_FLAGS(g_led_config.flags[i], 0x02)) { // 0x02 == LED_FLAG_UNDERGLOW
-            // RIGHT-HAND SIDE LEDS || LEFT-HAND SIDE LEDS
-            if (i == 67 || i == 77) {
-                rgb_matrix_set_color(i, 0xff, 0x00, 0xee);
-            } else if (i == 68 || i == 78) {
-                rgb_matrix_set_color(i, 0xcc, 0x00, 0xff);
-            } else if (i == 69 || i == 79) {
-                rgb_matrix_set_color(i, 0x9e, 0x00, 0xff);
-            } else if (i == 70 || i == 80) {
-                rgb_matrix_set_color(i, 0x70, 0x00, 0xff);
-            } else if (i == 71 || i == 81) {
-                rgb_matrix_set_color(i, 0x52, 0x00, 0xff);
-            } else if (i == 72 || i == 82) {
-                rgb_matrix_set_color(i, 0x33, 0x00, 0xff);
-            } else if (i == 73 || i == 83) {
-                rgb_matrix_set_color(i, 0x00, 0x38, 0xff);
-            } else if (i == 74 || i == 84) {
-                rgb_matrix_set_color(i, 0x00, 0x57, 0xff);
-            } else if (i == 75 || i == 85) {
-                rgb_matrix_set_color(i, 0x00, 0x85, 0xff);
-            } else if (i == 76 || i == 86) {
-                rgb_matrix_set_color(i, 0x00, 0xb2, 0xff);
-            } else {
-                rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
-            }
-        }
-    }
-    return rgb_matrix_check_finished_leds(led_max);
-}
-
-#endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
diff --git a/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/rules.mk b/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/rules.mk
deleted file mode 100644
index 6245023e803..00000000000
--- a/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-RGB_MATRIX_CUSTOM_USER = yes
diff --git a/keyboards/gmmk/gmmk2/p65/ansi/keymaps/thekorn/keymap.c b/keyboards/gmmk/gmmk2/p65/ansi/keymaps/thekorn/keymap.c
deleted file mode 100644
index c5f90e3fee0..00000000000
--- a/keyboards/gmmk/gmmk2/p65/ansi/keymaps/thekorn/keymap.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Copyright 2021 Glorious, LLC <salman@pcgamingrace.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-// The underscores don't mean anything - you can have a layer called STUFF or any other name.
-enum custom_layers {
-    _BL,
-    _FL,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap _BL: Base Layer (Default Layer)
-   */
-[_BL] = LAYOUT(
-  QK_GESC,  KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_HOME,
-  KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,  KC_PGUP,
-  KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_ENT,             KC_PGDN,
-  KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,  KC_UP,    KC_END,
-  KC_LCTL,  KC_LGUI,  KC_LALT,                                KC_SPC,                                 KC_RALT,  MO(1),    KC_LEFT,  KC_DOWN,  KC_RGHT),
-
-  /* Keymap _FL: Function Layer
-   */
-[_FL] = LAYOUT(
-  KC_GRV,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,    _______,  KC_INS,
-  RGB_M_P,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_PSCR,  KC_SCRL,  KC_PAUS,   _______,  _______,
-  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,             _______,
-  _______,  _______,  RGB_HUI,  RGB_HUD,  RGB_SPD,  RGB_SPI,  _______,  _______,  _______,  KC_MPRV,  KC_MPLY,  KC_MNXT,  _______,   RGB_VAI,  RGB_TOG,
-  KC_MUTE,  KC_VOLU,  KC_VOLD,                                QK_BOOT,                                _______,  _______,  RGB_RMOD,  RGB_VAD,  RGB_MOD)
-};
diff --git a/keyboards/gmmk/gmmk2/p65/ansi/keymaps/thekorn/readme.md b/keyboards/gmmk/gmmk2/p65/ansi/keymaps/thekorn/readme.md
deleted file mode 100644
index 4f80a5b9566..00000000000
--- a/keyboards/gmmk/gmmk2/p65/ansi/keymaps/thekorn/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# ANSI GMMKV2 65% Layout
diff --git a/keyboards/gmmk/gmmk2/p65/iso/iso.c b/keyboards/gmmk/gmmk2/p65/iso/iso.c
index 9a591cd4ef7..2be52853941 100644
--- a/keyboards/gmmk/gmmk2/p65/iso/iso.c
+++ b/keyboards/gmmk/gmmk2/p65/iso/iso.c
@@ -25,99 +25,99 @@ const aw20216s_led_t PROGMEM g_aw20216s_leds[AW20216S_LED_COUNT] = {
  *   |     |          G location
  *   |     |          |          B location
  *   |     |          |          | */
-    {0, CS1_SW1,   CS2_SW1,   CS3_SW1  },  //  0  Esc
-    {0, CS4_SW2,   CS5_SW2,   CS6_SW2  },  //  1  1
-    {0, CS4_SW3,   CS5_SW3,   CS6_SW3  },  //  2  2
-    {0, CS4_SW4,   CS5_SW4,   CS6_SW4  },  //  3  3
-    {0, CS4_SW5,   CS5_SW5,   CS6_SW5  },  //  4  4
-    {0, CS4_SW6,   CS5_SW6,   CS6_SW6  },  //  5  5
-    {0, CS4_SW7,   CS5_SW7,   CS6_SW7  },  //  6  6
-    {0, CS4_SW8,   CS5_SW8,   CS6_SW8  },  //  7  7
-    {0, CS4_SW9,   CS5_SW9,   CS6_SW9  },  //  8  8
-    {0, CS4_SW10,  CS5_SW10,  CS6_SW10 },  //  9  9
-    {0, CS4_SW11,  CS5_SW11,  CS6_SW11 },  //  10 0
-    {0, CS4_SW12,  CS5_SW12,  CS6_SW12 },  //  11 -
-    {1, CS1_SW5,   CS2_SW5,   CS3_SW5  },  //  12 =
-    {1, CS1_SW7,   CS2_SW7,   CS3_SW7  },  //  13 Backspace
-    {1, CS4_SW4,   CS5_SW4,   CS6_SW4  },  //  14 HOME
+    {0, SW1_CS1,   SW1_CS2,   SW1_CS3  },  //  0  Esc
+    {0, SW2_CS4,   SW2_CS5,   SW2_CS6  },  //  1  1
+    {0, SW3_CS4,   SW3_CS5,   SW3_CS6  },  //  2  2
+    {0, SW4_CS4,   SW4_CS5,   SW4_CS6  },  //  3  3
+    {0, SW5_CS4,   SW5_CS5,   SW5_CS6  },  //  4  4
+    {0, SW6_CS4,   SW6_CS5,   SW6_CS6  },  //  5  5
+    {0, SW7_CS4,   SW7_CS5,   SW7_CS6  },  //  6  6
+    {0, SW8_CS4,   SW8_CS5,   SW8_CS6  },  //  7  7
+    {0, SW9_CS4,   SW9_CS5,   SW9_CS6  },  //  8  8
+    {0, SW10_CS4,  SW10_CS5,  SW10_CS6 },  //  9  9
+    {0, SW11_CS4,  SW11_CS5,  SW11_CS6 },  //  10 0
+    {0, SW12_CS4,  SW12_CS5,  SW12_CS6 },  //  11 -
+    {1, SW5_CS1,   SW5_CS2,   SW5_CS3  },  //  12 =
+    {1, SW7_CS1,   SW7_CS2,   SW7_CS3  },  //  13 Backspace
+    {1, SW4_CS4,   SW4_CS5,   SW4_CS6  },  //  14 HOME
 
-    {0, CS7_SW1,   CS8_SW1,   CS9_SW1  },  //  15 Tab
-    {0, CS7_SW2,   CS8_SW2,   CS9_SW2  },  //  16 Q
-    {0, CS7_SW3,   CS8_SW3,   CS9_SW3  },  //  17 W
-    {0, CS7_SW4,   CS8_SW4,   CS9_SW4  },  //  18 E
-    {0, CS7_SW5,   CS8_SW5,   CS9_SW5  },  //  19 R
-    {0, CS7_SW6,   CS8_SW6,   CS9_SW6  },  //  20 T
-    {0, CS7_SW7,   CS8_SW7,   CS9_SW7  },  //  21 Y
-    {0, CS7_SW8,   CS8_SW8,   CS9_SW8  },  //  22 U
-    {0, CS7_SW9,   CS8_SW9,   CS9_SW9  },  //  23 I
-    {0, CS7_SW10,  CS8_SW10,  CS9_SW10 },  //  24 O
-    {0, CS7_SW11,  CS8_SW11,  CS9_SW11 },  //  25 P
-    {0, CS7_SW12,  CS8_SW12,  CS9_SW12 },  //  26 [
-    {1, CS1_SW8,   CS2_SW8,   CS3_SW8  },  //  27 ]
-    {1, CS1_SW11,  CS2_SW11,  CS3_SW11 },  //  28 ENTER
-    {1, CS4_SW7,   CS5_SW7,   CS6_SW7  },  //  29 PgUp
+    {0, SW1_CS7,   SW1_CS8,   SW1_CS9  },  //  15 Tab
+    {0, SW2_CS7,   SW2_CS8,   SW2_CS9  },  //  16 Q
+    {0, SW3_CS7,   SW3_CS8,   SW3_CS9  },  //  17 W
+    {0, SW4_CS7,   SW4_CS8,   SW4_CS9  },  //  18 E
+    {0, SW5_CS7,   SW5_CS8,   SW5_CS9  },  //  19 R
+    {0, SW6_CS7,   SW6_CS8,   SW6_CS9  },  //  20 T
+    {0, SW7_CS7,   SW7_CS8,   SW7_CS9  },  //  21 Y
+    {0, SW8_CS7,   SW8_CS8,   SW8_CS9  },  //  22 U
+    {0, SW9_CS7,   SW9_CS8,   SW9_CS9  },  //  23 I
+    {0, SW10_CS7,  SW10_CS8,  SW10_CS9 },  //  24 O
+    {0, SW11_CS7,  SW11_CS8,  SW11_CS9 },  //  25 P
+    {0, SW12_CS7,  SW12_CS8,  SW12_CS9 },  //  26 [
+    {1, SW8_CS1,   SW8_CS2,   SW8_CS3  },  //  27 ]
+    {1, SW11_CS1,  SW11_CS2,  SW11_CS3 },  //  28 ENTER
+    {1, SW7_CS4,   SW7_CS5,   SW7_CS6  },  //  29 PgUp
 
-    {0, CS10_SW1,  CS11_SW1,  CS12_SW1 },  //  30 Caps Lock
-    {0, CS10_SW2,  CS11_SW2,  CS12_SW2 },  //  31 A
-    {0, CS10_SW3,  CS11_SW3,  CS12_SW3 },  //  32 S
-    {0, CS10_SW4,  CS11_SW4,  CS12_SW4 },  //  33 D
-    {0, CS10_SW5,  CS11_SW5,  CS12_SW5 },  //  34 F
-    {0, CS10_SW6,  CS11_SW6,  CS12_SW6 },  //  35 G
-    {0, CS10_SW7,  CS11_SW7,  CS12_SW7 },  //  36 H
-    {0, CS10_SW8,  CS11_SW8,  CS12_SW8 },  //  37 J
-    {0, CS10_SW9,  CS11_SW9,  CS12_SW9 },  //  38 K
-    {0, CS10_SW10, CS11_SW10, CS12_SW10},  //  39 L
-    {0, CS10_SW11, CS11_SW11, CS12_SW11},  //  40 ;
-    {0, CS10_SW12, CS11_SW12, CS12_SW12},  //  41 '
-    {1, CS1_SW10,  CS2_SW10,  CS3_SW10 },  //  42 k42
-    {1, CS4_SW5,   CS5_SW5,   CS6_SW5  },  //  43 PgDn
+    {0, SW1_CS10,  SW1_CS11,  SW1_CS12 },  //  30 Caps Lock
+    {0, SW2_CS10,  SW2_CS11,  SW2_CS12 },  //  31 A
+    {0, SW3_CS10,  SW3_CS11,  SW3_CS12 },  //  32 S
+    {0, SW4_CS10,  SW4_CS11,  SW4_CS12 },  //  33 D
+    {0, SW5_CS10,  SW5_CS11,  SW5_CS12 },  //  34 F
+    {0, SW6_CS10,  SW6_CS11,  SW6_CS12 },  //  35 G
+    {0, SW7_CS10,  SW7_CS11,  SW7_CS12 },  //  36 H
+    {0, SW8_CS10,  SW8_CS11,  SW8_CS12 },  //  37 J
+    {0, SW9_CS10,  SW9_CS11,  SW9_CS12 },  //  38 K
+    {0, SW10_CS10, SW10_CS11, SW10_CS12},  //  39 L
+    {0, SW11_CS10, SW11_CS11, SW11_CS12},  //  40 ;
+    {0, SW12_CS10, SW12_CS11, SW12_CS12},  //  41 '
+    {1, SW10_CS1,  SW10_CS2,  SW10_CS3 },  //  42 k42
+    {1, SW5_CS4,   SW5_CS5,   SW5_CS6  },  //  43 PgDn
 
-    {0, CS13_SW1,  CS14_SW1,  CS15_SW1 },  //  44 Shift_L
-    {0, CS13_SW2,  CS14_SW2,  CS15_SW2 },  //  45 k45
-    {0, CS13_SW3,  CS14_SW3,  CS15_SW3 },  //  46 Z
-    {0, CS13_SW4,  CS14_SW4,  CS15_SW4 },  //  47 X
-    {0, CS13_SW5,  CS14_SW5,  CS15_SW5 },  //  48 C
-    {0, CS13_SW6,  CS14_SW6,  CS15_SW6 },  //  49 V
-    {0, CS13_SW7,  CS14_SW7,  CS15_SW7 },  //  50 B
-    {0, CS13_SW8,  CS14_SW8,  CS15_SW8 },  //  51 N
-    {0, CS13_SW9,  CS14_SW9,  CS15_SW9 },  //  52 M
-    {0, CS13_SW10, CS14_SW10, CS15_SW10},  //  53 ,
-    {0, CS13_SW11, CS14_SW11, CS15_SW11},  //  54 .
-    {0, CS13_SW12, CS14_SW12, CS15_SW12},  //  55 /
-    {1, CS4_SW8,   CS5_SW8,   CS6_SW8  },  //  56 Shift_R
-    {1, CS4_SW9,   CS5_SW9,   CS6_SW9  },  //  57 Up
-    {1, CS4_SW6,   CS5_SW6,   CS6_SW6  },  //  58 END
+    {0, SW1_CS13,  SW1_CS14,  SW1_CS15 },  //  44 Shift_L
+    {0, SW2_CS13,  SW2_CS14,  SW2_CS15 },  //  45 k45
+    {0, SW3_CS13,  SW3_CS14,  SW3_CS15 },  //  46 Z
+    {0, SW4_CS13,  SW4_CS14,  SW4_CS15 },  //  47 X
+    {0, SW5_CS13,  SW5_CS14,  SW5_CS15 },  //  48 C
+    {0, SW6_CS13,  SW6_CS14,  SW6_CS15 },  //  49 V
+    {0, SW7_CS13,  SW7_CS14,  SW7_CS15 },  //  50 B
+    {0, SW8_CS13,  SW8_CS14,  SW8_CS15 },  //  51 N
+    {0, SW9_CS13,  SW9_CS14,  SW9_CS15 },  //  52 M
+    {0, SW10_CS13, SW10_CS14, SW10_CS15},  //  53 ,
+    {0, SW11_CS13, SW11_CS14, SW11_CS15},  //  54 .
+    {0, SW12_CS13, SW12_CS14, SW12_CS15},  //  55 /
+    {1, SW8_CS4,   SW8_CS5,   SW8_CS6  },  //  56 Shift_R
+    {1, SW9_CS4,   SW9_CS5,   SW9_CS6  },  //  57 Up
+    {1, SW6_CS4,   SW6_CS5,   SW6_CS6  },  //  58 END
 
-    {0, CS16_SW1,  CS17_SW1,  CS18_SW1 },  //  59 Ctrl_L
-    {0, CS16_SW2,  CS17_SW2,  CS18_SW2 },  //  60 Win_L
-    {0, CS16_SW3,  CS17_SW3,  CS18_SW3 },  //  61 Alt_L
-    {0, CS16_SW6,  CS17_SW6,  CS18_SW6 },  //  62 Space
-    {0, CS16_SW9,  CS17_SW9,  CS18_SW9 },  //  63 Alt_R
-    {0, CS16_SW10, CS17_SW10, CS18_SW10},  //  64 FN
-    {1, CS4_SW10,  CS5_SW10,  CS6_SW10 },  //  65 Left
-    {1, CS4_SW11,  CS5_SW11,  CS6_SW11 },  //  66 Down
-    {1, CS4_SW12,  CS5_SW12,  CS6_SW12 },  //  67 Right
+    {0, SW1_CS16,  SW1_CS17,  SW1_CS18 },  //  59 Ctrl_L
+    {0, SW2_CS16,  SW2_CS17,  SW2_CS18 },  //  60 Win_L
+    {0, SW3_CS16,  SW3_CS17,  SW3_CS18 },  //  61 Alt_L
+    {0, SW6_CS16,  SW6_CS17,  SW6_CS18 },  //  62 Space
+    {0, SW9_CS16,  SW9_CS17,  SW9_CS18 },  //  63 Alt_R
+    {0, SW10_CS16, SW10_CS17, SW10_CS18},  //  64 FN
+    {1, SW10_CS4,  SW10_CS5,  SW10_CS6 },  //  65 Left
+    {1, SW11_CS4,  SW11_CS5,  SW11_CS6 },  //  66 Down
+    {1, SW12_CS4,  SW12_CS5,  SW12_CS6 },  //  67 Right
 
-    {1, CS13_SW1,  CS14_SW1,  CS15_SW1 },  //  68 LED 1
-    {1, CS13_SW2,  CS14_SW2,  CS15_SW2 },  //  69 LED 2
-    {1, CS13_SW3,  CS14_SW3,  CS15_SW3 },  //  70 LED 3
-    {1, CS13_SW4,  CS14_SW4,  CS15_SW4 },  //  71 LED 4
-    {1, CS13_SW5,  CS14_SW5,  CS15_SW5 },  //  72 LED 5
-    {1, CS13_SW6,  CS14_SW6,  CS15_SW6 },  //  73 LED 6
-    {1, CS13_SW7,  CS14_SW7,  CS15_SW7 },  //  74 LED 7
-    {1, CS13_SW8,  CS14_SW8,  CS15_SW8 },  //  75 LED 8
-    {1, CS13_SW9,  CS14_SW9,  CS15_SW9 },  //  76 LED 9
-    {1, CS13_SW10, CS14_SW10, CS15_SW10},  //  77 LED 10
-    {1, CS16_SW1,  CS17_SW1,  CS18_SW1 },  //  78 LED 11
-    {1, CS16_SW2,  CS17_SW2,  CS18_SW2 },  //  79 LED 12
-    {1, CS16_SW3,  CS17_SW3,  CS18_SW3 },  //  80 LED 13
-    {1, CS16_SW4,  CS17_SW4,  CS18_SW4 },  //  81 LED 14
-    {1, CS16_SW5,  CS17_SW5,  CS18_SW5 },  //  82 LED 15
-    {1, CS16_SW6,  CS17_SW6,  CS18_SW6 },  //  83 LED 16
-    {1, CS16_SW7,  CS17_SW7,  CS18_SW7 },  //  84 LED 17
-    {1, CS16_SW8,  CS17_SW8,  CS18_SW8 },  //  85 LED 18
-    {1, CS16_SW9,  CS17_SW9,  CS18_SW9 },  //  86 LED 19
-    {1, CS16_SW10, CS17_SW10, CS18_SW10}   //  87 LED 20
+    {1, SW1_CS13,  SW1_CS14,  SW1_CS15 },  //  68 LED 1
+    {1, SW2_CS13,  SW2_CS14,  SW2_CS15 },  //  69 LED 2
+    {1, SW3_CS13,  SW3_CS14,  SW3_CS15 },  //  70 LED 3
+    {1, SW4_CS13,  SW4_CS14,  SW4_CS15 },  //  71 LED 4
+    {1, SW5_CS13,  SW5_CS14,  SW5_CS15 },  //  72 LED 5
+    {1, SW6_CS13,  SW6_CS14,  SW6_CS15 },  //  73 LED 6
+    {1, SW7_CS13,  SW7_CS14,  SW7_CS15 },  //  74 LED 7
+    {1, SW8_CS13,  SW8_CS14,  SW8_CS15 },  //  75 LED 8
+    {1, SW9_CS13,  SW9_CS14,  SW9_CS15 },  //  76 LED 9
+    {1, SW10_CS13, SW10_CS14, SW10_CS15},  //  77 LED 10
+    {1, SW1_CS16,  SW1_CS17,  SW1_CS18 },  //  78 LED 11
+    {1, SW2_CS16,  SW2_CS17,  SW2_CS18 },  //  79 LED 12
+    {1, SW3_CS16,  SW3_CS17,  SW3_CS18 },  //  80 LED 13
+    {1, SW4_CS16,  SW4_CS17,  SW4_CS18 },  //  81 LED 14
+    {1, SW5_CS16,  SW5_CS17,  SW5_CS18 },  //  82 LED 15
+    {1, SW6_CS16,  SW6_CS17,  SW6_CS18 },  //  83 LED 16
+    {1, SW7_CS16,  SW7_CS17,  SW7_CS18 },  //  84 LED 17
+    {1, SW8_CS16,  SW8_CS17,  SW8_CS18 },  //  85 LED 18
+    {1, SW9_CS16,  SW9_CS17,  SW9_CS18 },  //  86 LED 19
+    {1, SW10_CS16, SW10_CS17, SW10_CS18}   //  87 LED 20
 };
 
 #define __ NO_LED
diff --git a/keyboards/gmmk/gmmk2/p96/ansi/ansi.c b/keyboards/gmmk/gmmk2/p96/ansi/ansi.c
index 83dcad728a9..d60b9e2254f 100644
--- a/keyboards/gmmk/gmmk2/p96/ansi/ansi.c
+++ b/keyboards/gmmk/gmmk2/p96/ansi/ansi.c
@@ -25,131 +25,131 @@ const aw20216s_led_t PROGMEM g_aw20216s_leds[AW20216S_LED_COUNT] = {
  *   |     |          G location
  *   |     |          |          B location
  *   |     |          |          | */
-    {0, CS1_SW1,   CS2_SW1,   CS3_SW1},   //   0, k00, Esc
-    {0, CS1_SW2,   CS2_SW2,   CS3_SW2},   //   1, k10, F1
-    {0, CS1_SW3,   CS2_SW3,   CS3_SW3},   //   2, k20, F2
-    {0, CS1_SW4,   CS2_SW4,   CS3_SW4},   //   3, k30, F3
-    {0, CS1_SW5,   CS2_SW5,   CS3_SW5},   //   4, k40, F4
-    {0, CS1_SW6,   CS2_SW6,   CS3_SW6},   //   5, k50, F5
-    {0, CS1_SW7,   CS2_SW7,   CS3_SW7},   //   6, k60, F6
-    {0, CS1_SW8,   CS2_SW8,   CS3_SW8},   //   7, k70, F7
-    {0, CS1_SW9,   CS2_SW9,   CS3_SW9},   //   8, k80, F8
-    {0, CS1_SW10,  CS2_SW10,  CS3_SW10},  //   9, k90, F9
-    {0, CS1_SW11,  CS2_SW11,  CS3_SW11},  //  10, ka0, F10
-    {0, CS1_SW12,  CS2_SW12,  CS3_SW12},  //  11, kb0, F11
-    {1, CS1_SW1,   CS2_SW1,   CS3_SW1},   //  12, kc0, F12
-    {1, CS4_SW2,   CS5_SW2,   CS6_SW2},   //  13, kd0, Printscreen
-    {1, CS4_SW3,   CS5_SW3,   CS6_SW3},   //  14, k06, Delete
-    {1, CS1_SW2,   CS2_SW2,   CS3_SW2},   //  15, k16, Insert
-    {1, CS4_SW4,   CS5_SW4,   CS6_SW4},   //  16, k26, Page Up
-    {1, CS4_SW7,   CS5_SW7,   CS6_SW7},   //  17, k36, Page Down
+    {0, SW1_CS1,   SW1_CS2,   SW1_CS3},   //   0, k00, Esc
+    {0, SW2_CS1,   SW2_CS2,   SW2_CS3},   //   1, k10, F1
+    {0, SW3_CS1,   SW3_CS2,   SW3_CS3},   //   2, k20, F2
+    {0, SW4_CS1,   SW4_CS2,   SW4_CS3},   //   3, k30, F3
+    {0, SW5_CS1,   SW5_CS2,   SW5_CS3},   //   4, k40, F4
+    {0, SW6_CS1,   SW6_CS2,   SW6_CS3},   //   5, k50, F5
+    {0, SW7_CS1,   SW7_CS2,   SW7_CS3},   //   6, k60, F6
+    {0, SW8_CS1,   SW8_CS2,   SW8_CS3},   //   7, k70, F7
+    {0, SW9_CS1,   SW9_CS2,   SW9_CS3},   //   8, k80, F8
+    {0, SW10_CS1,  SW10_CS2,  SW10_CS3},  //   9, k90, F9
+    {0, SW11_CS1,  SW11_CS2,  SW11_CS3},  //  10, ka0, F10
+    {0, SW12_CS1,  SW12_CS2,  SW12_CS3},  //  11, kb0, F11
+    {1, SW1_CS1,   SW1_CS2,   SW1_CS3},   //  12, kc0, F12
+    {1, SW2_CS4,   SW2_CS5,   SW2_CS6},   //  13, kd0, Printscreen
+    {1, SW3_CS4,   SW3_CS5,   SW3_CS6},   //  14, k06, Delete
+    {1, SW2_CS1,   SW2_CS2,   SW2_CS3},   //  15, k16, Insert
+    {1, SW4_CS4,   SW4_CS5,   SW4_CS6},   //  16, k26, Page Up
+    {1, SW7_CS4,   SW7_CS5,   SW7_CS6},   //  17, k36, Page Down
 
-    {0, CS4_SW1,   CS5_SW1,   CS6_SW1},   //  18, k01, `
-    {0, CS4_SW2,   CS5_SW2,   CS6_SW2},   //  19, k11, 1
-    {0, CS4_SW3,   CS5_SW3,   CS6_SW3},   //  20, k21, 2
-    {0, CS4_SW4,   CS5_SW4,   CS6_SW4},   //  21, k31, 3
-    {0, CS4_SW5,   CS5_SW5,   CS6_SW5},   //  22, k41, 4
-    {0, CS4_SW6,   CS5_SW6,   CS6_SW6},   //  23, k51, 5
-    {0, CS4_SW7,   CS5_SW7,   CS6_SW7},   //  24, k61, 6
-    {0, CS4_SW8,   CS5_SW8,   CS6_SW8},   //  25, k71, 7
-    {0, CS4_SW9,   CS5_SW9,   CS6_SW9},   //  26, k81, 8
-    {0, CS4_SW10,  CS5_SW10,  CS6_SW10},  //  27, k91, 9
-    {0, CS4_SW11,  CS5_SW11,  CS6_SW11},  //  28, ka1, 0
-    {0, CS4_SW12,  CS5_SW12,  CS6_SW12},  //  29, kb1, -
-    {1, CS1_SW5,   CS2_SW5,   CS3_SW5},   //  30, kc1, =
-    {1, CS1_SW7,   CS2_SW7,   CS3_SW7},   //  31, kd1, Backspace
-    {1, CS7_SW1,   CS8_SW1,   CS9_SW1},   //  32, k46, Num Lock
-    {1, CS7_SW2,   CS8_SW2,   CS9_SW2},   //  33, k56, Num /
-    {1, CS7_SW3,   CS8_SW3,   CS9_SW3},   //  34, k66, Num *
-    {1, CS7_SW4,   CS8_SW4,   CS9_SW4},   //  35, k76, Num -
+    {0, SW1_CS4,   SW1_CS5,   SW1_CS6},   //  18, k01, `
+    {0, SW2_CS4,   SW2_CS5,   SW2_CS6},   //  19, k11, 1
+    {0, SW3_CS4,   SW3_CS5,   SW3_CS6},   //  20, k21, 2
+    {0, SW4_CS4,   SW4_CS5,   SW4_CS6},   //  21, k31, 3
+    {0, SW5_CS4,   SW5_CS5,   SW5_CS6},   //  22, k41, 4
+    {0, SW6_CS4,   SW6_CS5,   SW6_CS6},   //  23, k51, 5
+    {0, SW7_CS4,   SW7_CS5,   SW7_CS6},   //  24, k61, 6
+    {0, SW8_CS4,   SW8_CS5,   SW8_CS6},   //  25, k71, 7
+    {0, SW9_CS4,   SW9_CS5,   SW9_CS6},   //  26, k81, 8
+    {0, SW10_CS4,  SW10_CS5,  SW10_CS6},  //  27, k91, 9
+    {0, SW11_CS4,  SW11_CS5,  SW11_CS6},  //  28, ka1, 0
+    {0, SW12_CS4,  SW12_CS5,  SW12_CS6},  //  29, kb1, -
+    {1, SW5_CS1,   SW5_CS2,   SW5_CS3},   //  30, kc1, =
+    {1, SW7_CS1,   SW7_CS2,   SW7_CS3},   //  31, kd1, Backspace
+    {1, SW1_CS7,   SW1_CS8,   SW1_CS9},   //  32, k46, Num Lock
+    {1, SW2_CS7,   SW2_CS8,   SW2_CS9},   //  33, k56, Num /
+    {1, SW3_CS7,   SW3_CS8,   SW3_CS9},   //  34, k66, Num *
+    {1, SW4_CS7,   SW4_CS8,   SW4_CS9},   //  35, k76, Num -
 
-    {0, CS7_SW1,   CS8_SW1,   CS9_SW1},   //  36, k02, Tab
-    {0, CS7_SW2,   CS8_SW2,   CS9_SW2},   //  37, k12, Q
-    {0, CS7_SW3,   CS8_SW3,   CS9_SW3},   //  38, k22, W
-    {0, CS7_SW4,   CS8_SW4,   CS9_SW4},   //  39, k32, E
-    {0, CS7_SW5,   CS8_SW5,   CS9_SW5},   //  40, k42, R
-    {0, CS7_SW6,   CS8_SW6,   CS9_SW6},   //  41, k52, T
-    {0, CS7_SW7,   CS8_SW7,   CS9_SW7},   //  42, k62, Y
-    {0, CS7_SW8,   CS8_SW8,   CS9_SW8},   //  43, k72, U
-    {0, CS7_SW9,   CS8_SW9,   CS9_SW9},   //  44, k82, I
-    {0, CS7_SW10,  CS8_SW10,  CS9_SW10},  //  45, k92, O
-    {0, CS7_SW11,  CS8_SW11,  CS9_SW11},  //  46, ka2, P
-    {0, CS7_SW12,  CS8_SW12,  CS9_SW12},  //  47, kb2, [
-    {1, CS1_SW8,   CS2_SW8,   CS3_SW8},   //  48, kc2, ]
-    {1, CS1_SW9,   CS2_SW9,   CS3_SW9},   //  49, kd3, "\\"
-    {1, CS7_SW5,   CS8_SW5,   CS9_SW5},   //  50, k86, Num 7
-    {1, CS7_SW6,   CS8_SW6,   CS9_SW6},   //  51, k96, Num 8
-    {1, CS7_SW7,   CS8_SW7,   CS9_SW7},   //  52, ka6, Num 9
-    {1, CS7_SW8,   CS8_SW8,   CS9_SW8},   //  53, kb6, Num +
+    {0, SW1_CS7,   SW1_CS8,   SW1_CS9},   //  36, k02, Tab
+    {0, SW2_CS7,   SW2_CS8,   SW2_CS9},   //  37, k12, Q
+    {0, SW3_CS7,   SW3_CS8,   SW3_CS9},   //  38, k22, W
+    {0, SW4_CS7,   SW4_CS8,   SW4_CS9},   //  39, k32, E
+    {0, SW5_CS7,   SW5_CS8,   SW5_CS9},   //  40, k42, R
+    {0, SW6_CS7,   SW6_CS8,   SW6_CS9},   //  41, k52, T
+    {0, SW7_CS7,   SW7_CS8,   SW7_CS9},   //  42, k62, Y
+    {0, SW8_CS7,   SW8_CS8,   SW8_CS9},   //  43, k72, U
+    {0, SW9_CS7,   SW9_CS8,   SW9_CS9},   //  44, k82, I
+    {0, SW10_CS7,  SW10_CS8,  SW10_CS9},  //  45, k92, O
+    {0, SW11_CS7,  SW11_CS8,  SW11_CS9},  //  46, ka2, P
+    {0, SW12_CS7,  SW12_CS8,  SW12_CS9},  //  47, kb2, [
+    {1, SW8_CS1,   SW8_CS2,   SW8_CS3},   //  48, kc2, ]
+    {1, SW9_CS1,   SW9_CS2,   SW9_CS3},   //  49, kd3, "\\"
+    {1, SW5_CS7,   SW5_CS8,   SW5_CS9},   //  50, k86, Num 7
+    {1, SW6_CS7,   SW6_CS8,   SW6_CS9},   //  51, k96, Num 8
+    {1, SW7_CS7,   SW7_CS8,   SW7_CS9},   //  52, ka6, Num 9
+    {1, SW8_CS7,   SW8_CS8,   SW8_CS9},   //  53, kb6, Num +
 
-    {0, CS10_SW1,  CS11_SW1,  CS12_SW1},  //  54, k03, Caps Lock
-    {0, CS10_SW2,  CS11_SW2,  CS12_SW2},  //  55, k13, A
-    {0, CS10_SW3,  CS11_SW3,  CS12_SW3},  //  56, k23, S
-    {0, CS10_SW4,  CS11_SW4,  CS12_SW4},  //  57, k33, D
-    {0, CS10_SW5,  CS11_SW5,  CS12_SW5},  //  58, k43, F
-    {0, CS10_SW6,  CS11_SW6,  CS12_SW6},  //  59, k53, G
-    {0, CS10_SW7,  CS11_SW7,  CS12_SW7},  //  60, k63, H
-    {0, CS10_SW8,  CS11_SW8,  CS12_SW8},  //  61, k73, J
-    {0, CS10_SW9,  CS11_SW9,  CS12_SW9},  //  62, k83, K
-    {0, CS10_SW10, CS11_SW10, CS12_SW10}, //  63, k93, L
-    {0, CS10_SW11, CS11_SW11, CS12_SW11}, //  64, ka3, ;
-    {0, CS10_SW12, CS11_SW12, CS12_SW12}, //  65, kb3, '
-    {1, CS1_SW11,  CS2_SW11,  CS3_SW11},  //  66, kc3, Enter
-    {1, CS7_SW9,   CS8_SW9,   CS9_SW9},   //  67, ka7, Num 4
-    {1, CS7_SW10,  CS8_SW10,  CS9_SW10},  //  68, kb7, Num 5
-    {1, CS7_SW11,  CS8_SW11,  CS9_SW11},  //  69, kc7, Num 6
+    {0, SW1_CS10,  SW1_CS11,  SW1_CS12},  //  54, k03, Caps Lock
+    {0, SW2_CS10,  SW2_CS11,  SW2_CS12},  //  55, k13, A
+    {0, SW3_CS10,  SW3_CS11,  SW3_CS12},  //  56, k23, S
+    {0, SW4_CS10,  SW4_CS11,  SW4_CS12},  //  57, k33, D
+    {0, SW5_CS10,  SW5_CS11,  SW5_CS12},  //  58, k43, F
+    {0, SW6_CS10,  SW6_CS11,  SW6_CS12},  //  59, k53, G
+    {0, SW7_CS10,  SW7_CS11,  SW7_CS12},  //  60, k63, H
+    {0, SW8_CS10,  SW8_CS11,  SW8_CS12},  //  61, k73, J
+    {0, SW9_CS10,  SW9_CS11,  SW9_CS12},  //  62, k83, K
+    {0, SW10_CS10, SW10_CS11, SW10_CS12}, //  63, k93, L
+    {0, SW11_CS10, SW11_CS11, SW11_CS12}, //  64, ka3, ;
+    {0, SW12_CS10, SW12_CS11, SW12_CS12}, //  65, kb3, '
+    {1, SW11_CS1,  SW11_CS2,  SW11_CS3},  //  66, kc3, Enter
+    {1, SW9_CS7,   SW9_CS8,   SW9_CS9},   //  67, ka7, Num 4
+    {1, SW10_CS7,  SW10_CS8,  SW10_CS9},  //  68, kb7, Num 5
+    {1, SW11_CS7,  SW11_CS8,  SW11_CS9},  //  69, kc7, Num 6
 
-    {0, CS13_SW1,  CS14_SW1,  CS15_SW1},  //  70, k04, Shift_L
-    {0, CS13_SW2,  CS14_SW2,  CS15_SW2},  //  71, k24, Z
-    {0, CS13_SW3,  CS14_SW3,  CS15_SW3},  //  72, k34, X
-    {0, CS13_SW4,  CS14_SW4,  CS15_SW4},  //  73, k44, C
-    {0, CS13_SW5,  CS14_SW5,  CS15_SW5},  //  74, k54, V
-    {0, CS13_SW6,  CS14_SW6,  CS15_SW6},  //  75, k64, B
-    {0, CS13_SW7,  CS14_SW7,  CS15_SW7},  //  76, k74, N
-    {0, CS13_SW8,  CS14_SW8,  CS15_SW8},  //  77, k84, M
-    {0, CS13_SW9,  CS14_SW9,  CS15_SW9},  //  78, k94, ,
-    {0, CS13_SW10, CS14_SW10, CS15_SW10}, //  79, ka4, .
-    {0, CS13_SW11, CS14_SW11, CS15_SW11}, //  80, kb4, /
-    {1, CS4_SW8,   CS5_SW8,   CS6_SW8},   //  81, kd4, Shift_R
-    {1, CS4_SW9,   CS5_SW9,   CS6_SW9},   //  82, k17, Up
-    {1, CS10_SW1,  CS11_SW1,  CS12_SW1},  //  83, k67, Num 1
-    {1, CS10_SW2,  CS11_SW2,  CS12_SW2},  //  84, k77, Num 2
-    {1, CS10_SW3,  CS11_SW3,  CS12_SW3},  //  85, k87, Num 3
-    {1, CS10_SW4,  CS11_SW4,  CS12_SW4},  //  86, k97, Enter_R
+    {0, SW1_CS13,  SW1_CS14,  SW1_CS15},  //  70, k04, Shift_L
+    {0, SW2_CS13,  SW2_CS14,  SW2_CS15},  //  71, k24, Z
+    {0, SW3_CS13,  SW3_CS14,  SW3_CS15},  //  72, k34, X
+    {0, SW4_CS13,  SW4_CS14,  SW4_CS15},  //  73, k44, C
+    {0, SW5_CS13,  SW5_CS14,  SW5_CS15},  //  74, k54, V
+    {0, SW6_CS13,  SW6_CS14,  SW6_CS15},  //  75, k64, B
+    {0, SW7_CS13,  SW7_CS14,  SW7_CS15},  //  76, k74, N
+    {0, SW8_CS13,  SW8_CS14,  SW8_CS15},  //  77, k84, M
+    {0, SW9_CS13,  SW9_CS14,  SW9_CS15},  //  78, k94, ,
+    {0, SW10_CS13, SW10_CS14, SW10_CS15}, //  79, ka4, .
+    {0, SW11_CS13, SW11_CS14, SW11_CS15}, //  80, kb4, /
+    {1, SW8_CS4,   SW8_CS5,   SW8_CS6},   //  81, kd4, Shift_R
+    {1, SW9_CS4,   SW9_CS5,   SW9_CS6},   //  82, k17, Up
+    {1, SW1_CS10,  SW1_CS11,  SW1_CS12},  //  83, k67, Num 1
+    {1, SW2_CS10,  SW2_CS11,  SW2_CS12},  //  84, k77, Num 2
+    {1, SW3_CS10,  SW3_CS11,  SW3_CS12},  //  85, k87, Num 3
+    {1, SW4_CS10,  SW4_CS11,  SW4_CS12},  //  86, k97, Enter_R
 
-    {0, CS16_SW1,  CS17_SW1,  CS18_SW1},  //  87, k05, Ctrl_L
-    {0, CS16_SW2,  CS17_SW2,  CS18_SW2},  //  88, k15, Win_L
-    {0, CS16_SW3,  CS17_SW3,  CS18_SW3},  //  89, k25, Alt_L
-    {0, CS16_SW6,  CS17_SW6,  CS18_SW6},  //  90, k65, Space
-    {0, CS16_SW9,  CS17_SW9,  CS18_SW9},  //  91, k95, Alt_R
-    {0, CS16_SW10, CS17_SW10, CS18_SW10}, //  92, ka5, FN
-    {0, CS16_SW12, CS17_SW12, CS18_SW12}, //  93, kc5, Ctrl_R
-    {1, CS4_SW10,  CS5_SW10,  CS6_SW10},  //  94, k07, Left
-    {1, CS4_SW11,  CS5_SW11,  CS6_SW11},  //  95, k27, Down
-    {1, CS10_SW5,  CS11_SW5,  CS12_SW5},  //  96, k37, Right
-    {1, CS10_SW6,  CS11_SW6,  CS12_SW6},  //  97, k47, Num 0
-    {1, CS10_SW7,  CS11_SW7,  CS12_SW7},  //  98, k57, Num .
+    {0, SW1_CS16,  SW1_CS17,  SW1_CS18},  //  87, k05, Ctrl_L
+    {0, SW2_CS16,  SW2_CS17,  SW2_CS18},  //  88, k15, Win_L
+    {0, SW3_CS16,  SW3_CS17,  SW3_CS18},  //  89, k25, Alt_L
+    {0, SW6_CS16,  SW6_CS17,  SW6_CS18},  //  90, k65, Space
+    {0, SW9_CS16,  SW9_CS17,  SW9_CS18},  //  91, k95, Alt_R
+    {0, SW10_CS16, SW10_CS17, SW10_CS18}, //  92, ka5, FN
+    {0, SW12_CS16, SW12_CS17, SW12_CS18}, //  93, kc5, Ctrl_R
+    {1, SW10_CS4,  SW10_CS5,  SW10_CS6},  //  94, k07, Left
+    {1, SW11_CS4,  SW11_CS5,  SW11_CS6},  //  95, k27, Down
+    {1, SW5_CS10,  SW5_CS11,  SW5_CS12},  //  96, k37, Right
+    {1, SW6_CS10,  SW6_CS11,  SW6_CS12},  //  97, k47, Num 0
+    {1, SW7_CS10,  SW7_CS11,  SW7_CS12},  //  98, k57, Num .
 
-    {1, CS13_SW1,  CS14_SW1,  CS15_SW1},  //  101, LED 1
-    {1, CS13_SW2,  CS14_SW2,  CS15_SW2},  //  102, LED 2
-    {1, CS13_SW3,  CS14_SW3,  CS15_SW3},  //  103, LED 3
-    {1, CS13_SW4,  CS14_SW4,  CS15_SW4},  //  104, LED 4
-    {1, CS13_SW5,  CS14_SW5,  CS15_SW5},  //  105, LED 5
-    {1, CS13_SW6,  CS14_SW6,  CS15_SW6},  //  106, LED 6
-    {1, CS13_SW7,  CS14_SW7,  CS15_SW7},  //  107, LED 7
-    {1, CS13_SW8,  CS14_SW8,  CS15_SW8},  //  108, LED 8
-    {1, CS13_SW9,  CS14_SW9,  CS15_SW9},  //  109, LED 9
-    {1, CS13_SW10, CS14_SW10, CS15_SW10}, //  110, LED 10
-    {1, CS16_SW1,  CS17_SW1,  CS18_SW1},  //  111, LED 11
-    {1, CS16_SW2,  CS17_SW2,  CS18_SW2},  //  112, LED 12
-    {1, CS16_SW3,  CS17_SW3,  CS18_SW3},  //  113, LED 13
-    {1, CS16_SW4,  CS17_SW4,  CS18_SW4},  //  114, LED 14
-    {1, CS16_SW5,  CS17_SW5,  CS18_SW5},  //  115, LED 15
-    {1, CS16_SW6,  CS17_SW6,  CS18_SW6},  //  116, LED 16
-    {1, CS16_SW7,  CS17_SW7,  CS18_SW7},  //  117, LED 17
-    {1, CS16_SW8,  CS17_SW8,  CS18_SW8},  //  118, LED 18
-    {1, CS16_SW9,  CS17_SW9,  CS18_SW9},  //  119, LED 19
-    {1, CS16_SW10, CS17_SW10, CS18_SW10}  //  120, LED 20
+    {1, SW1_CS13,  SW1_CS14,  SW1_CS15},  //  101, LED 1
+    {1, SW2_CS13,  SW2_CS14,  SW2_CS15},  //  102, LED 2
+    {1, SW3_CS13,  SW3_CS14,  SW3_CS15},  //  103, LED 3
+    {1, SW4_CS13,  SW4_CS14,  SW4_CS15},  //  104, LED 4
+    {1, SW5_CS13,  SW5_CS14,  SW5_CS15},  //  105, LED 5
+    {1, SW6_CS13,  SW6_CS14,  SW6_CS15},  //  106, LED 6
+    {1, SW7_CS13,  SW7_CS14,  SW7_CS15},  //  107, LED 7
+    {1, SW8_CS13,  SW8_CS14,  SW8_CS15},  //  108, LED 8
+    {1, SW9_CS13,  SW9_CS14,  SW9_CS15},  //  109, LED 9
+    {1, SW10_CS13, SW10_CS14, SW10_CS15}, //  110, LED 10
+    {1, SW1_CS16,  SW1_CS17,  SW1_CS18},  //  111, LED 11
+    {1, SW2_CS16,  SW2_CS17,  SW2_CS18},  //  112, LED 12
+    {1, SW3_CS16,  SW3_CS17,  SW3_CS18},  //  113, LED 13
+    {1, SW4_CS16,  SW4_CS17,  SW4_CS18},  //  114, LED 14
+    {1, SW5_CS16,  SW5_CS17,  SW5_CS18},  //  115, LED 15
+    {1, SW6_CS16,  SW6_CS17,  SW6_CS18},  //  116, LED 16
+    {1, SW7_CS16,  SW7_CS17,  SW7_CS18},  //  117, LED 17
+    {1, SW8_CS16,  SW8_CS17,  SW8_CS18},  //  118, LED 18
+    {1, SW9_CS16,  SW9_CS17,  SW9_CS18},  //  119, LED 19
+    {1, SW10_CS16, SW10_CS17, SW10_CS18}  //  120, LED 20
 };
 
 #define __ NO_LED
diff --git a/keyboards/gmmk/gmmk2/p96/iso/iso.c b/keyboards/gmmk/gmmk2/p96/iso/iso.c
index d412215fc48..af2ee17c4ae 100644
--- a/keyboards/gmmk/gmmk2/p96/iso/iso.c
+++ b/keyboards/gmmk/gmmk2/p96/iso/iso.c
@@ -25,132 +25,132 @@ const aw20216s_led_t PROGMEM g_aw20216s_leds[AW20216S_LED_COUNT] = {
  *   |     |          G location
  *   |     |          |          B location
  *   |     |          |          | */
-    {0, CS1_SW1,   CS2_SW1,   CS3_SW1},   //   0, k00, Esc
-    {0, CS1_SW2,   CS2_SW2,   CS3_SW2},   //   1, k10, F1
-    {0, CS1_SW3,   CS2_SW3,   CS3_SW3},   //   2, k20, F2
-    {0, CS1_SW4,   CS2_SW4,   CS3_SW4},   //   3, k30, F3
-    {0, CS1_SW5,   CS2_SW5,   CS3_SW5},   //   4, k40, F4
-    {0, CS1_SW6,   CS2_SW6,   CS3_SW6},   //   5, k50, F5
-    {0, CS1_SW7,   CS2_SW7,   CS3_SW7},   //   6, k60, F6
-    {0, CS1_SW8,   CS2_SW8,   CS3_SW8},   //   7, k70, F7
-    {0, CS1_SW9,   CS2_SW9,   CS3_SW9},   //   8, k80, F8
-    {0, CS1_SW10,  CS2_SW10,  CS3_SW10},  //   9, k90, F9
-    {0, CS1_SW11,  CS2_SW11,  CS3_SW11},  //  10, ka0, F10
-    {0, CS1_SW12,  CS2_SW12,  CS3_SW12},  //  11, kb0, F11
-    {1, CS1_SW1,   CS2_SW1,   CS3_SW1},   //  12, kc0, F12
-    {1, CS4_SW2,   CS5_SW2,   CS6_SW2},   //  13, kd0, Printscreen
-    {1, CS4_SW3,   CS5_SW3,   CS6_SW3},   //  14, k06, Delete
-    {1, CS1_SW2,   CS2_SW2,   CS3_SW2},   //  15, k16, Insert
-    {1, CS4_SW4,   CS5_SW4,   CS6_SW4},   //  16, k26, Page Up
-    {1, CS4_SW7,   CS5_SW7,   CS6_SW7},   //  17, k36, Page Down
+    {0, SW1_CS1,   SW1_CS2,   SW1_CS3},   //   0, k00, Esc
+    {0, SW2_CS1,   SW2_CS2,   SW2_CS3},   //   1, k10, F1
+    {0, SW3_CS1,   SW3_CS2,   SW3_CS3},   //   2, k20, F2
+    {0, SW4_CS1,   SW4_CS2,   SW4_CS3},   //   3, k30, F3
+    {0, SW5_CS1,   SW5_CS2,   SW5_CS3},   //   4, k40, F4
+    {0, SW6_CS1,   SW6_CS2,   SW6_CS3},   //   5, k50, F5
+    {0, SW7_CS1,   SW7_CS2,   SW7_CS3},   //   6, k60, F6
+    {0, SW8_CS1,   SW8_CS2,   SW8_CS3},   //   7, k70, F7
+    {0, SW9_CS1,   SW9_CS2,   SW9_CS3},   //   8, k80, F8
+    {0, SW10_CS1,  SW10_CS2,  SW10_CS3},  //   9, k90, F9
+    {0, SW11_CS1,  SW11_CS2,  SW11_CS3},  //  10, ka0, F10
+    {0, SW12_CS1,  SW12_CS2,  SW12_CS3},  //  11, kb0, F11
+    {1, SW1_CS1,   SW1_CS2,   SW1_CS3},   //  12, kc0, F12
+    {1, SW2_CS4,   SW2_CS5,   SW2_CS6},   //  13, kd0, Printscreen
+    {1, SW3_CS4,   SW3_CS5,   SW3_CS6},   //  14, k06, Delete
+    {1, SW2_CS1,   SW2_CS2,   SW2_CS3},   //  15, k16, Insert
+    {1, SW4_CS4,   SW4_CS5,   SW4_CS6},   //  16, k26, Page Up
+    {1, SW7_CS4,   SW7_CS5,   SW7_CS6},   //  17, k36, Page Down
 
-    {0, CS4_SW1,   CS5_SW1,   CS6_SW1},   //  18, k01, `
-    {0, CS4_SW2,   CS5_SW2,   CS6_SW2},   //  19, k11, 1
-    {0, CS4_SW3,   CS5_SW3,   CS6_SW3},   //  20, k21, 2
-    {0, CS4_SW4,   CS5_SW4,   CS6_SW4},   //  21, k31, 3
-    {0, CS4_SW5,   CS5_SW5,   CS6_SW5},   //  22, k41, 4
-    {0, CS4_SW6,   CS5_SW6,   CS6_SW6},   //  23, k51, 5
-    {0, CS4_SW7,   CS5_SW7,   CS6_SW7},   //  24, k61, 6
-    {0, CS4_SW8,   CS5_SW8,   CS6_SW8},   //  25, k71, 7
-    {0, CS4_SW9,   CS5_SW9,   CS6_SW9},   //  26, k81, 8
-    {0, CS4_SW10,  CS5_SW10,  CS6_SW10},  //  27, k91, 9
-    {0, CS4_SW11,  CS5_SW11,  CS6_SW11},  //  28, ka1, 0
-    {0, CS4_SW12,  CS5_SW12,  CS6_SW12},  //  29, kb1, -
-    {1, CS1_SW5,   CS2_SW5,   CS3_SW5},   //  30, kc1, =
-    {1, CS1_SW7,   CS2_SW7,   CS3_SW7},   //  31, kd1, Backspace
-    {1, CS7_SW1,   CS8_SW1,   CS9_SW1},   //  32, k46, Num Lock
-    {1, CS7_SW2,   CS8_SW2,   CS9_SW2},   //  33, k56, Num /
-    {1, CS7_SW3,   CS8_SW3,   CS9_SW3},   //  34, k66, Num *
-    {1, CS7_SW4,   CS8_SW4,   CS9_SW4},   //  35, k76, Num -
+    {0, SW1_CS4,   SW1_CS5,   SW1_CS6},   //  18, k01, `
+    {0, SW2_CS4,   SW2_CS5,   SW2_CS6},   //  19, k11, 1
+    {0, SW3_CS4,   SW3_CS5,   SW3_CS6},   //  20, k21, 2
+    {0, SW4_CS4,   SW4_CS5,   SW4_CS6},   //  21, k31, 3
+    {0, SW5_CS4,   SW5_CS5,   SW5_CS6},   //  22, k41, 4
+    {0, SW6_CS4,   SW6_CS5,   SW6_CS6},   //  23, k51, 5
+    {0, SW7_CS4,   SW7_CS5,   SW7_CS6},   //  24, k61, 6
+    {0, SW8_CS4,   SW8_CS5,   SW8_CS6},   //  25, k71, 7
+    {0, SW9_CS4,   SW9_CS5,   SW9_CS6},   //  26, k81, 8
+    {0, SW10_CS4,  SW10_CS5,  SW10_CS6},  //  27, k91, 9
+    {0, SW11_CS4,  SW11_CS5,  SW11_CS6},  //  28, ka1, 0
+    {0, SW12_CS4,  SW12_CS5,  SW12_CS6},  //  29, kb1, -
+    {1, SW5_CS1,   SW5_CS2,   SW5_CS3},   //  30, kc1, =
+    {1, SW7_CS1,   SW7_CS2,   SW7_CS3},   //  31, kd1, Backspace
+    {1, SW1_CS7,   SW1_CS8,   SW1_CS9},   //  32, k46, Num Lock
+    {1, SW2_CS7,   SW2_CS8,   SW2_CS9},   //  33, k56, Num /
+    {1, SW3_CS7,   SW3_CS8,   SW3_CS9},   //  34, k66, Num *
+    {1, SW4_CS7,   SW4_CS8,   SW4_CS9},   //  35, k76, Num -
 
-    {0, CS7_SW1,   CS8_SW1,   CS9_SW1},   //  36, k02, Tab
-    {0, CS7_SW2,   CS8_SW2,   CS9_SW2},   //  37, k12, Q
-    {0, CS7_SW3,   CS8_SW3,   CS9_SW3},   //  38, k22, W
-    {0, CS7_SW4,   CS8_SW4,   CS9_SW4},   //  39, k32, E
-    {0, CS7_SW5,   CS8_SW5,   CS9_SW5},   //  40, k42, R
-    {0, CS7_SW6,   CS8_SW6,   CS9_SW6},   //  41, k52, T
-    {0, CS7_SW7,   CS8_SW7,   CS9_SW7},   //  42, k62, Y
-    {0, CS7_SW8,   CS8_SW8,   CS9_SW8},   //  43, k72, U
-    {0, CS7_SW9,   CS8_SW9,   CS9_SW9},   //  44, k82, I
-    {0, CS7_SW10,  CS8_SW10,  CS9_SW10},  //  45, k92, O
-    {0, CS7_SW11,  CS8_SW11,  CS9_SW11},  //  46, ka2, P
-    {0, CS7_SW12,  CS8_SW12,  CS9_SW12},  //  47, kb2, [
-    {1, CS1_SW8,   CS2_SW8,   CS3_SW8},   //  48, kc2, ]
-    {1, CS1_SW11,  CS2_SW11,  CS3_SW11},  //  49, kd3, Enter
-    {1, CS7_SW5,   CS8_SW5,   CS9_SW5},   //  50, k86, Num 7
-    {1, CS7_SW6,   CS8_SW6,   CS9_SW6},   //  51, k96, Num 8
-    {1, CS7_SW7,   CS8_SW7,   CS9_SW7},   //  52, ka6, Num 9
-    {1, CS7_SW8,   CS8_SW8,   CS9_SW8},   //  53, kb6, Num +
+    {0, SW1_CS7,   SW1_CS8,   SW1_CS9},   //  36, k02, Tab
+    {0, SW2_CS7,   SW2_CS8,   SW2_CS9},   //  37, k12, Q
+    {0, SW3_CS7,   SW3_CS8,   SW3_CS9},   //  38, k22, W
+    {0, SW4_CS7,   SW4_CS8,   SW4_CS9},   //  39, k32, E
+    {0, SW5_CS7,   SW5_CS8,   SW5_CS9},   //  40, k42, R
+    {0, SW6_CS7,   SW6_CS8,   SW6_CS9},   //  41, k52, T
+    {0, SW7_CS7,   SW7_CS8,   SW7_CS9},   //  42, k62, Y
+    {0, SW8_CS7,   SW8_CS8,   SW8_CS9},   //  43, k72, U
+    {0, SW9_CS7,   SW9_CS8,   SW9_CS9},   //  44, k82, I
+    {0, SW10_CS7,  SW10_CS8,  SW10_CS9},  //  45, k92, O
+    {0, SW11_CS7,  SW11_CS8,  SW11_CS9},  //  46, ka2, P
+    {0, SW12_CS7,  SW12_CS8,  SW12_CS9},  //  47, kb2, [
+    {1, SW8_CS1,   SW8_CS2,   SW8_CS3},   //  48, kc2, ]
+    {1, SW11_CS1,  SW11_CS2,  SW11_CS3},  //  49, kd3, Enter
+    {1, SW5_CS7,   SW5_CS8,   SW5_CS9},   //  50, k86, Num 7
+    {1, SW6_CS7,   SW6_CS8,   SW6_CS9},   //  51, k96, Num 8
+    {1, SW7_CS7,   SW7_CS8,   SW7_CS9},   //  52, ka6, Num 9
+    {1, SW8_CS7,   SW8_CS8,   SW8_CS9},   //  53, kb6, Num +
 
-    {0, CS10_SW1,  CS11_SW1,  CS12_SW1},  //  54, k03, Caps Lock
-    {0, CS10_SW2,  CS11_SW2,  CS12_SW2},  //  55, k13, A
-    {0, CS10_SW3,  CS11_SW3,  CS12_SW3},  //  56, k23, S
-    {0, CS10_SW4,  CS11_SW4,  CS12_SW4},  //  57, k33, D
-    {0, CS10_SW5,  CS11_SW5,  CS12_SW5},  //  58, k43, F
-    {0, CS10_SW6,  CS11_SW6,  CS12_SW6},  //  59, k53, G
-    {0, CS10_SW7,  CS11_SW7,  CS12_SW7},  //  60, k63, H
-    {0, CS10_SW8,  CS11_SW8,  CS12_SW8},  //  61, k73, J
-    {0, CS10_SW9,  CS11_SW9,  CS12_SW9},  //  62, k83, K
-    {0, CS10_SW10, CS11_SW10, CS12_SW10}, //  63, k93, L
-    {0, CS10_SW11, CS11_SW11, CS12_SW11}, //  64, ka3, ;
-    {0, CS10_SW12, CS11_SW12, CS12_SW12}, //  65, kb3, '
-    {1, CS1_SW10,  CS2_SW10,  CS3_SW10},  //  66, kc3, #
-    {1, CS7_SW9,   CS8_SW9,   CS9_SW9},   //  67, ka7, Num 4
-    {1, CS7_SW10,  CS8_SW10,  CS9_SW10},  //  68, kb7, Num 5
-    {1, CS7_SW11,  CS8_SW11,  CS9_SW11},  //  69, kc7, Num 6
+    {0, SW1_CS10,  SW1_CS11,  SW1_CS12},  //  54, k03, Caps Lock
+    {0, SW2_CS10,  SW2_CS11,  SW2_CS12},  //  55, k13, A
+    {0, SW3_CS10,  SW3_CS11,  SW3_CS12},  //  56, k23, S
+    {0, SW4_CS10,  SW4_CS11,  SW4_CS12},  //  57, k33, D
+    {0, SW5_CS10,  SW5_CS11,  SW5_CS12},  //  58, k43, F
+    {0, SW6_CS10,  SW6_CS11,  SW6_CS12},  //  59, k53, G
+    {0, SW7_CS10,  SW7_CS11,  SW7_CS12},  //  60, k63, H
+    {0, SW8_CS10,  SW8_CS11,  SW8_CS12},  //  61, k73, J
+    {0, SW9_CS10,  SW9_CS11,  SW9_CS12},  //  62, k83, K
+    {0, SW10_CS10, SW10_CS11, SW10_CS12}, //  63, k93, L
+    {0, SW11_CS10, SW11_CS11, SW11_CS12}, //  64, ka3, ;
+    {0, SW12_CS10, SW12_CS11, SW12_CS12}, //  65, kb3, '
+    {1, SW10_CS1,  SW10_CS2,  SW10_CS3},  //  66, kc3, #
+    {1, SW9_CS7,   SW9_CS8,   SW9_CS9},   //  67, ka7, Num 4
+    {1, SW10_CS7,  SW10_CS8,  SW10_CS9},  //  68, kb7, Num 5
+    {1, SW11_CS7,  SW11_CS8,  SW11_CS9},  //  69, kc7, Num 6
 
-    {0, CS13_SW1,  CS14_SW1,  CS15_SW1},  //  70, k04, Shift_L
-    {0, CS13_SW12, CS14_SW12, CS15_SW12}, //  71, k14, "\\"
-    {0, CS13_SW2,  CS14_SW2,  CS15_SW2},  //  72, k24, Z
-    {0, CS13_SW3,  CS14_SW3,  CS15_SW3},  //  73, k34, X
-    {0, CS13_SW4,  CS14_SW4,  CS15_SW4},  //  74, k44, C
-    {0, CS13_SW5,  CS14_SW5,  CS15_SW5},  //  75, k54, V
-    {0, CS13_SW6,  CS14_SW6,  CS15_SW6},  //  76, k64, B
-    {0, CS13_SW7,  CS14_SW7,  CS15_SW7},  //  77, k74, N
-    {0, CS13_SW8,  CS14_SW8,  CS15_SW8},  //  78, k84, M
-    {0, CS13_SW9,  CS14_SW9,  CS15_SW9},  //  79, k94, ,
-    {0, CS13_SW10, CS14_SW10, CS15_SW10}, //  80, ka4, .
-    {0, CS13_SW11, CS14_SW11, CS15_SW11}, //  81, kb4, /
-    {1, CS4_SW8,   CS5_SW8,   CS6_SW8},   //  82, kd4, Shift_R
-    {1, CS4_SW9,   CS5_SW9,   CS6_SW9},   //  83, k17, Up
-    {1, CS10_SW1,  CS11_SW1,  CS12_SW1},  //  84, k67, Num 1
-    {1, CS10_SW2,  CS11_SW2,  CS12_SW2},  //  85, k77, Num 2
-    {1, CS10_SW3,  CS11_SW3,  CS12_SW3},  //  86, k87, Num 3
-    {1, CS10_SW4,  CS11_SW4,  CS12_SW4},  //  87, k97, Enter_R
+    {0, SW1_CS13,  SW1_CS14,  SW1_CS15},  //  70, k04, Shift_L
+    {0, SW12_CS13, SW12_CS14, SW12_CS15}, //  71, k14, "\\"
+    {0, SW2_CS13,  SW2_CS14,  SW2_CS15},  //  72, k24, Z
+    {0, SW3_CS13,  SW3_CS14,  SW3_CS15},  //  73, k34, X
+    {0, SW4_CS13,  SW4_CS14,  SW4_CS15},  //  74, k44, C
+    {0, SW5_CS13,  SW5_CS14,  SW5_CS15},  //  75, k54, V
+    {0, SW6_CS13,  SW6_CS14,  SW6_CS15},  //  76, k64, B
+    {0, SW7_CS13,  SW7_CS14,  SW7_CS15},  //  77, k74, N
+    {0, SW8_CS13,  SW8_CS14,  SW8_CS15},  //  78, k84, M
+    {0, SW9_CS13,  SW9_CS14,  SW9_CS15},  //  79, k94, ,
+    {0, SW10_CS13, SW10_CS14, SW10_CS15}, //  80, ka4, .
+    {0, SW11_CS13, SW11_CS14, SW11_CS15}, //  81, kb4, /
+    {1, SW8_CS4,   SW8_CS5,   SW8_CS6},   //  82, kd4, Shift_R
+    {1, SW9_CS4,   SW9_CS5,   SW9_CS6},   //  83, k17, Up
+    {1, SW1_CS10,  SW1_CS11,  SW1_CS12},  //  84, k67, Num 1
+    {1, SW2_CS10,  SW2_CS11,  SW2_CS12},  //  85, k77, Num 2
+    {1, SW3_CS10,  SW3_CS11,  SW3_CS12},  //  86, k87, Num 3
+    {1, SW4_CS10,  SW4_CS11,  SW4_CS12},  //  87, k97, Enter_R
 
-    {0, CS16_SW1,  CS17_SW1,  CS18_SW1},  //  88, k05, Ctrl_L
-    {0, CS16_SW2,  CS17_SW2,  CS18_SW2},  //  89, k15, Win_L
-    {0, CS16_SW3,  CS17_SW3,  CS18_SW3},  //  90, k25, Alt_L
-    {0, CS16_SW6,  CS17_SW6,  CS18_SW6},  //  91, k65, Space
-    {0, CS16_SW9,  CS17_SW9,  CS18_SW9},  //  92, k95, Alt_R
-    {0, CS16_SW10, CS17_SW10, CS18_SW10}, //  93, ka5, FN
-    {0, CS16_SW12, CS17_SW12, CS18_SW12}, //  94, kc5, Ctrl_R
-    {1, CS4_SW10,  CS5_SW10,  CS6_SW10},  //  95, k07, Left
-    {1, CS4_SW11,  CS5_SW11,  CS6_SW11},  //  96, k27, Down
-    {1, CS10_SW5,  CS11_SW5,  CS12_SW5},  //  97, k37, Right
-    {1, CS10_SW6,  CS11_SW6,  CS12_SW6},  //  98, k47, Num 0
-    {1, CS10_SW7,  CS11_SW7,  CS12_SW7},  //  99, k57, Num .
+    {0, SW1_CS16,  SW1_CS17,  SW1_CS18},  //  88, k05, Ctrl_L
+    {0, SW2_CS16,  SW2_CS17,  SW2_CS18},  //  89, k15, Win_L
+    {0, SW3_CS16,  SW3_CS17,  SW3_CS18},  //  90, k25, Alt_L
+    {0, SW6_CS16,  SW6_CS17,  SW6_CS18},  //  91, k65, Space
+    {0, SW9_CS16,  SW9_CS17,  SW9_CS18},  //  92, k95, Alt_R
+    {0, SW10_CS16, SW10_CS17, SW10_CS18}, //  93, ka5, FN
+    {0, SW12_CS16, SW12_CS17, SW12_CS18}, //  94, kc5, Ctrl_R
+    {1, SW10_CS4,  SW10_CS5,  SW10_CS6},  //  95, k07, Left
+    {1, SW11_CS4,  SW11_CS5,  SW11_CS6},  //  96, k27, Down
+    {1, SW5_CS10,  SW5_CS11,  SW5_CS12},  //  97, k37, Right
+    {1, SW6_CS10,  SW6_CS11,  SW6_CS12},  //  98, k47, Num 0
+    {1, SW7_CS10,  SW7_CS11,  SW7_CS12},  //  99, k57, Num .
 
-    {1, CS13_SW1,  CS14_SW1,  CS15_SW1},  // 101, LED 1
-    {1, CS13_SW2,  CS14_SW2,  CS15_SW2},  // 102, LED 2
-    {1, CS13_SW3,  CS14_SW3,  CS15_SW3},  // 103, LED 3
-    {1, CS13_SW4,  CS14_SW4,  CS15_SW4},  // 104, LED 4
-    {1, CS13_SW5,  CS14_SW5,  CS15_SW5},  // 105, LED 5
-    {1, CS13_SW6,  CS14_SW6,  CS15_SW6},  // 106, LED 6
-    {1, CS13_SW7,  CS14_SW7,  CS15_SW7},  // 107, LED 7
-    {1, CS13_SW8,  CS14_SW8,  CS15_SW8},  // 108, LED 8
-    {1, CS13_SW9,  CS14_SW9,  CS15_SW9},  // 109, LED 9
-    {1, CS13_SW10, CS14_SW10, CS15_SW10}, // 110, LED 10
-    {1, CS16_SW1,  CS17_SW1,  CS18_SW1},  // 111, LED 11
-    {1, CS16_SW2,  CS17_SW2,  CS18_SW2},  // 112, LED 12
-    {1, CS16_SW3,  CS17_SW3,  CS18_SW3},  // 113, LED 13
-    {1, CS16_SW4,  CS17_SW4,  CS18_SW4},  // 114, LED 14
-    {1, CS16_SW5,  CS17_SW5,  CS18_SW5},  // 115, LED 15
-    {1, CS16_SW6,  CS17_SW6,  CS18_SW6},  // 116, LED 16
-    {1, CS16_SW7,  CS17_SW7,  CS18_SW7},  // 117, LED 17
-    {1, CS16_SW8,  CS17_SW8,  CS18_SW8},  // 118, LED 18
-    {1, CS16_SW9,  CS17_SW9,  CS18_SW9},  // 119, LED 19
-    {1, CS16_SW10, CS17_SW10, CS18_SW10}  // 120, LED 20
+    {1, SW1_CS13,  SW1_CS14,  SW1_CS15},  // 101, LED 1
+    {1, SW2_CS13,  SW2_CS14,  SW2_CS15},  // 102, LED 2
+    {1, SW3_CS13,  SW3_CS14,  SW3_CS15},  // 103, LED 3
+    {1, SW4_CS13,  SW4_CS14,  SW4_CS15},  // 104, LED 4
+    {1, SW5_CS13,  SW5_CS14,  SW5_CS15},  // 105, LED 5
+    {1, SW6_CS13,  SW6_CS14,  SW6_CS15},  // 106, LED 6
+    {1, SW7_CS13,  SW7_CS14,  SW7_CS15},  // 107, LED 7
+    {1, SW8_CS13,  SW8_CS14,  SW8_CS15},  // 108, LED 8
+    {1, SW9_CS13,  SW9_CS14,  SW9_CS15},  // 109, LED 9
+    {1, SW10_CS13, SW10_CS14, SW10_CS15}, // 110, LED 10
+    {1, SW1_CS16,  SW1_CS17,  SW1_CS18},  // 111, LED 11
+    {1, SW2_CS16,  SW2_CS17,  SW2_CS18},  // 112, LED 12
+    {1, SW3_CS16,  SW3_CS17,  SW3_CS18},  // 113, LED 13
+    {1, SW4_CS16,  SW4_CS17,  SW4_CS18},  // 114, LED 14
+    {1, SW5_CS16,  SW5_CS17,  SW5_CS18},  // 115, LED 15
+    {1, SW6_CS16,  SW6_CS17,  SW6_CS18},  // 116, LED 16
+    {1, SW7_CS16,  SW7_CS17,  SW7_CS18},  // 117, LED 17
+    {1, SW8_CS16,  SW8_CS17,  SW8_CS18},  // 118, LED 18
+    {1, SW9_CS16,  SW9_CS17,  SW9_CS18},  // 119, LED 19
+    {1, SW10_CS16, SW10_CS17, SW10_CS18}  // 120, LED 20
 };
 
 #define __ NO_LED
diff --git a/keyboards/gmmk/numpad/numpad.c b/keyboards/gmmk/numpad/numpad.c
index 966ba087109..5a2bbdb1f61 100644
--- a/keyboards/gmmk/numpad/numpad.c
+++ b/keyboards/gmmk/numpad/numpad.c
@@ -26,37 +26,37 @@ const aw20216s_led_t PROGMEM g_aw20216s_leds[AW20216S_LED_COUNT] = {
  *   |     |          G location
  *   |     |          |          B location
  *   |     |          |          | */
-    {0, CS4_SW1,  CS5_SW1,  CS6_SW1  },  //  0  NUM
-    {0, CS4_SW2,  CS5_SW2,  CS6_SW2  },  //  1  /
-    {0, CS7_SW1,  CS8_SW1,  CS9_SW1  },  //  2  *
-    {0, CS7_SW2,  CS8_SW2,  CS9_SW2  },  //  3  -
-    {0, CS4_SW3,  CS5_SW3,  CS6_SW3  },  //  4  7
-    {0, CS4_SW4,  CS5_SW4,  CS6_SW4  },  //  5  8
-    {0, CS7_SW3,  CS8_SW3,  CS9_SW3  },  //  6  9
-    {0, CS7_SW4,  CS8_SW4,  CS9_SW4  },  //  7  +
-    {0, CS4_SW5,  CS5_SW5,  CS6_SW5  },  //  8  4
-    {0, CS4_SW6,  CS5_SW6,  CS6_SW6  },  //  9  5
-    {0, CS7_SW5,  CS8_SW5,  CS9_SW5  },  //  10 6
-    {0, CS4_SW7,  CS5_SW7,  CS6_SW7  },  //  11 1
-    {0, CS4_SW8,  CS5_SW8,  CS6_SW8  },  //  12 2
-    {0, CS7_SW7,  CS8_SW7,  CS9_SW7  },  //  13 3
-    {0, CS7_SW8,  CS8_SW8,  CS9_SW8  },  //  14 ENTER
-    {0, CS4_SW9,  CS5_SW9,  CS6_SW9  },  //  15 0
-    {0, CS7_SW9,  CS8_SW9,  CS9_SW9  },  //  16 .
-    {0, CS1_SW1,  CS2_SW1,  CS3_SW1  },  //  17 LED18
-    {0, CS1_SW2,  CS2_SW2,  CS3_SW2  },  //  18 LED19
-    {0, CS1_SW3,  CS2_SW3,  CS3_SW3  },  //  19 LED20
-    {0, CS1_SW4,  CS2_SW4,  CS3_SW4  },  //  20 LED21
-    {0, CS1_SW5,  CS2_SW5,  CS3_SW5  },  //  21 LED22
-    {0, CS1_SW6,  CS2_SW6,  CS3_SW6  },  //  22 LED23
-    {0, CS1_SW7,  CS2_SW7,  CS3_SW7  },  //  23 LED24
-    {0, CS10_SW1, CS11_SW1, CS12_SW1 },  //  24 LED27
-    {0, CS10_SW2, CS11_SW2, CS12_SW2 },  //  25 LED28
-    {0, CS10_SW3, CS11_SW3, CS12_SW3 },  //  26 LED29
-    {0, CS10_SW4, CS11_SW4, CS12_SW4 },  //  27 LED30
-    {0, CS10_SW5, CS11_SW5, CS12_SW5 },  //  28 LED31
-    {0, CS10_SW6, CS11_SW6, CS12_SW6 },  //  29 LED32
-    {0, CS10_SW7, CS11_SW7, CS12_SW7 },  //  30 LED33
+    {0, SW1_CS4,  SW1_CS5,  SW1_CS6  },  //  0  NUM
+    {0, SW2_CS4,  SW2_CS5,  SW2_CS6  },  //  1  /
+    {0, SW1_CS7,  SW1_CS8,  SW1_CS9  },  //  2  *
+    {0, SW2_CS7,  SW2_CS8,  SW2_CS9  },  //  3  -
+    {0, SW3_CS4,  SW3_CS5,  SW3_CS6  },  //  4  7
+    {0, SW4_CS4,  SW4_CS5,  SW4_CS6  },  //  5  8
+    {0, SW3_CS7,  SW3_CS8,  SW3_CS9  },  //  6  9
+    {0, SW4_CS7,  SW4_CS8,  SW4_CS9  },  //  7  +
+    {0, SW5_CS4,  SW5_CS5,  SW5_CS6  },  //  8  4
+    {0, SW6_CS4,  SW6_CS5,  SW6_CS6  },  //  9  5
+    {0, SW5_CS7,  SW5_CS8,  SW5_CS9  },  //  10 6
+    {0, SW7_CS4,  SW7_CS5,  SW7_CS6  },  //  11 1
+    {0, SW8_CS4,  SW8_CS5,  SW8_CS6  },  //  12 2
+    {0, SW7_CS7,  SW7_CS8,  SW7_CS9  },  //  13 3
+    {0, SW8_CS7,  SW8_CS8,  SW8_CS9  },  //  14 ENTER
+    {0, SW9_CS4,  SW9_CS5,  SW9_CS6  },  //  15 0
+    {0, SW9_CS7,  SW9_CS8,  SW9_CS9  },  //  16 .
+    {0, SW1_CS1,  SW1_CS2,  SW1_CS3  },  //  17 LED18
+    {0, SW2_CS1,  SW2_CS2,  SW2_CS3  },  //  18 LED19
+    {0, SW3_CS1,  SW3_CS2,  SW3_CS3  },  //  19 LED20
+    {0, SW4_CS1,  SW4_CS2,  SW4_CS3  },  //  20 LED21
+    {0, SW5_CS1,  SW5_CS2,  SW5_CS3  },  //  21 LED22
+    {0, SW6_CS1,  SW6_CS2,  SW6_CS3  },  //  22 LED23
+    {0, SW7_CS1,  SW7_CS2,  SW7_CS3  },  //  23 LED24
+    {0, SW1_CS10, SW1_CS11, SW1_CS12 },  //  24 LED27
+    {0, SW2_CS10, SW2_CS11, SW2_CS12 },  //  25 LED28
+    {0, SW3_CS10, SW3_CS11, SW3_CS12 },  //  26 LED29
+    {0, SW4_CS10, SW4_CS11, SW4_CS12 },  //  27 LED30
+    {0, SW5_CS10, SW5_CS11, SW5_CS12 },  //  28 LED31
+    {0, SW6_CS10, SW6_CS11, SW6_CS12 },  //  29 LED32
+    {0, SW7_CS10, SW7_CS11, SW7_CS12 },  //  30 LED33
 };
 
 led_config_t g_led_config = {{
diff --git a/keyboards/gmmk/pro/rev1/ansi/ansi.c b/keyboards/gmmk/pro/rev1/ansi/ansi.c
index ff6382625ac..77e0a8c1a11 100644
--- a/keyboards/gmmk/pro/rev1/ansi/ansi.c
+++ b/keyboards/gmmk/pro/rev1/ansi/ansi.c
@@ -137,105 +137,105 @@ led_config_t g_led_config = {{
 }};
 
 const aw20216s_led_t PROGMEM g_aw20216s_leds[AW20216S_LED_COUNT] = {
-    {0, CS1_SW1, CS2_SW1, CS3_SW1},        //  0, ESC, k13
-    {0, CS4_SW1, CS5_SW1, CS6_SW1},        //  1, ~, k16
-    {0, CS7_SW1, CS8_SW1, CS9_SW1},        //  2, Tab, k11
-    {0, CS10_SW1, CS11_SW1, CS12_SW1},     //  3, Caps, k21
-    {0, CS13_SW1, CS14_SW1, CS15_SW1},     //  4, Sh_L, k00
-    {0, CS16_SW1, CS17_SW1, CS18_SW1},     //  5, Ct_L, k06
-    {0, CS1_SW2, CS2_SW2, CS3_SW2},        //  6, F1, k26
-    {0, CS4_SW2, CS5_SW2, CS6_SW2},        //  7, 1, k17
-    {0, CS7_SW2, CS8_SW2, CS9_SW2},        //  8, Q, k10
-    {0, CS10_SW2, CS11_SW2, CS12_SW2},     //  9, A, k12
-    {0, CS13_SW2, CS14_SW2, CS15_SW2},     //  10, Z, k14
-    {0, CS16_SW2, CS17_SW2, CS18_SW2},     //  11, Win_L, k90
-    {0, CS1_SW3, CS2_SW3, CS3_SW3},        //  12, F2, k36
-    {0, CS4_SW3, CS5_SW3, CS6_SW3},        //  13, 2, k27
-    {0, CS7_SW3, CS8_SW3, CS9_SW3},        //  14, W, k20
-    {0, CS10_SW3, CS11_SW3, CS12_SW3},     //  15, S, k22
-    {0, CS13_SW3, CS14_SW3, CS15_SW3},     //  16, X, k24
-    {0, CS16_SW3, CS17_SW3, CS18_SW3},     //  17, Alt_L, k93
-    {0, CS1_SW4, CS2_SW4, CS3_SW4},        //  18, F3, k31
-    {0, CS4_SW4, CS5_SW4, CS6_SW4},        //  19, 3, k37
-    {0, CS7_SW4, CS8_SW4, CS9_SW4},        //  20, E, k30
-    {0, CS10_SW4, CS11_SW4, CS12_SW4},     //  21, D, k32
-    {0, CS13_SW4, CS14_SW4, CS15_SW4},     //  22, C, k34
-    {0, CS1_SW5, CS2_SW5, CS3_SW5},        //  23, F4, k33
-    {0, CS4_SW5, CS5_SW5, CS6_SW5},        //  24, 4, k47
-    {0, CS7_SW5, CS8_SW5, CS9_SW5},        //  25, R, k40
-    {0, CS10_SW5, CS11_SW5, CS12_SW5},     //  26, F, k42
-    {0, CS13_SW5, CS14_SW5, CS15_SW5},     //  27, V, k44
-    {0, CS1_SW6, CS2_SW6, CS3_SW6},        //  28, F5, k07
-    {0, CS4_SW6, CS5_SW6, CS6_SW6},        //  29, 5, k46
-    {0, CS7_SW6, CS8_SW6, CS9_SW6},        //  30, T, k41
-    {0, CS10_SW6, CS11_SW6, CS12_SW6},     //  31, G, k43
-    {0, CS13_SW6, CS14_SW6, CS15_SW6},     //  32, B, k45
-    {0, CS16_SW6, CS17_SW6, CS18_SW6},     //  33, SPACE, k94
-    {0, CS1_SW7, CS2_SW7, CS3_SW7},        //  34, F6, k63
-    {0, CS4_SW7, CS5_SW7, CS6_SW7},        //  35, 6, k56
-    {0, CS7_SW7, CS8_SW7, CS9_SW7},        //  36, Y, k51
-    {0, CS10_SW7, CS11_SW7, CS12_SW7},     //  37, H, k53
-    {0, CS13_SW7, CS14_SW7, CS15_SW7},     //  38, N, k55
-    {0, CS1_SW8, CS2_SW8, CS3_SW8},        //  39, F7, k71
-    {0, CS4_SW8, CS5_SW8, CS6_SW8},        //  40, 7, k57
-    {0, CS7_SW8, CS8_SW8, CS9_SW8},        //  41, U, k50
-    {0, CS10_SW8, CS11_SW8, CS12_SW8},     //  42, J, k52
-    {0, CS13_SW8, CS14_SW8, CS15_SW8},     //  43, M, k54
-    {0, CS1_SW9, CS2_SW9, CS3_SW9},        //  44, F8, k76
-    {0, CS4_SW9, CS5_SW9, CS6_SW9},        //  45, 8, k67
-    {0, CS7_SW9, CS8_SW9, CS9_SW9},        //  46, I, k60
-    {0, CS10_SW9, CS11_SW9, CS12_SW9},     //  47, K, k62
-    {0, CS13_SW9, CS14_SW9, CS15_SW9},     //  48, ,, k64
-    {0, CS16_SW9, CS17_SW9, CS18_SW9},     //  49, Alt_R, k95
-    {0, CS1_SW10, CS2_SW10, CS3_SW10},     //  50, F9, ka6
-    {0, CS4_SW10, CS5_SW10, CS6_SW10},     //  51, 9, k77
-    {0, CS7_SW10, CS8_SW10, CS9_SW10},     //  52, O, k70
-    {0, CS10_SW10, CS11_SW10, CS12_SW10},  //  53, L, k72
-    {0, CS13_SW10, CS14_SW10, CS15_SW10},  //  54, ., k74
-    {0, CS16_SW10, CS17_SW10, CS18_SW10},  //  55, FN, k92
-    {0, CS1_SW11, CS2_SW11, CS3_SW11},     //  56, F10, ka7
-    {0, CS4_SW11, CS5_SW11, CS6_SW11},     //  57, 0, k87
-    {0, CS7_SW11, CS8_SW11, CS9_SW11},     //  58, P, k80
-    {0, CS10_SW11, CS11_SW11, CS12_SW11},  //  59, ;, k82
-    {0, CS13_SW11, CS14_SW11, CS15_SW11},  //  60, ?, k85
-    {0, CS1_SW12, CS2_SW12, CS3_SW12},     //  61, F11, ka3
-    {0, CS4_SW12, CS5_SW12, CS6_SW12},     //  62, -, k86
-    {0, CS7_SW12, CS8_SW12, CS9_SW12},     //  63, [, k81
-    {0, CS10_SW12, CS11_SW12, CS12_SW12},  //  64, ", k83
-    {0, CS16_SW12, CS17_SW12, CS18_SW12},  //  65, Ct_R, k04
+    {0, SW1_CS1, SW1_CS2, SW1_CS3},        //  0, ESC, k13
+    {0, SW1_CS4, SW1_CS5, SW1_CS6},        //  1, ~, k16
+    {0, SW1_CS7, SW1_CS8, SW1_CS9},        //  2, Tab, k11
+    {0, SW1_CS10, SW1_CS11, SW1_CS12},     //  3, Caps, k21
+    {0, SW1_CS13, SW1_CS14, SW1_CS15},     //  4, Sh_L, k00
+    {0, SW1_CS16, SW1_CS17, SW1_CS18},     //  5, Ct_L, k06
+    {0, SW2_CS1, SW2_CS2, SW2_CS3},        //  6, F1, k26
+    {0, SW2_CS4, SW2_CS5, SW2_CS6},        //  7, 1, k17
+    {0, SW2_CS7, SW2_CS8, SW2_CS9},        //  8, Q, k10
+    {0, SW2_CS10, SW2_CS11, SW2_CS12},     //  9, A, k12
+    {0, SW2_CS13, SW2_CS14, SW2_CS15},     //  10, Z, k14
+    {0, SW2_CS16, SW2_CS17, SW2_CS18},     //  11, Win_L, k90
+    {0, SW3_CS1, SW3_CS2, SW3_CS3},        //  12, F2, k36
+    {0, SW3_CS4, SW3_CS5, SW3_CS6},        //  13, 2, k27
+    {0, SW3_CS7, SW3_CS8, SW3_CS9},        //  14, W, k20
+    {0, SW3_CS10, SW3_CS11, SW3_CS12},     //  15, S, k22
+    {0, SW3_CS13, SW3_CS14, SW3_CS15},     //  16, X, k24
+    {0, SW3_CS16, SW3_CS17, SW3_CS18},     //  17, Alt_L, k93
+    {0, SW4_CS1, SW4_CS2, SW4_CS3},        //  18, F3, k31
+    {0, SW4_CS4, SW4_CS5, SW4_CS6},        //  19, 3, k37
+    {0, SW4_CS7, SW4_CS8, SW4_CS9},        //  20, E, k30
+    {0, SW4_CS10, SW4_CS11, SW4_CS12},     //  21, D, k32
+    {0, SW4_CS13, SW4_CS14, SW4_CS15},     //  22, C, k34
+    {0, SW5_CS1, SW5_CS2, SW5_CS3},        //  23, F4, k33
+    {0, SW5_CS4, SW5_CS5, SW5_CS6},        //  24, 4, k47
+    {0, SW5_CS7, SW5_CS8, SW5_CS9},        //  25, R, k40
+    {0, SW5_CS10, SW5_CS11, SW5_CS12},     //  26, F, k42
+    {0, SW5_CS13, SW5_CS14, SW5_CS15},     //  27, V, k44
+    {0, SW6_CS1, SW6_CS2, SW6_CS3},        //  28, F5, k07
+    {0, SW6_CS4, SW6_CS5, SW6_CS6},        //  29, 5, k46
+    {0, SW6_CS7, SW6_CS8, SW6_CS9},        //  30, T, k41
+    {0, SW6_CS10, SW6_CS11, SW6_CS12},     //  31, G, k43
+    {0, SW6_CS13, SW6_CS14, SW6_CS15},     //  32, B, k45
+    {0, SW6_CS16, SW6_CS17, SW6_CS18},     //  33, SPACE, k94
+    {0, SW7_CS1, SW7_CS2, SW7_CS3},        //  34, F6, k63
+    {0, SW7_CS4, SW7_CS5, SW7_CS6},        //  35, 6, k56
+    {0, SW7_CS7, SW7_CS8, SW7_CS9},        //  36, Y, k51
+    {0, SW7_CS10, SW7_CS11, SW7_CS12},     //  37, H, k53
+    {0, SW7_CS13, SW7_CS14, SW7_CS15},     //  38, N, k55
+    {0, SW8_CS1, SW8_CS2, SW8_CS3},        //  39, F7, k71
+    {0, SW8_CS4, SW8_CS5, SW8_CS6},        //  40, 7, k57
+    {0, SW8_CS7, SW8_CS8, SW8_CS9},        //  41, U, k50
+    {0, SW8_CS10, SW8_CS11, SW8_CS12},     //  42, J, k52
+    {0, SW8_CS13, SW8_CS14, SW8_CS15},     //  43, M, k54
+    {0, SW9_CS1, SW9_CS2, SW9_CS3},        //  44, F8, k76
+    {0, SW9_CS4, SW9_CS5, SW9_CS6},        //  45, 8, k67
+    {0, SW9_CS7, SW9_CS8, SW9_CS9},        //  46, I, k60
+    {0, SW9_CS10, SW9_CS11, SW9_CS12},     //  47, K, k62
+    {0, SW9_CS13, SW9_CS14, SW9_CS15},     //  48, ,, k64
+    {0, SW9_CS16, SW9_CS17, SW9_CS18},     //  49, Alt_R, k95
+    {0, SW10_CS1, SW10_CS2, SW10_CS3},     //  50, F9, ka6
+    {0, SW10_CS4, SW10_CS5, SW10_CS6},     //  51, 9, k77
+    {0, SW10_CS7, SW10_CS8, SW10_CS9},     //  52, O, k70
+    {0, SW10_CS10, SW10_CS11, SW10_CS12},  //  53, L, k72
+    {0, SW10_CS13, SW10_CS14, SW10_CS15},  //  54, ., k74
+    {0, SW10_CS16, SW10_CS17, SW10_CS18},  //  55, FN, k92
+    {0, SW11_CS1, SW11_CS2, SW11_CS3},     //  56, F10, ka7
+    {0, SW11_CS4, SW11_CS5, SW11_CS6},     //  57, 0, k87
+    {0, SW11_CS7, SW11_CS8, SW11_CS9},     //  58, P, k80
+    {0, SW11_CS10, SW11_CS11, SW11_CS12},  //  59, ;, k82
+    {0, SW11_CS13, SW11_CS14, SW11_CS15},  //  60, ?, k85
+    {0, SW12_CS1, SW12_CS2, SW12_CS3},     //  61, F11, ka3
+    {0, SW12_CS4, SW12_CS5, SW12_CS6},     //  62, -, k86
+    {0, SW12_CS7, SW12_CS8, SW12_CS9},     //  63, [, k81
+    {0, SW12_CS10, SW12_CS11, SW12_CS12},  //  64, ", k83
+    {0, SW12_CS16, SW12_CS17, SW12_CS18},  //  65, Ct_R, k04
 
-    {1, CS1_SW1, CS2_SW1, CS3_SW1},     //  66, F12, ka5
-    {1, CS13_SW1, CS14_SW1, CS15_SW1},  //  67, LED, l01
-    {1, CS16_SW1, CS17_SW1, CS18_SW1},  //  68, LED, l11
-    {1, CS4_SW2, CS5_SW2, CS6_SW2},     //  69, Prt, k97
-    {1, CS13_SW2, CS14_SW2, CS15_SW2},  //  70, LED, l02
-    {1, CS16_SW2, CS17_SW2, CS18_SW2},  //  71, LED, l12
-    {1, CS4_SW3, CS5_SW3, CS6_SW3},     //  72, Del, k65
-    {1, CS13_SW3, CS14_SW3, CS15_SW3},  //  73, LED, l03
-    {1, CS16_SW3, CS17_SW3, CS18_SW3},  //  74, LED, l13
-    {1, CS4_SW4, CS5_SW4, CS6_SW4},     //  75, PgUp, k15
-    {1, CS13_SW4, CS14_SW4, CS15_SW4},  //  76, LED, l04
-    {1, CS16_SW4, CS17_SW4, CS18_SW4},  //  77, LED, l14
-    {1, CS1_SW5, CS2_SW5, CS3_SW5},     //  78, =, k66
-    {1, CS10_SW5, CS11_SW5, CS12_SW5},  //  79, Right, k05
-    {1, CS13_SW5, CS14_SW5, CS15_SW5},  //  80, LED, l05
-    {1, CS16_SW5, CS17_SW5, CS18_SW5},  //  81, LED, l15
-    {1, CS4_SW6, CS5_SW6, CS6_SW6},     //  82, End, k75
-    {1, CS13_SW6, CS14_SW6, CS15_SW6},  //  83, LED, l06
-    {1, CS16_SW6, CS17_SW6, CS18_SW6},  //  84, LED, l16
-    {1, CS1_SW7, CS2_SW7, CS3_SW7},     //  85, BSpc, ka1
-    {1, CS4_SW7, CS5_SW7, CS6_SW7},     //  86, PgDn, k25
-    {1, CS13_SW7, CS14_SW7, CS15_SW7},  //  87, LED, l07
-    {1, CS16_SW7, CS17_SW7, CS18_SW7},  //  88, LED, l17
-    {1, CS1_SW8, CS2_SW8, CS3_SW8},     //  89, ], k61
-    {1, CS4_SW8, CS5_SW8, CS6_SW8},     //  90, Sh_R, k91
-    {1, CS13_SW8, CS14_SW8, CS15_SW8},  //  91, LED, l08
-    {1, CS16_SW8, CS17_SW8, CS18_SW8},  //  92, LED, l18
-    {1, CS1_SW9, CS2_SW9, CS3_SW9},     //  93, \, ka2
-    {1, CS4_SW9, CS5_SW9, CS6_SW9},     //  94, Up, k35
-    {1, CS4_SW10, CS5_SW10, CS6_SW10},  //  95, Left, k03
-    {1, CS1_SW11, CS2_SW11, CS3_SW11},  //  96, Enter, ka4
-    {1, CS4_SW11, CS5_SW11, CS6_SW11},  //  97, Down, k73
+    {1, SW1_CS1, SW1_CS2, SW1_CS3},     //  66, F12, ka5
+    {1, SW1_CS13, SW1_CS14, SW1_CS15},  //  67, LED, l01
+    {1, SW1_CS16, SW1_CS17, SW1_CS18},  //  68, LED, l11
+    {1, SW2_CS4, SW2_CS5, SW2_CS6},     //  69, Prt, k97
+    {1, SW2_CS13, SW2_CS14, SW2_CS15},  //  70, LED, l02
+    {1, SW2_CS16, SW2_CS17, SW2_CS18},  //  71, LED, l12
+    {1, SW3_CS4, SW3_CS5, SW3_CS6},     //  72, Del, k65
+    {1, SW3_CS13, SW3_CS14, SW3_CS15},  //  73, LED, l03
+    {1, SW3_CS16, SW3_CS17, SW3_CS18},  //  74, LED, l13
+    {1, SW4_CS4, SW4_CS5, SW4_CS6},     //  75, PgUp, k15
+    {1, SW4_CS13, SW4_CS14, SW4_CS15},  //  76, LED, l04
+    {1, SW4_CS16, SW4_CS17, SW4_CS18},  //  77, LED, l14
+    {1, SW5_CS1, SW5_CS2, SW5_CS3},     //  78, =, k66
+    {1, SW5_CS10, SW5_CS11, SW5_CS12},  //  79, Right, k05
+    {1, SW5_CS13, SW5_CS14, SW5_CS15},  //  80, LED, l05
+    {1, SW5_CS16, SW5_CS17, SW5_CS18},  //  81, LED, l15
+    {1, SW6_CS4, SW6_CS5, SW6_CS6},     //  82, End, k75
+    {1, SW6_CS13, SW6_CS14, SW6_CS15},  //  83, LED, l06
+    {1, SW6_CS16, SW6_CS17, SW6_CS18},  //  84, LED, l16
+    {1, SW7_CS1, SW7_CS2, SW7_CS3},     //  85, BSpc, ka1
+    {1, SW7_CS4, SW7_CS5, SW7_CS6},     //  86, PgDn, k25
+    {1, SW7_CS13, SW7_CS14, SW7_CS15},  //  87, LED, l07
+    {1, SW7_CS16, SW7_CS17, SW7_CS18},  //  88, LED, l17
+    {1, SW8_CS1, SW8_CS2, SW8_CS3},     //  89, ], k61
+    {1, SW8_CS4, SW8_CS5, SW8_CS6},     //  90, Sh_R, k91
+    {1, SW8_CS13, SW8_CS14, SW8_CS15},  //  91, LED, l08
+    {1, SW8_CS16, SW8_CS17, SW8_CS18},  //  92, LED, l18
+    {1, SW9_CS1, SW9_CS2, SW9_CS3},     //  93, \, ka2
+    {1, SW9_CS4, SW9_CS5, SW9_CS6},     //  94, Up, k35
+    {1, SW10_CS4, SW10_CS5, SW10_CS6},  //  95, Left, k03
+    {1, SW11_CS1, SW11_CS2, SW11_CS3},  //  96, Enter, ka4
+    {1, SW11_CS4, SW11_CS5, SW11_CS6},  //  97, Down, k73
 };
 // clang-format on
 #endif
diff --git a/keyboards/gmmk/pro/rev1/iso/iso.c b/keyboards/gmmk/pro/rev1/iso/iso.c
index 68165dd27f3..932c6a1f494 100644
--- a/keyboards/gmmk/pro/rev1/iso/iso.c
+++ b/keyboards/gmmk/pro/rev1/iso/iso.c
@@ -138,106 +138,106 @@ led_config_t g_led_config = {{
 }};
 
 const aw20216s_led_t PROGMEM g_aw20216s_leds[AW20216S_LED_COUNT] = {
-    {0, CS1_SW1, CS2_SW1, CS3_SW1},        //  0, ESC, k13
-    {0, CS4_SW1, CS5_SW1, CS6_SW1},        //  1, ~, k16
-    {0, CS7_SW1, CS8_SW1, CS9_SW1},        //  2, Tab, k11
-    {0, CS10_SW1, CS11_SW1, CS12_SW1},     //  3, Caps, k21
-    {0, CS13_SW1, CS14_SW1, CS15_SW1},     //  4, Sh_L, k00
-    {0, CS16_SW1, CS17_SW1, CS18_SW1},     //  5, Ct_L, k06
-    {0, CS1_SW2, CS2_SW2, CS3_SW2},        //  6, F1, k26
-    {0, CS4_SW2, CS5_SW2, CS6_SW2},        //  7, 1, k17
-    {0, CS7_SW2, CS8_SW2, CS9_SW2},        //  8, Q, k10
-    {0, CS10_SW2, CS11_SW2, CS12_SW2},     //  9, A, k12
-    {0, CS13_SW2, CS14_SW2, CS15_SW2},     //  10, Z, k14
-    {0, CS16_SW2, CS17_SW2, CS18_SW2},     //  11, Win_L, k90
-    {0, CS1_SW3, CS2_SW3, CS3_SW3},        //  12, F2, k36
-    {0, CS4_SW3, CS5_SW3, CS6_SW3},        //  13, 2, k27
-    {0, CS7_SW3, CS8_SW3, CS9_SW3},        //  14, W, k20
-    {0, CS10_SW3, CS11_SW3, CS12_SW3},     //  15, S, k22
-    {0, CS13_SW3, CS14_SW3, CS15_SW3},     //  16, X, k24
-    {0, CS16_SW3, CS17_SW3, CS18_SW3},     //  17, Alt_L, k93
-    {0, CS1_SW4, CS2_SW4, CS3_SW4},        //  18, F3, k31
-    {0, CS4_SW4, CS5_SW4, CS6_SW4},        //  19, 3, k37
-    {0, CS7_SW4, CS8_SW4, CS9_SW4},        //  20, E, k30
-    {0, CS10_SW4, CS11_SW4, CS12_SW4},     //  21, D, k32
-    {0, CS13_SW4, CS14_SW4, CS15_SW4},     //  22, C, k34
-    {0, CS1_SW5, CS2_SW5, CS3_SW5},        //  23, F4, k33
-    {0, CS4_SW5, CS5_SW5, CS6_SW5},        //  24, 4, k47
-    {0, CS7_SW5, CS8_SW5, CS9_SW5},        //  25, R, k40
-    {0, CS10_SW5, CS11_SW5, CS12_SW5},     //  26, F, k42
-    {0, CS13_SW5, CS14_SW5, CS15_SW5},     //  27, V, k44
-    {0, CS1_SW6, CS2_SW6, CS3_SW6},        //  28, F5, k07
-    {0, CS4_SW6, CS5_SW6, CS6_SW6},        //  29, 5, k46
-    {0, CS7_SW6, CS8_SW6, CS9_SW6},        //  30, T, k41
-    {0, CS10_SW6, CS11_SW6, CS12_SW6},     //  31, G, k43
-    {0, CS13_SW6, CS14_SW6, CS15_SW6},     //  32, B, k45
-    {0, CS16_SW6, CS17_SW6, CS18_SW6},     //  33, SPACE, k94
-    {0, CS1_SW7, CS2_SW7, CS3_SW7},        //  34, F6, k63
-    {0, CS4_SW7, CS5_SW7, CS6_SW7},        //  35, 6, k56
-    {0, CS7_SW7, CS8_SW7, CS9_SW7},        //  36, Y, k51
-    {0, CS10_SW7, CS11_SW7, CS12_SW7},     //  37, H, k53
-    {0, CS13_SW7, CS14_SW7, CS15_SW7},     //  38, N, k55
-    {0, CS1_SW8, CS2_SW8, CS3_SW8},        //  39, F7, k71
-    {0, CS4_SW8, CS5_SW8, CS6_SW8},        //  40, 7, k57
-    {0, CS7_SW8, CS8_SW8, CS9_SW8},        //  41, U, k50
-    {0, CS10_SW8, CS11_SW8, CS12_SW8},     //  42, J, k52
-    {0, CS13_SW8, CS14_SW8, CS15_SW8},     //  43, M, k54
-    {0, CS1_SW9, CS2_SW9, CS3_SW9},        //  44, F8, k76
-    {0, CS4_SW9, CS5_SW9, CS6_SW9},        //  45, 8, k67
-    {0, CS7_SW9, CS8_SW9, CS9_SW9},        //  46, I, k60
-    {0, CS10_SW9, CS11_SW9, CS12_SW9},     //  47, K, k62
-    {0, CS13_SW9, CS14_SW9, CS15_SW9},     //  48, ,, k64
-    {0, CS16_SW9, CS17_SW9, CS18_SW9},     //  49, Alt_R, k95
-    {0, CS1_SW10, CS2_SW10, CS3_SW10},     //  50, F9, ka6
-    {0, CS4_SW10, CS5_SW10, CS6_SW10},     //  51, 9, k77
-    {0, CS7_SW10, CS8_SW10, CS9_SW10},     //  52, O, k70
-    {0, CS10_SW10, CS11_SW10, CS12_SW10},  //  53, L, k72
-    {0, CS13_SW10, CS14_SW10, CS15_SW10},  //  54, ., k74
-    {0, CS16_SW10, CS17_SW10, CS18_SW10},  //  55, FN, k92
-    {0, CS1_SW11, CS2_SW11, CS3_SW11},     //  56, F10, ka7
-    {0, CS4_SW11, CS5_SW11, CS6_SW11},     //  57, 0, k87
-    {0, CS7_SW11, CS8_SW11, CS9_SW11},     //  58, P, k80
-    {0, CS10_SW11, CS11_SW11, CS12_SW11},  //  59, ;, k82
-    {0, CS13_SW11, CS14_SW11, CS15_SW11},  //  60, ?, k85
-    {0, CS1_SW12, CS2_SW12, CS3_SW12},     //  61, F11, ka3
-    {0, CS4_SW12, CS5_SW12, CS6_SW12},     //  62, -, k86
-    {0, CS7_SW12, CS8_SW12, CS9_SW12},     //  63, [, k81
-    {0, CS10_SW12, CS11_SW12, CS12_SW12},  //  64, ", k83
-    {0, CS16_SW12, CS17_SW12, CS18_SW12},  //  65, Ct_R, k04
+    {0, SW1_CS1, SW1_CS2, SW1_CS3},        //  0, ESC, k13
+    {0, SW1_CS4, SW1_CS5, SW1_CS6},        //  1, ~, k16
+    {0, SW1_CS7, SW1_CS8, SW1_CS9},        //  2, Tab, k11
+    {0, SW1_CS10, SW1_CS11, SW1_CS12},     //  3, Caps, k21
+    {0, SW1_CS13, SW1_CS14, SW1_CS15},     //  4, Sh_L, k00
+    {0, SW1_CS16, SW1_CS17, SW1_CS18},     //  5, Ct_L, k06
+    {0, SW2_CS1, SW2_CS2, SW2_CS3},        //  6, F1, k26
+    {0, SW2_CS4, SW2_CS5, SW2_CS6},        //  7, 1, k17
+    {0, SW2_CS7, SW2_CS8, SW2_CS9},        //  8, Q, k10
+    {0, SW2_CS10, SW2_CS11, SW2_CS12},     //  9, A, k12
+    {0, SW2_CS13, SW2_CS14, SW2_CS15},     //  10, Z, k14
+    {0, SW2_CS16, SW2_CS17, SW2_CS18},     //  11, Win_L, k90
+    {0, SW3_CS1, SW3_CS2, SW3_CS3},        //  12, F2, k36
+    {0, SW3_CS4, SW3_CS5, SW3_CS6},        //  13, 2, k27
+    {0, SW3_CS7, SW3_CS8, SW3_CS9},        //  14, W, k20
+    {0, SW3_CS10, SW3_CS11, SW3_CS12},     //  15, S, k22
+    {0, SW3_CS13, SW3_CS14, SW3_CS15},     //  16, X, k24
+    {0, SW3_CS16, SW3_CS17, SW3_CS18},     //  17, Alt_L, k93
+    {0, SW4_CS1, SW4_CS2, SW4_CS3},        //  18, F3, k31
+    {0, SW4_CS4, SW4_CS5, SW4_CS6},        //  19, 3, k37
+    {0, SW4_CS7, SW4_CS8, SW4_CS9},        //  20, E, k30
+    {0, SW4_CS10, SW4_CS11, SW4_CS12},     //  21, D, k32
+    {0, SW4_CS13, SW4_CS14, SW4_CS15},     //  22, C, k34
+    {0, SW5_CS1, SW5_CS2, SW5_CS3},        //  23, F4, k33
+    {0, SW5_CS4, SW5_CS5, SW5_CS6},        //  24, 4, k47
+    {0, SW5_CS7, SW5_CS8, SW5_CS9},        //  25, R, k40
+    {0, SW5_CS10, SW5_CS11, SW5_CS12},     //  26, F, k42
+    {0, SW5_CS13, SW5_CS14, SW5_CS15},     //  27, V, k44
+    {0, SW6_CS1, SW6_CS2, SW6_CS3},        //  28, F5, k07
+    {0, SW6_CS4, SW6_CS5, SW6_CS6},        //  29, 5, k46
+    {0, SW6_CS7, SW6_CS8, SW6_CS9},        //  30, T, k41
+    {0, SW6_CS10, SW6_CS11, SW6_CS12},     //  31, G, k43
+    {0, SW6_CS13, SW6_CS14, SW6_CS15},     //  32, B, k45
+    {0, SW6_CS16, SW6_CS17, SW6_CS18},     //  33, SPACE, k94
+    {0, SW7_CS1, SW7_CS2, SW7_CS3},        //  34, F6, k63
+    {0, SW7_CS4, SW7_CS5, SW7_CS6},        //  35, 6, k56
+    {0, SW7_CS7, SW7_CS8, SW7_CS9},        //  36, Y, k51
+    {0, SW7_CS10, SW7_CS11, SW7_CS12},     //  37, H, k53
+    {0, SW7_CS13, SW7_CS14, SW7_CS15},     //  38, N, k55
+    {0, SW8_CS1, SW8_CS2, SW8_CS3},        //  39, F7, k71
+    {0, SW8_CS4, SW8_CS5, SW8_CS6},        //  40, 7, k57
+    {0, SW8_CS7, SW8_CS8, SW8_CS9},        //  41, U, k50
+    {0, SW8_CS10, SW8_CS11, SW8_CS12},     //  42, J, k52
+    {0, SW8_CS13, SW8_CS14, SW8_CS15},     //  43, M, k54
+    {0, SW9_CS1, SW9_CS2, SW9_CS3},        //  44, F8, k76
+    {0, SW9_CS4, SW9_CS5, SW9_CS6},        //  45, 8, k67
+    {0, SW9_CS7, SW9_CS8, SW9_CS9},        //  46, I, k60
+    {0, SW9_CS10, SW9_CS11, SW9_CS12},     //  47, K, k62
+    {0, SW9_CS13, SW9_CS14, SW9_CS15},     //  48, ,, k64
+    {0, SW9_CS16, SW9_CS17, SW9_CS18},     //  49, Alt_R, k95
+    {0, SW10_CS1, SW10_CS2, SW10_CS3},     //  50, F9, ka6
+    {0, SW10_CS4, SW10_CS5, SW10_CS6},     //  51, 9, k77
+    {0, SW10_CS7, SW10_CS8, SW10_CS9},     //  52, O, k70
+    {0, SW10_CS10, SW10_CS11, SW10_CS12},  //  53, L, k72
+    {0, SW10_CS13, SW10_CS14, SW10_CS15},  //  54, ., k74
+    {0, SW10_CS16, SW10_CS17, SW10_CS18},  //  55, FN, k92
+    {0, SW11_CS1, SW11_CS2, SW11_CS3},     //  56, F10, ka7
+    {0, SW11_CS4, SW11_CS5, SW11_CS6},     //  57, 0, k87
+    {0, SW11_CS7, SW11_CS8, SW11_CS9},     //  58, P, k80
+    {0, SW11_CS10, SW11_CS11, SW11_CS12},  //  59, ;, k82
+    {0, SW11_CS13, SW11_CS14, SW11_CS15},  //  60, ?, k85
+    {0, SW12_CS1, SW12_CS2, SW12_CS3},     //  61, F11, ka3
+    {0, SW12_CS4, SW12_CS5, SW12_CS6},     //  62, -, k86
+    {0, SW12_CS7, SW12_CS8, SW12_CS9},     //  63, [, k81
+    {0, SW12_CS10, SW12_CS11, SW12_CS12},  //  64, ", k83
+    {0, SW12_CS16, SW12_CS17, SW12_CS18},  //  65, Ct_R, k04
 
-    {1, CS1_SW1, CS2_SW1, CS3_SW1},     //  66, F12, ka5
-    {1, CS4_SW1, CS5_SW1, CS6_SW1},     //  67, \, k23
-    {1, CS13_SW1, CS14_SW1, CS15_SW1},  //  68, LED, l01
-    {1, CS16_SW1, CS17_SW1, CS18_SW1},  //  69, LED, l11
-    {1, CS4_SW2, CS5_SW2, CS6_SW2},     //  70, Prt, k97
-    {1, CS13_SW2, CS14_SW2, CS15_SW2},  //  71, LED, l02
-    {1, CS16_SW2, CS17_SW2, CS18_SW2},  //  72, LED, l12
-    {1, CS4_SW3, CS5_SW3, CS6_SW3},     //  73, Del, k65
-    {1, CS13_SW3, CS14_SW3, CS15_SW3},  //  74, LED, l03
-    {1, CS16_SW3, CS17_SW3, CS18_SW3},  //  75, LED, l13
-    {1, CS4_SW4, CS5_SW4, CS6_SW4},     //  76, PgUp, k15
-    {1, CS13_SW4, CS14_SW4, CS15_SW4},  //  77, LED, l04
-    {1, CS16_SW4, CS17_SW4, CS18_SW4},  //  78, LED, l14
-    {1, CS1_SW5, CS2_SW5, CS3_SW5},     //  79, =, k66
-    {1, CS10_SW5, CS11_SW5, CS12_SW5},  //  80, Right, k05
-    {1, CS13_SW5, CS14_SW5, CS15_SW5},  //  81, LED, l05
-    {1, CS16_SW5, CS17_SW5, CS18_SW5},  //  82, LED, l15
-    {1, CS4_SW6, CS5_SW6, CS6_SW6},     //  83, End, k75
-    {1, CS13_SW6, CS14_SW6, CS15_SW6},  //  84, LED, l06
-    {1, CS16_SW6, CS17_SW6, CS18_SW6},  //  85, LED, l16
-    {1, CS1_SW7, CS2_SW7, CS3_SW7},     //  86, BSpc, ka1
-    {1, CS4_SW7, CS5_SW7, CS6_SW7},     //  87, PgDn, k25
-    {1, CS13_SW7, CS14_SW7, CS15_SW7},  //  88, LED, l07
-    {1, CS16_SW7, CS17_SW7, CS18_SW7},  //  89, LED, l17
-    {1, CS1_SW8, CS2_SW8, CS3_SW8},     //  90, ], k61
-    {1, CS4_SW8, CS5_SW8, CS6_SW8},     //  91, Sh_R, k91
-    {1, CS13_SW8, CS14_SW8, CS15_SW8},  //  92, LED, l08
-    {1, CS16_SW8, CS17_SW8, CS18_SW8},  //  93, LED, l18
-    {1, CS4_SW9, CS5_SW9, CS6_SW9},     //  94, Up, k35
-    {1, CS1_SW10, CS2_SW10, CS3_SW10},  //  95, #, k84
-    {1, CS4_SW10, CS5_SW10, CS6_SW10},  //  96, Left, k03
-    {1, CS1_SW11, CS2_SW11, CS3_SW11},  //  97, Enter, ka4
-    {1, CS4_SW11, CS5_SW11, CS6_SW11},  //  98, Down, k73
+    {1, SW1_CS1, SW1_CS2, SW1_CS3},     //  66, F12, ka5
+    {1, SW1_CS4, SW1_CS5, SW1_CS6},     //  67, \, k23
+    {1, SW1_CS13, SW1_CS14, SW1_CS15},  //  68, LED, l01
+    {1, SW1_CS16, SW1_CS17, SW1_CS18},  //  69, LED, l11
+    {1, SW2_CS4, SW2_CS5, SW2_CS6},     //  70, Prt, k97
+    {1, SW2_CS13, SW2_CS14, SW2_CS15},  //  71, LED, l02
+    {1, SW2_CS16, SW2_CS17, SW2_CS18},  //  72, LED, l12
+    {1, SW3_CS4, SW3_CS5, SW3_CS6},     //  73, Del, k65
+    {1, SW3_CS13, SW3_CS14, SW3_CS15},  //  74, LED, l03
+    {1, SW3_CS16, SW3_CS17, SW3_CS18},  //  75, LED, l13
+    {1, SW4_CS4, SW4_CS5, SW4_CS6},     //  76, PgUp, k15
+    {1, SW4_CS13, SW4_CS14, SW4_CS15},  //  77, LED, l04
+    {1, SW4_CS16, SW4_CS17, SW4_CS18},  //  78, LED, l14
+    {1, SW5_CS1, SW5_CS2, SW5_CS3},     //  79, =, k66
+    {1, SW5_CS10, SW5_CS11, SW5_CS12},  //  80, Right, k05
+    {1, SW5_CS13, SW5_CS14, SW5_CS15},  //  81, LED, l05
+    {1, SW5_CS16, SW5_CS17, SW5_CS18},  //  82, LED, l15
+    {1, SW6_CS4, SW6_CS5, SW6_CS6},     //  83, End, k75
+    {1, SW6_CS13, SW6_CS14, SW6_CS15},  //  84, LED, l06
+    {1, SW6_CS16, SW6_CS17, SW6_CS18},  //  85, LED, l16
+    {1, SW7_CS1, SW7_CS2, SW7_CS3},     //  86, BSpc, ka1
+    {1, SW7_CS4, SW7_CS5, SW7_CS6},     //  87, PgDn, k25
+    {1, SW7_CS13, SW7_CS14, SW7_CS15},  //  88, LED, l07
+    {1, SW7_CS16, SW7_CS17, SW7_CS18},  //  89, LED, l17
+    {1, SW8_CS1, SW8_CS2, SW8_CS3},     //  90, ], k61
+    {1, SW8_CS4, SW8_CS5, SW8_CS6},     //  91, Sh_R, k91
+    {1, SW8_CS13, SW8_CS14, SW8_CS15},  //  92, LED, l08
+    {1, SW8_CS16, SW8_CS17, SW8_CS18},  //  93, LED, l18
+    {1, SW9_CS4, SW9_CS5, SW9_CS6},     //  94, Up, k35
+    {1, SW10_CS1, SW10_CS2, SW10_CS3},  //  95, #, k84
+    {1, SW10_CS4, SW10_CS5, SW10_CS6},  //  96, Left, k03
+    {1, SW11_CS1, SW11_CS2, SW11_CS3},  //  97, Enter, ka4
+    {1, SW11_CS4, SW11_CS5, SW11_CS6},  //  98, Down, k73
 };
 // clang-format on
 #endif
diff --git a/keyboards/gmmk/pro/rev1/iso/keymaps/chofstede/keymap.c b/keyboards/gmmk/pro/rev1/iso/keymaps/chofstede/keymap.c
deleted file mode 100644
index 971e0821a32..00000000000
--- a/keyboards/gmmk/pro/rev1/iso/keymaps/chofstede/keymap.c
+++ /dev/null
@@ -1,107 +0,0 @@
-/* Copyright 2021 Glorious, LLC <salman@pcgamingrace.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include QMK_KEYBOARD_H
-
-// clang-format off
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-//      ESC      F1       F2       F3       F4       F5       F6       F7       F8       F9       F10      F11      F12	     Prt           Rotary(Mute)
-//      ~        1        2        3        4        5        6        7        8        9        0         -       (=)	     BackSpc           Del
-//      Tab      Q        W        E        R        T        Y        U        I        O        P        [        ]                          PgUp
-//      Caps     A        S        D        F        G        H        J        K        L        ;        "        #        Enter             PgDn
-//      Sh_L     /        Z        X        C        V        B        N        M        ,        .        ?                 Sh_R     Up       End
-//      Ct_L     Win_L    Alt_L                               SPACE                               Alt_R    FN       Ct_R     Left     Down     Right
-
-
-    // The FN key by default maps to a momentary toggle to layer 1 to provide access to the QK_BOOT key (to put the board into bootloader mode). Without
-    // this mapping, you have to open the case to hit the button on the bottom of the PCB (near the USB cable attachment) while plugging in the USB
-    // cable to get the board into bootloader mode - definitely not fun when you're working on your QMK builds. Remove this and put it back to KC_RGUI
-    // if that's your preference.
-    //
-    // To put the keyboard in bootloader mode, use FN+backspace. If you accidentally put it into bootloader, you can just unplug the USB cable and
-    // it'll be back to normal when you plug it back in.
-    //
-    // This keyboard defaults to 6KRO instead of NKRO for compatibility reasons (some KVMs and BIOSes are incompatible with NKRO).
-    // Since this is, among other things, a "gaming" keyboard, a key combination to enable NKRO on the fly is provided for convenience.
-    // Press Fn+N to toggle between 6KRO and NKRO. This setting is persisted to the EEPROM and thus persists between restarts.
-    [0] = LAYOUT(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_HOME,          KC_MUTE,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_DEL,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,                   KC_PGUP,
-        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,           KC_PGDN,
-        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   KC_END,
-        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-
-    [1] = LAYOUT(
-        _______, KC_MYCM, KC_WHOM, KC_CALC, KC_MSEL, KC_MPRV, KC_MNXT, KC_MPLY, KC_MSTP, KC_MUTE, KC_VOLD, KC_VOLU, _______, KC_PSCR,          _______,
-        _______, RGB_TOG, RGB_M_P, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,          _______,
-        _______, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
-        _______, _______, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______,  KC_INS, _______,          _______,
-        _______, _______, _______, RGB_HUI, _______, _______, _______, NK_TOGG, _______, _______, _______, _______,          _______, RGB_MOD, _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______, RGB_SPD, RGB_RMOD, RGB_SPI
-    ),
-
-
-};
-// clang-format on
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (clockwise) {
-      tap_code(KC_VOLU);
-    } else {
-      tap_code(KC_VOLD);
-    }
-    return false;
-}
-#endif
-
-bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
-    static uint32_t cycle_led_timer = 0;
-    static uint8_t  current_value   = 0;
-    static uint8_t  left_side_leds[8] = {68, 71, 74, 77, 81, 84, 88, 92};
-    static uint8_t  right_side_leds[8] = {69, 72, 75, 78, 82, 85, 89, 93};
-
-    if (host_keyboard_led_state().caps_lock) {
-        if (timer_elapsed32(cycle_led_timer) > 500) {
-            current_value = current_value == 0 ? 255 : 0;
-            cycle_led_timer = timer_read32();
-        }
-    HSV tempHSV = {.h = 0, .s = 255, .v = current_value};
-    RGB tempRGB = hsv_to_rgb(tempHSV);
-    for (uint8_t i = 0; i < ARRAY_SIZE(left_side_leds); i++) {
-        rgb_matrix_set_color(left_side_leds[i], tempRGB.r, tempRGB.g, tempRGB.b);
-        rgb_matrix_set_color(right_side_leds[i], tempRGB.r, tempRGB.g, tempRGB.b);
-        }
-    }
-
-    static uint8_t l2_functions[26] = {6, 7, 8, 12, 13, 14, 15, 16, 18, 23, 28, 34, 38, 39, 44, 50, 56, 61, 66, 70, 80, 86, 94, 95, 96, 98};
-    switch(get_highest_layer(layer_state)){  // special handling per layer
-       case 2:  //layer one
-         break;
-       case 1:
-         for (uint8_t i = 0; i < ARRAY_SIZE(l2_functions); i++) {
-             RGB_MATRIX_INDICATOR_SET_COLOR(l2_functions[i], 255, 0, 0);
-         }
-         break;
-       default:
-         break;
-       break;
-    }
-    return false;
-}
diff --git a/keyboards/gmmk/pro/rev1/iso/keymaps/chofstede/readme.md b/keyboards/gmmk/pro/rev1/iso/keymaps/chofstede/readme.md
deleted file mode 100644
index da66c447ada..00000000000
--- a/keyboards/gmmk/pro/rev1/iso/keymaps/chofstede/readme.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# chofstede GMMK Pro layout
-
-- Added Print-Screen to FN+POS1
-- Added Insert to FN+#
-- The LED bars on the left and right side of the keyboard blink red when CAPS Lock is enabled
-- All mapped keys light up red when FN is being pressed
-
-
diff --git a/keyboards/gmmk/pro/rev1/iso/keymaps/falkecarlsen/keymap.c b/keyboards/gmmk/pro/rev1/iso/keymaps/falkecarlsen/keymap.c
deleted file mode 100644
index 694fd80e197..00000000000
--- a/keyboards/gmmk/pro/rev1/iso/keymaps/falkecarlsen/keymap.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/* Copyright 2021 Glorious, LLC <salman@pcgamingrace.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include QMK_KEYBOARD_H
-
-// clang-format off
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-//      ESC      F1       F2       F3       F4       F5       F6       F7       F8       F9       F10      F11      F12	     Prt           Rotary(Mute)
-//      ~        1        2        3        4        5        6        7        8        9        0         -       (=)	     BackSpc           Del
-//      Tab      Q        W        E        R        T        Y        U        I        O        P        [        ]                          PgUp
-//      Caps     A        S        D        F        G        H        J        K        L        ;        "        #        Enter             PgDn
-//      Sh_L     /        Z        X        C        V        B        N        M        ,        .        ?                 Sh_R     Up       End
-//      Ct_L     Win_L    Alt_L                               SPACE                               Alt_R    FN       Ct_R     Left     Down     Right
-
-
-    // The FN key by default maps to a momentary toggle to layer 1 to provide access to the QK_BOOT key (to put the board into bootloader mode). Without
-    // this mapping, you have to open the case to hit the button on the bottom of the PCB (near the USB cable attachment) while plugging in the USB
-    // cable to get the board into bootloader mode - definitely not fun when you're working on your QMK builds. Remove this and put it back to KC_RGUI
-    // if that's your preference.
-    //
-    // To put the keyboard in bootloader mode, use FN+backspace. If you accidentally put it into bootloader, you can just unplug the USB cable and
-    // it'll be back to normal when you plug it back in.
-    //
-    // This keyboard defaults to 6KRO instead of NKRO for compatibility reasons (some KVMs and BIOSes are incompatible with NKRO).
-    // Since this is, among other things, a "gaming" keyboard, a key combination to enable NKRO on the fly is provided for convenience.
-    // Press Fn+N to toggle between 6KRO and NKRO. This setting is persisted to the EEPROM and thus persists between restarts.
-    [0] = LAYOUT(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,           KC_MPLY,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_HOME,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,                   KC_PGUP,
-        MO(1),   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,           KC_PGDN,
-        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   KC_END,
-        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-
-    [1] = LAYOUT(
-        _______, KC_BRID, KC_BRIU, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_MSTP,          KC_MNXT,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,          _______,
-        _______, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
-        _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, RGB_VAD, RGB_TOG, RGB_VAI, RGB_HUI, _______, NK_TOGG, _______, _______, _______, _______,          _______, RGB_MOD, _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______, RGB_SPD, RGB_RMOD, RGB_SPI
-    ),
-
-
-};
-// clang-format on
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (clockwise) {
-      tap_code(KC_VOLU);
-    } else {
-      tap_code(KC_VOLD);
-    }
-    return false;
-}
-#endif
diff --git a/keyboards/gmmk/pro/rev1/iso/keymaps/falkecarlsen/readme.md b/keyboards/gmmk/pro/rev1/iso/keymaps/falkecarlsen/readme.md
deleted file mode 100644
index 4239e0dcb8d..00000000000
--- a/keyboards/gmmk/pro/rev1/iso/keymaps/falkecarlsen/readme.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# Falke Carlsen keymap for GMMK PRO ISO
-Based on the default keymap, inheriting rotary encoder and LED configs without modification.
-
-## Changes:
-- Fixes layer 1 of top-row to correspond to 'Keychron ISO Q1 & K2 Dye-Sub PBT Nordic' printed legend multimedia keys.
-- Adds early 2010s Ducky layer 1 mouse-emulation to WASD with left+right click and scroll in the 2x4 cluster.
-- Remaps default keymaps LED-handling to 2nd-row due to addition of mouse-emulation.
-- Swap layer 0 rotary encoder click to play/pause, and layer 1 click to next.
diff --git a/keyboards/gmmk/pro/rev2/ansi/ansi.c b/keyboards/gmmk/pro/rev2/ansi/ansi.c
index c592e3cdaee..a3f957ef0a2 100644
--- a/keyboards/gmmk/pro/rev2/ansi/ansi.c
+++ b/keyboards/gmmk/pro/rev2/ansi/ansi.c
@@ -137,105 +137,105 @@ led_config_t g_led_config = {{
 }};
 
 const aw20216s_led_t PROGMEM g_aw20216s_leds[AW20216S_LED_COUNT] = {
-    {0, CS1_SW1, CS2_SW1, CS3_SW1},        //  0, ESC, k13
-    {0, CS4_SW1, CS5_SW1, CS6_SW1},        //  1, ~, k16
-    {0, CS7_SW1, CS8_SW1, CS9_SW1},        //  2, Tab, k11
-    {0, CS10_SW1, CS11_SW1, CS12_SW1},     //  3, Caps, k21
-    {0, CS13_SW1, CS14_SW1, CS15_SW1},     //  4, Sh_L, k00
-    {0, CS16_SW1, CS17_SW1, CS18_SW1},     //  5, Ct_L, k06
-    {0, CS1_SW2, CS2_SW2, CS3_SW2},        //  6, F1, k26
-    {0, CS4_SW2, CS5_SW2, CS6_SW2},        //  7, 1, k17
-    {0, CS7_SW2, CS8_SW2, CS9_SW2},        //  8, Q, k10
-    {0, CS10_SW2, CS11_SW2, CS12_SW2},     //  9, A, k12
-    {0, CS13_SW2, CS14_SW2, CS15_SW2},     //  10, Z, k14
-    {0, CS16_SW2, CS17_SW2, CS18_SW2},     //  11, Win_L, k90
-    {0, CS1_SW3, CS2_SW3, CS3_SW3},        //  12, F2, k36
-    {0, CS4_SW3, CS5_SW3, CS6_SW3},        //  13, 2, k27
-    {0, CS7_SW3, CS8_SW3, CS9_SW3},        //  14, W, k20
-    {0, CS10_SW3, CS11_SW3, CS12_SW3},     //  15, S, k22
-    {0, CS13_SW3, CS14_SW3, CS15_SW3},     //  16, X, k24
-    {0, CS16_SW3, CS17_SW3, CS18_SW3},     //  17, Alt_L, k93
-    {0, CS1_SW4, CS2_SW4, CS3_SW4},        //  18, F3, k31
-    {0, CS4_SW4, CS5_SW4, CS6_SW4},        //  19, 3, k37
-    {0, CS7_SW4, CS8_SW4, CS9_SW4},        //  20, E, k30
-    {0, CS10_SW4, CS11_SW4, CS12_SW4},     //  21, D, k32
-    {0, CS13_SW4, CS14_SW4, CS15_SW4},     //  22, C, k34
-    {0, CS1_SW5, CS2_SW5, CS3_SW5},        //  23, F4, k33
-    {0, CS4_SW5, CS5_SW5, CS6_SW5},        //  24, 4, k47
-    {0, CS7_SW5, CS8_SW5, CS9_SW5},        //  25, R, k40
-    {0, CS10_SW5, CS11_SW5, CS12_SW5},     //  26, F, k42
-    {0, CS13_SW5, CS14_SW5, CS15_SW5},     //  27, V, k44
-    {0, CS1_SW6, CS2_SW6, CS3_SW6},        //  28, F5, k07
-    {0, CS4_SW6, CS5_SW6, CS6_SW6},        //  29, 5, k46
-    {0, CS7_SW6, CS8_SW6, CS9_SW6},        //  30, T, k41
-    {0, CS10_SW6, CS11_SW6, CS12_SW6},     //  31, G, k43
-    {0, CS13_SW6, CS14_SW6, CS15_SW6},     //  32, B, k45
-    {0, CS16_SW6, CS17_SW6, CS18_SW6},     //  33, SPACE, k94
-    {0, CS1_SW7, CS2_SW7, CS3_SW7},        //  34, F6, k63
-    {0, CS4_SW7, CS5_SW7, CS6_SW7},        //  35, 6, k56
-    {0, CS7_SW7, CS8_SW7, CS9_SW7},        //  36, Y, k51
-    {0, CS10_SW7, CS11_SW7, CS12_SW7},     //  37, H, k53
-    {0, CS13_SW7, CS14_SW7, CS15_SW7},     //  38, N, k55
-    {0, CS1_SW8, CS2_SW8, CS3_SW8},        //  39, F7, k71
-    {0, CS4_SW8, CS5_SW8, CS6_SW8},        //  40, 7, k57
-    {0, CS7_SW8, CS8_SW8, CS9_SW8},        //  41, U, k50
-    {0, CS10_SW8, CS11_SW8, CS12_SW8},     //  42, J, k52
-    {0, CS13_SW8, CS14_SW8, CS15_SW8},     //  43, M, k54
-    {0, CS1_SW9, CS2_SW9, CS3_SW9},        //  44, F8, k76
-    {0, CS4_SW9, CS5_SW9, CS6_SW9},        //  45, 8, k67
-    {0, CS7_SW9, CS8_SW9, CS9_SW9},        //  46, I, k60
-    {0, CS10_SW9, CS11_SW9, CS12_SW9},     //  47, K, k62
-    {0, CS13_SW9, CS14_SW9, CS15_SW9},     //  48, ,, k64
-    {0, CS16_SW9, CS17_SW9, CS18_SW9},     //  49, Alt_R, k95
-    {0, CS1_SW10, CS2_SW10, CS3_SW10},     //  50, F9, ka6
-    {0, CS4_SW10, CS5_SW10, CS6_SW10},     //  51, 9, k77
-    {0, CS7_SW10, CS8_SW10, CS9_SW10},     //  52, O, k70
-    {0, CS10_SW10, CS11_SW10, CS12_SW10},  //  53, L, k72
-    {0, CS13_SW10, CS14_SW10, CS15_SW10},  //  54, ., k74
-    {0, CS16_SW10, CS17_SW10, CS18_SW10},  //  55, FN, k92
-    {0, CS1_SW11, CS2_SW11, CS3_SW11},     //  56, F10, ka7
-    {0, CS4_SW11, CS5_SW11, CS6_SW11},     //  57, 0, k87
-    {0, CS7_SW11, CS8_SW11, CS9_SW11},     //  58, P, k80
-    {0, CS10_SW11, CS11_SW11, CS12_SW11},  //  59, ;, k82
-    {0, CS13_SW11, CS14_SW11, CS15_SW11},  //  60, ?, k85
-    {0, CS1_SW12, CS2_SW12, CS3_SW12},     //  61, F11, ka3
-    {0, CS4_SW12, CS5_SW12, CS6_SW12},     //  62, -, k86
-    {0, CS7_SW12, CS8_SW12, CS9_SW12},     //  63, [, k81
-    {0, CS10_SW12, CS11_SW12, CS12_SW12},  //  64, ", k83
-    {0, CS16_SW12, CS17_SW12, CS18_SW12},  //  65, Ct_R, k04
+    {0, SW1_CS1, SW1_CS2, SW1_CS3},        //  0, ESC, k13
+    {0, SW1_CS4, SW1_CS5, SW1_CS6},        //  1, ~, k16
+    {0, SW1_CS7, SW1_CS8, SW1_CS9},        //  2, Tab, k11
+    {0, SW1_CS10, SW1_CS11, SW1_CS12},     //  3, Caps, k21
+    {0, SW1_CS13, SW1_CS14, SW1_CS15},     //  4, Sh_L, k00
+    {0, SW1_CS16, SW1_CS17, SW1_CS18},     //  5, Ct_L, k06
+    {0, SW2_CS1, SW2_CS2, SW2_CS3},        //  6, F1, k26
+    {0, SW2_CS4, SW2_CS5, SW2_CS6},        //  7, 1, k17
+    {0, SW2_CS7, SW2_CS8, SW2_CS9},        //  8, Q, k10
+    {0, SW2_CS10, SW2_CS11, SW2_CS12},     //  9, A, k12
+    {0, SW2_CS13, SW2_CS14, SW2_CS15},     //  10, Z, k14
+    {0, SW2_CS16, SW2_CS17, SW2_CS18},     //  11, Win_L, k90
+    {0, SW3_CS1, SW3_CS2, SW3_CS3},        //  12, F2, k36
+    {0, SW3_CS4, SW3_CS5, SW3_CS6},        //  13, 2, k27
+    {0, SW3_CS7, SW3_CS8, SW3_CS9},        //  14, W, k20
+    {0, SW3_CS10, SW3_CS11, SW3_CS12},     //  15, S, k22
+    {0, SW3_CS13, SW3_CS14, SW3_CS15},     //  16, X, k24
+    {0, SW3_CS16, SW3_CS17, SW3_CS18},     //  17, Alt_L, k93
+    {0, SW4_CS1, SW4_CS2, SW4_CS3},        //  18, F3, k31
+    {0, SW4_CS4, SW4_CS5, SW4_CS6},        //  19, 3, k37
+    {0, SW4_CS7, SW4_CS8, SW4_CS9},        //  20, E, k30
+    {0, SW4_CS10, SW4_CS11, SW4_CS12},     //  21, D, k32
+    {0, SW4_CS13, SW4_CS14, SW4_CS15},     //  22, C, k34
+    {0, SW5_CS1, SW5_CS2, SW5_CS3},        //  23, F4, k33
+    {0, SW5_CS4, SW5_CS5, SW5_CS6},        //  24, 4, k47
+    {0, SW5_CS7, SW5_CS8, SW5_CS9},        //  25, R, k40
+    {0, SW5_CS10, SW5_CS11, SW5_CS12},     //  26, F, k42
+    {0, SW5_CS13, SW5_CS14, SW5_CS15},     //  27, V, k44
+    {0, SW6_CS1, SW6_CS2, SW6_CS3},        //  28, F5, k07
+    {0, SW6_CS4, SW6_CS5, SW6_CS6},        //  29, 5, k46
+    {0, SW6_CS7, SW6_CS8, SW6_CS9},        //  30, T, k41
+    {0, SW6_CS10, SW6_CS11, SW6_CS12},     //  31, G, k43
+    {0, SW6_CS13, SW6_CS14, SW6_CS15},     //  32, B, k45
+    {0, SW6_CS16, SW6_CS17, SW6_CS18},     //  33, SPACE, k94
+    {0, SW7_CS1, SW7_CS2, SW7_CS3},        //  34, F6, k63
+    {0, SW7_CS4, SW7_CS5, SW7_CS6},        //  35, 6, k56
+    {0, SW7_CS7, SW7_CS8, SW7_CS9},        //  36, Y, k51
+    {0, SW7_CS10, SW7_CS11, SW7_CS12},     //  37, H, k53
+    {0, SW7_CS13, SW7_CS14, SW7_CS15},     //  38, N, k55
+    {0, SW8_CS1, SW8_CS2, SW8_CS3},        //  39, F7, k71
+    {0, SW8_CS4, SW8_CS5, SW8_CS6},        //  40, 7, k57
+    {0, SW8_CS7, SW8_CS8, SW8_CS9},        //  41, U, k50
+    {0, SW8_CS10, SW8_CS11, SW8_CS12},     //  42, J, k52
+    {0, SW8_CS13, SW8_CS14, SW8_CS15},     //  43, M, k54
+    {0, SW9_CS1, SW9_CS2, SW9_CS3},        //  44, F8, k76
+    {0, SW9_CS4, SW9_CS5, SW9_CS6},        //  45, 8, k67
+    {0, SW9_CS7, SW9_CS8, SW9_CS9},        //  46, I, k60
+    {0, SW9_CS10, SW9_CS11, SW9_CS12},     //  47, K, k62
+    {0, SW9_CS13, SW9_CS14, SW9_CS15},     //  48, ,, k64
+    {0, SW9_CS16, SW9_CS17, SW9_CS18},     //  49, Alt_R, k95
+    {0, SW10_CS1, SW10_CS2, SW10_CS3},     //  50, F9, ka6
+    {0, SW10_CS4, SW10_CS5, SW10_CS6},     //  51, 9, k77
+    {0, SW10_CS7, SW10_CS8, SW10_CS9},     //  52, O, k70
+    {0, SW10_CS10, SW10_CS11, SW10_CS12},  //  53, L, k72
+    {0, SW10_CS13, SW10_CS14, SW10_CS15},  //  54, ., k74
+    {0, SW10_CS16, SW10_CS17, SW10_CS18},  //  55, FN, k92
+    {0, SW11_CS1, SW11_CS2, SW11_CS3},     //  56, F10, ka7
+    {0, SW11_CS4, SW11_CS5, SW11_CS6},     //  57, 0, k87
+    {0, SW11_CS7, SW11_CS8, SW11_CS9},     //  58, P, k80
+    {0, SW11_CS10, SW11_CS11, SW11_CS12},  //  59, ;, k82
+    {0, SW11_CS13, SW11_CS14, SW11_CS15},  //  60, ?, k85
+    {0, SW12_CS1, SW12_CS2, SW12_CS3},     //  61, F11, ka3
+    {0, SW12_CS4, SW12_CS5, SW12_CS6},     //  62, -, k86
+    {0, SW12_CS7, SW12_CS8, SW12_CS9},     //  63, [, k81
+    {0, SW12_CS10, SW12_CS11, SW12_CS12},  //  64, ", k83
+    {0, SW12_CS16, SW12_CS17, SW12_CS18},  //  65, Ct_R, k04
 
-    {1, CS1_SW1, CS2_SW1, CS3_SW1},     //  66, F12, ka5
-    {1, CS13_SW1, CS14_SW1, CS15_SW1},  //  67, LED, l01
-    {1, CS16_SW1, CS17_SW1, CS18_SW1},  //  68, LED, l11
-    {1, CS4_SW2, CS5_SW2, CS6_SW2},     //  69, Prt, k97
-    {1, CS13_SW2, CS14_SW2, CS15_SW2},  //  70, LED, l02
-    {1, CS16_SW2, CS17_SW2, CS18_SW2},  //  71, LED, l12
-    {1, CS4_SW3, CS5_SW3, CS6_SW3},     //  72, Del, k65
-    {1, CS13_SW3, CS14_SW3, CS15_SW3},  //  73, LED, l03
-    {1, CS16_SW3, CS17_SW3, CS18_SW3},  //  74, LED, l13
-    {1, CS4_SW4, CS5_SW4, CS6_SW4},     //  75, PgUp, k15
-    {1, CS13_SW4, CS14_SW4, CS15_SW4},  //  76, LED, l04
-    {1, CS16_SW4, CS17_SW4, CS18_SW4},  //  77, LED, l14
-    {1, CS1_SW5, CS2_SW5, CS3_SW5},     //  78, =, k66
-    {1, CS10_SW5, CS11_SW5, CS12_SW5},  //  79, Right, k05
-    {1, CS13_SW5, CS14_SW5, CS15_SW5},  //  80, LED, l05
-    {1, CS16_SW5, CS17_SW5, CS18_SW5},  //  81, LED, l15
-    {1, CS4_SW6, CS5_SW6, CS6_SW6},     //  82, End, k75
-    {1, CS13_SW6, CS14_SW6, CS15_SW6},  //  83, LED, l06
-    {1, CS16_SW6, CS17_SW6, CS18_SW6},  //  84, LED, l16
-    {1, CS1_SW7, CS2_SW7, CS3_SW7},     //  85, BSpc, ka1
-    {1, CS4_SW7, CS5_SW7, CS6_SW7},     //  86, PgDn, k25
-    {1, CS13_SW7, CS14_SW7, CS15_SW7},  //  87, LED, l07
-    {1, CS16_SW7, CS17_SW7, CS18_SW7},  //  88, LED, l17
-    {1, CS1_SW8, CS2_SW8, CS3_SW8},     //  89, ], k61
-    {1, CS4_SW8, CS5_SW8, CS6_SW8},     //  90, Sh_R, k91
-    {1, CS13_SW8, CS14_SW8, CS15_SW8},  //  91, LED, l08
-    {1, CS16_SW8, CS17_SW8, CS18_SW8},  //  92, LED, l18
-    {1, CS1_SW9, CS2_SW9, CS3_SW9},     //  93, \, ka2
-    {1, CS4_SW9, CS5_SW9, CS6_SW9},     //  94, Up, k35
-    {1, CS4_SW10, CS5_SW10, CS6_SW10},  //  95, Left, k03
-    {1, CS1_SW11, CS2_SW11, CS3_SW11},  //  96, Enter, ka4
-    {1, CS4_SW11, CS5_SW11, CS6_SW11},  //  97, Down, k73
+    {1, SW1_CS1, SW1_CS2, SW1_CS3},     //  66, F12, ka5
+    {1, SW1_CS13, SW1_CS14, SW1_CS15},  //  67, LED, l01
+    {1, SW1_CS16, SW1_CS17, SW1_CS18},  //  68, LED, l11
+    {1, SW2_CS4, SW2_CS5, SW2_CS6},     //  69, Prt, k97
+    {1, SW2_CS13, SW2_CS14, SW2_CS15},  //  70, LED, l02
+    {1, SW2_CS16, SW2_CS17, SW2_CS18},  //  71, LED, l12
+    {1, SW3_CS4, SW3_CS5, SW3_CS6},     //  72, Del, k65
+    {1, SW3_CS13, SW3_CS14, SW3_CS15},  //  73, LED, l03
+    {1, SW3_CS16, SW3_CS17, SW3_CS18},  //  74, LED, l13
+    {1, SW4_CS4, SW4_CS5, SW4_CS6},     //  75, PgUp, k15
+    {1, SW4_CS13, SW4_CS14, SW4_CS15},  //  76, LED, l04
+    {1, SW4_CS16, SW4_CS17, SW4_CS18},  //  77, LED, l14
+    {1, SW5_CS1, SW5_CS2, SW5_CS3},     //  78, =, k66
+    {1, SW5_CS10, SW5_CS11, SW5_CS12},  //  79, Right, k05
+    {1, SW5_CS13, SW5_CS14, SW5_CS15},  //  80, LED, l05
+    {1, SW5_CS16, SW5_CS17, SW5_CS18},  //  81, LED, l15
+    {1, SW6_CS4, SW6_CS5, SW6_CS6},     //  82, End, k75
+    {1, SW6_CS13, SW6_CS14, SW6_CS15},  //  83, LED, l06
+    {1, SW6_CS16, SW6_CS17, SW6_CS18},  //  84, LED, l16
+    {1, SW7_CS1, SW7_CS2, SW7_CS3},     //  85, BSpc, ka1
+    {1, SW7_CS4, SW7_CS5, SW7_CS6},     //  86, PgDn, k25
+    {1, SW7_CS13, SW7_CS14, SW7_CS15},  //  87, LED, l07
+    {1, SW7_CS16, SW7_CS17, SW7_CS18},  //  88, LED, l17
+    {1, SW8_CS1, SW8_CS2, SW8_CS3},     //  89, ], k61
+    {1, SW8_CS4, SW8_CS5, SW8_CS6},     //  90, Sh_R, k91
+    {1, SW8_CS13, SW8_CS14, SW8_CS15},  //  91, LED, l08
+    {1, SW8_CS16, SW8_CS17, SW8_CS18},  //  92, LED, l18
+    {1, SW9_CS1, SW9_CS2, SW9_CS3},     //  93, \, ka2
+    {1, SW9_CS4, SW9_CS5, SW9_CS6},     //  94, Up, k35
+    {1, SW10_CS4, SW10_CS5, SW10_CS6},  //  95, Left, k03
+    {1, SW11_CS1, SW11_CS2, SW11_CS3},  //  96, Enter, ka4
+    {1, SW11_CS4, SW11_CS5, SW11_CS6},  //  97, Down, k73
 };
 // clang-format on
 #endif
diff --git a/keyboards/gmmk/pro/rev2/iso/iso.c b/keyboards/gmmk/pro/rev2/iso/iso.c
index 969ce8bf2e2..7a34f2432fe 100644
--- a/keyboards/gmmk/pro/rev2/iso/iso.c
+++ b/keyboards/gmmk/pro/rev2/iso/iso.c
@@ -138,106 +138,106 @@ led_config_t g_led_config = {{
 }};
 
 const aw20216s_led_t PROGMEM g_aw20216s_leds[AW20216S_LED_COUNT] = {
-    {0, CS1_SW1, CS2_SW1, CS3_SW1},        //  0, ESC, k13
-    {0, CS4_SW1, CS5_SW1, CS6_SW1},        //  1, ~, k16
-    {0, CS7_SW1, CS8_SW1, CS9_SW1},        //  2, Tab, k11
-    {0, CS10_SW1, CS11_SW1, CS12_SW1},     //  3, Caps, k21
-    {0, CS13_SW1, CS14_SW1, CS15_SW1},     //  4, Sh_L, k00
-    {0, CS16_SW1, CS17_SW1, CS18_SW1},     //  5, Ct_L, k06
-    {0, CS1_SW2, CS2_SW2, CS3_SW2},        //  6, F1, k26
-    {0, CS4_SW2, CS5_SW2, CS6_SW2},        //  7, 1, k17
-    {0, CS7_SW2, CS8_SW2, CS9_SW2},        //  8, Q, k10
-    {0, CS10_SW2, CS11_SW2, CS12_SW2},     //  9, A, k12
-    {0, CS13_SW2, CS14_SW2, CS15_SW2},     //  10, Z, k14
-    {0, CS16_SW2, CS17_SW2, CS18_SW2},     //  11, Win_L, k90
-    {0, CS1_SW3, CS2_SW3, CS3_SW3},        //  12, F2, k36
-    {0, CS4_SW3, CS5_SW3, CS6_SW3},        //  13, 2, k27
-    {0, CS7_SW3, CS8_SW3, CS9_SW3},        //  14, W, k20
-    {0, CS10_SW3, CS11_SW3, CS12_SW3},     //  15, S, k22
-    {0, CS13_SW3, CS14_SW3, CS15_SW3},     //  16, X, k24
-    {0, CS16_SW3, CS17_SW3, CS18_SW3},     //  17, Alt_L, k93
-    {0, CS1_SW4, CS2_SW4, CS3_SW4},        //  18, F3, k31
-    {0, CS4_SW4, CS5_SW4, CS6_SW4},        //  19, 3, k37
-    {0, CS7_SW4, CS8_SW4, CS9_SW4},        //  20, E, k30
-    {0, CS10_SW4, CS11_SW4, CS12_SW4},     //  21, D, k32
-    {0, CS13_SW4, CS14_SW4, CS15_SW4},     //  22, C, k34
-    {0, CS1_SW5, CS2_SW5, CS3_SW5},        //  23, F4, k33
-    {0, CS4_SW5, CS5_SW5, CS6_SW5},        //  24, 4, k47
-    {0, CS7_SW5, CS8_SW5, CS9_SW5},        //  25, R, k40
-    {0, CS10_SW5, CS11_SW5, CS12_SW5},     //  26, F, k42
-    {0, CS13_SW5, CS14_SW5, CS15_SW5},     //  27, V, k44
-    {0, CS1_SW6, CS2_SW6, CS3_SW6},        //  28, F5, k07
-    {0, CS4_SW6, CS5_SW6, CS6_SW6},        //  29, 5, k46
-    {0, CS7_SW6, CS8_SW6, CS9_SW6},        //  30, T, k41
-    {0, CS10_SW6, CS11_SW6, CS12_SW6},     //  31, G, k43
-    {0, CS13_SW6, CS14_SW6, CS15_SW6},     //  32, B, k45
-    {0, CS16_SW6, CS17_SW6, CS18_SW6},     //  33, SPACE, k94
-    {0, CS1_SW7, CS2_SW7, CS3_SW7},        //  34, F6, k63
-    {0, CS4_SW7, CS5_SW7, CS6_SW7},        //  35, 6, k56
-    {0, CS7_SW7, CS8_SW7, CS9_SW7},        //  36, Y, k51
-    {0, CS10_SW7, CS11_SW7, CS12_SW7},     //  37, H, k53
-    {0, CS13_SW7, CS14_SW7, CS15_SW7},     //  38, N, k55
-    {0, CS1_SW8, CS2_SW8, CS3_SW8},        //  39, F7, k71
-    {0, CS4_SW8, CS5_SW8, CS6_SW8},        //  40, 7, k57
-    {0, CS7_SW8, CS8_SW8, CS9_SW8},        //  41, U, k50
-    {0, CS10_SW8, CS11_SW8, CS12_SW8},     //  42, J, k52
-    {0, CS13_SW8, CS14_SW8, CS15_SW8},     //  43, M, k54
-    {0, CS1_SW9, CS2_SW9, CS3_SW9},        //  44, F8, k76
-    {0, CS4_SW9, CS5_SW9, CS6_SW9},        //  45, 8, k67
-    {0, CS7_SW9, CS8_SW9, CS9_SW9},        //  46, I, k60
-    {0, CS10_SW9, CS11_SW9, CS12_SW9},     //  47, K, k62
-    {0, CS13_SW9, CS14_SW9, CS15_SW9},     //  48, ,, k64
-    {0, CS16_SW9, CS17_SW9, CS18_SW9},     //  49, Alt_R, k95
-    {0, CS1_SW10, CS2_SW10, CS3_SW10},     //  50, F9, ka6
-    {0, CS4_SW10, CS5_SW10, CS6_SW10},     //  51, 9, k77
-    {0, CS7_SW10, CS8_SW10, CS9_SW10},     //  52, O, k70
-    {0, CS10_SW10, CS11_SW10, CS12_SW10},  //  53, L, k72
-    {0, CS13_SW10, CS14_SW10, CS15_SW10},  //  54, ., k74
-    {0, CS16_SW10, CS17_SW10, CS18_SW10},  //  55, FN, k92
-    {0, CS1_SW11, CS2_SW11, CS3_SW11},     //  56, F10, ka7
-    {0, CS4_SW11, CS5_SW11, CS6_SW11},     //  57, 0, k87
-    {0, CS7_SW11, CS8_SW11, CS9_SW11},     //  58, P, k80
-    {0, CS10_SW11, CS11_SW11, CS12_SW11},  //  59, ;, k82
-    {0, CS13_SW11, CS14_SW11, CS15_SW11},  //  60, ?, k85
-    {0, CS1_SW12, CS2_SW12, CS3_SW12},     //  61, F11, ka3
-    {0, CS4_SW12, CS5_SW12, CS6_SW12},     //  62, -, k86
-    {0, CS7_SW12, CS8_SW12, CS9_SW12},     //  63, [, k81
-    {0, CS10_SW12, CS11_SW12, CS12_SW12},  //  64, ", k83
-    {0, CS16_SW12, CS17_SW12, CS18_SW12},  //  65, Ct_R, k04
+    {0, SW1_CS1, SW1_CS2, SW1_CS3},        //  0, ESC, k13
+    {0, SW1_CS4, SW1_CS5, SW1_CS6},        //  1, ~, k16
+    {0, SW1_CS7, SW1_CS8, SW1_CS9},        //  2, Tab, k11
+    {0, SW1_CS10, SW1_CS11, SW1_CS12},     //  3, Caps, k21
+    {0, SW1_CS13, SW1_CS14, SW1_CS15},     //  4, Sh_L, k00
+    {0, SW1_CS16, SW1_CS17, SW1_CS18},     //  5, Ct_L, k06
+    {0, SW2_CS1, SW2_CS2, SW2_CS3},        //  6, F1, k26
+    {0, SW2_CS4, SW2_CS5, SW2_CS6},        //  7, 1, k17
+    {0, SW2_CS7, SW2_CS8, SW2_CS9},        //  8, Q, k10
+    {0, SW2_CS10, SW2_CS11, SW2_CS12},     //  9, A, k12
+    {0, SW2_CS13, SW2_CS14, SW2_CS15},     //  10, Z, k14
+    {0, SW2_CS16, SW2_CS17, SW2_CS18},     //  11, Win_L, k90
+    {0, SW3_CS1, SW3_CS2, SW3_CS3},        //  12, F2, k36
+    {0, SW3_CS4, SW3_CS5, SW3_CS6},        //  13, 2, k27
+    {0, SW3_CS7, SW3_CS8, SW3_CS9},        //  14, W, k20
+    {0, SW3_CS10, SW3_CS11, SW3_CS12},     //  15, S, k22
+    {0, SW3_CS13, SW3_CS14, SW3_CS15},     //  16, X, k24
+    {0, SW3_CS16, SW3_CS17, SW3_CS18},     //  17, Alt_L, k93
+    {0, SW4_CS1, SW4_CS2, SW4_CS3},        //  18, F3, k31
+    {0, SW4_CS4, SW4_CS5, SW4_CS6},        //  19, 3, k37
+    {0, SW4_CS7, SW4_CS8, SW4_CS9},        //  20, E, k30
+    {0, SW4_CS10, SW4_CS11, SW4_CS12},     //  21, D, k32
+    {0, SW4_CS13, SW4_CS14, SW4_CS15},     //  22, C, k34
+    {0, SW5_CS1, SW5_CS2, SW5_CS3},        //  23, F4, k33
+    {0, SW5_CS4, SW5_CS5, SW5_CS6},        //  24, 4, k47
+    {0, SW5_CS7, SW5_CS8, SW5_CS9},        //  25, R, k40
+    {0, SW5_CS10, SW5_CS11, SW5_CS12},     //  26, F, k42
+    {0, SW5_CS13, SW5_CS14, SW5_CS15},     //  27, V, k44
+    {0, SW6_CS1, SW6_CS2, SW6_CS3},        //  28, F5, k07
+    {0, SW6_CS4, SW6_CS5, SW6_CS6},        //  29, 5, k46
+    {0, SW6_CS7, SW6_CS8, SW6_CS9},        //  30, T, k41
+    {0, SW6_CS10, SW6_CS11, SW6_CS12},     //  31, G, k43
+    {0, SW6_CS13, SW6_CS14, SW6_CS15},     //  32, B, k45
+    {0, SW6_CS16, SW6_CS17, SW6_CS18},     //  33, SPACE, k94
+    {0, SW7_CS1, SW7_CS2, SW7_CS3},        //  34, F6, k63
+    {0, SW7_CS4, SW7_CS5, SW7_CS6},        //  35, 6, k56
+    {0, SW7_CS7, SW7_CS8, SW7_CS9},        //  36, Y, k51
+    {0, SW7_CS10, SW7_CS11, SW7_CS12},     //  37, H, k53
+    {0, SW7_CS13, SW7_CS14, SW7_CS15},     //  38, N, k55
+    {0, SW8_CS1, SW8_CS2, SW8_CS3},        //  39, F7, k71
+    {0, SW8_CS4, SW8_CS5, SW8_CS6},        //  40, 7, k57
+    {0, SW8_CS7, SW8_CS8, SW8_CS9},        //  41, U, k50
+    {0, SW8_CS10, SW8_CS11, SW8_CS12},     //  42, J, k52
+    {0, SW8_CS13, SW8_CS14, SW8_CS15},     //  43, M, k54
+    {0, SW9_CS1, SW9_CS2, SW9_CS3},        //  44, F8, k76
+    {0, SW9_CS4, SW9_CS5, SW9_CS6},        //  45, 8, k67
+    {0, SW9_CS7, SW9_CS8, SW9_CS9},        //  46, I, k60
+    {0, SW9_CS10, SW9_CS11, SW9_CS12},     //  47, K, k62
+    {0, SW9_CS13, SW9_CS14, SW9_CS15},     //  48, ,, k64
+    {0, SW9_CS16, SW9_CS17, SW9_CS18},     //  49, Alt_R, k95
+    {0, SW10_CS1, SW10_CS2, SW10_CS3},     //  50, F9, ka6
+    {0, SW10_CS4, SW10_CS5, SW10_CS6},     //  51, 9, k77
+    {0, SW10_CS7, SW10_CS8, SW10_CS9},     //  52, O, k70
+    {0, SW10_CS10, SW10_CS11, SW10_CS12},  //  53, L, k72
+    {0, SW10_CS13, SW10_CS14, SW10_CS15},  //  54, ., k74
+    {0, SW10_CS16, SW10_CS17, SW10_CS18},  //  55, FN, k92
+    {0, SW11_CS1, SW11_CS2, SW11_CS3},     //  56, F10, ka7
+    {0, SW11_CS4, SW11_CS5, SW11_CS6},     //  57, 0, k87
+    {0, SW11_CS7, SW11_CS8, SW11_CS9},     //  58, P, k80
+    {0, SW11_CS10, SW11_CS11, SW11_CS12},  //  59, ;, k82
+    {0, SW11_CS13, SW11_CS14, SW11_CS15},  //  60, ?, k85
+    {0, SW12_CS1, SW12_CS2, SW12_CS3},     //  61, F11, ka3
+    {0, SW12_CS4, SW12_CS5, SW12_CS6},     //  62, -, k86
+    {0, SW12_CS7, SW12_CS8, SW12_CS9},     //  63, [, k81
+    {0, SW12_CS10, SW12_CS11, SW12_CS12},  //  64, ", k83
+    {0, SW12_CS16, SW12_CS17, SW12_CS18},  //  65, Ct_R, k04
 
-    {1, CS1_SW1, CS2_SW1, CS3_SW1},     //  66, F12, ka5
-    {1, CS4_SW1, CS5_SW1, CS6_SW1},     //  67, \, k23
-    {1, CS13_SW1, CS14_SW1, CS15_SW1},  //  68, LED, l01
-    {1, CS16_SW1, CS17_SW1, CS18_SW1},  //  69, LED, l11
-    {1, CS4_SW2, CS5_SW2, CS6_SW2},     //  70, Prt, k97
-    {1, CS13_SW2, CS14_SW2, CS15_SW2},  //  71, LED, l02
-    {1, CS16_SW2, CS17_SW2, CS18_SW2},  //  72, LED, l12
-    {1, CS4_SW3, CS5_SW3, CS6_SW3},     //  73, Del, k65
-    {1, CS13_SW3, CS14_SW3, CS15_SW3},  //  74, LED, l03
-    {1, CS16_SW3, CS17_SW3, CS18_SW3},  //  75, LED, l13
-    {1, CS4_SW4, CS5_SW4, CS6_SW4},     //  76, PgUp, k15
-    {1, CS13_SW4, CS14_SW4, CS15_SW4},  //  77, LED, l04
-    {1, CS16_SW4, CS17_SW4, CS18_SW4},  //  78, LED, l14
-    {1, CS1_SW5, CS2_SW5, CS3_SW5},     //  79, =, k66
-    {1, CS10_SW5, CS11_SW5, CS12_SW5},  //  80, Right, k05
-    {1, CS13_SW5, CS14_SW5, CS15_SW5},  //  81, LED, l05
-    {1, CS16_SW5, CS17_SW5, CS18_SW5},  //  82, LED, l15
-    {1, CS4_SW6, CS5_SW6, CS6_SW6},     //  83, End, k75
-    {1, CS13_SW6, CS14_SW6, CS15_SW6},  //  84, LED, l06
-    {1, CS16_SW6, CS17_SW6, CS18_SW6},  //  85, LED, l16
-    {1, CS1_SW7, CS2_SW7, CS3_SW7},     //  86, BSpc, ka1
-    {1, CS4_SW7, CS5_SW7, CS6_SW7},     //  87, PgDn, k25
-    {1, CS13_SW7, CS14_SW7, CS15_SW7},  //  88, LED, l07
-    {1, CS16_SW7, CS17_SW7, CS18_SW7},  //  89, LED, l17
-    {1, CS1_SW8, CS2_SW8, CS3_SW8},     //  90, ], k61
-    {1, CS4_SW8, CS5_SW8, CS6_SW8},     //  91, Sh_R, k91
-    {1, CS13_SW8, CS14_SW8, CS15_SW8},  //  92, LED, l08
-    {1, CS16_SW8, CS17_SW8, CS18_SW8},  //  93, LED, l18
-    {1, CS4_SW9, CS5_SW9, CS6_SW9},     //  94, Up, k35
-    {1, CS1_SW10, CS2_SW10, CS3_SW10},  //  95, #, k84
-    {1, CS4_SW10, CS5_SW10, CS6_SW10},  //  96, Left, k03
-    {1, CS1_SW11, CS2_SW11, CS3_SW11},  //  97, Enter, ka4
-    {1, CS4_SW11, CS5_SW11, CS6_SW11},  //  98, Down, k73
+    {1, SW1_CS1, SW1_CS2, SW1_CS3},     //  66, F12, ka5
+    {1, SW1_CS4, SW1_CS5, SW1_CS6},     //  67, \, k23
+    {1, SW1_CS13, SW1_CS14, SW1_CS15},  //  68, LED, l01
+    {1, SW1_CS16, SW1_CS17, SW1_CS18},  //  69, LED, l11
+    {1, SW2_CS4, SW2_CS5, SW2_CS6},     //  70, Prt, k97
+    {1, SW2_CS13, SW2_CS14, SW2_CS15},  //  71, LED, l02
+    {1, SW2_CS16, SW2_CS17, SW2_CS18},  //  72, LED, l12
+    {1, SW3_CS4, SW3_CS5, SW3_CS6},     //  73, Del, k65
+    {1, SW3_CS13, SW3_CS14, SW3_CS15},  //  74, LED, l03
+    {1, SW3_CS16, SW3_CS17, SW3_CS18},  //  75, LED, l13
+    {1, SW4_CS4, SW4_CS5, SW4_CS6},     //  76, PgUp, k15
+    {1, SW4_CS13, SW4_CS14, SW4_CS15},  //  77, LED, l04
+    {1, SW4_CS16, SW4_CS17, SW4_CS18},  //  78, LED, l14
+    {1, SW5_CS1, SW5_CS2, SW5_CS3},     //  79, =, k66
+    {1, SW5_CS10, SW5_CS11, SW5_CS12},  //  80, Right, k05
+    {1, SW5_CS13, SW5_CS14, SW5_CS15},  //  81, LED, l05
+    {1, SW5_CS16, SW5_CS17, SW5_CS18},  //  82, LED, l15
+    {1, SW6_CS4, SW6_CS5, SW6_CS6},     //  83, End, k75
+    {1, SW6_CS13, SW6_CS14, SW6_CS15},  //  84, LED, l06
+    {1, SW6_CS16, SW6_CS17, SW6_CS18},  //  85, LED, l16
+    {1, SW7_CS1, SW7_CS2, SW7_CS3},     //  86, BSpc, ka1
+    {1, SW7_CS4, SW7_CS5, SW7_CS6},     //  87, PgDn, k25
+    {1, SW7_CS13, SW7_CS14, SW7_CS15},  //  88, LED, l07
+    {1, SW7_CS16, SW7_CS17, SW7_CS18},  //  89, LED, l17
+    {1, SW8_CS1, SW8_CS2, SW8_CS3},     //  90, ], k61
+    {1, SW8_CS4, SW8_CS5, SW8_CS6},     //  91, Sh_R, k91
+    {1, SW8_CS13, SW8_CS14, SW8_CS15},  //  92, LED, l08
+    {1, SW8_CS16, SW8_CS17, SW8_CS18},  //  93, LED, l18
+    {1, SW9_CS4, SW9_CS5, SW9_CS6},     //  94, Up, k35
+    {1, SW10_CS1, SW10_CS2, SW10_CS3},  //  95, #, k84
+    {1, SW10_CS4, SW10_CS5, SW10_CS6},  //  96, Left, k03
+    {1, SW11_CS1, SW11_CS2, SW11_CS3},  //  97, Enter, ka4
+    {1, SW11_CS4, SW11_CS5, SW11_CS6},  //  98, Down, k73
 };
 // clang-format on
 #endif
diff --git a/keyboards/gon/nerd60/keymaps/mauin/keymap.c b/keyboards/gon/nerd60/keymaps/mauin/keymap.c
deleted file mode 100644
index e410d6c0cfe..00000000000
--- a/keyboards/gon/nerd60/keymaps/mauin/keymap.c
+++ /dev/null
@@ -1,114 +0,0 @@
-/* Copyright 2017 Marvin Ramin (@Mauin)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-
-// Keymap layers
-enum layer_names {
-    _BS, // Base Layer
-    _FN, // Function Layer
-    _SY  // System Layer
-};
-
-enum custom_keycodes {
-    ESC_GRV = SAFE_RANGE
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Layer 0: Default Layer
-   * ,-----------------------------------------------------------.
-   * |Esc|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  = |  BSp |
-   * |-----------------------------------------------------------|
-   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|    \|
-   * |-----------------------------------------------------------|
-   * |Funct |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Enter   |
-   * |-----------------------------------------------------------|
-   * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|    Shift |
-   * |-----------------------------------------------------------'
-   * |  Ctl|Alt|Gui  |         Space         |Gui  |Alt| F2| Ctl |
-   * `-----------------------------------------------------------'
-   */
-  [_BS] = LAYOUT_all(
-      ESC_GRV, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  XXXXXXX, KC_BSPC,
-      KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
-      MO(1),   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
-      KC_LSFT, XXXXXXX, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, XXXXXXX,
-      KC_LCTL, KC_LALT, KC_LGUI,                            KC_SPC,                             KC_RGUI, KC_RALT, MO(2),   KC_RCTL
-  ),
-
-  /* Layer 1: Function Layer
-   * ,-----------------------------------------------------------.
-   * |   | F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11| F12|  Del |
-   * |-----------------------------------------------------------|
-   * |     |Prv|Ply|Nxt|   |   |Pg^|Hme|Up |End|   |Br-|Br+|     |
-   * |-----------------------------------------------------------|
-   * |Hold  |Mte|Vl-|Vl+|   |   |Pgv|Lft|Dwn|Rgt|   |   |        |
-   * |-----------------------------------------------------------|
-   * |        |   |   |   |   |   |   |   |   |   |   |          |
-   * |-----------------------------------------------------------'
-   * |     |   |     |                       |     |   |   |     |
-   * `-----------------------------------------------------------'
-   */
-  [_FN] = LAYOUT_all(
-      KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  XXXXXXX, KC_DEL,
-      XXXXXXX, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, XXXXXXX, KC_PGUP, KC_HOME, KC_UP,   KC_END,  XXXXXXX, KC_SCRL, KC_PAUS, XXXXXXX,
-      KC_TRNS, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX, XXXXXXX, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX,          XXXXXXX,
-      KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-      KC_LCTL, KC_LALT, KC_LGUI,                            KC_SPC,                             XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-  ),
-
-  /* Layer 2: System Layer
-   * ,-----------------------------------------------------------.
-   * |Reset|   |   |   |   |   |   |   |   |   |   |    |   |    |
-   * |-----------------------------------------------------------|
-   * |     |   |   |   |   |   |   |   |   |   |   |   |   |     |
-   * |-----------------------------------------------------------|
-   * |      |   |   |   |   |   |   |   |   |   |   |   |        |
-   * |-----------------------------------------------------------|
-   * |        |   |   |   |   |   |   |   |   |   |   |          |
-   * |-----------------------------------------------------------'
-   * |     |   |     |                       |     |   |   |     |
-   * `-----------------------------------------------------------'
-   */
-  [_SY] = LAYOUT_all(
-      QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX,
-      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-      XXXXXXX, XXXXXXX, XXXXXXX,                            XXXXXXX,                            XXXXXXX, XXXXXXX, KC_TRNS, XXXXXXX
-  ),
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    uint8_t esc_grv_mask = get_mods() & MOD_BIT(KC_LGUI);
-    switch (keycode) {
-        case ESC_GRV:
-            if (esc_grv_mask) {
-                if (record->event.pressed) {
-                    register_code16(G(KC_GRV));
-                } else {
-                    unregister_code16(G(KC_GRV));
-                }
-            } else {
-                if (record->event.pressed) {
-                    register_code(KC_ESC);
-                } else {
-                    unregister_code(KC_ESC);
-                }
-            }
-            break;
-    }
-    return true;
-}
diff --git a/keyboards/gon/nerd60/keymaps/mauin/readme.md b/keyboards/gon/nerd60/keymaps/mauin/readme.md
deleted file mode 100644
index 63be7c3923f..00000000000
--- a/keyboards/gon/nerd60/keymaps/mauin/readme.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Mauin's keymap for the GON NerD
-
-This layout is based on a Pok3r style layout with a standard base layer.
-
-Function layers provide access to navigation and media keys.
diff --git a/keyboards/gon/nerd60/keymaps/mauin/rules.mk b/keyboards/gon/nerd60/keymaps/mauin/rules.mk
deleted file mode 100644
index 4bf836c22a2..00000000000
--- a/keyboards/gon/nerd60/keymaps/mauin/rules.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-NKRO_ENABLE = yes           # USB Nkey Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-MIDI_ENABLE = no            # MIDI support
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-AUDIO_ENABLE = no           # Audio output on port C6
diff --git a/keyboards/gon/nerdtkl/keymaps/gam3cat/config.h b/keyboards/gon/nerdtkl/keymaps/gam3cat/config.h
deleted file mode 100644
index 334beb0ac2b..00000000000
--- a/keyboards/gon/nerdtkl/keymaps/gam3cat/config.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#pragma once
-
-//Force NKRO to be enabled.
-#define FORCE_NKRO
-
-//GRAVE_ESC override for CTRL+SHIFT+ESC Windows task manager shortcut.
-//#define GRAVE_ESC_CTRL_OVERRIDE
-
-//Delay matrix scan for tap dance, reduce to activate modifier keys faster.
-//#define TAPPING_TERM 200
diff --git a/keyboards/gon/nerdtkl/keymaps/gam3cat/keymap.c b/keyboards/gon/nerdtkl/keymaps/gam3cat/keymap.c
deleted file mode 100644
index 065cf3eddc0..00000000000
--- a/keyboards/gon/nerdtkl/keymaps/gam3cat/keymap.c
+++ /dev/null
@@ -1,261 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "version.h"
-
-enum layers {
-    _BL = 0,    // Base Layer
-    _WL,        // Workman Layer
-    _NL,        // Norman Layer
-    _DL,        // Dvorak Layer
-    _CL,        // Base Layer
-    _FL,        // Function Layer
-    _AL,        // Adjust Layer
-};
-
-enum custom_keycodes {
-    QMK_REV = SAFE_RANGE,
-    KC_WEB,
-    KC_SP4,
-    DYNAMIC_MACRO_RANGE
-};
-
-extern backlight_config_t backlight_config;
-
-#include "dynamic_macro.h"
-#define FN_CAPS LT(_FL, KC_CAPS)
-#define KC_DMR1 DM_REC1
-#define KC_DMR2 DM_REC2
-#define KC_DMP1 DM_PLY1
-#define KC_DMP2 DM_PLY2
-#define KC_DMRS DM_RSTP
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /*#### _BL: Base Layer - Standard TKL QWERTY layout.
-    *    .-----------------------------------------------------------------------.
-    *    |Esc|||||F1 |F2 |F3 |F4 |||F5 |F6 |F7 |F8 |||F9 |F10|F11|F12|PSc|SLk|Pau|
-    *    |-----------------------------------------------------------|-----------|
-    *    |~  |1  |2  |3  |4  |5  |6  |7  |8  |9  |0  |-  |=  |Backsp |Ins|Hom|PgU|
-    *    |-----------------------------------------------------------|-----------|
-    *    |Tab  |Q  |W  |E  |R  |T  |Y  |U  |I  |O  |P  |[  |]  |\    |Del|End|PgD|
-    *    |-----------------------------------------------------------|-----------|
-    *    |Caps  |A  |S  |D  |F  |G  |H  |J  |K  |L  |;  |'  |Return  |           |
-    *    |-----------------------------------------------------------|-----------|
-    *    |Shift   |Z  |X  |C  |V  |B  |N  |M  |,  |.  |/  |Shift |Fn |   | Up|   |
-    *    |-----------------------------------------------------------|-----------|
-    *    |Ctrl |Win|Alt  |      Space                |RAlt |Fn |Ctrl |Lft|Dwn|Rgt|
-    *    *-----------------------------------------------------------------------*
-    */
-    [_BL] = LAYOUT_tkl(
-        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SCRL, KC_PAUS,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
-        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, XXXXXXX, KC_ENT,
-        KC_LSFT, XXXXXXX, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(_FL),          KC_UP,
-        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RGUI, KC_RALT, MO(_FL), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-    /*#### _WL: Workman Layer.
-    *    .-----------------------------------------------------------------------.
-    *    |   |||||   |   |   |   |||   |   |   |   |||   |   |   |   |   |   |   |
-    *    .-----------------------------------------------------------|-----------|
-    *    |   |   |   |   |   |   |   |   |   |   |   |-  |=  |       |   |   |   |
-    *    |-----------------------------------------------------------|-----------|
-    *    |     |Q  |D  |R  |W  |B  |J  |F  |U  |P  |;  |[  |]  |\    |   |   |   |
-    *    |-----------------------------------------------------------|-----------|
-    *    |      |A  |S  |H  |T  |G  |Y  |N  |E  |O  |I  |'  |        |           |
-    *    |-----------------------------------------------------------|-----------|
-    *    |        |Z  |X  |M  |C  |V  |K  |L  |,  |.  |/  |      |   |   |   |   |
-    *    |-----------------------------------------------------------|-----------|
-    *    |     |   |     |                           |     |   |     |   |   |   |
-    *    *-----------------------------------------------------------------------*
-    */
-    [_WL] = LAYOUT_tkl(
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, KC_Q   , KC_D   , KC_R   , KC_W   , KC_B   , KC_J   , KC_F   , KC_U   , KC_P   , KC_SCLN, _______, _______, _______, _______, _______, _______,
-        _______, KC_A   , KC_S   , KC_H   , KC_T   , KC_G   , KC_Y   , KC_N   , KC_E   , KC_O   , KC_I   , _______, _______, _______,
-        _______, _______, KC_Z   , KC_X   , KC_M   , KC_C   , KC_V   , KC_K   , KC_L   , KC_COMM, KC_DOT , KC_SLSH, _______, _______,          _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______, _______
-    ),
-    /*#### _NL: Norman Layer.
-    *    .-----------------------------------------------------------------------.
-    *    |   |||||   |   |   |   |||   |   |   |   |||   |   |   |   |   |   |   |
-    *    .-----------------------------------------------------------|-----------|
-    *    |   |   |   |   |   |   |   |   |   |   |   |-  |=  |       |   |   |   |
-    *    |-----------------------------------------------------------|-----------|
-    *    |     |Q  |W  |D  |F  |K  |J  |U  |R  |L  |;  |[  |]  |\    |   |   |   |
-    *    |-----------------------------------------------------------|-----------|
-    *    |      |A  |S  |E  |T  |G  |Y  |N  |I  |O  |H  |'  |        |           |
-    *    |-----------------------------------------------------------|-----------|
-    *    |        |Z  |X  |C  |V  |B  |P  |M  |,  |.  |/  |      |   |   |   |   |
-    *    |-----------------------------------------------------------|-----------|
-    *    |     |   |     |                           |     |   |     |   |   |   |
-    *    *-----------------------------------------------------------------------*
-    */
-    [_NL] = LAYOUT_tkl(
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, KC_Q   , KC_W   , KC_D   , KC_F   , KC_K   , KC_J   , KC_U   , KC_R   , KC_L   , KC_SCLN, _______, _______, _______, _______, _______, _______,
-        _______, KC_A   , KC_S   , KC_E   , KC_T   , KC_G   , KC_Y   , KC_N   , KC_I   , KC_O   , KC_H   , _______, _______, _______,
-        _______, _______, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_P   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, _______, _______,          _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______, _______
-    ),
-    /*#### _DL: Dvorak Layer.
-    *    .-----------------------------------------------------------------------.
-    *    |   |||||   |   |   |   |||   |   |   |   |||   |   |   |   |   |   |   |
-    *    .-----------------------------------------------------------|-----------|
-    *    |   |   |   |   |   |   |   |   |   |   |   |[  |]  |       |   |   |   |
-    *    |-----------------------------------------------------------|-----------|
-    *    |     |'  |,  |.  |P  |Y  |F  |G  |C  |R  |L  |/  |=  |\    |   |   |   |
-    *    |-----------------------------------------------------------|-----------|
-    *    |      |A  |O  |E  |U  |I  |D  |H  |T  |N  |S  |-  |        |           |
-    *    |-----------------------------------------------------------|-----------|
-    *    |        |;  |Q  |J  |K  |X  |B  |M  |W  |V  |Z  |      |   |   |   |   |
-    *    |-----------------------------------------------------------|-----------|
-    *    |     |   |     |                           |     |   |     |   |   |   |
-    *    *-----------------------------------------------------------------------*
-    */
-    [_DL] = LAYOUT_tkl(
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, _______, _______, _______, _______,
-        _______, KC_QUOT, KC_COMM, KC_DOT , KC_P   , KC_Y   , KC_F   , KC_G   , KC_C   , KC_R   , KC_L   , KC_SLSH, KC_EQL , _______, _______, _______, _______,
-        _______, KC_A   , KC_O   , KC_E   , KC_U   , KC_I   , KC_D   , KC_H   , KC_T   , KC_N   , KC_S   , KC_MINS, _______, _______,
-        _______, _______, KC_SCLN, KC_Q   , KC_J   , KC_K   , KC_X   , KC_B   , KC_M   , KC_W   , KC_V   , KC_Z   , _______, _______,          _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______, _______
-    ),
-    /*#### _CL: Colmak Layer.
-    *    .-----------------------------------------------------------------------.
-    *    |   |||||   |   |   |   |||   |   |   |   |||   |   |   |   |   |   |   |
-    *    .-----------------------------------------------------------|-----------|
-    *    |   |   |   |   |   |   |   |   |   |   |   |-  |=  |       |   |   |   |
-    *    |-----------------------------------------------------------|-----------|
-    *    |     |Q  |W  |F  |P  |G  |J  |L  |U  |Y  |;  |[  |]  |\    |   |   |   |
-    *    |-----------------------------------------------------------|-----------|
-    *    |      |A  |R  |S  |T  |D  |H  |N  |E  |I  |O  |'  |        |           |
-    *    |-----------------------------------------------------------|-----------|
-    *    |        |Z  |X  |C  |V  |B  |K  |M  |,  |.  |/  |      |   |   |   |   |
-    *    |-----------------------------------------------------------|-----------|
-    *    |     |   |     |                           |     |   |     |   |   |   |
-    *    *-----------------------------------------------------------------------*
-    */
-    [_CL] = LAYOUT_tkl(
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, KC_Q   , KC_W   , KC_F   , KC_P   , KC_G   , KC_J   , KC_L   , KC_U   , KC_Y   , KC_SCLN, _______, _______, _______, _______, _______, _______,
-        _______, KC_A   , KC_R   , KC_S   , KC_T   , KC_D   , KC_H   , KC_N   , KC_E   , KC_I   , KC_O   , _______, _______, _______,
-        _______, _______, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_K   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, _______, _______,          _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______, _______
-    ),
-    /*#### _FL: Function Layer.
-    *    .-----------------------------------------------------------------------.
-    *    |   |||||   |   |   |   |||   |   |   |   |||   |VlM|VlD|VlU|   |   |   |
-    *    .-----------------------------------------------------------|-----------|
-    *    |Web|   |   |   |   |   |   |   |   |   |   |   |   |       |   |   |   |
-    *    |-----------------------------------------------------------|-----------|
-    *    |Fn_AL|   |   |   |   |   |   |   |   |   |   |   |   |     |   |   |   |
-    *    |-----------------------------------------------------------|-----------|
-    *    |      |   |   |   |   |   |   |Lft|Dwn|Up |Rgt|   |        |           |
-    *    |-----------------------------------------------------------|-----------|
-    *    |        |   |   |   |   |   |   |   |   |   |   |      |Fn |   |   |   |
-    *    |-----------------------------------------------------------|-----------|
-    *    |     |   |     |      SP4                  |     |Fn |     |WBk|   |WFw|
-    *    *-----------------------------------------------------------------------*
-    */
-    [_FL] = LAYOUT_tkl(
-        XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX, XXXXXXX, XXXXXXX,
-        KC_WEB,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        MO(_AL), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,          XXXXXXX,
-        XXXXXXX, XXXXXXX, KC_MENU,                            KC_SP4,                             XXXXXXX, _______, XXXXXXX, XXXXXXX, KC_WBAK, XXXXXXX, KC_WFWD
-    ),
-    /*#### _AL: Adjust Layer - Keymap select, LED backlight, and Dynamic Macro settings.
-    *    .-----------------------------------------------------------------------.
-    *    |Rst|||||   |   |   |   |||   |   |   |   |||   |   |   |   |   |   |   |
-    *    .-----------------------------------------------------------|-----------|
-    *    |Rev|Tog|Mod|H- |H+ |S- |S+ |V- |V+ |   |BLT|BL-|BL+|       |   |MR1|MP1|
-    *    |-----------------------------------------------------------|-----------|
-    *    |Fn_AL|_BL|_WL|   |   |   |   |   |   |   |   |   |   |     | MS|MR2|MP2|
-    *    |-----------------------------------------------------------|-----------|
-    *    |      |   |   |_DL|   |   |   |   |   |   |   |   |        |           |
-    *    |-----------------------------------------------------------|-----------|
-    *    |        |   |   |_CL|   |_BL|_NL|   |   |   |   |      |Fn |   |   |   |
-    *    |-----------------------------------------------------------|-----------|
-    *    |     |   |     |                           |     |Fn |     |   |   |   |
-    *    *-----------------------------------------------------------------------*
-    */
-    [_AL] = LAYOUT_tkl(
-        QK_BOOT,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        QMK_REV, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, XXXXXXX, BL_TOGG, BL_DOWN, BL_UP,   XXXXXXX, XXXXXXX, KC_DMR1, KC_DMP1,
-        _______, DF(_BL), DF(_WL), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_DMRS, KC_DMR2, KC_DMP2,
-        XXXXXXX, XXXXXXX, XXXXXXX, DF(_DL), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DF(_CL), XXXXXXX, DF(_BL), DF(_NL), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,          XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX,                            XXXXXXX,                            XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-    ),
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case QMK_REV:
-            if (record->event.pressed) {
-                SEND_STRING(QMK_KEYBOARD "/" QMK_KEYMAP "@" QMK_VERSION ":" QMK_BUILDDATE);
-            }
-            return false;
-            break;
-        case KC_WEB:
-            if (record->event.pressed) {
-                SEND_STRING(SS_LGUI("r"));
-                wait_ms(100);
-                SEND_STRING("chrome.exe\n");
-            }
-            return false;
-            break;
-        case KC_SP4:
-            if (record->event.pressed) {
-                SEND_STRING ("    ");
-            }
-            return false;
-            break;
-    }
-    // Dynamic Macros.
-    if (!process_record_dynamic_macro(keycode, record)) {
-        return false;
-    }
-    return true;
-}
-
-void custom_backlight_level(uint8_t level) {
-    if (level > BACKLIGHT_LEVELS)
-        level = BACKLIGHT_LEVELS;
-    backlight_config.level = level;
-    backlight_config.enable = !!backlight_config.level;
-    backlight_set(backlight_config.level);
-}
-
-void matrix_init_user(void) {
-    #ifdef BACKLIGHT_ENABLE
-        custom_backlight_level(0);
-    #endif
-}
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    switch (get_highest_layer(state)) {
-        case _BL:
-            custom_backlight_level(0);
-            break;
-        case _WL:
-        case _NL:
-        case _DL:
-        case _CL:
-            custom_backlight_level(1);
-            break;
-        case _FL:
-            custom_backlight_level(2);
-            break;
-        case _AL:
-            custom_backlight_level(3);
-            break;
-        default:
-            custom_backlight_level(0);
-            break;
-    }
-    return state;
-}
diff --git a/keyboards/gon/nerdtkl/keymaps/gam3cat/readme.md b/keyboards/gon/nerdtkl/keymaps/gam3cat/readme.md
deleted file mode 100644
index 8630ea2966c..00000000000
--- a/keyboards/gon/nerdtkl/keymaps/gam3cat/readme.md
+++ /dev/null
@@ -1,114 +0,0 @@
-# Keymap Maintainer: Gam3cat
-make gonnerd:gam3cat
-## Layout Config:
-2u backspace, 2.25u lshift/enter, [2.75u rshift] or [1.75u rshift, 1u Fn].
-[1.5u, 1u, 1.5u 1x7.0u, 1.5u, 1u, 1.5u, 3x1u] or [2x1.5u, 1x7.0u, 2x1.5u, 3x1u] bottom row.
-
-## Base Layer Selection:
-(Fn+TAB+(  )): (Q)WERTY, (W)orkman, (N)orman, (D)vorak, (C)olmak
-
-### Base Layer Options:
-#### _BL: Base Layer - Standard TKL QWERTY layout.
-    .-----------------------------------------------------------------------.
-    |Esc|||||F1 |F2 |F3 |F4 |||F5 |F6 |F7 |F8 |||F9 |F10|F11|F12|PSc|SLk|Pau|
-    |-----------------------------------------------------------|-----------|
-    |~  |1  |2  |3  |4  |5  |6  |7  |8  |9  |0  |-  |=  |Backsp |Ins|Hom|PgU|
-    |-----------------------------------------------------------|-----------|
-    |Tab  |Q  |W  |E  |R  |T  |Y  |U  |I  |O  |P  |[  |]  |\    |Del|End|PgD|
-    |-----------------------------------------------------------|-----------|
-    |Caps  |A  |S  |D  |F  |G  |H  |J  |K  |L  |;  |'  |Return  |           |
-    |-----------------------------------------------------------|-----------|
-    |Shift   |Z  |X  |C  |V  |B  |N  |M  |,  |.  |/  |Shift |Fn |   | Up|   |
-    |-----------------------------------------------------------|-----------|
-    |Ctrl |Win|Alt  |      Space                |RAlt |Fn |Ctrl |Lft|Dwn|Rgt|
-    *-----------------------------------------------------------------------*
-
-#### _WL: Workman Layer.
-    .-----------------------------------------------------------------------.
-    |   |||||   |   |   |   |||   |   |   |   |||   |   |   |   |   |   |   |
-    .-----------------------------------------------------------|-----------|
-    |   |   |   |   |   |   |   |   |   |   |   |-  |=  |       |   |   |   |
-    |-----------------------------------------------------------|-----------|
-    |     |Q  |D  |R  |W  |B  |J  |F  |U  |P  |;  |[  |]  |\    |   |   |   |
-    |-----------------------------------------------------------|-----------|
-    |      |A  |S  |H  |T  |G  |Y  |N  |E  |O  |I  |'  |        |           |
-    |-----------------------------------------------------------|-----------|
-    |        |Z  |X  |M  |C  |V  |K  |L  |,  |.  |/  |      |   |   |   |   |
-    |-----------------------------------------------------------|-----------|
-    |     |   |     |                           |     |   |     |   |   |   |
-    *-----------------------------------------------------------------------*
-
-#### _NL: Norman Layer.
-    .-----------------------------------------------------------------------.
-    |   |||||   |   |   |   |||   |   |   |   |||   |   |   |   |   |   |   |
-    .-----------------------------------------------------------|-----------|
-    |   |   |   |   |   |   |   |   |   |   |   |-  |=  |       |   |   |   |
-    |-----------------------------------------------------------|-----------|
-    |     |Q  |W  |D  |F  |K  |J  |U  |R  |L  |;  |[  |]  |\    |   |   |   |
-    |-----------------------------------------------------------|-----------|
-    |      |A  |S  |E  |T  |G  |Y  |N  |I  |O  |H  |'  |        |           |
-    |-----------------------------------------------------------|-----------|
-    |        |Z  |X  |C  |V  |B  |P  |M  |,  |.  |/  |      |   |   |   |   |
-    |-----------------------------------------------------------|-----------|
-    |     |   |     |                           |     |   |     |   |   |   |
-    *-----------------------------------------------------------------------*
-
-#### _DL: Dvorak Layer.
-    .-----------------------------------------------------------------------.
-    |   |||||   |   |   |   |||   |   |   |   |||   |   |   |   |   |   |   |
-    .-----------------------------------------------------------|-----------|
-    |   |   |   |   |   |   |   |   |   |   |   |[  |]  |       |   |   |   |
-    |-----------------------------------------------------------|-----------|
-    |     |'  |,  |.  |P  |Y  |F  |G  |C  |R  |L  |/  |=  |\    |   |   |   |
-    |-----------------------------------------------------------|-----------|
-    |      |A  |O  |E  |U  |I  |D  |H  |T  |N  |S  |-  |        |           |
-    |-----------------------------------------------------------|-----------|
-    |        |;  |Q  |J  |K  |X  |B  |M  |W  |V  |Z  |      |   |   |   |   |
-    |-----------------------------------------------------------|-----------|
-    |     |   |     |                           |     |   |     |   |   |   |
-    *-----------------------------------------------------------------------*
-
-#### _CL: Colmak Layer.
-    .-----------------------------------------------------------------------.
-    |   |||||   |   |   |   |||   |   |   |   |||   |   |   |   |   |   |   |
-    .-----------------------------------------------------------|-----------|
-    |   |   |   |   |   |   |   |   |   |   |   |-  |=  |       |   |   |   |
-    |-----------------------------------------------------------|-----------|
-    |     |Q  |W  |F  |P  |G  |J  |L  |U  |Y  |;  |[  |]  |\    |   |   |   |
-    |-----------------------------------------------------------|-----------|
-    |      |A  |R  |S  |T  |D  |H  |N  |E  |I  |O  |'  |        |           |
-    |-----------------------------------------------------------|-----------|
-    |        |Z  |X  |C  |V  |B  |K  |M  |,  |.  |/  |      |   |   |   |   |
-    |-----------------------------------------------------------|-----------|
-    |     |   |     |                           |     |   |     |   |   |   |
-    *-----------------------------------------------------------------------*
-
-#### _FL: Function Layer.
-    .-----------------------------------------------------------------------.
-    |   |||||   |   |   |   |||   |   |   |   |||   |VlM|VlD|VlU|   |   |   |
-    .-----------------------------------------------------------|-----------|
-    |Web|   |   |   |   |   |   |   |   |   |   |   |   |       |   |   |   |
-    |-----------------------------------------------------------|-----------|
-    |Fn_AL|   |   |   |   |   |   |   |   |   |   |   |   |     |   |   |   |
-    |-----------------------------------------------------------|-----------|
-    |      |   |   |   |   |   |   |Lft|Dwn|Up |Rgt|   |        |           |
-    |-----------------------------------------------------------|-----------|
-    |        |   |   |   |   |   |   |   |   |   |   |      |Fn |   |   |   |
-    |-----------------------------------------------------------|-----------|
-    |     |   |     |      SP4                  |     |Fn |     |WBk|   |WFw|
-    *-----------------------------------------------------------------------*
-
-#### _AL: Adjust Layer - Keymap select, LED backlight, and Dynamic Macro settings.
-    .-----------------------------------------------------------------------.
-    |Rst|||||   |   |   |   |||   |   |   |   |||   |   |   |   |   |   |   |
-    .-----------------------------------------------------------|-----------|
-    |Rev|Tog|Mod|H- |H+ |S- |S+ |V- |V+ |   |BLT|BL-|BL+|       |   |MR1|MP1|
-    |-----------------------------------------------------------|-----------|
-    |Fn_AL|_BL|_WL|   |   |   |   |   |   |   |   |   |   |     | MS|MR2|MP2|
-    |-----------------------------------------------------------|-----------|
-    |      |   |   |_DL|   |   |   |   |   |   |   |   |        |           |
-    |-----------------------------------------------------------|-----------|
-    |        |   |   |_CL|   |_BL|_NL|   |   |   |   |      |Fn |   |   |   |
-    |-----------------------------------------------------------|-----------|
-    |     |   |     |                           |     |Fn |     |   |   |   |
-    *-----------------------------------------------------------------------*
diff --git a/keyboards/gon/nerdtkl/keymaps/gam3cat/rules.mk b/keyboards/gon/nerdtkl/keymaps/gam3cat/rules.mk
deleted file mode 100644
index c82cafd606b..00000000000
--- a/keyboards/gon/nerdtkl/keymaps/gam3cat/rules.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-NKRO_ENABLE = yes           # USB Nkey Rollover - If this doesn't work, add this to config.h: #define FORCE_NKRO
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-MIDI_ENABLE = no            # MIDI support
-UNICODE_ENABLE = no         # Unicode
-UNICODEMAP_ENABLE = no      # Enable extended unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-AUDIO_ENABLE = no           # Audio output on port C6
-#VARIABLE_TRACE = no         # Use this to debug changes to variable values
-KEY_LOCK_ENABLE = no        # This enables key lock
-SPLIT_KEYBOARD = no         # This enables split keyboard support and includes all necessary files located at quantum/split_common
-TAP_DANCE_ENABLE = no       # Enable TapDance functionality
diff --git a/keyboards/gray_studio/think65/solder/keymaps/dangjoeltang/keymap.c b/keyboards/gray_studio/think65/solder/keymaps/dangjoeltang/keymap.c
deleted file mode 100644
index 884efb7b960..00000000000
--- a/keyboards/gray_studio/think65/solder/keymaps/dangjoeltang/keymap.c
+++ /dev/null
@@ -1,232 +0,0 @@
-/* Copyright 2021 Qiaowei Tang
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-
-
- /*
- * LED ranges for Think6.5v2 2U
- * These values were derived from manual testing. Derived from keymaps/rys.
- * ┌───────┬───────┬─────────────┬───────────────────────────────────────────┐
- * │ 00 01 │ 02 03 │ 04 05 06 07 │ 08 09 10 11 12 13 14 15 16 17 18 19 20 21 │
- * │ badge │ badge │    (?)      │              underglow (?)                │
- * │  bar  │ icon  │             │                                           │
- * └───────┴───────┴─────────────┴───────────────────────────────────────────┘
- */
-
-// Define the LED ranges                  start, end
-#define THINK65_LED_RANGE_OFF                 0, 0
-#define THINK65_LED_RANGE_CAPS                0, 2
-#define THINK65_LED_RANGE_BADGE               0, 4
-#define THINK65_LED_RANGE_UNDERGLOW           4, 22
-#define THINK65_LED_RANGE_ALL                 0, 22
-
-// Turn the LEDs off by setting HSV to 0, 0, 0
-#define THINK65_LEDS_OFF                      0, 0, 0
-
-// Caps Lock indicator LED
-#define THINK65_LEDS_CAPS                    0, 0, 255
-
-#define THINK65_LED_STATE_OFF                 0x0 // 0b00000000
-#define THINK65_LED_STATE_CAPS                0x1 // 0b00000001
-#define THINK65_LED_STATE_BADGE               0x2 // 0b00000010
-#define THINK65_LED_STATE_CAPS_AND_BADGE      0x3 // 0b00000011
-
-// Define each LED range as a bit flag
-#define THINK65_LED_CAPS_RANGE_BIT            0
-#define THINK65_LED_BADGE_RANGE_BIT           1
-
-// Setup some keycodes to control cycling and range toggling
-enum {
-    KVM_SW1 = SAFE_RANGE,
-    KVM_SW2,
-    CYC_LED,
-    TOG_BDG
-};
-
-// setup the user EEPROM space we need
-typedef union {
-    uint8_t raw;
-    struct {
-        uint8_t current_led_state:8;
-    };
-} user_config_t;
-
-user_config_t user_config;
-
-// toggle one of the range flag bits
-void toggle_led_state(unsigned int led_range) {
-    if (led_range >= THINK65_LED_CAPS_RANGE_BIT && led_range <= THINK65_LED_BADGE_RANGE_BIT) {
-        user_config.current_led_state ^= 1 << led_range;
-    }
-}
-
-// set one of the range flag bits
-void set_led_state(unsigned int led_range) {
-    if (led_range >= THINK65_LED_CAPS_RANGE_BIT && led_range <= THINK65_LED_BADGE_RANGE_BIT) {
-        user_config.current_led_state |= 1 << led_range;
-    }
-}
-
-// clear one of the range flag bits
-void clear_led_state(unsigned int led_range) {
-    if (led_range >= THINK65_LED_CAPS_RANGE_BIT && led_range <= THINK65_LED_BADGE_RANGE_BIT) {
-        user_config.current_led_state &= ~(1 << led_range);
-    }
-}
-
-// cycle LED states: Off -> Esc -> Badge -> Underglow -> Esc+Badge -> Esc+Underglow -> Badge+Underglow -> All
-void cycle_led_state(void) {
-    switch(user_config.current_led_state) {
-        case THINK65_LED_STATE_OFF:
-            user_config.current_led_state = THINK65_LED_STATE_CAPS;
-            break;
-        case THINK65_LED_STATE_CAPS:
-            user_config.current_led_state = THINK65_LED_STATE_BADGE;
-            break;
-        case THINK65_LED_STATE_BADGE:
-            user_config.current_led_state = THINK65_LED_STATE_CAPS_AND_BADGE;
-            break;
-        case THINK65_LED_STATE_CAPS_AND_BADGE:
-            user_config.current_led_state = THINK65_LED_STATE_OFF;
-            break;
-        default:
-            break;
-    }
-}
-
-void apply_led_state(void) {
-    uint8_t h = rgblight_get_hue();
-    uint8_t s = rgblight_get_sat();
-    uint8_t v = rgblight_get_val();
-
-    // Set the RGB ranges based on the current state
-    switch(user_config.current_led_state) {
-        case THINK65_LED_STATE_OFF:
-            rgblight_sethsv_range(THINK65_LEDS_OFF,     THINK65_LED_RANGE_ALL);
-            break;
-        case THINK65_LED_STATE_CAPS:
-            rgblight_sethsv_range(THINK65_LEDS_OFF,     THINK65_LED_RANGE_BADGE);
-            rgblight_sethsv_range(THINK65_LEDS_CAPS,    THINK65_LED_RANGE_CAPS);
-            break;
-        case THINK65_LED_STATE_BADGE:
-            rgblight_sethsv_range(THINK65_LEDS_OFF,     THINK65_LED_RANGE_CAPS);
-            rgblight_sethsv_range(h, s, v,              THINK65_LED_RANGE_BADGE);
-            break;
-        case THINK65_LED_STATE_CAPS_AND_BADGE:
-            rgblight_sethsv_range(h, s, v,              THINK65_LED_RANGE_BADGE);
-            rgblight_sethsv_range(THINK65_LEDS_CAPS,    THINK65_LED_RANGE_CAPS);
-            break;
-        default:
-            break;
-    }
-}
-
-void keyboard_post_init_user(void) {
-    user_config.raw = eeconfig_read_user();
-
-    if (user_config.current_led_state >= THINK65_LED_STATE_OFF && user_config.current_led_state <= THINK65_LED_STATE_CAPS_AND_BADGE) {
-        // If the current state read from user EEPROM is valid, apply it
-        apply_led_state();
-    } else {
-        // Setup a new default state of off
-        user_config.current_led_state = THINK65_LED_STATE_OFF;
-        apply_led_state();
-        eeconfig_update_user(user_config.raw);
-    }
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case KVM_SW1:
-            if (record->event.pressed) {
-                SEND_STRING(SS_TAP(X_RCTL) SS_TAP(X_RCTL) "1");
-            } else {}
-            break;
-        case KVM_SW2:
-            if(record->event.pressed) {
-                SEND_STRING(SS_TAP(X_RCTL) SS_TAP(X_RCTL) "2");
-            } else {}
-            break;
-        case CYC_LED:
-            if (record->event.pressed) {
-                cycle_led_state();
-                apply_led_state();
-                eeconfig_update_user(user_config.raw);
-            }
-            break;
-        case TOG_BDG:
-            if (record->event.pressed) {
-                toggle_led_state(THINK65_LED_BADGE_RANGE_BIT);
-                apply_led_state();
-                eeconfig_update_user(user_config.raw);
-            }
-            break;
-        case KC_CAPS:
-            if (!record->event.pressed) {
-                // connect capslock LED control to the badge LEDs
-                host_keyboard_led_state().caps_lock ? set_led_state(THINK65_LED_CAPS_RANGE_BIT) : clear_led_state(THINK65_LED_CAPS_RANGE_BIT);
-                apply_led_state();
-                eeconfig_update_user(user_config.raw);
-            }
-            break;
-    }
-    return true;
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Base Layer
-    * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
-    * │Esc│! 1│@ 2│# 3│$ 4│% 5│^ 6│& 7│* 8│( 9│) 0│_ -│+ =│ Bckspc│` ~│
-    * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
-    * │Tab  │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │{ [│} ]│|   \│Del│
-    * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
-    * │HyCaps│ A │ S │ D │ F │ G │ H │ J │ K │ L │: ;│" '│   Enter│   │
-    * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤   │
-    * │Shift   │ Z │ X │ C │ V │ B │ N │ M │< ,│> .│? /│ Shift│ Up│   │
-    * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
-    * │Ctrl│ Opt│ Cmd│          Space         │Cmd │FnPy│ │Lef│Dow│Rig│
-    * └────┴────┴────┴────────────────────────┴────┴────┴─┴───┴───┴───┘
-    */
-    [0] = LAYOUT_65_ansi_blocker(
-        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_GRV,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
-        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,           XXXXXXX,
-        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   XXXXXXX,
-        KC_LCTL, KC_LGUI, KC_LALT,                      KC_SPC,                          MO(1),   KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-    /*
-     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬────────┬───┐
-     * │RST│ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│        │SW1│
-     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬──────┼───┤
-     * │ TOG │PLN│MOD│HU+│HU-│SA+│SA-│VA+│VA-│   │   │Hom│End│      │SW2│
-     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴──────┼───┤
-     * │      │CYC│BDG│UGL│CAP│   │   │   │   │   │   │   │         │   │
-     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬────┤   │
-     * │        │   │   │   │   │   │   │   │   │   │   │      │Vol+│   │
-     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼────┼───┤
-     * │    │    │    │                        │    │    │ │   │Vol-│   │
-     * └────┴────┴────┴────────────────────────┴────┴────┴─┴───┴────┴───┘
-     */
-    [1] = LAYOUT_65_ansi_blocker(
-        QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KVM_SW1,
-        TOG_BDG, RGB_M_P, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, KC_HOME, KC_END,  _______, KVM_SW2,
-        _______, CYC_LED, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_VOLU, _______,
-        _______, _______, _______,                      _______,                         _______, _______,          _______, KC_VOLD, _______
-    ),
-
-};
-
diff --git a/keyboards/gray_studio/think65/solder/keymaps/dangjoeltang/readme.md b/keyboards/gray_studio/think65/solder/keymaps/dangjoeltang/readme.md
deleted file mode 100644
index 520e7e0752e..00000000000
--- a/keyboards/gray_studio/think65/solder/keymaps/dangjoeltang/readme.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# dangjoeltang's Think6.5v2 keymap
-
-My personal keymap for the Think6.5v2. Using the `LAYOUT_65_ansi_blocker` LAYOUT for a 2U blocker version. I added functionality to enable the Caps-lock indicator LED above the badge. This functionality shipped with the original board; however, for those who reflash their boards using the default `gray_studio/think65/solder` keymaps that functionality disappeared.
-
-## [Base Layer](http://www.keyboard-layout-editor.com/#/gists/9c6a905a643b77249958f28662348f53)
-![Base Layer](https://imgur.com/Gyim08a)
-
-## [Function Layer](http://www.keyboard-layout-editor.com/#/gists/1c061d3664ea5caf5cb64c759339278d)
-![Function Layer](https://imgur.com/H2Yqnv3)
diff --git a/keyboards/gray_studio/think65/solder/keymaps/yt/keymap.c b/keyboards/gray_studio/think65/solder/keymaps/yt/keymap.c
deleted file mode 100644
index d4d6a7157af..00000000000
--- a/keyboards/gray_studio/think65/solder/keymaps/yt/keymap.c
+++ /dev/null
@@ -1,139 +0,0 @@
-/* Copyright 2021 Qiaowei Tang
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-
- /*
- * LED ranges for Think6.5v2 2U
- * These values were derived from manual testing. Derived from keymaps/rys.
- * ┌───────┬───────┬─────────────┬───────────────────────────────────────────┐
- * │ 00 01 │ 02 03 │ 04 05 06 07 │ 08 09 10 11 12 13 14 15 16 17 18 19 20 21 │
- * │ badge │ badge │    (?)      │              underglow (?)                │
- * │  bar  │ icon  │             │                                           │
- * └───────┴───────┴─────────────┴───────────────────────────────────────────┘
- */
-
-
-// Setup some layers to control mac/win layouts
-#include QMK_KEYBOARD_H
-
-enum bs_layers {
-    _WIN,
-    _MAC,
-    _FN,
-    _BLANC
-};
-
-// Setup some keycodes to control cycling and range toggling
-enum bs_keycodes {
-  WIN = SAFE_RANGE,
-  MAC
-};
-
-// Light LEDs 6 to 9 and 12 to 15 red when caps lock is active. Hard to ignore!
-const rgblight_segment_t PROGMEM my_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {0, 4, HSV_WHITE}     // Light 4 LEDs, starting with LED 12
-);
-
-// Now define the array of layers. Later layers take precedence
-const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
-    my_capslock_layer     // Overrides other layers
-);
-
-void keyboard_post_init_user(void) {
-    // Enable the LED layers
-    rgblight_layers = my_rgb_layers;
-};
-
-bool led_update_user(led_t led_state) {
-    rgblight_set_layer_state(0, led_state.caps_lock);
-    return true;
-};
-
-layer_state_t default_layer_state_set_user(layer_state_t state) {
-    if (get_highest_layer(state) == _MAC) {
-        rgblight_mode_noeeprom(6);
-    } else {
-        rgblight_mode_noeeprom(9);
-    }
-    return state;
-}
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Win Layer
-    * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
-    * │Esc│! 1│@ 2│# 3│$ 4│% 5│^ 6│& 7│* 8│( 9│) 0│_ -│+ =│ Bckspc│pup│
-    * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
-    * │Tab  │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │{ [│} ]│|   \│pdw│
-    * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
-    * │lTCap │ A │ S │ D │ F │ G │ H │ J │ K │ L │: ;│" '│   Enter│   │
-    * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤   │
-    * │Shift   │ Z │ X │ C │ V │ B │ N │ M │< ,│> .│? /│ Shift│ Up│   │
-    * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┴───┴┬─┬───┼───┼───┤
-    * │Ctrl│ win│ alt│          Space         │   Func  │ │Lef│Dow│Rig│
-    * └────┴────┴────┴────────────────────────┴─────────┴─┴───┴───┴───┘
-    */
-    [_WIN] = LAYOUT_65_ansi_blocker(
-        QK_GESC,            KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_PGUP,
-        KC_TAB,             KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN,
-        LT(_FN, KC_CAPS), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,             _______,
-        KC_LSFT,            KC_Z,      KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,        KC_UP,   _______,
-        KC_LCTL,            KC_LGUI, KC_LALT,                      KC_SPC,                          KC_1,   MO(_FN),          KC_LEFT, KC_DOWN,  KC_RGHT
-    ),
-    /* Mac Layer
-    * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
-    * │Esc│! 1│@ 2│# 3│$ 4│% 5│^ 6│& 7│* 8│( 9│) 0│_ -│+ =│ Bckspc│pup│
-    * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
-    * │Tab  │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │{ [│} ]│|   \│pdw│
-    * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
-    * │lTCap │ A │ S │ D │ F │ G │ H │ J │ K │ L │: ;│" '│   Enter│   │
-    * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤   │
-    * │Shift   │ Z │ X │ C │ V │ B │ N │ M │< ,│> .│? /│ Shift│ Up│   │
-    * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┴───┴┬─┬───┼───┼───┤
-    * │Ctrl│ Opt│ Cmd│          Space         │   Func  │ │Lef│Dow│Rig│
-    * └────┴────┴────┴────────────────────────┴─────────┴─┴───┴───┴───┘
-    */
-    [_MAC] = LAYOUT_65_ansi_blocker(
-        QK_GESC,            KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_PGUP,
-        KC_TAB,             KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN,
-        LT(_FN, KC_CAPS),   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,           _______,
-        KC_LSFT,            KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   _______,
-        KC_LCTL,            KC_LOPT, KC_LCMD,                      KC_SPC,                          KC_1,   MO(_FN),           KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-    /* Fn Layer
-     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬────────┬───┐
-     * │lck│ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│ delete │mac│
-     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬──────┼───┤
-     * │ TOG │MB1│MSU│MB2│MDU│   │   │   │UP │   │Hom│pgu│End│      │win│
-     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴──────┼───┤
-     * │MO(2) │MSL│MSD│MSR│MWD│   │   │Lft│Dwn│rgt│END│pgd│  reset  │   │
-     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬────┤   │
-     * │ RGB_mod│F13│F14│F15│F16│F17│F18│F19│F20│F21│F22│F23   │Bri+│   │
-     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼────┼───┤
-     * │Vold│Mute│Volu│                        │    │    │ │   │Bri-│   │
-     * └────┴────┴────┴────────────────────────┴────┴────┴─┴───┴────┴───┘
-     */
-    [_FN] = LAYOUT_65_ansi_blocker(
-        QK_LOCK, KC_F1,      KC_F2,      KC_F3,       KC_F4,          KC_F5,    KC_F6,    KC_F7,    KC_F8,   KC_F9,    KC_F10,  KC_F11,  KC_F12,  KC_DEL,    MAC,
-        RGB_TOG, KC_MS_BTN1, KC_MS_UP,   KC_MS_BTN2,  KC_MS_WH_UP,    _______,  _______,  _______,  KC_UP,   _______,  KC_HOME, KC_PGUP, _______, _______,   WIN,
-        _______, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, KC_MS_WH_DOWN,  _______,  _______,  KC_LEFT,  KC_DOWN, KC_RIGHT, KC_END,  KC_PGDN,          QK_BOOT,     _______,
-        RGB_MOD, KC_F13,     KC_F14,     KC_F15,      KC_F16,         KC_F17,   KC_F18,   KC_F19,   KC_F20,  KC_F21,   KC_F22,  KC_F23,           KC_BRIU,   _______, 
-        KC_VOLD, KC_MUTE,    KC_VOLU,                 _______,                            _______,  _______,                             _______, KC_BRID,   _______
-    ),
-
-};
-
-    
diff --git a/keyboards/gray_studio/think65/solder/keymaps/yt/readme.md b/keyboards/gray_studio/think65/solder/keymaps/yt/readme.md
deleted file mode 100644
index 84286c5e342..00000000000
--- a/keyboards/gray_studio/think65/solder/keymaps/yt/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# YT45's Think6.5v2 keymap
-
-My personal keymap for the Think6.5v2. Using the dangjoeltang as a the base and adding a quick switch from mac to win layouts. also with indication of the current layer with RGB lights.
diff --git a/keyboards/gray_studio/think65/solder/keymaps/yt/rules.mk b/keyboards/gray_studio/think65/solder/keymaps/yt/rules.mk
deleted file mode 100644
index 37868485298..00000000000
--- a/keyboards/gray_studio/think65/solder/keymaps/yt/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-LTO_ENABLE = yes
-VIA_ENABLE = yes
-MOUSEKEY_ENABLE = yes
-KEY_LOCK_ENABLE = yes
-CONSOLE_ENABLE = no
\ No newline at end of file
diff --git a/keyboards/hadron/ver3/keymaps/sebaslayout/keymap.c b/keyboards/hadron/ver3/keymaps/sebaslayout/keymap.c
deleted file mode 100644
index fcae7f07c6c..00000000000
--- a/keyboards/hadron/ver3/keymaps/sebaslayout/keymap.c
+++ /dev/null
@@ -1,43 +0,0 @@
-#include QMK_KEYBOARD_H
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	LAYOUT(
-		KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_PSCR, 
-		KC_GRV, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_P7, KC_P8, KC_P9, 
-		KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, KC_SCLN, KC_P4, KC_P5, KC_P6, 
-		KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_UP, KC_SLSH, KC_P1, KC_P2, KC_P3, 
-		KC_LCTL, KC_LGUI, KC_LALT, MO(1), KC_SPC, KC_SPC, KC_SPC, MO(1), KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT, KC_PENT),
-/* Primary
- * ,------+------+------+------+------+------------------------------------------------.
- * | Esc  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   10 | PRTSN|
- * |------+------+------+------+------+------+------+------+------+------+------+------+--------------------.
- * |  ˜   |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | BKSP |  7   |   8  |   9  |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * |  Tab |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |  '   |   ;  |  4   |   5  |   6  |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |  .   |  Up  |  /?  |   1  |   2  |  3   |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | Alt  | GUI  | Raise|         Space      | Raise| Ctrl | Left | Down |Right |   0  |   .  | Enter|
- * `--------------------------------------------------------------------------------------------------------'
- */
-	LAYOUT(
-		KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_TRNS, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F11, KC_F12, KC_TRNS, KC_HOME, KC_INS, KC_PGUP, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END, KC_DEL, KC_PGDN, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-/* Secondary
- * ,------+------+------+------+------+------------------------------------------------.
- * |  Esc |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  | F10  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------+--------------------.
- * |      |      |      |      |      |      |      |      |      |  F11 | F12  |      | Home | Ins  | PgUP |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      | End  |  Del | PgDN |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      | Vol+ |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      | Vol- |      |      |      |      |
- * `--------------------------------------------------------------------------------------------------------'
- */
-};
-
diff --git a/keyboards/hadron/ver3/keymaps/sebaslayout/readme.md b/keyboards/hadron/ver3/keymaps/sebaslayout/readme.md
deleted file mode 100644
index ce6974ce096..00000000000
--- a/keyboards/hadron/ver3/keymaps/sebaslayout/readme.md
+++ /dev/null
@@ -1,7 +0,0 @@
-![Hadron v3 Layout Image](https://i.imgur.com/Mi5L57j.png)
-
-# My Custome Hadron Layout
-
-+ Moved numpad to the right
-+ changed F row to standard numbers
-+ Bottom row subject to change
diff --git a/keyboards/handwired/10k/info.json b/keyboards/handwired/10k/info.json
index af75560e843..9c215a5e860 100644
--- a/keyboards/handwired/10k/info.json
+++ b/keyboards/handwired/10k/info.json
@@ -8,15 +8,12 @@
     "rows": ["B6"]
   },
   "features": {
-    "audio": false,
-    "backlight": false,
     "bootmagic": false,
     "command": false,
     "console": false,
     "extrakey": false,
     "mousekey": false,
-    "nkro": false,
-    "rgblight": false
+    "nkro": false
   },
   "usb": {
     "vid": "0x6869",
diff --git a/keyboards/handwired/3dortho14u/rev1/info.json b/keyboards/handwired/3dortho14u/rev1/info.json
index 9179bd3a1bb..63773d405f2 100644
--- a/keyboards/handwired/3dortho14u/rev1/info.json
+++ b/keyboards/handwired/3dortho14u/rev1/info.json
@@ -7,18 +7,12 @@
     "bootloader": "atmel-dfu",
     "diode_direction": "COL2ROW",
     "features": {
-    "audio": false,
-    "backlight": false,
-    "bluetooth": false,
-    "bootmagic": true,
-    "command": false,
-    "console": true,
-    "extrakey": true,
-    "midi": false,
-    "mousekey": true,
-    "nkro": true,
-    "rgblight": false,
-    "unicode": false
+      "bootmagic": true,
+      "command": false,
+      "console": true,
+      "extrakey": true,
+      "mousekey": true,
+      "nkro": true
     },
     "indicators": {
       "caps_lock": "F0"
diff --git a/keyboards/handwired/3dortho14u/rev2/info.json b/keyboards/handwired/3dortho14u/rev2/info.json
index 499d8603cee..9e048d643d2 100644
--- a/keyboards/handwired/3dortho14u/rev2/info.json
+++ b/keyboards/handwired/3dortho14u/rev2/info.json
@@ -7,18 +7,12 @@
     "bootloader": "atmel-dfu",
     "diode_direction": "COL2ROW",
     "features": {
-    "audio": false,
-    "backlight": false,
-    "bluetooth": false,
-    "bootmagic": true,
-    "command": false,
-    "console": true,
-    "extrakey": true,
-    "midi": false,
-    "mousekey": true,
-    "nkro": true,
-    "rgblight": false,
-    "unicode": false
+      "bootmagic": true,
+      "command": false,
+      "console": true,
+      "extrakey": true,
+      "mousekey": true,
+      "nkro": true
     },
     "indicators": {
       "caps_lock": "F4"
diff --git a/keyboards/handwired/aim65/keymaps/bonnee/keymap.c b/keyboards/handwired/aim65/keymaps/bonnee/keymap.c
deleted file mode 100644
index 7884841b21a..00000000000
--- a/keyboards/handwired/aim65/keymaps/bonnee/keymap.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Copyright 2021 Matteo Bonora
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-#define CTESC LCTL_T(KC_ESC)
-
-enum layer_names {
-    BL,
-    FL
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [BL] = LAYOUT(
-             KC_1,    KC_2,    KC_3,    KC_4,    KC_5,   KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_MINS,  KC_EQL, KC_BSPC,
-      KC_GRV,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_LBRC,   KC_RBRC, KC_RGUI,
-         CTESC,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN,   KC_QUOT,   KC_BSLS,      KC_ENT,
-       KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH, KC_RSFT,
-                                                           LT(FL, KC_SPC)
-    ),
-
-    [FL] = LAYOUT(
-            KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,  KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,  KC_DEL,
-     KC_TAB, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-         _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN,   KC_UP, KC_RGHT, _______, _______, _______, _______,
-         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-                                                             _______
-    )
-};
diff --git a/keyboards/handwired/baredev/rev1/info.json b/keyboards/handwired/baredev/rev1/info.json
index ab7747d43aa..470b926bb40 100644
--- a/keyboards/handwired/baredev/rev1/info.json
+++ b/keyboards/handwired/baredev/rev1/info.json
@@ -23,19 +23,12 @@
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "features": {
-        "audio": false,
         "bootmagic": true,
         "command": false,
         "console": false,
         "extrakey": true,
-        "midi": false,
         "mousekey": true,
-        "nkro": true,
-        "rgblight": false,
-        "unicode": false,
-        "bluetooth": false,
-        "backlight": false,
-        "sleep_led": false
+        "nkro": true
     },
     "layout_aliases": {
         "LAYOUT": "LAYOUT_abnt2"
diff --git a/keyboards/handwired/baredev/rev1/keymaps/manoshu/keymap.c b/keyboards/handwired/baredev/rev1/keymaps/manoshu/keymap.c
deleted file mode 100644
index 82277e21584..00000000000
--- a/keyboards/handwired/baredev/rev1/keymaps/manoshu/keymap.c
+++ /dev/null
@@ -1,99 +0,0 @@
-/* Copyright 2021 Fernando "ManoShu" Rodrigues
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-
-#include "keymap_brazilian_abnt2.h"
-#include "sendstring_brazilian_abnt2.h"
-
-enum { 
-    LAYER_BASE, 
-    LAYER_FUNCTIONS 
-};
-
-#define L_FUNCT MO(LAYER_FUNCTIONS)
-#define W_CHOLD LGUI_T(KC_CAPS)
-
-//Combination keycodes
-#define KC_PSBR C(KC_PAUSE)    // Ctrl+Pause/Break
-#define KC_SNIP SGUI(BR_S)     // Screen Snip (GUI + Shift + S)
-#define KC_WRUN G(BR_R)        // Run (GUI + R)
-#define KC_WLCK G(BR_L)        // Lock (GUI + L)
-#define KC_WDSK G(BR_D)        // Desktop (GUI + D)
-#define KC_WEXP G(BR_E)        // Explorer (GUI + E)
-#define KC_WPSE G(KC_PAUSE)    // System Properties (GUI + Pause)
-#define KC_WMGP G(BR_EQL)      // Magnify (+)
-#define KC_WMGM G(BR_MINS)     // Magnify (-)
-
-enum custom_keycodes {
-    KC_WPRN = SAFE_RANGE,  // Project (P)
-    KC_WSPC                // Input Select (Space)
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    if (get_highest_layer(state) == LAYER_BASE) {
-        unregister_mods(MOD_MASK_GUI);
-    }
-    return state;
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    if(keycode == KC_WPRN || keycode == KC_WSPC) {
-        if (record->event.pressed) {
-
-            register_code(KC_LGUI);
-
-            if(keycode == KC_WPRN) {
-                tap_code(KC_P);
-            } else if (keycode == KC_WSPC) {
-                tap_code(KC_SPACE);
-            }
-        }
-    }
-    return true;
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [LAYER_BASE] = LAYOUT(
-        /* ┌─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┐ */
-              KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,              KC_F9,    KC_F10,  KC_F11,   KC_F12,
-        /* ├─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┴─────────┤ */
-             BR_QUOT,   BR_1,     BR_2,     BR_3,      BR_4,    BR_5,     BR_6,      BR_7,    BR_8,     BR_9,     BR_0,    BR_MINS,  BR_EQL,        KC_BSPC,
-        /* ├─────────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬──────────────┤ */
-                KC_TAB,      BR_Q,     BR_W,     BR_E,     BR_R,     BR_T,     BR_Y,     BR_U,     BR_I,     BR_O,     BR_P,    BR_ACUT,  BR_LBRC,      KC_ENT,
-        /* ├──────────────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬           ┤ */
-                  W_CHOLD,      BR_A,     BR_S,      BR_D,    BR_F,     BR_G,     BR_H,     BR_J,     BR_K,     BR_L,    BR_CCED,  BR_TILD,  BR_RBRC,
-        /* ├───────────┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴─────────┴─┬─────────┤ */
-              KC_LSFT,   BR_BSLS,   BR_Z,     BR_X,     BR_C,     BR_V,     BR_B,     BR_N,     BR_M,    BR_COMM,  BR_DOT,   BR_SCLN,      BR_SLSH,       KC_UP,
-        /* ├───────────┼─────────┴─┬───────┴───┬─────┴─────────┴─────────┴─────────┴─────────┴─────────┴───────┬─┴───────┬─┴───────┬─┴───────┬─────────┼─────────┤ */
-              KC_LCTL,   L_FUNCT,    KC_LALT,                                 KC_SPC,                            KC_APP,    KC_DEL,  KC_LEFT,  KC_DOWN,  KC_RGHT
-        /* └───────────┴───────────┴───────────┴───────────────────────────────────────────────────────────────┴─────────┴─────────┴─────────┴─────────┴─────────┘ */
-    ),
-    [LAYER_FUNCTIONS] = LAYOUT(
-        /* ┌─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┐ */
-              QK_BOOT,           _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,  KC_PSBR,  KC_SNIP, 
-        /* ├─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┴─────────┤ */
-             _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_WMGM,  KC_WMGP,       _______,
-        /* ├─────────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬──────────────┤ */
-               _______,     KC_MPLY,  KC_MUTE,  KC_WEXP,  KC_WRUN,  _______,  _______,  _______,  _______,  _______,  KC_WPRN,  _______,  _______,      _______,
-        /* ├──────────────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬           ┤ */
-                 _______,      KC_MPRV,  KC_MNXT,  KC_WDSK,  _______,  _______,  _______,  _______,  _______,  KC_WLCK,  _______,  _______,  _______,    
-        /* ├───────────┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴─────────┴─┬─────────┤ */
-              _______,   _______,  KC_VOLU,  KC_VOLD,  KC_CALC,  _______,  _______,  _______,  _______,  _______,  _______,  _______,      _______,      KC_PGUP, 
-        /* ├───────────┼─────────┴─┬───────┴───┬─────┴─────────┴─────────┴─────────┴─────────┴─────────┴───────┬─┴───────┬─┴───────┬─┴───────┬─────────┼─────────┤ */
-              _______,    _______,    _______,                                KC_WSPC,                           _______,   KC_INS,  KC_HOME,  KC_PGDN,  KC_END
-        /* └───────────┴───────────┴───────────┴───────────────────────────────────────────────────────────────┴─────────┴─────────┴─────────┴─────────┴─────────┘ */
-    )
-};
\ No newline at end of file
diff --git a/keyboards/handwired/baredev/rev1/keymaps/manoshu/readme.md b/keyboards/handwired/baredev/rev1/keymaps/manoshu/readme.md
deleted file mode 100644
index 1852a0fbc20..00000000000
--- a/keyboards/handwired/baredev/rev1/keymaps/manoshu/readme.md
+++ /dev/null
@@ -1,16 +0,0 @@
-![BareDev Layout Image](https://i.imgur.com/FXye4Hn.png)
-
-# ManoShu's custom layout
-
-Has all the functions of a ABNT TKL keyboard, sans right shift.
-
-Basic media functions also included.
-
-Trying to emulate where notebooks/smaller OEM keyboard put the function key, for this reason the GUI key was moved and it can be used by holding the Caps Lock key.
-
-To not use the new GUI position very often, commonly used GUI + [X] commands are sent using `SEND_STRING()`, `(un)register_code()` and `tap_code()`.
-
-## Why you didn't used `LT(FUNCTIONS, KC_LGUI)` on the GUI/FN key?
-Because I don't want rely on the tapping term to determine I will send either KC_HOME or snap the active window to the left.
-
-If there is a better way to solve this, please let me know.
\ No newline at end of file
diff --git a/keyboards/handwired/bento/keymaps/cbc02009/keymap.c b/keyboards/handwired/bento/keymaps/cbc02009/keymap.c
deleted file mode 100644
index 57c107b9fc9..00000000000
--- a/keyboards/handwired/bento/keymaps/cbc02009/keymap.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Copyright 2019 cbc02009
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-
-
-/* LAYER 1
-  * ,---------------+-------.
-  * |KC_MPRV|KC_MNXT|KC_MUTE|
-  * |-------+-------+-------,
-  * |KC_MPLY|KC_MSTP|KC_MUTE|
-  * `-------+-------+-------'
-  */
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT(KC_MPRV, KC_MNXT, KC_MUTE, KC_MPLY, KC_MSTP, KC_MUTE)
-};
-
-#ifdef ENCODER_ENABLE
-#include "encoder.h"
-bool encoder_update_user(uint8_t index, bool clockwise) {
-  if (index == 0) { /* First encoder */
-    if (clockwise) {
-      tap_code(KC_VOLU);
-    } else {
-      tap_code(KC_VOLD);
-    }
-  }
-  return true;
-}
-#endif
diff --git a/keyboards/handwired/cyberstar/config.h b/keyboards/handwired/cyberstar/config.h
index 4d9d9bf5c26..701ad8da86a 100644
--- a/keyboards/handwired/cyberstar/config.h
+++ b/keyboards/handwired/cyberstar/config.h
@@ -24,6 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define WS2812_PWM_DRIVER PWMD3
 #define WS2812_PWM_CHANNEL 1
 #define WS2812_PWM_PAL_MODE 1
-#define WS2812_DMA_STREAM STM32_DMA1_STREAM3
-#define WS2812_DMA_CHANNEL 3
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM3
+#define WS2812_PWM_DMA_CHANNEL 3
 #define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_RGB
diff --git a/keyboards/handwired/dactyl_kinesis/info.json b/keyboards/handwired/dactyl_kinesis/info.json
index 91cb98e0409..ee68a2c515f 100644
--- a/keyboards/handwired/dactyl_kinesis/info.json
+++ b/keyboards/handwired/dactyl_kinesis/info.json
@@ -14,10 +14,7 @@
         "console": false,
         "extrakey": true,
         "mousekey": true,
-        "nkro": false,
-        "audio": false,
-        "backlight": false,
-        "rgblight": false
+        "nkro": false
     },
     "rgblight": {
         "led_count": 12
diff --git a/keyboards/handwired/dactyl_lightcycle/info.json b/keyboards/handwired/dactyl_lightcycle/info.json
index 4d581b974e0..1b5f2dd39a3 100644
--- a/keyboards/handwired/dactyl_lightcycle/info.json
+++ b/keyboards/handwired/dactyl_lightcycle/info.json
@@ -14,9 +14,6 @@
         "console": false,
         "mousekey": true,
         "extrakey": true,
-        "audio": false,
-        "rgblight": false,
-        "backlight": false,
         "nkro": false
     },
     "ws2812": {
diff --git a/keyboards/handwired/dactyl_manuform/4x5_5/keymaps/ssedrick/keymap.c b/keyboards/handwired/dactyl_manuform/4x5_5/keymaps/ssedrick/keymap.c
deleted file mode 100644
index 5774ab7f3bd..00000000000
--- a/keyboards/handwired/dactyl_manuform/4x5_5/keymaps/ssedrick/keymap.c
+++ /dev/null
@@ -1,89 +0,0 @@
-// Copyright 2022 Shem Sedrick (@ssedrick)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-#include "print.h"
-
-enum key_layers {
-    _BASE,
-    _COLEMAK,
-    _RAISE,
-    _LOWER
-};
-
-enum layer_keycodes {
-    QWERTY = SAFE_RANGE,
-    COLEMAK,
-};
-
-#define RAISE  TT(_RAISE)
-#define LOWER  MO(_LOWER)
-#define SH_ESC SFT_T(KC_ESC)
-#define UNDSC  RSFT(KC_MINS)
-#define MAC_LOCK C(G(KC_D))
-#define ____   KC_TRANSPARENT
-
-#undef TAPPING_TOGGLE
-#define TAPPING_TOGGLE 2
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_BASE] = LAYOUT(
-        KC_Q,    KC_W,    KC_E,    KC_R,   KC_T,                        KC_Y,    KC_U,   KC_I,    KC_O,   KC_P,
-        KC_A,    KC_S,    KC_D,    KC_F,   KC_G,                        KC_H,    KC_J,   KC_K,    KC_L,   KC_SCLN,
-        KC_Z,    KC_X,    KC_C,    KC_V,   KC_B,                        KC_N,    KC_M,   KC_COMM, KC_DOT, KC_SLSH,
-                 KC_LCBR, KC_RCBR,                                                       KC_QUOT, KC_GRV,
-                                   SH_ESC, KC_LGUI, KC_TAB,    KC_RSFT, KC_SPC,  KC_ENT,
-                                   RAISE,  KC_LCTL,                     KC_BSPC, LOWER
-    ),
-
-    [_COLEMAK] = LAYOUT(
-        KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,                  KC_J, KC_L, KC_U,    KC_Y,   KC_SCLN,
-        KC_A,    KC_R,    KC_S,    KC_T,    KC_D,                  KC_H, KC_N, KC_E,    KC_I,   KC_O,
-        KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                  KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH,
-                 KC_LCBR, KC_RCBR,                                             KC_QUOT, KC_GRV,
-                                   ____,    ____,  ____,     ____, ____, ____,
-                                   ____,    ____,                  ____, ____
-    ),
-
-    [_RAISE] = LAYOUT(
-        KC_1,    KC_2,    KC_3,    KC_4,    KC_5,             KC_6,    KC_7,    KC_8,    KC_9,    KC_0,
-     S(KC_9), S(KC_0), KC_LBRC, KC_RBRC,  KC_EQL,            KC_MINS,  KC_4,    KC_5,    KC_6, KC_QUOT,
-      QK_RBT, QK_BOOT,    ____,    ____,    ____,             ____,    KC_1,    KC_2,    KC_3,    ____,
-             MAC_LOCK,    ____,                                                 KC_0,  KC_DOT,
-                                   ____,    ____,  ____,     ____, ____,    ____,
-                                   ____,    ____,                  ____,    ____
-    ),
-
-    [_LOWER] = LAYOUT(
-     KC_EXLM,   KC_AT, KC_HASH,  KC_DLR, KC_PERC,            KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN,
-     S(KC_9), S(KC_0), KC_LBRC, KC_RBRC,  KC_EQL,              UNDSC, KC_MINS,  KC_EQL, KC_BSLS, KC_PIPE,
-     KC_MNXT, KC_MPLY, KC_VOLU, KC_VOLD,    ____,               ____, KC_LEFT, KC_DOWN,   KC_UP, KC_RGHT,
-                 ____,    ____,                                              QWERTY, COLEMAK,
-                                   ____,    ____,  ____,     ____, ____,    ____,
-                                   ____,    ____,                  ____,    ____
-    )
-};
-
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  // If console is enabled, it will print the matrix position and status of each key pressed
-#ifdef CONSOLE_ENABLE
-    uprintf("KL: kc: 0x%04X, col: %u, row: %u, pressed: %d, time: %u, interrupt: %d, count: %u\n", keycode, record->event.key.col, record->event.key.row, record->event.pressed, record->event.time, record->tap.interrupted, record->tap.count);
-#endif 
-    switch (keycode) {
-        case QWERTY:
-            if (record->event.pressed) {
-                set_single_persistent_default_layer(_BASE);
-            }
-            return false;
-            break;
-        case COLEMAK:
-            if (record->event.pressed) {
-                set_single_persistent_default_layer(_COLEMAK);
-            }
-            return false;
-            break;
-    }
-    return true;
-}
-
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/nabos/config.h b/keyboards/handwired/dactyl_manuform/5x6/keymaps/nabos/config.h
deleted file mode 100644
index 2ab0c912a34..00000000000
--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/nabos/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
-Copyright 2022 Nabos <nabos at glargh dot fr>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#define EE_HANDS
-
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/nabos/keymap.c b/keyboards/handwired/dactyl_manuform/5x6/keymaps/nabos/keymap.c
deleted file mode 100644
index d118eec92ab..00000000000
--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/nabos/keymap.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
-Copyright 2022 Nabos <nabos at glargh dot fr>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include QMK_KEYBOARD_H
-
-enum layer_names {
-    _QWERTY,
-    _FUNCTIONS,
-    _NUMPAD,
-    _GAMING
-};
-
-#define FUNCTIONS MO(_FUNCTIONS)
-#define NUMPAD MO(_NUMPAD)
-#define GAMING TG(_GAMING)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT_5x6(
-     QK_GESC, KC_1 , KC_2  ,  KC_3  , KC_4  , KC_5  ,         KC_6     , KC_7  , KC_8  , KC_9 , KC_0  ,KC_RBRC,
-     KC_TAB , KC_Q , KC_W  ,  KC_E  , KC_R  , KC_T  ,         KC_Y     , KC_U  , KC_I  , KC_O , KC_P  ,KC_LBRC,
-     KC_PGUP, KC_A , KC_S  ,  KC_D  , KC_F  , KC_G  ,         KC_H     , KC_J  , KC_K  , KC_L ,KC_SCLN,KC_QUOT,
-     KC_PGDN, KC_Z , KC_X  ,  KC_C  , KC_V  , KC_B  ,         KC_N     , KC_M  ,KC_COMM,KC_DOT,KC_SLSH,_______,
-                    KC_LEFT,KC_RIGHT,                                           KC_DOWN,KC_UP ,
-                                     KC_LSFT,KC_SPC ,         KC_ENT   ,KC_BSPC,
-                                     KC_LGUI,KC_LALT,         FUNCTIONS,KC_RALT,
-                                     KC_DEL ,GAMING ,         NUMPAD   ,KC_RCTL
-  ),
-
-  [_FUNCTIONS] = LAYOUT_5x6(
-     KC_F12 , KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 ,         KC_F6  , KC_F7 , KC_F8 , KC_F9 ,KC_F10 ,KC_F11 ,
-     _______,_______,_______,_______,_______,_______,         _______,_______,_______,_______,_______,_______,
-     _______,_______,_______,_______,_______,_______,         _______,_______,_______,_______,_______,_______,
-     _______,_______,_______,_______,_______,_______,         _______,_______,_______,_______,_______,_______,
-                     _______,_______,                                         _______,_______,
-                                     _______,_______,         _______,_______,
-                                     _______,_______,         _______,_______,
-                                     _______,_______,         _______,_______
-  ),
-
-  [_NUMPAD] = LAYOUT_5x6(
-     _______,_______,_______,_______,_______,_______,         _______,KC_NUM ,_______,_______,KC_MINS,KC_EQL ,
-     _______,_______,_______,_______,_______,_______,         _______,KC_KP_7,KC_KP_8,KC_KP_9,_______,_______,
-     _______,_______,_______,_______,_______,_______,         _______,KC_KP_4,KC_KP_5,KC_KP_6,_______,_______,
-     _______,_______,_______,_______,_______,_______,         _______,KC_KP_1,KC_KP_2,KC_KP_3,_______,KC_PSCR,
-                     _______,_______,                                         KC_KP_0,KC_PDOT,
-                                     _______,_______,         KC_PENT,_______,
-                                     _______,_______,         _______,_______,
-                                     _______,_______,         _______,_______
-  ),
-
-  [_GAMING] = LAYOUT_5x6(
-     _______,_______,_______,_______,_______,_______,         _______,_______,_______,_______,_______,_______,
-      KC_T  ,KC_TAB , KC_Q  , KC_W  , KC_E  , KC_R  ,         _______,_______,_______,_______,_______,_______,
-      KC_G  ,KC_LSFT, KC_A  , KC_S  , KC_D  , KC_F  ,         _______,_______,_______,_______,_______,_______,
-      KC_B  ,KC_LCTL, KC_Z  , KC_X  , KC_C  , KC_V  ,         _______,_______,_______,_______,_______,_______,
-                     _______,_______,                                         _______,_______,
-                                     _______,_______,         _______,_______,
-                                     _______,_______,         _______,_______,
-                                     _______,_______,         _______,_______
-  )
-};
-
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/squirrel/config.h b/keyboards/handwired/dactyl_manuform/5x6/keymaps/squirrel/config.h
deleted file mode 100644
index e97810f8bc3..00000000000
--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/squirrel/config.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-
-#pragma once
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-//#define EE_HANDS
-
-// Mouse
-#undef MOUSEKEY_INTERVAL
-#define MOUSEKEY_INTERVAL       15
-#undef MOUSEKEY_TIME_TO_MAX
-#define MOUSEKEY_TIME_TO_MAX    60
-#undef MOUSEKEY_WHEEL_MAX_SPEED
-#define MOUSEKEY_WHEEL_MAX_SPEED   	3
-
-// RGB backlight
-#undef WS2812_DI_PIN
-#define WS2812_DI_PIN D3
-#undef RGBLED_NUM
-#define RGBLED_NUM 30
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLIGHT_LIMIT_VAL 95
-#define RGBLIGHT_SPLIT
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/squirrel/keymap.c b/keyboards/handwired/dactyl_manuform/5x6/keymaps/squirrel/keymap.c
deleted file mode 100644
index c4887a3dbb5..00000000000
--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/squirrel/keymap.c
+++ /dev/null
@@ -1,106 +0,0 @@
-/* A standard layout for the Dactyl Manuform 5x6 Keyboard */
-
-#include QMK_KEYBOARD_H
-
-enum layer_names {
-    _MAC,
-    _WINDOWS,
-    _MOUSE,
-    _ARROWS,
-    _SYMBOLS,
-    _NUMBERS,
-    _MEDIA,
-};
-
-#define RAISE MO(_RAISE)
-#define LOWER MO(_LOWER)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [_MAC] = LAYOUT_5x6(
-     KC_ESC , KC_1  , KC_2  , KC_3  , KC_4  , KC_5  ,                         KC_6  , KC_7  , KC_8  , KC_9  , KC_0  ,KC_GRAVE,
-     KC_TAB , KC_Q  , KC_W  , KC_E  , KC_R  , KC_T  ,                         KC_Y  , KC_U  , KC_I  , KC_O  , KC_P  ,KC_MINS,
-     KC_BSPC, KC_A  , KC_S  , KC_D  , KC_F  , KC_G  ,                         KC_H  , KC_J  , KC_K  , KC_L  ,KC_SCLN,KC_QUOT,
-     KC_LSFT, CTL_T(KC_Z)  , KC_X  , KC_C  , KC_V  , KC_B  ,                  KC_N  , KC_M  ,KC_COMM,KC_DOT ,KC_SLSH,KC_BSLS,
-                      KC_LALT,KC_LCTL,                                                        KC_DEL, KC_PMNS,
-                                      KC_SPC, MO(_ARROWS),                          MO(_MOUSE), KC_ENT,
-                                      KC_LCMD, MO(_SYMBOLS),                        KC_EQL, KC_RALT,
-                                      KC_LALT, MO(_NUMBERS),                        MO(_MEDIA), KC_EJCT
-  ),
-
-  [_WINDOWS] = LAYOUT_5x6(
-
-   _______,_______, _______ ,_______,_______ ,_______,                        _______,_______,_______,_______,_______,_______,
-   _______,_______,_______,_______,_______,_______,                        _______, _______ , _______ , _______ ,_______,_______,
-   _______,_______,_______,_______,_______ ,_______,                        _______, _______ , _______ , _______ ,_______,_______,
-     _______,_______,_______,_______,_______,_______,                        _______, _______ , _______ , _______ ,_______ ,_______,
-                          KC_LCMD,KC_LALT,                                                       _______, _______,
-                                             _______,_______,            _______,_______,
-                                             KC_LCTL,_______,            _______,_______,
-                                             _______,_______,            _______,_______
-
-  ),
-
-  [_MOUSE] = LAYOUT_5x6(
-
-                 KC_F11,KC_F1, KC_F2 ,KC_F3,KC_F4 ,KC_F5,                        KC_F6,KC_F7,KC_F8,KC_F9,KC_F10,KC_F12,
-                 _______,_______,_______,KC_WH_U,_______,_______,                        _______, _______ , KC_MS_U , _______ ,_______,_______,
-                 _______,_______,KC_WH_L,KC_WH_D,KC_WH_R ,_______,                        KC_BTN1, KC_MS_L , KC_MS_D , KC_MS_R ,_______,_______,
-                  _______,_______,KC_ACL0,KC_ACL1,KC_ACL2,_______,                        _______, KC_BTN2 , _______ , _______ ,_______ ,_______,
-                                       _______,_______,                                                       _______, QK_BOOT,
-                                                          KC_BTN1,KC_BTN2,            _______,_______,
-                                                          _______,KC_BTN2,            _______,_______,
-                                                          _______,_______,            _______,_______
-
-               ),
-  [_ARROWS] = LAYOUT_5x6(
-
-                   QK_BOOT,_______, _______ ,_______,_______ ,TG(_WINDOWS),                        _______,_______,_______,_______,_______,_______,
-                   _______,_______,_______,_______,_______,_______,                        _______, KC_HOME , KC_UP , KC_END ,_______,_______,
-                   _______,_______,_______,_______,_______ ,_______,                        KC_HOME, KC_LEFT , KC_DOWN , KC_RIGHT ,KC_END,_______,
-                   _______,_______,_______,_______,_______,_______,                        _______, KC_PGDN ,   _______ , KC_PGUP ,_______ ,_______,
-                                        QK_BOOT,_______,                                                       _______, _______,
-                                                           _______,_______,            _______,_______,
-                                                           _______,_______,            _______,_______,
-                                                           _______,_______,            _______,_______
-
-                ),
-  [_SYMBOLS] = LAYOUT_5x6(
-
-                    _______,_______, _______ ,_______,_______ ,_______,                        KC_CIRC,KC_CIRC,KC_LABK,KC_RABK,_______,_______,
-                    _______,_______,_______,_______,_______,_______,                        KC_LABK, KC_AT , KC_LCBR , KC_RCBR ,KC_HASH,KC_RABK,
-                    _______,_______,_______,_______,_______ ,_______,                        KC_PERC, KC_EQL , KC_LPRN , KC_RPRN ,KC_DLR,KC_AMPR,
-                    _______,_______,_______,_______,_______,_______,                        KC_TILD, KC_GRAVE , KC_LBRC , KC_RBRC ,KC_PIPE ,KC_EXLM,
-                                         _______,_______,                                                       KC_PPLS, KC_PMNS,
-                                                            _______,_______,            _______,_______,
-                                                            _______,_______,            _______,_______,
-                                                            _______,_______,            _______,_______
-
-                 ),
-  [_NUMBERS] = LAYOUT_5x6(
-
-                    QK_BOOT,_______, _______ ,_______,_______ ,_______,                        KC_PSLS,KC_PAST,KC_PPLS,KC_PMNS,_______,_______,
-                    _______,_______,_______,KC_PSLS,KC_PAST,_______,                        _______, KC_7 , KC_8 , KC_9 ,_______,_______,
-                    _______,_______,_______,KC_PMNS,KC_PPLS ,_______,                        _______, KC_4 , KC_5 , KC_6 ,_______,_______,
-                    _______,_______,_______,_______,_______,_______,                        _______, KC_1 , KC_2 , KC_3 ,_______ ,_______,
-                                         _______,_______,                                                       KC_0, KC_DOT,
-                                                            _______,_______,            _______,_______,
-                                                            _______,_______,            _______,_______,
-                                                            _______,_______,            _______,_______
-
-                 ),
-  [_MEDIA] = LAYOUT_5x6(
-
-                  KC_MSTP,KC_MPRV, KC_MPLY ,KC_MNXT,_______ ,_______,                        _______,_______,_______,_______,_______,_______,
-                  _______,_______,_______,_______,KC_VOLU,_______,                        RGB_SPI, _______ , _______ , _______ ,_______,_______,
-                  _______,_______,_______,_______,KC_VOLD ,_______,                        RGB_TOG, RGB_MODE_FORWARD , RGB_HUI , RGB_SAI ,RGB_VAI,_______,
-                  _______,_______,_______,_______,KC_MUTE,_______,                        RGB_SPD, RGB_MODE_REVERSE , RGB_HUD , RGB_SAD ,RGB_VAD ,_______,
-                                       _______,_______,                                                       _______, _______,
-                                                          _______,_______,            _______,_______,
-                                                          _______,_______,            _______,_______,
-                                                          _______,_______,            _______,_______
-
-               ),
-};
-
-
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/squirrel/rules.mk b/keyboards/handwired/dactyl_manuform/5x6/keymaps/squirrel/rules.mk
deleted file mode 100644
index 1e3cebb1451..00000000000
--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/squirrel/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-RGBLIGHT_ENABLE = yes
diff --git a/keyboards/handwired/dactyl_manuform/5x6_68/info.json b/keyboards/handwired/dactyl_manuform/5x6_68/info.json
index 78a602cb64f..59d37ec15b0 100644
--- a/keyboards/handwired/dactyl_manuform/5x6_68/info.json
+++ b/keyboards/handwired/dactyl_manuform/5x6_68/info.json
@@ -15,10 +15,7 @@
         "console": false,
         "extrakey": true,
         "mousekey": true,
-        "nkro": true,
-        "audio": false,
-        "backlight": false,
-        "rgblight": false
+        "nkro": true
     },
     "split": {
         "enabled": true,
diff --git a/keyboards/handwired/dactyl_manuform/6x6/keymaps/dumam/keymap.c b/keyboards/handwired/dactyl_manuform/6x6/keymaps/dumam/keymap.c
deleted file mode 100644
index 421a1e62474..00000000000
--- a/keyboards/handwired/dactyl_manuform/6x6/keymaps/dumam/keymap.c
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright 2021 Bartosz Nowak (@dumam)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-
-enum custom_layers {
-    _QWERTY,   // daily use and coding
-    _MOVE,     // mouse, arrows, browsing useful keys
-    _CONF,     // machine settings, keyboard settings, backlight
-};
-#define _KC_SPC LT(_CONF, KC_SPC)
-#define _KC_ENT LT(_MOVE, KC_ENT)
-
-#define KC_SPEC SC_SENT // Right Shift when held, Enter when tapped
-#define KC_INS_ KC_INS
-#define KC_TAB_ KC_TAB
-#define RESET__ QK_BOOT
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [_QWERTY] = LAYOUT_6x6_5_thumb(
-
-    KC_F1  ,KC_F2  ,KC_F3  ,KC_F4  ,KC_F5  ,KC_F6  ,                          KC_F7  ,KC_F8  ,KC_F9  ,KC_F10 ,KC_F11 ,KC_F12 ,
-    KC_GRV ,KC_1   ,KC_2   ,KC_3   ,KC_4   ,KC_5   ,                          KC_6   ,KC_7   ,KC_8   ,KC_9   ,KC_0   ,KC_MINS,
-    KC_BSLS,KC_Q   ,KC_W   ,KC_E   ,KC_R   ,KC_T   ,                          KC_Y   ,KC_U   ,KC_I   ,KC_O   ,KC_P   ,KC_EQL ,
-    KC_SLSH,KC_A   ,KC_S   ,KC_D   ,KC_F   ,KC_G   ,                          KC_H   ,KC_J   ,KC_K   ,KC_L   ,KC_LBRC,KC_RBRC,
-    KC_LSFT,KC_Z   ,KC_X   ,KC_C   ,KC_V   ,KC_B   ,                          KC_N   ,KC_M   ,KC_COMM,KC_DOT ,KC_SCLN,KC_QUOT,
-                    KC_LGUI,KC_ESC ,                                                          KC_HOME,KC_END ,
-                                    _KC_SPC,                                          _KC_ENT,
-                                            KC_TAB_,KC_BSPC,          KC_DEL ,KC_RSFT,
-                                            KC_LCTL,KC_LALT,          KC_RALT,KC_RCTL
-  ),
-
-  [_CONF] = LAYOUT_6x6_5_thumb(
-
-    RESET__,XXXXXXX,XXXXXXX,XXXXXXX,KC_SLEP,KC_WAKE,                          XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,RESET__,
-    XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,                          XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,
-    XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,                          XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,
-    XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,KC_PGUP,XXXXXXX,                          XXXXXXX,KC_PGUP,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,
-    XXXXXXX,KC_CAPS,KC_MENU,XXXXXXX,KC_PGDN,KC_LGUI,                          KC_LGUI,KC_PGDN,XXXXXXX,KC_INS_,KC_PSCR,XXXXXXX,
-                    _______,_______,                                                          _______,_______,
-                                    _______,                                          _______,
-                                            _______,_______,          _______,_______,
-                                            _______,_______,          _______,_______
-  ),
-
-  [_MOVE] = LAYOUT_6x6_5_thumb(
-
-    RESET__,XXXXXXX,XXXXXXX,KC_MPRV,KC_MPLY,KC_MPLY,                          KC_MUTE,KC_VOLD,KC_VOLU,XXXXXXX,XXXXXXX,RESET__,
-    XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,                          XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,
-    XXXXXXX,XXXXXXX,XXXXXXX,KC_MS_U,XXXXXXX,XXXXXXX,                          XXXXXXX,XXXXXXX,KC_UP  ,XXXXXXX,XXXXXXX,XXXXXXX,
-    XXXXXXX,XXXXXXX,KC_MS_L,KC_MS_D,KC_MS_R,XXXXXXX,                          XXXXXXX,KC_LEFT,KC_DOWN,KC_RGHT,XXXXXXX,XXXXXXX,
-    XXXXXXX,XXXXXXX,KC_BTN1,KC_BTN3,KC_BTN2,XXXXXXX,                          XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,
-                    _______,_______,                                                          _______,_______,
-                                    _______,                                          _______,
-                                            _______,_______,          _______,_______,
-                                            _______,_______,          _______,_______
-  ),
-};
diff --git a/keyboards/handwired/dactyl_manuform/6x6/keymaps/happysalada/keymap.c b/keyboards/handwired/dactyl_manuform/6x6/keymaps/happysalada/keymap.c
deleted file mode 100644
index d96ae996a59..00000000000
--- a/keyboards/handwired/dactyl_manuform/6x6/keymaps/happysalada/keymap.c
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
-Copyright 2021 Raphael Megzari <raphael@megzari.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include QMK_KEYBOARD_H
-
-enum custom_layers {
- _COLEMAK_DH,
- _LEFT,
- _LEFT_UP,
- _RIGHT,
- _RIGHT_UP,
- _QWERTY
-};
-
-#define COLMAK TO(_COLEMAK_DH)
-#define QWERTY TO(_QWERTY)
-
-enum custom_keycodes {
-  EQ_SUP = SAFE_RANGE,
-  INF_EQ,
-  SUP_EQ,
-  INF_MIN,
-  MIN_SUP,
-  PIPE_R,
-  SUP_SUP,
-  INF_INF,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [_COLEMAK_DH] = LAYOUT_6x6(
-
-     _______,_______,_______,_______,_______,_______,                         _______,_______,_______,_______,_______,_______,
-     _______,_______,_______,_______,_______,_______,                         _______,_______,_______,_______,_______,_______,
-     QWERTY ,KC_Q   ,KC_W   ,KC_F   ,KC_P   ,KC_K   ,                         KC_Z   ,KC_L   ,KC_U   ,KC_Y   ,KC_COLN,_______,
-     _______,KC_A   ,KC_R   ,KC_S   ,KC_T   ,KC_G   ,                         KC_M   ,KC_N   ,KC_E   ,KC_I   ,KC_O   ,_______,
-     KC_LSFT,KC_J   ,KC_B   ,KC_C   ,KC_D   ,KC_V   ,                         KC_X   ,KC_H   ,KC_COMM,KC_DOT ,KC_QUES,KC_RSFT,
-                     KC_K   ,KC_V   ,                                                         KC_X   ,KC_Z   ,
-                     LT(_RIGHT_UP,KC_BSPC),LSFT_T(KC_ESC),            LT(_LEFT, KC_ENT),LT(_LEFT_UP,KC_SPC),
-                                   _______,LCTL_T(KC_DEL),               LGUI_T(KC_TAB),_______,
-                                             _______,_______,         _______,_______
-  ),
-
-  [_QWERTY] = LAYOUT_6x6(
-
-     _______,_______,_______,_______,_______,_______,                         _______,_______,_______,_______,_______,_______,
-     _______,_______,_______,_______,_______,_______,                         _______,_______,_______,_______,_______,_______,
-     COLMAK ,KC_Q   ,KC_W   ,KC_E   ,KC_R   ,KC_T   ,                         KC_Y   ,KC_U   ,KC_I   ,KC_O   ,KC_P   ,_______,
-     _______,KC_A   ,KC_S   ,KC_D   ,KC_F   ,KC_G   ,                         KC_H   ,KC_J   ,KC_K   ,KC_L   ,KC_COLN,_______,
-     KC_LSFT,KC_Z   ,KC_X   ,KC_C   ,KC_V   ,KC_B   ,                         KC_N   ,KC_M   ,KC_COMM,KC_DOT ,KC_QUES,KC_RSFT,
-                     _______,_______,                                                         _______,_______,
-                     LT(_RIGHT_UP,KC_BSPC),LSFT_T(KC_ESC),            LT(_LEFT, KC_ENT),LT(_LEFT_UP,KC_SPC),
-                                   _______,LCTL_T(KC_DEL),               LGUI_T(KC_TAB),_______,
-                                             _______,_______,         _______,_______
-  ),
-
-  [_LEFT] = LAYOUT_6x6(
-
-     _______,_______,_______,_______,_______,_______,                         _______,_______,_______,_______,_______,_______,
-     _______,_______,_______,_______,_______,_______,                         _______,_______,_______,_______,_______,_______,
-     _______,_______,KC_PLUS,KC_CIRC,KC_AMPR,_______,                         _______,KC_EQL ,KC_PERC,KC_HASH,_______,_______,
-     _______,_______,KC_TILD,KC_DQUO,KC_PIPE,_______,                         _______,KC_LPRN,KC_LCBR,KC_LBRC,_______,_______,
-     _______,_______,KC_BSLS,KC_ASTR,KC_SLSH,_______,                         _______,KC_RPRN,KC_RCBR,KC_RBRC,_______,_______,
-                     _______,_______,                                                         _______,_______,
-                                     _______,_______,                         _______,_______,
-                                             _______,_______,         _______,_______,
-                                             _______,_______,         _______,_______
-  ),
-
-  [_LEFT_UP] = LAYOUT_6x6(
-
-     _______,_______,_______,_______,_______,_______,                         _______,_______,_______,_______,_______,_______,
-     _______,_______,_______,_______,_______,_______,                         _______,_______,_______,_______,_______,_______,
-     _______,_______,KC_LABK,KC_MINS,KC_RABK,_______,                         _______,KC_7   ,KC_8   ,KC_9   ,_______,_______,
-     _______,_______,KC_UNDS,KC_QUOT,KC_DLR ,KC_GRV ,                         _______,KC_4   ,KC_5   ,KC_6   ,KC_0   ,_______,
-     _______,_______,KC_SCLN,KC_AT  ,KC_EXLM,_______,                         _______,KC_1   ,KC_2   ,KC_3   ,_______,_______,
-                     _______,_______,                                                         _______,_______,
-                                     _______,_______,                         _______,_______,
-                                             _______,_______,         _______,_______,
-                                             _______,_______,         _______,_______
-  ),
-
-  [_RIGHT] = LAYOUT_6x6(
-
-     _______,_______,_______,_______,_______,_______,                         _______,_______,_______,_______,_______,_______,
-     _______,_______,_______,_______,_______,_______,                         _______,_______,_______,_______,_______,_______,
-     _______,_______,_______,_______,_______,_______,                         _______,_______,_______,_______,_______,_______,
-     _______,_______,_______,_______,_______,_______,                         _______,_______,_______,_______,_______,_______,
-     _______,_______,_______,_______,_______,_______,                         _______,_______,_______,_______,_______,_______,
-                     _______,_______,                                                         _______,_______,
-                                     _______,_______,                         _______,_______,
-                                             _______,_______,         _______,_______,
-                                             _______,_______,         _______,_______
-  ),
-
-  [_RIGHT_UP] = LAYOUT_6x6(
-
-     _______,_______,_______,_______,_______,_______,                         _______,_______      ,_______    ,_______      ,_______,_______,
-     _______,_______,_______,_______,_______,_______,                         _______,_______      ,_______    ,_______      ,_______,_______,
-     _______,_______,INF_INF,_______,SUP_SUP,_______,                         _______,LCTL(KC_LEFT),KC_UP      ,LCTL(KC_RGHT),_______,_______,
-     _______,_______,MIN_SUP,EQ_SUP ,PIPE_R ,_______,                         _______,KC_LEFT      ,KC_DOWN    ,KC_RGHT      ,LGUI(KC_UP),_______,
-     _______,_______,INF_MIN,INF_EQ ,_______,_______,                         _______,_______      ,KC_CAPS    ,_______      ,_______,_______,
-                     _______,_______,                                                               _______    ,_______      ,
-                                     _______,_______,                         _______,_______,
-                                             _______,_______,         _______,_______,
-                                             _______,_______,         _______,_______
-  ),
-
-
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch(keycode) {
-    case PIPE_R:
-      if (record->event.pressed) {
-        SEND_STRING("|> ");
-      }
-      break;
-    case EQ_SUP:
-      if (record->event.pressed) {
-        SEND_STRING("=> ");
-      }
-      break;
-    case INF_EQ:
-      if (record->event.pressed) {
-        SEND_STRING("<= ");
-      }
-      break;
-    case MIN_SUP:
-      if (record->event.pressed) {
-        SEND_STRING("-> ");
-      }
-      break;
-    case INF_MIN:
-      if (record->event.pressed) {
-        SEND_STRING("<- ");
-      }
-      break;
-    case INF_INF:
-      if (record->event.pressed) {
-        SEND_STRING("<<");
-      }
-      break;
-    case SUP_SUP:
-      if (record->event.pressed) {
-        SEND_STRING(">>");
-      }
-      break;
-  }
-  return true;
-}
-
-
diff --git a/keyboards/handwired/dactyl_manuform/6x7/info.json b/keyboards/handwired/dactyl_manuform/6x7/info.json
index 529d92bd3f9..5ce0affbeea 100644
--- a/keyboards/handwired/dactyl_manuform/6x7/info.json
+++ b/keyboards/handwired/dactyl_manuform/6x7/info.json
@@ -14,10 +14,7 @@
         "console": false,
         "extrakey": true,
         "mousekey": true,
-        "nkro": false,
-        "audio": false,
-        "backlight": false,
-        "rgblight": false
+        "nkro": false
     },
     "ws2812": {
         "pin": "D3"
diff --git a/keyboards/handwired/jotanck/info.json b/keyboards/handwired/jotanck/info.json
index 0e4966218ab..4c81ac1a61b 100644
--- a/keyboards/handwired/jotanck/info.json
+++ b/keyboards/handwired/jotanck/info.json
@@ -1,20 +1,30 @@
 {
     "keyboard_name": "Jotanck",
     "manufacturer": "Jotix",
-    "url": "",
+    "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/handwired/jotanck",
     "maintainer": "jotix",
     "usb": {
         "vid": "0x4A4F",
         "pid": "0x5458",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "tapping": {
+        "term": 175
+    },
+    "development_board": "promicro",
     "matrix_pins": {
         "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "D3", "D2", "D1", "D0", "D4", "C6"],
         "rows": ["D7", "E6", "B6", "B2"]
     },
     "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
-    "bootloader": "caterina",
     "community_layouts": ["ortho_4x12"],
     "layouts": {
         "LAYOUT_ortho_4x12": {
diff --git a/keyboards/handwired/jotanck/rules.mk b/keyboards/handwired/jotanck/rules.mk
index 696f3387241..6e7633bfe01 100644
--- a/keyboards/handwired/jotanck/rules.mk
+++ b/keyboards/handwired/jotanck/rules.mk
@@ -1,12 +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 = yes        # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
+# This file intentionally left blank
diff --git a/keyboards/handwired/k_numpad17/keymaps/karlssn/keymap.c b/keyboards/handwired/k_numpad17/keymaps/karlssn/keymap.c
deleted file mode 100644
index fdbc3c8a391..00000000000
--- a/keyboards/handwired/k_numpad17/keymaps/karlssn/keymap.c
+++ /dev/null
@@ -1,61 +0,0 @@
-#include QMK_KEYBOARD_H
-
-//Tap Dance Declarations
-enum {
-  TD_DOT_COMMAS = 0
-};
-
-//Tap Dance Definitions
-tap_dance_action_t tap_dance_actions[] = {
-  //Tap once for Esc, twice for Caps Lock
-  [TD_DOT_COMMAS]  = ACTION_TAP_DANCE_DOUBLE(KC_DOT, KC_COMMA)
-// Other declarations would go here, separated by commas, if you have them
-};
-
-//In Layer declaration, add tap dance item in place of a key code
-
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /*
-   * ,-------------------.
-   * |bcsp| /  | *  | -  |
-   * |----|----|----|----|
-   * | 7  | 8  | 9  |    |
-   * |----|----|----| +  |
-   * | 4  | 5  | 6  |    |
-   * |----|----|----|----|
-   * | 1  | 2  | 3  |    |
-   * |----|----|----| En |
-   * |   FN/0  | .  |    |
-   * `-------------------'
-   */
-
-  [0] = LAYOUT_numpad_5x4(
-    KC_BSPC, KC_PSLS, KC_PAST, KC_PMNS, 
-    KC_P7,   KC_P8,   KC_P9,   
-    KC_P4,   KC_P5,   KC_P6,   KC_PPLS, 
-    KC_P1,   KC_P2,   KC_P3,   
-    LT(1, KC_P0), TD(TD_DOT_COMMAS),  KC_PENT  
-  ),
-  /*
-   * ,-------------------.
-   * | F10| F11| F12| -  |
-   * |----|----|----|----|
-   * | F7 | F8 | F9 |    |
-   * |----|----|----| vol|
-   * | F4 | F5 | F6 |  + |
-   * |----|----|----|----|
-   * | F1 | F2 | F3 | vol|
-   * |----|----|----|  - |
-   * |    FN   | .  |    |
-   * `-------------------'
-   */
-  [1] = LAYOUT_numpad_5x4(
-    KC_F10, KC_F11, KC_F12, KC_NO, 
-    KC_F7,   KC_F8,   KC_F9,   
-    KC_F4,   KC_F5,   KC_F6, KC_VOLU, 
-    KC_F1,   KC_F2,   KC_F3,   
-    KC_NO, KC_PDOT,  KC_VOLD  
-  )
-};
diff --git a/keyboards/handwired/k_numpad17/keymaps/karlssn/rules.mk b/keyboards/handwired/k_numpad17/keymaps/karlssn/rules.mk
deleted file mode 100644
index e5ddcae8d92..00000000000
--- a/keyboards/handwired/k_numpad17/keymaps/karlssn/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-TAP_DANCE_ENABLE = yes
diff --git a/keyboards/handwired/lagrange/keymaps/dpapavas/config.h b/keyboards/handwired/lagrange/keymaps/dpapavas/config.h
deleted file mode 100644
index 0114d6c7f92..00000000000
--- a/keyboards/handwired/lagrange/keymaps/dpapavas/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2020 Dimitris Papavasiliou <dpapavas@protonmail.ch>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#undef TAPPING_TERM
-#define TAPPING_TERM 175
-#define TAPPING_TERM_PER_KEY
-#define PERMISSIVE_HOLD_PER_KEY
diff --git a/keyboards/handwired/lagrange/keymaps/dpapavas/keymap.c b/keyboards/handwired/lagrange/keymaps/dpapavas/keymap.c
deleted file mode 100644
index 8d2ecd9c791..00000000000
--- a/keyboards/handwired/lagrange/keymaps/dpapavas/keymap.c
+++ /dev/null
@@ -1,202 +0,0 @@
-/* Copyright 2020 Dimitris Papavasiliou <dpapavas@protonmail.ch>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-#define CAPS_SFT MT(MOD_LSFT, KC_CAPS)
-#define QUOT_SFT MT(MOD_RSFT, KC_QUOT)
-#define PSCR_SFT MT(MOD_LSFT, KC_PSCR)
-#define PAUSE_SFT MT(MOD_RSFT, KC_PAUSE)
-#define F_SFT MT(MOD_LSFT, KC_F)
-#define J_SFT MT(MOD_RSFT, KC_J)
-#define PGUP_GUI MT(MOD_LGUI, KC_PGUP)
-#define END_GUI MT(MOD_LGUI, KC_END)
-#define UP_GUI MT(MOD_RGUI, KC_UP)
-#define LEFT_GUI MT(MOD_RGUI, KC_LEFT)
-#define EQL_CTL MT(MOD_RCTL, KC_EQL)
-#define MINS_CTL MT(MOD_LCTL, KC_MINS)
-#define BSPC_ALT LALT_T(KC_BSPC)
-#define ENT_ALT LALT_T(KC_ENT)
-#define SPC_ALT RALT_T(KC_SPC)
-#define DEL_ALT RALT_T(KC_DEL)
-
-enum tapdance_keycodes {
-    TD_LEFT,
-    TD_RGHT,
-    TD_C_X
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT(
-                           /* Left hand */                                                                                       /* Right hand */
-
-        KC_GRV,   KC_1,    KC_2,    KC_3,     KC_4,     KC_5,                                                   KC_6,    KC_7,    KC_8,     KC_9,     KC_0,    KC_ESC,
-        KC_TAB,   KC_Q,    KC_W,    KC_E,     KC_R,     KC_T,                                                   KC_Y,    KC_U,    KC_I,     KC_O,     KC_P,    KC_BSLS,
-        CAPS_SFT, KC_A,    KC_S,    KC_D,     F_SFT,    KC_G,                                                   KC_H,    J_SFT,   KC_K,     KC_L,     KC_SCLN, QUOT_SFT,
-        PSCR_SFT, KC_Z,    KC_X,    KC_C,     KC_V,     KC_B,                                                   KC_N,    KC_M,    KC_COMM,  KC_DOT,   KC_SLSH, PAUSE_SFT,
-
-        TD(TD_LEFT),       KC_INS,  KC_LBRC, MINS_CTL, BSPC_ALT, DEL_ALT, TD(TD_C_X),   TD(TD_C_X), ENT_ALT,  SPC_ALT,  EQL_CTL, KC_RBRC, KC_DEL,          TD(TD_RGHT),
-                                             KC_HOME,  PGUP_GUI, END_GUI,                           LEFT_GUI, UP_GUI,   KC_RGHT,
-                                                       KC_PGDN,                                               KC_DOWN
-        ),
-
-  [1] = LAYOUT(
-                          /* Left hand */                                                                        /* Right hand */
-
-        KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                                     KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F11,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_F12,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-
-        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
-                                            KC_TRNS, KC_TRNS, KC_TRNS,                 KC_TRNS, KC_TRNS, KC_TRNS,
-                                                     KC_TRNS,                                   KC_TRNS
-        ),
-};
-
-/* The following helper macros define tap dances that support
- * separated press, release, tap and double-tap functions. */
-
-#define STEPS(DANCE) [DANCE] = ACTION_TAP_DANCE_FN_ADVANCED(            \
-        NULL,                                                           \
-        dance_ ## DANCE ## _finished,                                   \
-        dance_ ## DANCE ## _reset)
-
-#define CHOREOGRAPH(DANCE, PRESS, RELEASE, TAP, DOUBLETAP)              \
-    static bool dance_ ## DANCE ## _pressed;                            \
-                                                                        \
-    void dance_ ## DANCE ## _finished(tap_dance_state_t *state, void *user_data) { \
-        if (state->count == 1) {                                        \
-            if (state->pressed) {                                       \
-                dance_ ## DANCE ## _pressed = true;                     \
-                PRESS;                                                  \
-            } else {                                                    \
-                TAP;                                                    \
-            }                                                           \
-        } else if (state->count == 2) {                                 \
-            if (!state->pressed) {                                      \
-                DOUBLETAP;                                              \
-            }                                                           \
-        }                                                               \
-    }                                                                   \
-                                                                        \
-    void dance_ ## DANCE ## _reset(tap_dance_state_t *state, void *user_data) { \
-        if (state->count == 1) {                                        \
-            if (dance_ ## DANCE ## _pressed) {                          \
-                RELEASE;                                                \
-                dance_ ## DANCE ## _pressed = false;                    \
-            }                                                           \
-        }                                                               \
-    }
-
-/* Define dance for left palm key. */
-
-CHOREOGRAPH(TD_LEFT,
-            layer_invert(1),    /* Temporarily toggle layer when held. */
-            layer_invert(1),
-
-            /* Press and release both shifts on tap, to change
-             * keyboard layout (i.e. language). */
-
-            SEND_STRING(SS_DOWN(X_LSFT) SS_DOWN(X_RSFT)
-                        SS_UP(X_LSFT) SS_UP(X_RSFT)),
-
-            layer_invert(1));   /* Toggle layer (permanently) on
-                                 * double-tap. */
-
-/* Define dance for right palm key. */
-
-CHOREOGRAPH(TD_RGHT,
-            layer_invert(1),    /* Same as above */
-            layer_invert(1),
-            /* Send a complex macro: C-x C-s Mod-t up.  (Save in
-             * Emacs, switch to terminal and recall previous command,
-             * hopefully a compile command.) */
-            SEND_STRING(SS_DOWN(X_LCTL) SS_TAP(X_X) SS_TAP(X_S) SS_UP(X_LCTL)
-                        SS_DOWN(X_LGUI) SS_TAP(X_T) SS_UP(X_LGUI) SS_TAP(X_UP)),
-            layer_invert(1));
-
-/* This facilitates C-x chords in Emacs.  Used as a modifier along
- * with, say, the s-key, it saves, by sending C-x C-s.  When tapped it
- * just sends C-x. */
-
-CHOREOGRAPH(TD_C_X,
-            SEND_STRING(SS_DOWN(X_LCTL) SS_TAP(X_X)),
-            SEND_STRING(SS_UP(X_LCTL)),
-            SEND_STRING(SS_DOWN(X_LCTL) SS_TAP(X_X) SS_UP(X_LCTL)),);
-
-tap_dance_action_t tap_dance_actions[] = {
-    STEPS(TD_LEFT), STEPS(TD_RGHT), STEPS(TD_C_X)
-};
-
-/* Set a longer tapping term for palm keys to allow comfortable
- * permanent layer toggle.  Also set an essentially infinite tapping
- * term for certain mod-tap keys one tends to keep pressed (such as
- * space, backspace, etc.).  This prevents sending the modifier
- * keycode by accident (allowing re-tap to get repeated key-press)
- * and, in combination with permissive hold, they can still be used
- * fine as modifiers. */
-
-uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case TD(TD_LEFT):
-        case TD(TD_RGHT):
-             return 250;
-        case BSPC_ALT:
-        case UP_GUI:
-        case LEFT_GUI:
-            return 5000;
-        default:
-            return TAPPING_TERM;
-    }
-}
-
-bool get_permissive_hold(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case TD(TD_LEFT):
-        case TD(TD_RGHT):
-        case BSPC_ALT:
-        case UP_GUI:
-        case LEFT_GUI:
-            return true;
-        default:
-            return false;
-    }
-}
-
-/* Use the first LED to indicate the active layer. */
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    writePin(D0, (get_highest_layer(state) > 0));
-
-    return state;
-}
-
-/* Cycle through the LEDs after initialization. */
-
-void keyboard_post_init_user(void) {
-    const pin_t pins[] = {D0, D1, D2};
-    uint8_t i, j;
-
-    for (i = 0 ; i < ARRAY_SIZE(pins) + 2 ; i += 1) {
-        for (j = 0 ; j < ARRAY_SIZE(pins); j += 1) {
-            setPinOutput(pins[j]);
-            writePin(pins[j], (j == i || j == i - 1));
-        }
-
-        wait_ms(100);
-    }
-}
diff --git a/keyboards/handwired/lagrange/keymaps/dpapavas/rules.mk b/keyboards/handwired/lagrange/keymaps/dpapavas/rules.mk
deleted file mode 100644
index 42f42f627ac..00000000000
--- a/keyboards/handwired/lagrange/keymaps/dpapavas/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# Enable additional features.
-
-DEBOUNCE_TYPE = sym_defer_pk
-TAP_DANCE_ENABLE = yes
diff --git a/keyboards/handwired/macroboard/config.h b/keyboards/handwired/macroboard/config.h
index 95e7d9d1aa6..b8e437bddf9 100644
--- a/keyboards/handwired/macroboard/config.h
+++ b/keyboards/handwired/macroboard/config.h
@@ -20,8 +20,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define WS2812_PWM_DRIVER   PWMD4
 #define WS2812_PWM_CHANNEL  4
 #define WS2812_PWM_PAL_MODE 2
-#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_DMA_STREAM   STM32_DMA1_STREAM6  // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
+#define WS2812_PWM_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
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/handwired/marauder/keymaps/orvia/keymap.c b/keyboards/handwired/marauder/keymaps/orvia/keymap.c
deleted file mode 100644
index 53463fa002a..00000000000
--- a/keyboards/handwired/marauder/keymaps/orvia/keymap.c
+++ /dev/null
@@ -1,199 +0,0 @@
-/* Copyright 2021 BB-66
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-bool is_alt_tab_active = false;
-uint16_t alt_tab_timer = 0;
-
-char wpm_str[4];
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT(
-        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,       KC_F5,   KC_F6,   KC_F7,   KC_F8,        KC_F9,   KC_F10,  KC_F11,  KC_F12,    KC_PAUS, KC_PSCR, KC_SCRL, KC_ESC,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,            KC_NUM,  KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_MINUS,
-        KC_TAB,      KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,        KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_PLUS,
-        KC_CAPS,       KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,                KC_KP_4, KC_KP_5, KC_KP_6,
-        KC_LSFT,            KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,                   KC_KP_1, KC_KP_2, KC_KP_3, KC_KP_ENTER,
-        KC_LCTL,     KC_LGUI, KC_LALT,                             KC_SPC,                                 KC_RALT,     KC_RGUI, KC_RCTL,        KC_KP_0,          KC_KP_DOT
-    ),
-    [1] = LAYOUT(
-        KC_NO,           KC_NO,   KC_NO,   KC_NO,   KC_NO,       KC_NO,   KC_NO,   KC_NO,   KC_NO,        KC_NO,   KC_NO,  KC_NO,  KC_NO,        KC_NO, KC_NO, KC_NO, KC_NO,
-        KC_NO,  KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO, KC_NO,  KC_NO,        KC_NO, KC_NO, KC_NO, KC_NO,
-        KC_NO,      KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO, KC_NO, KC_NO,     KC_NO, KC_NO, KC_NO, KC_NO,
-        KC_NO,       KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO, KC_NO, KC_NO,              KC_NO, KC_NO, KC_NO,
-        KC_NO,            KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO, KC_NO,  KC_NO, KC_NO,                     KC_NO, KC_NO, KC_NO, KC_NO,
-        KC_NO,     KC_NO, KC_NO,                             KC_NO,                                 KC_NO,     KC_NO, KC_NO,                     KC_NO,        KC_NO
-    ),
-    [2] = LAYOUT(
-        KC_NO,           KC_NO,   KC_NO,   KC_NO,   KC_NO,       KC_NO,   KC_NO,   KC_NO,   KC_NO,        KC_NO,   KC_NO,  KC_NO,  KC_NO,        KC_NO, KC_NO, KC_NO, KC_NO,
-        KC_NO,  KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO, KC_NO,  KC_NO,        KC_NO, KC_NO, KC_NO, KC_NO,
-        KC_NO,      KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO, KC_NO, KC_NO,     KC_NO, KC_NO, KC_NO, KC_NO,
-        KC_NO,       KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO, KC_NO, KC_NO,              KC_NO, KC_NO, KC_NO,
-        KC_NO,            KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO, KC_NO,  KC_NO, KC_NO,                     KC_NO, KC_NO, KC_NO, KC_NO,
-        KC_NO,     KC_NO, KC_NO,                             KC_NO,                                 KC_NO,     KC_NO, KC_NO,                     KC_NO,        KC_NO
-    ),
-    [3] = LAYOUT(
-        KC_NO,           KC_NO,   KC_NO,   KC_NO,   KC_NO,       KC_NO,   KC_NO,   KC_NO,   KC_NO,        KC_NO,   KC_NO,  KC_NO,  KC_NO,        KC_NO, KC_NO, KC_NO, KC_NO,
-        KC_NO,  KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO, KC_NO,  KC_NO,        KC_NO, KC_NO, KC_NO, KC_NO,
-        KC_NO,      KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO, KC_NO, KC_NO,     KC_NO, KC_NO, KC_NO, KC_NO,
-        KC_NO,       KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO, KC_NO, KC_NO,              KC_NO, KC_NO, KC_NO,
-        KC_NO,            KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO, KC_NO,  KC_NO, KC_NO,                     KC_NO, KC_NO, KC_NO, KC_NO,
-        KC_NO,     KC_NO, KC_NO,                             KC_NO,                                 KC_NO,     KC_NO, KC_NO,                     KC_NO,        KC_NO
-    ),
-
-};
-
-
-#ifdef OLED_ENABLE
-// WPM-responsive animation stuff here
-#    define IDLE_FRAMES 5
-#    define IDLE_SPEED 20  // below this wpm value your animation will idle
-
-// #define PREP_FRAMES 1 // uncomment if >1
-
-#    define TAP_FRAMES 2
-#    define TAP_SPEED 40  // above this wpm value typing animation to trigger
-
-#    define ANIM_FRAME_DURATION 200  // how long each frame lasts in ms
-// #define SLEEP_TIMER 60000 // should sleep after this period of 0 wpm, needs fixing
-#    define ANIM_SIZE 610  // number of bytes in array, minimize for adequate firmware size, max is 1024
-
-uint32_t anim_timer         = 0;
-uint32_t anim_sleep         = 0;
-uint8_t  current_idle_frame = 0;
-// uint8_t current_prep_frame = 0; // uncomment if PREP_FRAMES >1
-uint8_t current_tap_frame = 0;
-
-// Code containing pixel art, contains:
-// 5 idle frames, 1 prep frame, and 2 tap frames
-
-// To make your own pixel art:
-// save a png/jpeg of an 128x32 image (resource: https://www.pixilart.com/draw )
-// follow this guide up to and including "CONVERT YOUR IMAGE" https://docs.splitkb.com/hc/en-us/articles/360013811280-How-do-I-convert-an-image-for-use-on-an-OLED-display-
-// replace numbers in brackets with your own
-// if you start getting errors when compiling make sure you didn't accedentally delete a bracket
-static void render_anim(void) {
-    static const char PROGMEM idle[IDLE_FRAMES][ANIM_SIZE] = {{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x20, 0x18, 0x04, 0x02, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x20, 0x40, 0x40, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xc1, 0x01, 0x01, 0x02, 0x02, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x40, 0x80, 0x80, 0x40, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x04, 0x08, 0x08, 0x10, 0x20, 0x40, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01,
-                                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x18, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x83, 0x83, 0x40, 0x40, 0x40, 0x40, 0x20, 0x21, 0x21, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x04, 0x08, 0x30, 0x40, 0x80, 0x80, 0x00, 0x00, 0x01, 0x86, 0x98, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x41, 0x42, 0x24, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-                                                              {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x40, 0x40, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xc1, 0x01, 0x01, 0x02, 0x02, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x80, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x01, 0x02, 0x04, 0x04, 0x08, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01,
-                                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x30, 0x0c, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x86, 0x86, 0x40, 0x40, 0x40, 0x40, 0x21, 0x22, 0x22, 0x20, 0x11, 0x11, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x04, 0x08, 0x30, 0x40, 0x80, 0x80, 0x00, 0x00, 0x01, 0x86, 0x98, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x41, 0x42, 0x24, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-                                                              {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x82, 0x02, 0x02, 0x04, 0x04, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x02, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x80, 0x00, 0x00, 0x60, 0x60, 0x00, 0x01, 0x01, 0x02, 0x04, 0x04, 0x08, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01,
-                                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x30, 0x0c, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x86, 0x86, 0x40, 0x40, 0x40, 0x40, 0x21, 0x22, 0x22, 0x20, 0x11, 0x11, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x04, 0x08, 0x30, 0x40, 0x80, 0x80, 0x00, 0x00, 0x01, 0x86, 0x98, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x41, 0x42, 0x24, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-                                                              {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x34, 0xc4, 0x04, 0x04, 0x04, 0x08, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x02, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x40, 0x80, 0x80, 0x40, 0x00, 0x00, 0x30, 0x30, 0x00, 0x01, 0x01, 0x02, 0x02, 0x04, 0x04, 0x04, 0x08, 0x08, 0x10, 0x20, 0x40, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01,
-                                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x18, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x83, 0x83, 0x40, 0x40, 0x40, 0x40, 0x20, 0x21, 0x21, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x04, 0x08, 0x30, 0x40, 0x80, 0x80, 0x00, 0x00, 0x01, 0x86, 0x98, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x41, 0x42, 0x24, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-                                                              {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x20, 0x18, 0x04, 0x02, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x20, 0x40, 0x40, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x0d, 0x31, 0xc1, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x04, 0x04, 0x02, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x40, 0x80, 0x80, 0x40, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x04, 0x08, 0x08, 0x10, 0x20, 0x40, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01,
-                                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x18, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x83, 0x83, 0x40, 0x40, 0x40, 0x40, 0x20, 0x21, 0x21, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x04, 0x08, 0x30, 0x40, 0x80, 0x80, 0x00, 0x00, 0x01, 0x86, 0x98, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x41, 0x42, 0x24, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}};
-    static const char PROGMEM prep[][ANIM_SIZE]            = {{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x40, 0x40, 0x20, 0x20, 0x10, 0x08, 0x04, 0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xc1, 0x01, 0x01, 0x02, 0x02, 0x04, 0x84, 0x44, 0x44, 0x42, 0x82, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x40, 0x80, 0x80, 0x40, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x64, 0x18, 0x04, 0x12, 0xc2, 0xca, 0x24, 0x88, 0xf0, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01,
-                                                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x18, 0x06, 0x01, 0x00, 0x00, 0x0c, 0x03, 0x00, 0x02, 0x18, 0x19, 0x00, 0x05, 0xfe, 0x80, 0x83, 0x83, 0x40, 0x40, 0x40, 0x40, 0x20, 0x21, 0x21, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}};
-    static const char PROGMEM tap[TAP_FRAMES][ANIM_SIZE]   = {
-        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x40, 0x40, 0x20, 0x20, 0x10, 0x08, 0x04, 0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xc1, 0x01, 0x01, 0x02, 0x02, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x40, 0x80, 0x80, 0x40, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x64, 0x18, 0x04, 0x12, 0xc2, 0xca, 0x24, 0x88, 0xf0, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x18, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x83, 0x83, 0x40, 0x40, 0x40, 0x40, 0x20, 0x21, 0x21, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x41, 0x42, 0x24, 0x98, 0xc0, 0x88, 0x88, 0x8c, 0x9c, 0x1c, 0x1e, 0x0e, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x40, 0x40, 0x20, 0x20, 0x10, 0x08, 0x04, 0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xc1, 0x01, 0x01, 0x02, 0x02, 0x04, 0x84, 0x44, 0x44, 0x42, 0x82, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x40, 0x80, 0x80, 0x40, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x04, 0x08, 0x08, 0x10, 0x20, 0x40, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x18, 0x06, 0x01, 0x00, 0x00, 0x0c, 0x03, 0x00, 0x02, 0x18, 0x19, 0x00, 0x05, 0xfe, 0x80, 0x83, 0x83, 0x40, 0x40, 0x40, 0x40, 0x20, 0x21, 0x21, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x04, 0x08, 0x30, 0x40, 0x80, 0x80, 0x00, 0x00, 0x01, 0x86, 0x98, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x0f, 0x0f, 0x07, 0x03, 0x03, 0x61, 0xf0, 0xf8, 0xfc, 0x60, 0x01, 0x01, 0x01, 0x3c, 0x78, 0xf8, 0xf0, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-    };
-
-    // assumes 1 frame prep stage
-    void animation_phase(void) {
-        if (get_current_wpm() <= IDLE_SPEED) {
-            current_idle_frame = (current_idle_frame + 1) % IDLE_FRAMES;
-            oled_write_raw_P(idle[abs((IDLE_FRAMES - 1) - current_idle_frame)], ANIM_SIZE);
-        }
-        if (get_current_wpm() > IDLE_SPEED && get_current_wpm() < TAP_SPEED) {
-            // oled_write_raw_P(prep[abs((PREP_FRAMES-1)-current_prep_frame)], ANIM_SIZE); // uncomment if IDLE_FRAMES >1
-            oled_write_raw_P(prep[0], ANIM_SIZE);  // remove if IDLE_FRAMES >1
-        }
-        if (get_current_wpm() >= TAP_SPEED) {
-            current_tap_frame = (current_tap_frame + 1) % TAP_FRAMES;
-            oled_write_raw_P(tap[abs((TAP_FRAMES - 1) - current_tap_frame)], ANIM_SIZE);
-        }
-    }
-    if (get_current_wpm() != 000) {
-        oled_on();  // not essential but turns on animation OLED with any alpha keypress
-        if (timer_elapsed32(anim_timer) > ANIM_FRAME_DURATION) {
-            anim_timer = timer_read32();
-            animation_phase();
-        }
-        anim_sleep = timer_read32();
-    } else {
-        if (timer_elapsed32(anim_sleep) > OLED_TIMEOUT) {
-            oled_off();
-        } else {
-            if (timer_elapsed32(anim_timer) > ANIM_FRAME_DURATION) {
-                anim_timer = timer_read32();
-                animation_phase();
-            }
-        }
-    }
-}
-
-// Used to draw on to the oled screen
-bool oled_task_user(void) {
-    render_anim();  // renders pixelart
-
-    oled_set_cursor(0, 0);                            // sets cursor to (row, column) using charactar spacing (4 rows, 21 full columns on a 128x32 screen, anything more will overflow back to the top)
-    uint8_t n = get_current_wpm();
-    wpm_str[3] = '\0';
-    wpm_str[2] = '0' + n % 10;
-    wpm_str[1] = (n /= 10) % 10 ? '0' + (n) % 10 : (n / 10) % 10 ? '0' : ' ';
-    wpm_str[0] = n / 10 ? '0' + n / 10 : ' ';
-    oled_write_P(PSTR("WPM:"), false);
-    oled_write(wpm_str, false);
-
-    led_t led_state = host_keyboard_led_state();  // caps lock stuff, prints CAPS on new line if caps led is on
-    oled_set_cursor(0, 1);
-    oled_write_P(led_state.caps_lock ? PSTR("CAPS") : PSTR("    "), false);
-    oled_set_cursor(0, 2);
-    oled_write_P(led_state.num_lock ? PSTR("NUM") : PSTR("   "), false);
-    oled_set_cursor(4, 2);
-    oled_write_P(led_state.scroll_lock ? PSTR("SCLK") : PSTR("    "), false);
-    oled_set_cursor(0, 3);
-    switch (get_highest_layer(layer_state)) {
-        case 0:
-            oled_write_P(PSTR("Base Layer\n"), false);
-            break;
-        case 1:
-            oled_write_P(PSTR("Base Enhanced\n"), false);
-            break;
-        case 2:
-            oled_write_P(PSTR("Gaming\n"), false);
-            break;
-        case 3:
-            oled_write_P(PSTR("Gaming Enh\n"), false);
-            break;
-        default:
-            oled_write_ln_P(PSTR("Undefined"), false);
-    }
-    oled_set_cursor(17, 3);
-    oled_write_P(PSTR("NKRO"), keymap_config.nkro);
-    return false;
-}
-#endif
diff --git a/keyboards/handwired/marauder/keymaps/orvia/rules.mk b/keyboards/handwired/marauder/keymaps/orvia/rules.mk
deleted file mode 100644
index e39f8c6e9e8..00000000000
--- a/keyboards/handwired/marauder/keymaps/orvia/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-VIA_ENABLE = yes
-OLED_ENABLE = yes
-WPM_ENABLE = yes			# WPM counting Enable
diff --git a/keyboards/handwired/minorca/keymaps/rgb/config.h b/keyboards/handwired/minorca/keymaps/rgb/config.h
index 4bee6b205d7..16e748dd70b 100644
--- a/keyboards/handwired/minorca/keymaps/rgb/config.h
+++ b/keyboards/handwired/minorca/keymaps/rgb/config.h
@@ -12,7 +12,7 @@
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 13     // Number of LEDs
+#define RGBLIGHT_LED_COUNT 13     // Number of LEDs
 #define RGBLIGHT_HUE_STEP 10
 #define RGBLIGHT_SAT_STEP 17
 #define RGBLIGHT_VAL_STEP 17
diff --git a/keyboards/handwired/onekey/info.json b/keyboards/handwired/onekey/info.json
index 17bb84a82c1..2d266f5ea3b 100644
--- a/keyboards/handwired/onekey/info.json
+++ b/keyboards/handwired/onekey/info.json
@@ -17,10 +17,7 @@
         "extrakey": true,
         "console": false,
         "command": false,
-        "nkro": false,
-        "backlight": false,
-        "rgblight": false,
-        "audio": false
+        "nkro": false
     },
     "community_layouts": ["ortho_1x1"],
     "layouts": {
diff --git a/keyboards/handwired/onekey/keymaps/chibios_waiting_test/keymap.c b/keyboards/handwired/onekey/keymaps/chibios_waiting_test/keymap.c
index 65983c8dd8d..361a08a7604 100644
--- a/keyboards/handwired/onekey/keymaps/chibios_waiting_test/keymap.c
+++ b/keyboards/handwired/onekey/keymaps/chibios_waiting_test/keymap.c
@@ -13,20 +13,20 @@ static inline void chThdSleepMicroseconds(uint32_t us) {
 #endif
 
 void keyboard_post_init_user(void) {
-    setPinOutput(QMK_WAITING_TEST_BUSY_PIN);
-    setPinOutput(QMK_WAITING_TEST_YIELD_PIN);
+    gpio_set_pin_output(QMK_WAITING_TEST_BUSY_PIN);
+    gpio_set_pin_output(QMK_WAITING_TEST_YIELD_PIN);
 }
 
 static inline void wait_us_polling_with_strobe(uint32_t us) {
-    writePinHigh(QMK_WAITING_TEST_BUSY_PIN);
+    gpio_write_pin_high(QMK_WAITING_TEST_BUSY_PIN);
     wait_us(us);
-    writePinLow(QMK_WAITING_TEST_BUSY_PIN);
+    gpio_write_pin_low(QMK_WAITING_TEST_BUSY_PIN);
 }
 
 static inline void wait_us_yield_with_strobe(uint32_t us) {
-    writePinHigh(QMK_WAITING_TEST_YIELD_PIN);
+    gpio_write_pin_high(QMK_WAITING_TEST_YIELD_PIN);
     chThdSleepMicroseconds(us);
-    writePinLow(QMK_WAITING_TEST_YIELD_PIN);
+    gpio_write_pin_low(QMK_WAITING_TEST_YIELD_PIN);
 }
 
 static const uint32_t waiting_values[] = {0, 1, 5, 10, 25, 50, 100, 150, 200, 500, 1000};
diff --git a/keyboards/handwired/onekey/keymaps/rgb/config.h b/keyboards/handwired/onekey/keymaps/rgb/config.h
index 1e543837698..1434c4d0c82 100644
--- a/keyboards/handwired/onekey/keymaps/rgb/config.h
+++ b/keyboards/handwired/onekey/keymaps/rgb/config.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#define RGBLED_NUM 9
+#define RGBLIGHT_LED_COUNT 9
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/handwired/onekey/stm32f3_disco/config.h b/keyboards/handwired/onekey/stm32f3_disco/config.h
index a0e3c54ec1c..0927767772a 100644
--- a/keyboards/handwired/onekey/stm32f3_disco/config.h
+++ b/keyboards/handwired/onekey/stm32f3_disco/config.h
@@ -4,3 +4,9 @@
 #pragma once
 
 #define ADC_PIN A0
+
+#define UART_TX_PIN C4
+#define UART_RX_PIN C5
+
+#define SERIAL_USART_TX_PIN C4
+#define SERIAL_USART_RX_PIN C4
diff --git a/keyboards/handwired/onekey/stm32f3_disco/mcuconf.h b/keyboards/handwired/onekey/stm32f3_disco/mcuconf.h
index 9172860b0f1..520a5dc3048 100644
--- a/keyboards/handwired/onekey/stm32f3_disco/mcuconf.h
+++ b/keyboards/handwired/onekey/stm32f3_disco/mcuconf.h
@@ -7,3 +7,9 @@
 
 #undef STM32_ADC_USE_ADC1
 #define STM32_ADC_USE_ADC1 TRUE
+
+#undef STM32_SIO_USE_USART1
+#define STM32_SIO_USE_USART1 TRUE
+
+#undef STM32_SERIAL_USE_USART1
+#define STM32_SERIAL_USE_USART1 TRUE
diff --git a/keyboards/handwired/polly40/info.json b/keyboards/handwired/polly40/info.json
index 63856fa7394..9ff34b339ef 100644
--- a/keyboards/handwired/polly40/info.json
+++ b/keyboards/handwired/polly40/info.json
@@ -21,11 +21,7 @@
         "extrakey": true,
         "console": false,
         "command": false,
-        "nkro": true,
-        "backlight": false,
-        "rgblight": false,
-        "audio": false,
-        "key_lock": false
+        "nkro": true
     },
     "layouts": {
         "LAYOUT": {
diff --git a/keyboards/handwired/pteron/keymaps/FSund/keymap.c b/keyboards/handwired/pteron/keymaps/FSund/keymap.c
deleted file mode 100644
index 14ad23cd43e..00000000000
--- a/keyboards/handwired/pteron/keymaps/FSund/keymap.c
+++ /dev/null
@@ -1,116 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum pteron_layers {
-  _QWERTY,
-  _LOWER,
-  _RAISE,
-  _ADJUST
-};
-
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-
-// alt gr
-#undef G
-#define G(kc) RALT(kc)
-
-// custom keycodes
-// use F_ prefix to avoid problems
-
-// NB! I use Norwegian keyboard layout on my machines, so the keymap probably
-// doesn't make much sense for US/ANSI users
-
-#define F_FSLH S(KC_7) // forward slash
-#define F_BSLH KC_EQL // backward slash
-#define F_EQL S(KC_0) // equals sign
-#define F_APOS KC_BSLS // '
-#define F_TIMES S(KC_BSLS) // *
-#define F_PLUS KC_MINS // +
-#define F_QUEST S(KC_MINS) // ?
-#define F_HAT S(KC_RBRC) // ^
-#define F_TILD G(KC_RBRC) // ~
-#define F_UML KC_RBRC // ¨ (umlaut)
-#define F_SECT S(KC_GRV) // section sign ("law sign") (shifted key below esc)
-#define F_GRAVE S(KC_EQL)
-#define F_ACUTE G(KC_EQL)
-
-#define KC_AA KC_LBRC
-#define KC_OE KC_SCLN
-#define KC_AE KC_QUOT
-
-// brackets
-#define F_SBRL G(KC_8) // square bracket left
-#define F_SBRR G(KC_9) // square bracket right
-#define F_CBRL G(KC_7) // curly bracket left
-#define F_CBRR G(KC_0) // curly bracket right
-#define F_RBRL S(KC_8) // round bracket left
-#define F_RBRR S(KC_9) // round bracket right
-#define F_ABRL KC_NUBS // angle bracket left
-#define F_ABRR S(KC_NUBS) // angle bracket right
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* QWERTY
- * +-----------------------------------------+                                +-----------------------------------------+
- * | Esc  |   1  |   2  |   3  |   4  |   5  |                                |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+------|                                |------+------+------+------+------+------|
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |                                |   Y  |   U  |   I  |   O  |   P  |   Å  |
- * |------+------+------+------+------+------|                                |------+------+------+------+------+------|
- * | Ctrl |   A  |   S  |   D  |   F  |   G  |                                |   H  |   J  |   K  |   L  |   Ø  |   Æ  |
- * |------+------+------+------+------+------|                                |------+------+------+------+------+------|
- * | Shft |   Z  |   X  |   C  |   V  |   B  |                                |   N  |   M  |   ,  |   .  |   -  | Shft |
- * +---------------------------+------+------+-------------+    +-------------+------+------+---------------------------+
- *                             | LOWR | Spc  | Alt  | Win  |    | Win  | Alt  | Spc  | RISE |
- *                             +---------------------------+    +---------------------------+
- */
-
-[_QWERTY] = LAYOUT(
-        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,             KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,             KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_AA,
-        KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,             KC_H,    KC_J,    KC_K,    KC_L,    KC_OE,   KC_AE,
-        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,             KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-                          LOWER,   KC_SPC,  KC_LALT, KC_LGUI,          KC_RGUI, KC_RALT, KC_ENT,  RAISE
-    ),
-
-/* LOWER
- * +-----------------------------------------+                                +-----------------------------------------+
- * |      |      |      |      |      |      |                                |      |      |      |      |      |      |
- * |------+------+------+------+------+------|                                |------+------+------+------+------+------|
- * |      |      |      |      |      |      |                                |   \  |   /  |   [  |   ]  |   =  | Del  |
- * |------+------+------+------+------+------|                                |------+------+------+------+------+------|
- * |      |  F1  |  F2  |  F3  |  F4  |  F5  |                                |   <  |   >  |   (  |   )  |   *  |   ~  |
- * |------+------+------+------+------+------|                                |------+------+------+------+------+------|
- * |      |  F6  |  F7  |  F8  |  F9  |  F10 |                                |  F11 |  F12 |   {  |   }  |   +  |      |
- * +---------------------------+------+------+-------------+    +-------------+------+------+---------------------------+
- *                             |      |      |      |      |    |      |      |      |      |
- *                             +---------------------------+    +---------------------------+
- */
-
-[_LOWER] = LAYOUT(
-        _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______,          F_BSLH,  F_FSLH,  F_SBRL,  F_SBRR,  F_EQL,   KC_DEL,
-        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,            F_ABRL,  F_ABRR,  F_RBRL,  F_RBRR,  F_TIMES, F_TILD,
-        _______, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,           KC_F11,  KC_F12,  F_CBRL,  F_CBRR,  F_PLUS,  _______,
-                          _______, _______, _______, _______,          _______, _______, _______, _______
-    ),
-
-[_RAISE] = LAYOUT(
-        _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______,
-        _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,             KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_AA,
-        F_SECT,  S(KC_1), S(KC_2), S(KC_3), S(KC_4), S(KC_5),          F_QUEST, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, F_APOS,
-        _______, S(KC_6), G(KC_2), G(KC_3), G(KC_4), G(KC_5),          F_HAT,   KC_HOME, KC_PGDN, KC_PGUP, KC_END,  _______,
-                          _______, _______, _______, _______,          _______, _______, _______, _______
-    ),
-
-[_ADJUST] = LAYOUT(
-        _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______,
-        _______, F_UML,   F_GRAVE, F_ACUTE, _______, QK_BOOT,          _______, _______, _______, _______, KC_PSCR, _______,
-        _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______,          _______, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT, _______,
-                          _______, _______, _______, _______,          _______, _______, _______, _______
-    )
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
diff --git a/keyboards/handwired/pteron/keymaps/alzafacon/config.h b/keyboards/handwired/pteron/keymaps/alzafacon/config.h
deleted file mode 100644
index 3bc36a62ae5..00000000000
--- a/keyboards/handwired/pteron/keymaps/alzafacon/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
- /* Copyright 2021 Fidel Coria
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-  */ 
-
-#pragma once
-
-/* override diode direction from keyboard config */
-/* COL2ROW or ROW2COL */
-#undef DIODE_DIRECTION
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/pteron/keymaps/alzafacon/keymap.c b/keyboards/handwired/pteron/keymaps/alzafacon/keymap.c
deleted file mode 100644
index 1d030599fd8..00000000000
--- a/keyboards/handwired/pteron/keymaps/alzafacon/keymap.c
+++ /dev/null
@@ -1,120 +0,0 @@
- /* Copyright 2021 Fidel Coria
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-  */ 
-
-#include QMK_KEYBOARD_H
-
-enum pteron_layers {
-  _QWERTY,
-  _LOWER,
-  _RAISE,
-  _ADJUST
-};
-
-
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * +-----------------------------------------+      +-----------------------------------------+
- * |   `  |   1  |   2  |   3  |   4  |   5  |      |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+------|      |------+------+------+------+------+------|
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |      |   Y  |   U  |   I  |   O  |   P  | Del  |
- * |------+------+------+------+------+------|      |------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |      |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|      |------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |      |   N  |   M  |   ,  |   .  |   /  |Enter |
- * +-------------+------+------+------+------|      |------+------+------+------+-------------+
- *               |Lower | SPC  | Alt  | GUI  |      | Alt  | GUI  | SPC  |Raise |
- *               +---------------------------+      +---------------------------+
- */
-[_QWERTY] = LAYOUT(
-  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,            KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
-  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,            KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_DEL,
-  KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,            KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,            KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,
-                    LOWER,   KC_SPC,  KC_LALT, KC_LGUI,         KC_RALT, KC_RGUI, KC_SPC,  RAISE
-),
-
-/* Lower
- * +-----------------------------------------+      +-----------------------------------------+
- * |   ~  |   !  |   @  |   #  |   $  |   %  |      |   ^  |   &  |   *  |   (  |   )  | Bksp |
- * |------+------+------+------+------+------|      |------+------+------+------+------+------|
- * |   ~  |   !  |   @  |   #  |   $  |   %  |      |   ^  |   &  |   *  |   (  |   )  | Del  |
- * |------+------+------+------+------+------|      |------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |      |  F6  |   _  |   +  |   {  |   }  |  |   |
- * |------+------+------+------+------+------|      |------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |      |  F12 |ISO ~ |ISO | |      |      |      |
- * +-------------+------+------+------+------|      |------+------+------+------+-------------+
- *               |      |      |      |      |      | Next | Vol- | Vol+ | Play |
- *               +---------------------------+      +---------------------------+
- */
-[_LOWER] = LAYOUT(
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,         KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,         KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL,
-  KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,           KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
-  _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,          KC_F12,S(KC_NUHS),S(KC_NUBS),KC_HOME, KC_END, _______,
-                    _______, _______, _______, _______,         KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Raise
- * +-----------------------------------------+      +-----------------------------------------+
- * |   `  |   1  |   2  |   3  |   4  |   5  |      |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+------|      |------+------+------+------+------+------|
- * |   `  |   1  |   2  |   3  |   4  |   5  |      |   6  |   7  |   8  |   9  |   0  | Del  |
- * |------+------+------+------+------+------|      |------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |      |  F6  |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------|      |------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |      |  F12 |ISO # |ISO / |      |      |      |
- * +-------------+------+------+------+------|      |------+------+------+------+-------------+
- *               |      |      |      |      |      | Next | Vol- | Vol+ | Play |
- *               +---------------------------+      +---------------------------+
- */
-[_RAISE] = LAYOUT(
-  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,            KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
-  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,            KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL,
-  KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,           KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
-  _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,          KC_F12,  KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, _______,
-                    _______, _______, _______, _______,         KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Adjust (Lower + Raise)
- * +-----------------------------------------+      +-----------------------------------------+
- * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
- * |------+------+------+------+------+------|      |------+------+------+------+------+------|
- * |      | Reset|      |      |      |      |      |      |      |      |      |      |  Del |
- * |------+------+------+------+------+------|      |------+------+------+------+------+------|
- * |      |      |      |Aud on|AudOff|AGnorm|      |AGswap|Qwerty|Colemk|Dvorak|      |      |
- * |------+------+------+------+------+------|      |------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|MusOff|MidiOn|      |MidOff|      |      |      |      |      |
- * +-------------+------+------+------+------|      |------+------+------+------+-------------+
- *               |      |      |      |      |      |      |      |      |      |      
- *               +---------------------------+      +---------------------------+
- */
-[_ADJUST] = LAYOUT(
-  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,           KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-  _______, QK_BOOT, DB_TOGG, _______, _______, _______,         _______, _______, _______, _______, _______, KC_DEL,
-  _______, _______, _______, _______, _______, _______,         _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______,         _______, _______, _______, _______, _______, _______,
-                    _______, _______, _______, _______,         _______, _______, _______, _______
-)
-
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
diff --git a/keyboards/handwired/pteron/keymaps/alzafacon/readme.md b/keyboards/handwired/pteron/keymaps/alzafacon/readme.md
deleted file mode 100644
index 0bc5f2704fd..00000000000
--- a/keyboards/handwired/pteron/keymaps/alzafacon/readme.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# alzafacon pteron layout
-
-This keymap is for builds with elite-c controllers.
-Also notice `DIODE_DIRECTION COL2ROW`. I prefer to hand-wire this way.
diff --git a/keyboards/handwired/pteron/keymaps/alzafacon/rules.mk b/keyboards/handwired/pteron/keymaps/alzafacon/rules.mk
deleted file mode 100644
index 03323308e77..00000000000
--- a/keyboards/handwired/pteron/keymaps/alzafacon/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-# for elite-c
-BOOTLOADER = atmel-dfu
diff --git a/keyboards/handwired/scottokeebs/scotto61/info.json b/keyboards/handwired/scottokeebs/scotto61/info.json
index 8614ec81ebe..cf321a2e976 100644
--- a/keyboards/handwired/scottokeebs/scotto61/info.json
+++ b/keyboards/handwired/scottokeebs/scotto61/info.json
@@ -10,8 +10,7 @@
         "console": false,
         "extrakey": true,
         "mousekey": true,
-        "nkro": true,
-        "rgblight": false
+        "nkro": true
     },
     "matrix_pins": {
         "cols": ["GP6", "GP7", "GP8", "GP9", "GP10", "GP11", "GP12", "GP13", "GP22", "GP20", "GP19", "GP18", "GP17", "GP16"],
diff --git a/keyboards/handwired/selene/keymaps/bpendragon/keymap.c b/keyboards/handwired/selene/keymaps/bpendragon/keymap.c
deleted file mode 100644
index 4723250e354..00000000000
--- a/keyboards/handwired/selene/keymaps/bpendragon/keymap.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Copyright 2020 Bpendragon
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-enum custom_keycodes {
-    DBL_0 = SAFE_RANGE,
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case DBL_0:
-            if(record->event.pressed) {
-                SEND_STRING("00");
-            }
-            break;
-    }
-    return true;
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT (
-    KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS, KC_MUTE, KC_MPRV, KC_MNXT, KC_MPLY,
-    KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS,
-    KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, KC_P7, KC_P8, KC_P9, KC_PPLS,
-    KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_P4, KC_P5, KC_P6,
-    KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT,
-    KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, DBL_0, KC_PDOT
-  )
-};
diff --git a/keyboards/handwired/steamvan/keymaps/jmdaly/keymap.c b/keyboards/handwired/steamvan/keymaps/jmdaly/keymap.c
deleted file mode 100644
index 21ba0e5b3d5..00000000000
--- a/keyboards/handwired/steamvan/keymaps/jmdaly/keymap.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/* Copyright 2019 John M Daly <jmdaly@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-
-
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-// The underscores don't mean anything - you can have a layer called STUFF or any other name.
-// Layer names don't all need to be of the same length, obviously, and you can also skip them
-// entirely and just use numbers.
-
-enum {
-  // Layers
-  _L1,
-  _L2,
-  _L3,
-  _L4,
-  _L5
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_L1] = LAYOUT_standard( /* Qwerty */
-    LT(_L5, KC_TAB),        KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,     KC_P,    KC_BSPC,
-    CTL_T(KC_ESC), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,     KC_SCLN, LT(_L2, KC_QUOT),
-    SC_LSPO,       KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,   KC_SLSH, SC_RSPC,
-    MO(_L2),       KC_LGUI, MO(_L3),          KC_ENT,  LT(_L2, KC_SPC),                    KC_RALT, KC_BSLS,           MO(_L4)
-  ),
-  [_L2] = LAYOUT_standard( /* LAYER 2 */
-    KC_GRV,  KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL,
-    _______, KC_BSLS, KC_QUOT, KC_MINS, KC_EQL,  KC_LBRC, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______,
-    _______, KC_ESC,  _______, KC_PSCR, _______, _______, _______, KC_MSTP, KC_LBRC, KC_RBRC, KC_MNXT, _______,
-    _______, KC_LGUI, _______,          _______, _______,                   _______, _______,          MO(_L4)
-  ),
-  [_L3] = LAYOUT_standard( /* LAYER 3 */
-    KC_MINS, KC_1,     KC_2,     KC_3,     KC_4,    KC_5,          KC_6,          KC_7,    KC_8,    KC_9,    KC_0,    _______,
-    KC_EQL,  KC_PIPE,  KC_TILD,  KC_UNDS,  KC_PLUS, LSFT(KC_LBRC), LSFT(KC_RBRC), KC_4,    KC_5,    KC_6,    KC_VOLU, KC_INS,
-    _______, RGB_TOG,  RGB_MOD,  RGB_RMOD, KC_DQUO, _______,       KC_0,          KC_1,    KC_2,    KC_3,    KC_VOLD, _______,
-    _______, _______,  _______,            _______, _______,                               _______, _______,          _______
-  ),
-  [_L4] = LAYOUT_standard( /* LAYER 4 */
-    QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,     KC_PGUP,   _______,
-    KC_ESC,  _______, _______, _______, _______, _______, _______, KC_F5,   KC_F6,   KC_HOME,   KC_END,    _______,
-    KC_LSFT, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_F9,   KC_F10,  KC_PGDN,   KC_F12,    _______,
-    _______, KC_LSFT, KC_B,             KC_SPC,  KC_C,                      _______, _______,              _______
-  ),
-  [_L5] = LAYOUT_standard( /* LAYER 5 */
-    _______,   LGUI(KC_1),   LGUI(KC_2),   LGUI(KC_3),   LGUI(KC_4),   LGUI(KC_5),   LGUI(KC_6),   LGUI(KC_7),   LGUI(KC_8),   LGUI(KC_9),     LGUI(KC_0),   LGUI(KC_MINS),
-    KC_ESC,  _______, _______, _______, _______, _______, _______, KC_F5,   KC_F6,   KC_HOME,   KC_END,    _______,
-    KC_LSFT, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_F9,   KC_F10,  KC_PGDN,   KC_F12,    _______,
-    _______, KC_LSFT, KC_B,             KC_SPC,  KC_C,                      _______, _______,              _______
-  )
-};
diff --git a/keyboards/handwired/steamvan/keymaps/jmdaly/readme.md b/keyboards/handwired/steamvan/keymaps/jmdaly/readme.md
deleted file mode 100644
index 5aeae7064f1..00000000000
--- a/keyboards/handwired/steamvan/keymaps/jmdaly/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# jmdaly's keymap for the steamvan
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f303/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/f303/config.h
index 3a7f97f8d2f..a2818e7176f 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f303/config.h
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f303/config.h
@@ -26,8 +26,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define WS2812_PWM_CHANNEL  1      // default: 2
 #define WS2812_PWM_PAL_MODE 2      // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 2
 //#define WS2812_PWM_COMPLEMENTARY_OUTPUT // Define for a complementary timer output (TIMx_CHyN); omit for a normal timer output (TIMx_CHy).
-// #define WS2812_DMA_STREAM   STM32_DMA1_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 WS2812_PWM_DMA_STREAM   STM32_DMA1_STREAM3  // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
+#define WS2812_PWM_DMA_CHANNEL  3  // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
 
 #define DEBUG_LED_PIN C13
 
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h
index 2ad18267ad5..87f830e1757 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h
@@ -27,8 +27,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define WS2812_PWM_PAL_MODE 1      // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 2
 #define WS2812_EXTERNAL_PULLUP
 //#define WS2812_PWM_COMPLEMENTARY_OUTPUT // Define for a complementary timer output (TIMx_CHyN); omit for a normal timer output (TIMx_CHy).
-#define WS2812_DMA_STREAM   STM32_DMA1_STREAM7  // 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 WS2812_PWM_DMA_STREAM   STM32_DMA1_STREAM7  // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
+#define WS2812_PWM_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 DEBUG_LED_PIN      C13
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.c b/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.c
index 10986fd25ff..a0c3ee0f4e4 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.c
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.c
@@ -24,7 +24,7 @@ void matrix_scan_sub_kb(void) {
     }
 }
 
-__attribute__((weak)) void bootmagic_lite(void) {
+__attribute__((weak)) void bootmagic_scan(void) {
     // We need multiple scans because debouncing can't be turned off.
     matrix_scan();
 #if defined(DEBOUNCE) && DEBOUNCE > 0
@@ -34,13 +34,13 @@ __attribute__((weak)) void bootmagic_lite(void) {
 #endif
     matrix_scan();
 
-    uint8_t row = BOOTMAGIC_LITE_ROW;
-    uint8_t col = BOOTMAGIC_LITE_COLUMN;
+    uint8_t row = BOOTMAGIC_ROW;
+    uint8_t col = BOOTMAGIC_COLUMN;
 
-#if defined(SPLIT_KEYBOARD) && defined(BOOTMAGIC_LITE_ROW_RIGHT) && defined(BOOTMAGIC_LITE_COLUMN_RIGHT)
+#if defined(SPLIT_KEYBOARD) && defined(BOOTMAGIC_ROW_RIGHT) && defined(BOOTMAGIC_COLUMN_RIGHT)
     if (!is_keyboard_left()) {
-        row = BOOTMAGIC_LITE_ROW_RIGHT;
-        col = BOOTMAGIC_LITE_COLUMN_RIGHT;
+        row = BOOTMAGIC_ROW_RIGHT;
+        col = BOOTMAGIC_COLUMN_RIGHT;
     }
 #endif
 
diff --git a/keyboards/handwired/tritium_numpad/keymaps/blu/keymap.c b/keyboards/handwired/tritium_numpad/keymaps/blu/keymap.c
deleted file mode 100644
index ce4066dca23..00000000000
--- a/keyboards/handwired/tritium_numpad/keymaps/blu/keymap.c
+++ /dev/null
@@ -1,40 +0,0 @@
-#include QMK_KEYBOARD_H
-
-void keyboard_pre_init_user(void)
-{
-	// Set layer LED as an output
-    setPinOutput(B0);
-}
-
-layer_state_t layer_state_set_user(layer_state_t state)
-{
-	// Switch layer LED accordingly
-    switch (get_highest_layer(state)) {
-    case 0:
-        writePinHigh(B0);
-        break;
-    case 1:
-        writePinLow(B0);
-        break;
-	}
-    return state;
-}
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[0] = LAYOUT_ortho_6x4(
-		KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
-		KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
-		KC_P4,   KC_P5,   KC_P6,   KC_BSPC,
-		KC_P1,   KC_P2,   KC_P3,   KC_PENT,
-		KC_P0,   KC_UP,   KC_PDOT, TT(1),
-		KC_LEFT, KC_DOWN, KC_RGHT, BL_STEP
-	),
-	[1] = LAYOUT_ortho_6x4(
-		KC_NO,   KC_NO,   KC_NO,   KC_NO,
-		KC_NO,   KC_K,    KC_NO,   KC_NO,
-		KC_H,    KC_NO,   KC_L,    KC_NO,
-		KC_NO,   KC_J,    KC_NO,   KC_NO,
-		KC_LSFT, KC_Z,    KC_X,    KC_TRNS,
-		KC_NO,   KC_NO,   KC_NO,   KC_NO
-	)
-};
diff --git a/keyboards/handwired/tritium_numpad/keymaps/blu/layers.json b/keyboards/handwired/tritium_numpad/keymaps/blu/layers.json
deleted file mode 100644
index fca4d01591e..00000000000
--- a/keyboards/handwired/tritium_numpad/keymaps/blu/layers.json
+++ /dev/null
@@ -1 +0,0 @@
-[["KC_NUM", "KC_PSLS", "KC_PAST", "KC_PMNS", "KC_P7", "KC_P8", "KC_P9", "KC_PPLS", "KC_P4", "KC_P5", "KC_P6", "KC_BSPC", "KC_P1", "KC_P2", "KC_P3", "KC_PENT", "KC_P0", "KC_UP", "KC_PDOT", "TT(1)", "KC_LEFT", "KC_DOWN", "KC_RGHT", "BL_STEP"], ["KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_K", "KC_NO", "KC_NO", "KC_H", "KC_NO", "KC_L", "KC_NO", "KC_NO", "KC_J", "KC_NO", "KC_NO", "KC_LSFT", "KC_Z", "KC_X", "KC_TRNS", "KC_NO", "KC_NO", "KC_NO", "KC_NO"]]
\ No newline at end of file
diff --git a/keyboards/handwired/tritium_numpad/keymaps/blu/readme.md b/keyboards/handwired/tritium_numpad/keymaps/blu/readme.md
deleted file mode 100644
index fd07b155fb7..00000000000
--- a/keyboards/handwired/tritium_numpad/keymaps/blu/readme.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Generated Keymap Layout
-
-This layout was generated by the QMK API. You can find the JSON data used to
-generate this keymap in the file layers.json.
-
-To make use of this file you will need follow the following steps:
-
-* Download or Clone QMK Firmware: <https://github.com/qmk/qmk_firmware/>
-* Extract QMK Firmware to a location on your hard drive
-* Copy this folder into %s
-* You are now ready to compile or use your keymap with the source
-
-More information can be found in the QMK docs: <https://docs.qmk.fm>
\ No newline at end of file
diff --git a/keyboards/handwired/wakizashi40/info.json b/keyboards/handwired/wakizashi40/info.json
index 3a72e5d3102..495d9a0376a 100644
--- a/keyboards/handwired/wakizashi40/info.json
+++ b/keyboards/handwired/wakizashi40/info.json
@@ -6,18 +6,12 @@
     "bootloader": "atmel-dfu",
     "diode_direction": "COL2ROW",
     "features": {
-        "audio": false,
-        "backlight": false,
-        "bluetooth": false,
         "bootmagic": true,
         "command": false,
         "console": true,
         "extrakey": true,
-        "midi": false,
         "mousekey": true,
-        "nkro": true,
-        "rgblight": false,
-        "unicode": false
+        "nkro": true
     },
     "matrix_pins": {
         "cols": ["F4", "F6", "F7", "B1", "B3", "B2", "B6", "B5", "B4", "E6", "D7", "C6", "D4"],
diff --git a/keyboards/handwired/z150/keymaps/zyxx/keymap.c b/keyboards/handwired/z150/keymaps/zyxx/keymap.c
deleted file mode 100644
index 76ee90d9dc0..00000000000
--- a/keyboards/handwired/z150/keymaps/zyxx/keymap.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/* Copyright 2020 DmNosachev
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-
-// Defines names for use in layer keycodes and the keymap
-enum layer_names {
-    _BASE,
-    _FN1
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/*
- * ,---------------------------------------------------------------------------------------------------------------------------.
- * |  F1 |  F2 | Esc |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |Backspace| ~`  |  ScrLk |  FN1   |
- * |---------------------------------------------------------------------------------------------------------------------------|
- * |  F3 |  F4 |  Tab  |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]   |      |Home |  ↑  |PgUp |PrnSc|
- * |---------------------------------------------------------------------------------------------      ------------------------|
- * |  F5 |  F6 |  Ctrl  |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;: |  '" |     Enter  |  ←  |  ↓  |  →  | wh+ |
- * |---------------------------------------------------------------------------------------------------------------------------|
- * |  F7 |  F8 |   Shift   |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /? |  Shift  |  |\ |End  |     |PgDn | wh- |
- * |----------------------------------------------------------------------------------------------------------------------     |
- * |  F9 | F10 |  Alt   |FN1 |                        Space                            |  Alt    |    Ins    |   Del     |     |
- * `---------------------------------------------------------------------------------------------------------------------------'
-*/
-    [_BASE] = LAYOUT(
-    KC_F1,  KC_F2, KC_ESC,   KC_1,    KC_2,   KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,   KC_GRV,   KC_SCRL,       MO(_FN1),
-    KC_F3,  KC_F4, KC_TAB,   KC_Q,    KC_W,   KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,            KC_HOME, KC_UP,   KC_PGUP, KC_PSCR,
-    KC_F5,  KC_F6, KC_LCTL,  KC_A,    KC_S,   KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,    KC_LEFT, KC_DOWN, KC_RGHT, KC_WH_U,
-    KC_F7,  KC_F8, KC_LSFT,           KC_Z,   KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_BSLS,   KC_END,  KC_NO,   KC_PGDN, KC_WH_D,
-    KC_F9,  KC_F10,KC_LALT,        MO(_FN1),                                KC_SPC,                                            KC_RALT,       KC_INS,            KC_DEL
-    ),
-/*
- * ,---------------------------------------------------------------------------------------------------------------------------.
- * |reset|     |    | F11 | F12 | au+ | au- | clk | clk+| clk-| clkr|     |     |     |     |  Delete  |NumLk|   /    |  FN1   |
- * |---------------------------------------------------------------------------------------------------------------------------|
- * |     |     |       |     | mlb | m↑  | mrb |     |     |     |     |     |     |     |      |      |  7  |  8  |  9  |  *  |
- * |---------------------------------------------------------------------------------------------      ------------------------|
- * |     |     |        |     | m←  | m↓  | m→  |     |     |     |     |     |     |     |            |  4  |  5  |  6  |  -  |
- * |---------------------------------------------------------------------------------------------------------------------------|
- * |     |     |           |     |     |     |     |     |     |     |     |     |     |         |     |  1  |  2  |  3  |  +  |
- * |----------------------------------------------------------------------------------------------------------------------     |
- * |     |     |        |FN1 |                                                         | CapsLock|   0 Ins   |    . Del  |     |
- * `---------------------------------------------------------------------------------------------------------------------------'
-*/
-    [_FN1] = LAYOUT(
-    QK_BOOT, _______, _______,  KC_F11,  KC_F12,  AU_ON,   AU_OFF,  CK_TOGG, CK_UP,   CK_DOWN, CK_RST,  _______, _______, _______, _______, KC_DEL,    KC_NUM,     KC_PSLS,       _______,
-    _______, _______, _______,  _______, KC_BTN1, KC_MS_U, KC_BTN2, _______, _______, _______, _______, _______, _______, _______, _______,            KC_P7,   KC_P8,   KC_P9,   KC_PAST,
-    _______, _______, _______ , _______, KC_MS_L, KC_MS_D, KC_MS_R, _______, _______, _______, _______, _______, _______, _______,          _______,   KC_P4,   KC_P5,   KC_P6,   KC_PMNS,
-    _______, _______, _______,           _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   KC_P1,   KC_P2,   KC_P3,   KC_PPLS,
-    _______, _______, _______,         _______,                                 _______,                                           KC_CAPS,       KC_P0,            KC_PDOT
-    )
-};
diff --git a/keyboards/helix/rev2/keymaps/fraanrosi/config.h b/keyboards/helix/rev2/keymaps/fraanrosi/config.h
deleted file mode 100644
index 6c816d0accd..00000000000
--- a/keyboards/helix/rev2/keymaps/fraanrosi/config.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-Copyright 2021 Franco Rosi <fraanrosi@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-// place overrides here
-
-// If you need more program area, try select and reduce rgblight modes to use.
-
-#ifndef LED_ANIMATIONS
-#    define LED_ANIMATIONS
-#endif
-
-// Selection of RGBLIGHT MODE to use.
-#if defined(LED_ANIMATIONS)
-   #define RGBLIGHT_EFFECT_BREATHING
-   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-   #define RGBLIGHT_EFFECT_SNAKE
-   #define RGBLIGHT_EFFECT_KNIGHT
-   #define RGBLIGHT_EFFECT_CHRISTMAS
-   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-   #define RGBLIGHT_EFFECT_RGB_TEST
-   #define RGBLIGHT_EFFECT_ALTERNATING
-   #define RGBLIGHT_EFFECT_TWINKLE
-#endif
-
-#undef RGBLIGHT_HUE_STEP
-#define RGBLIGHT_HUE_STEP 4
-
-#ifdef MOUSEKEY_ENABLE
-   #undef MOUSEKEY_INTERVAL
-   #define MOUSEKEY_INTERVAL 20
-
-   #undef MOUSEKEY_TIME_TO_MAX
-   #define MOUSEKEY_TIME_TO_MAX 40
-
-   #undef MOUSEKEY_MAX_SPEED
-   #define MOUSEKEY_MAX_SPEED 6
-
-   #undef MOUSEKEY_MOVE_DELTA
-   #define MOUSEKEY_MOVE_DELTA 5
-
-   #undef MOUSEKEY_DELAY
-   #define MOUSEKEY_DELAY 0
-#endif
diff --git a/keyboards/helix/rev2/keymaps/fraanrosi/keymap.c b/keyboards/helix/rev2/keymaps/fraanrosi/keymap.c
deleted file mode 100644
index 1bd43ab24a0..00000000000
--- a/keyboards/helix/rev2/keymaps/fraanrosi/keymap.c
+++ /dev/null
@@ -1,288 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-Copyright 2021 Franco Rosi <fraanrosi@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include QMK_KEYBOARD_H
-
-// Following line allows macro to read current RGB settings
-#ifdef RGBLIGHT_ENABLE
-uint8_t                  RGB_current_mode;
-HSV                      CURRENT_COLOR;
-bool                     caps_is_active = false;
-/*Here I set the first rgb mode*/
-void keyboard_post_init_user(void) {
-    rgblight_enable();  // Enables RGB, without saving settings
-    rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL + 3);
-    RGB_current_mode = rgblight_get_mode();
-    rgblight_sethsv(HSV_RED);
-    CURRENT_COLOR = rgblight_get_hsv();
-}
-#endif
-
-extern uint8_t is_master;
-
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-// The underscores don't mean anything - you can have a layer called STUFF or any other name.
-// Layer names don't all need to be of the same length, obviously, and you can also skip them
-// entirely and just use numbers.
-enum layer_number {
-    _QWERTY = 0,
-    _LOWER,
-    _RAISE
-};
-
-enum custom_keycodes {
-    QWERTY = SAFE_RANGE,
-    LOWER,
-    RAISE,
-    RGBRST,
-    RGB_1,
-    RGB_2,
-    RGB_3,
-    RGB_4,
-    RGB_5,
-    RGB_6,
-    RGB_7,
-    RGB_8,
-    RGB_9
-};
-
-#define LOWER MO(1)
-#define RAISE MO(2)
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    /* Qwerty
-   * ,-----------------------------------------.             ,-----------------------------------------.
-   * |   |  |   1  |   2  |   3  |   4  |   5  |             |   6  |   7  |   8  |   9  |   0  | Del  |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * | Tab  |   Q  |   W  |   E  |   R  |   T  |             |   Y  |   U  |   I  |   O  |   P  | Bksp |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * | CAPS |   A  |   S  |   D  |   F  |   G  |             |   H  |   J  |   K  |   L  |   Ñ  |Enter |
-   * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
-   * |Shift |   Z  |   X  |   C  |   V  |   B  |   {  |   }  |   N  |   M  |   ,  |   .  |   -  |Shift |
-   * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
-   * | Ctrl | Esc  | Win  | Alt  |Raise |Lower |Space |Space |Alt Gr| Left |  Up  | Down |Right | Ctrl |
-   * `-------------------------------------------------------------------------------------------------'
-   */
-    [_QWERTY] = LAYOUT(
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                      KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT,
-        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,   KC_QUOT,  KC_NUHS, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-        KC_LCTL, KC_ESC,  KC_LGUI, KC_LALT, MO(2),   MO(1),  KC_SPC,   KC_SPC,  KC_RALT, KC_LEFT, KC_UP,   KC_DOWN, KC_RGHT, KC_RCTL
-        ),
-
-    /*Lower
-   * ,-----------------------------------------.             ,-----------------------------------------.
-   * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |             |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * |      | Mute | Play |Mouse1|Mouse2|      |             |Print |      |Insert|' ? \ | ¿  ¡ |      |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * |      |Shine+|Shine-| Vol -| Vol +|      |             |      |Mouse↑|      | ´  ¨ |+ * ~ |      |
-   * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
-   * |      | <  > |      |      |      |      |      |      |Mouse←|Mouse↓|Mouse→|      |      |      |
-   * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
-   * |      |      |      |      |      |      |      |      |      | Home |PageUp|PageDn| End  |      |
-   * `-------------------------------------------------------------------------------------------------'
-   */
-    [_LOWER] = LAYOUT(
-        KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                     KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-        KC_TRNS, KC_MUTE, KC_MPLY, KC_BTN1, KC_BTN2, KC_TRNS,                   KC_PSCR, KC_TRNS, KC_INS,  KC_MINS, KC_EQL,  KC_TRNS,
-        KC_NO,   KC_BRID, KC_BRIU, KC_VOLD, KC_VOLU, KC_TRNS,                   KC_TRNS, KC_MS_U, KC_TRNS, KC_LBRC, KC_RBRC, KC_TRNS,
-        KC_TRNS, KC_NUBS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,  KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,  KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, KC_PGDN, KC_END,  KC_TRNS
-        ),
-
-    /* Raise
-   * ,-----------------------------------------.             ,-----------------------------------------.
-   * |      |      |      |      |      |      |             |      |      |      |      |      |      |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * | RGB1 | RGB2 | RGB3 | RGB4 |RGB ON|      |             |      | MODE+| MODE-|      |      |      |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * | RGB5 | RGB6 | RGB7 | RGB8 | RGB9 |      |             |      | HUE+ | HUE- |      |      |      |
-   * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
-   * |      | MODE+| MODE-| HUE+ | HUE- |      | Reset|      |      |      |      |      |      |      |
-   * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
-   * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
-   * `-------------------------------------------------------------------------------------------------'
-   */
-    [_RAISE] = LAYOUT(
-        KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,                     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
-        RGB_1,   RGB_2,   RGB_3,   RGB_4,   RGB_TOG, KC_NO,                     KC_NO,   RGB_MOD, RGB_RMOD,KC_NO,   KC_NO,   KC_NO,
-        RGB_5,   RGB_6,   RGB_7,   RGB_8,   RGB_9,   KC_NO,                     KC_NO,   RGB_HUI, RGB_HUD, KC_NO,   KC_NO,   KC_NO,
-        KC_NO,   RGB_MOD, RGB_RMOD,RGB_HUI, RGB_HUD, KC_NO,  QK_BOOT,  KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
-        KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_TRNS, KC_NO,  KC_NO,    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO
-        )
-};
-
-// define variables for reactive RGB
-bool TOG_STATUS = false;
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case LOWER:
-            if (record->event.pressed) {
-                // not sure how to have keyboard check mode and set it to a variable, so my work around
-                // uses another variable that would be set to true after the first time a reactive key is pressed.
-                if (TOG_STATUS) {  // TOG_STATUS checks is another reactive key currently pressed, only changes RGB mode if returns false
-                } else {
-                    TOG_STATUS = !TOG_STATUS;
-                    #ifdef RGBLIGHT_ENABLE
-                        if (!caps_is_active) {
-                            RGB_current_mode = rgblight_get_mode();
-                            CURRENT_COLOR    = rgblight_get_hsv();
-                        }
-                        rgblight_mode(RGBLIGHT_MODE_STATIC_LIGHT);
-                        rgblight_sethsv(HSV_BLUE);
-                    #endif
-                }
-                layer_on(_LOWER);
-            } else {
-                #ifdef RGBLIGHT_ENABLE
-                    if (!caps_is_active) {
-                        rgblight_mode(RGB_current_mode);
-                        rgblight_sethsv(CURRENT_COLOR.h, CURRENT_COLOR.s, CURRENT_COLOR.v);
-                    } else {
-                        rgblight_mode(RGBLIGHT_MODE_ALTERNATING);
-                        rgblight_sethsv(HSV_WHITE);
-                    }
-                #endif
-                TOG_STATUS = false;
-                layer_off(_LOWER);
-            }
-            return false;
-            break;
-        case RAISE:
-            if (record->event.pressed) {
-                // not sure how to have keyboard check mode and set it to a variable, so my work around
-                // uses another variable that would be set to true after the first time a reactive key is pressed.
-                if (TOG_STATUS) {  // TOG_STATUS checks is another reactive key currently pressed, only changes RGB mode if returns false
-                } else {
-                    TOG_STATUS = !TOG_STATUS;
-                    #ifdef RGBLIGHT_ENABLE
-                        if (!caps_is_active) {
-                            RGB_current_mode = rgblight_get_mode();
-                            CURRENT_COLOR    = rgblight_get_hsv();
-                        }
-                        rgblight_mode(RGBLIGHT_MODE_STATIC_LIGHT);
-                        rgblight_sethsv(HSV_RED);
-                    #endif
-                }
-                layer_on(_RAISE);
-            } else {
-                #ifdef RGBLIGHT_ENABLE
-                    if (!caps_is_active) {
-                        rgblight_mode(RGB_current_mode);
-                        rgblight_sethsv(CURRENT_COLOR.h, CURRENT_COLOR.s, CURRENT_COLOR.v);
-                    } else {
-                        rgblight_mode(RGBLIGHT_MODE_ALTERNATING);
-                        rgblight_sethsv(HSV_WHITE);
-                    }
-                #endif
-                layer_off(_RAISE);
-                TOG_STATUS = false;
-            }
-            return false;
-            break;
-            //led operations - RGB mode change now updates the RGB_current_mode to allow the right RGB mode to be set after reactive keys are released
-        case RGB_1 ... RGB_9:
-            if (record->event.pressed) {
-                rgblight_sethsv(CURRENT_COLOR.h, CURRENT_COLOR.s, CURRENT_COLOR.v);
-                //this to have each custom mode separately, but sharing logic
-                switch(keycode){
-                    case RGB_1:
-                        rgblight_mode(RGBLIGHT_MODE_RAINBOW_MOOD + 1);
-                        break;
-                    case RGB_2:
-                        rgblight_mode(RGBLIGHT_MODE_KNIGHT);
-                        break;
-                    case RGB_3:
-                        rgblight_mode(RGBLIGHT_MODE_SNAKE);
-                        break;
-                    case RGB_4:
-                        rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL + 3);
-                        break;
-                    case RGB_5:
-                        rgblight_mode(RGBLIGHT_MODE_TWINKLE + 5);
-                        break;
-                    case RGB_6:
-                        rgblight_mode(RGBLIGHT_MODE_BREATHING + 3);
-                        break;
-                    case RGB_7:
-                        rgblight_mode(RGBLIGHT_MODE_STATIC_LIGHT);
-                        break;
-                    case RGB_8:
-                        rgblight_mode(RGBLIGHT_MODE_STATIC_GRADIENT + 5);
-                        break;
-                    case RGB_9:
-                        rgblight_mode(RGBLIGHT_MODE_CHRISTMAS);
-                        break;
-                }
-                RGB_current_mode = rgblight_get_mode();
-                CURRENT_COLOR = rgblight_get_hsv();
-            }
-            return false;
-            break;
-        case RGB_TOG ... RGB_HUD:
-            if (record->event.pressed) {
-                rgblight_sethsv(CURRENT_COLOR.h, CURRENT_COLOR.s, CURRENT_COLOR.v);
-                rgblight_mode(RGB_current_mode);
-                process_rgb(keycode, record);
-                RGB_current_mode = rgblight_get_mode();
-                CURRENT_COLOR = rgblight_get_hsv();
-            }
-            return false;
-            break;
-        case KC_CAPS:
-            if (record->event.pressed) {
-                register_code(KC_CAPS);
-                caps_is_active = !caps_is_active;
-                if (caps_is_active) {
-                    CURRENT_COLOR    = rgblight_get_hsv();
-                    rgblight_mode(RGBLIGHT_MODE_ALTERNATING);
-                    rgblight_sethsv(HSV_WHITE);
-                } else if (!caps_is_active) {
-                    unregister_code(KC_CAPS);
-                    rgblight_mode(RGB_current_mode);
-                    rgblight_sethsv(CURRENT_COLOR.h, CURRENT_COLOR.s, CURRENT_COLOR.v);
-                }
-            }
-            return false;
-            break;
-        case RGBRST:
-            #ifdef RGBLIGHT_ENABLE
-                if (record->event.pressed) {
-                    eeconfig_update_rgblight_default();
-                    rgblight_enable();
-                    RGB_current_mode = rgblight_get_mode();
-                }
-            #endif
-            break;
-    }
-    return true;
-}
-
-void matrix_init_user(void) {
-#ifdef RGBLIGHT_ENABLE
-    RGB_current_mode = rgblight_get_mode();
-    CURRENT_COLOR    = rgblight_get_hsv();
-#endif
-}
diff --git a/keyboards/helix/rev2/keymaps/fraanrosi/readme.md b/keyboards/helix/rev2/keymaps/fraanrosi/readme.md
deleted file mode 100644
index 71f71bbb99f..00000000000
--- a/keyboards/helix/rev2/keymaps/fraanrosi/readme.md
+++ /dev/null
@@ -1,40 +0,0 @@
- <!---Copyright 2021 Franco Rosi <fraanrosi@gmail.com> -->
-## Fraanrosi
-A **Latin American Spanish** keymap for Helix/rev2/under, 5 rows.   
-Designed to be as simple and more touch typing oriented as possible.    
-It was inspired by a DELL Latitude E5470.
-
-## Layers
-
-The Helix obviously does not have enough keys compared to a typical keyboard.  
-The keymap has multiple layers, moving extra keys to different layers.
-
-|Priority|Layer ID|Layer Name|Contents|
-| ---- | ---- | --- | --- |
-||0|Qwerty|Qwerty layout (Base)|
-||1|Lower|Symbols, media, function keys and mouse.(Blue)|
-||2|Raise|Underglow RGB config(Red)|
-
-Keymap : http://www.keyboard-layout-editor.com/#/gists/4cd7b4ccda1de5cf9edc56d29b64da30
-### First layer (qwerty).
-
-It contains the "**Ñ**" letter.         
-"Caps Lock" key toggle an RGB mode, to alert.           
-@ is typed with AltGr+q 
-![first-layer](https://i.imgur.com/BaVDVdB.png)
-### Second layer (Lower).
-
-While "Lower" key is pressed, the RBG mode remains BLUE.           
-It has the "Symbols, media, function keys and mouse" features.              
-It completes the rest of the needed qwerty and F keys.              
-![second-layer](https://i.imgur.com/HbDVTfp.png)
-### Third layer (Raise).
-
-While "Raise" key is pressed, the RBG mode remains RED.             
-This is the underglow RGB's layer , where can be controlled the modes and hue.                  
-With reset button for the micros.
-![third-layer](https://i.imgur.com/MF8jjbu.png)
-### All the layers.
- ![all-the-layers](https://i.imgur.com/jn1VI4V.png)
- 
- <!---![Keyboard](https://i.imgur.com/Onwmsss.png) -->
diff --git a/keyboards/helix/rev2/keymaps/fraanrosi/rules.mk b/keyboards/helix/rev2/keymaps/fraanrosi/rules.mk
deleted file mode 100644
index 688813ce399..00000000000
--- a/keyboards/helix/rev2/keymaps/fraanrosi/rules.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-# QMK Standard Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
-#   See TOP/keyboards/helix/rules.mk for a list of options that can be set.
-#   See TOP/docs/config_options.md for more information.
-#
-SPLIT_KEYBOARD = yes
-LTO_ENABLE = yes         # if firmware size over limit, try this option
-MOUSEKEY_ENABLE = yes    # Mouse keys
-EXTRAKEY_ENABLE = yes    # Audio control and System control
-# AUDIO_ENABLE = yes       # Audio output on port C6
-# Helix Spacific Build Options
-# you can uncomment and edit follows 7 Variables
-#  jp: 以下の7つの変数を必要に応じて編集し、コメントアウトをはずします。
-# OLED_ENABLE = no            # OLED_ENABLE
-# LOCAL_GLCDFONT = no         # use each keymaps "helixfont.h" insted of "common/glcdfont.c"
-# LED_BACK_ENABLE = no        # LED backlight (Enable WS2812 RGB underlight.)
-# LED_UNDERGLOW_ENABLE = no   # LED underglow (Enable WS2812 RGB underlight.)
-LED_ANIMATIONS = yes        # LED animations
-# IOS_DEVICE_ENABLE = no      # connect to IOS device (iPad,iPhone)
-
-LED_BACK_ENABLE = no
-LED_UNDERGLOW_ENABLE = yes
diff --git a/keyboards/helix/rev2/keymaps/froggy/config.h b/keyboards/helix/rev2/keymaps/froggy/config.h
deleted file mode 100644
index fea362bcd61..00000000000
--- a/keyboards/helix/rev2/keymaps/froggy/config.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#undef TAPPING_TERM
-#define TAPPING_TERM 200
-#define ONESHOT_TAP_TOGGLE 5 /* Tapping this number of times holds the key until tapped this number of times again. */
-#define ONESHOT_TIMEOUT 5000 /* Time (in ms) before the one shot key is released */
-
-// the froggy keymap does not use the right hand side, so sync_timer is not needed
-#define DISABLE_SYNC_TIMER
-// For the same reason, the following are also not needed
-#undef SPLIT_LAYER_STATE_ENABLE
-#undef SPLIT_LED_STATE_ENABLE
-
-// If you need more program area, try select and reduce rgblight modes to use.
-
-// Selection of RGBLIGHT MODE to use.
-#if defined(LED_ANIMATIONS)
-   #define RGBLIGHT_EFFECT_BREATHING
-   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-   #define RGBLIGHT_EFFECT_SNAKE
-   #define RGBLIGHT_EFFECT_KNIGHT
-   #define RGBLIGHT_EFFECT_CHRISTMAS
-   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-   //#define RGBLIGHT_EFFECT_RGB_TEST
-   //#define RGBLIGHT_EFFECT_ALTERNATING
-#endif
-
-#endif /* CONFIG_USER_H */
diff --git a/keyboards/helix/rev2/keymaps/froggy/helixfont.h b/keyboards/helix/rev2/keymaps/froggy/helixfont.h
deleted file mode 100644
index 5360eace95b..00000000000
--- a/keyboards/helix/rev2/keymaps/froggy/helixfont.h
+++ /dev/null
@@ -1,235 +0,0 @@
-// This is the 'classic' fixed-space bitmap font for Adafruit_GFX since 1.0.
-// See gfxfont.h for newer custom bitmap font info.
-
-#pragma once
-
-#include "progmem.h"
-
-// Standard ASCII 5x7 font
-
-static const unsigned char font[] PROGMEM = {
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x3E, 0x5B, 0x4F, 0x5B, 0x3E, 0x00, 
-0x3E, 0x6B, 0x4F, 0x6B, 0x3E, 0x00, 
-0x1C, 0x3E, 0x7C, 0x3E, 0x1C, 0x00, 
-0x18, 0x3C, 0x7E, 0x3C, 0x18, 0x00, 
-0x1C, 0x57, 0x7D, 0x57, 0x1C, 0x00, 
-0x1C, 0x5E, 0x7F, 0x5E, 0x1C, 0x00, 
-0x00, 0x18, 0x3C, 0x18, 0x00, 0x00, 
-0xFF, 0xE7, 0xC3, 0xE7, 0xFF, 0x00, 
-0x00, 0x18, 0x24, 0x18, 0x00, 0x00, 
-0xFF, 0xE7, 0xDB, 0xE7, 0xFF, 0x00, 
-0x30, 0x48, 0x3A, 0x06, 0x0E, 0x00, 
-0x26, 0x29, 0x79, 0x29, 0x26, 0x00, 
-0x40, 0x7F, 0x05, 0x05, 0x07, 0x00, 
-0x40, 0x7F, 0x05, 0x25, 0x3F, 0x00, 
-0x5A, 0x3C, 0xE7, 0x3C, 0x5A, 0x00, 
-0x7F, 0x3E, 0x1C, 0x1C, 0x08, 0x00, 
-0x08, 0x1C, 0x1C, 0x3E, 0x7F, 0x00, 
-0x14, 0x22, 0x7F, 0x22, 0x14, 0x00, 
-0x5F, 0x5F, 0x00, 0x5F, 0x5F, 0x00, 
-0x06, 0x09, 0x7F, 0x01, 0x7F, 0x00, 
-0x00, 0x66, 0x89, 0x95, 0x6A, 0x00, 
-0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 
-0x94, 0xA2, 0xFF, 0xA2, 0x94, 0x00, 
-0x08, 0x04, 0x7E, 0x04, 0x08, 0x00, 
-0x10, 0x20, 0x7E, 0x20, 0x10, 0x00, 
-0x08, 0x08, 0x2A, 0x1C, 0x08, 0x00, 
-0x08, 0x1C, 0x2A, 0x08, 0x08, 0x00, 
-0x1E, 0x10, 0x10, 0x10, 0x10, 0x00, 
-0x0C, 0x1E, 0x0C, 0x1E, 0x0C, 0x00, 
-0x30, 0x38, 0x3E, 0x38, 0x30, 0x00, 
-0x06, 0x0E, 0x3E, 0x0E, 0x06, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x5F, 0x00, 0x00, 0x00, 
-0x00, 0x07, 0x00, 0x07, 0x00, 0x00, 
-0x14, 0x7F, 0x14, 0x7F, 0x14, 0x00, 
-0x24, 0x2A, 0x7F, 0x2A, 0x12, 0x00, 
-0x23, 0x13, 0x08, 0x64, 0x62, 0x00, 
-0x36, 0x49, 0x56, 0x20, 0x50, 0x00, 
-0x00, 0x08, 0x07, 0x03, 0x00, 0x00, 
-0x00, 0x1C, 0x22, 0x41, 0x00, 0x00, 
-0x00, 0x41, 0x22, 0x1C, 0x00, 0x00, 
-0x2A, 0x1C, 0x7F, 0x1C, 0x2A, 0x00, 
-0x08, 0x08, 0x3E, 0x08, 0x08, 0x00, 
-0x00, 0x80, 0x70, 0x30, 0x00, 0x00, 
-0x08, 0x08, 0x08, 0x08, 0x08, 0x00, 
-0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-0x20, 0x10, 0x08, 0x04, 0x02, 0x00, 
-0x3E, 0x51, 0x49, 0x45, 0x3E, 0x00, 
-0x00, 0x42, 0x7F, 0x40, 0x00, 0x00, 
-0x72, 0x49, 0x49, 0x49, 0x46, 0x00, 
-0x21, 0x41, 0x49, 0x4D, 0x33, 0x00, 
-0x18, 0x14, 0x12, 0x7F, 0x10, 0x00, 
-0x27, 0x45, 0x45, 0x45, 0x39, 0x00, 
-0x3C, 0x4A, 0x49, 0x49, 0x31, 0x00, 
-0x41, 0x21, 0x11, 0x09, 0x07, 0x00, 
-0x36, 0x49, 0x49, 0x49, 0x36, 0x00, 
-0x46, 0x49, 0x49, 0x29, 0x1E, 0x00, 
-0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 
-0x00, 0x40, 0x34, 0x00, 0x00, 0x00, 
-0x00, 0x08, 0x14, 0x22, 0x41, 0x00, 
-0x14, 0x14, 0x14, 0x14, 0x14, 0x00, 
-0x00, 0x41, 0x22, 0x14, 0x08, 0x00, 
-0x02, 0x01, 0x59, 0x09, 0x06, 0x00, 
-0x3E, 0x41, 0x5D, 0x59, 0x4E, 0x00, 
-0x7C, 0x12, 0x11, 0x12, 0x7C, 0x00, 
-0x7F, 0x49, 0x49, 0x49, 0x36, 0x00, 
-0x3E, 0x41, 0x41, 0x41, 0x22, 0x00, 
-0x7F, 0x41, 0x41, 0x41, 0x3E, 0x00, 
-0x7F, 0x49, 0x49, 0x49, 0x41, 0x00, 
-0x7F, 0x09, 0x09, 0x09, 0x01, 0x00, 
-0x3E, 0x41, 0x41, 0x51, 0x73, 0x00, 
-0x7F, 0x08, 0x08, 0x08, 0x7F, 0x00, 
-0x00, 0x41, 0x7F, 0x41, 0x00, 0x00, 
-0x20, 0x40, 0x41, 0x3F, 0x01, 0x00, 
-0x7F, 0x08, 0x14, 0x22, 0x41, 0x00, 
-0x7F, 0x40, 0x40, 0x40, 0x40, 0x00, 
-0x7F, 0x02, 0x1C, 0x02, 0x7F, 0x00, 
-0x7F, 0x04, 0x08, 0x10, 0x7F, 0x00, 
-0x3E, 0x41, 0x41, 0x41, 0x3E, 0x00, 
-0x7F, 0x09, 0x09, 0x09, 0x06, 0x00, 
-0x3E, 0x41, 0x51, 0x21, 0x5E, 0x00, 
-0x7F, 0x09, 0x19, 0x29, 0x46, 0x00, 
-0x26, 0x49, 0x49, 0x49, 0x32, 0x00, 
-0x03, 0x01, 0x7F, 0x01, 0x03, 0x00, 
-0x3F, 0x40, 0x40, 0x40, 0x3F, 0x00, 
-0x1F, 0x20, 0x40, 0x20, 0x1F, 0x00, 
-0x3F, 0x40, 0x38, 0x40, 0x3F, 0x00, 
-0x63, 0x14, 0x08, 0x14, 0x63, 0x00, 
-0x03, 0x04, 0x78, 0x04, 0x03, 0x00, 
-0x61, 0x59, 0x49, 0x4D, 0x43, 0x00, 
-0x00, 0x7F, 0x41, 0x41, 0x41, 0x00, 
-0x02, 0x04, 0x08, 0x10, 0x20, 0x00, 
-0x00, 0x41, 0x41, 0x41, 0x7F, 0x00, 
-0x04, 0x02, 0x01, 0x02, 0x04, 0x00, 
-0x40, 0x40, 0x40, 0x40, 0x40, 0x00, 
-0xFC, 0xFE, 0x02, 0x82, 0x82, 0x82, 
-0x82, 0x82, 0x82, 0xC2, 0x82, 0x02, 
-0x02, 0xFE, 0x00, 0x00, 0xFE, 0xFE, 
-0x02, 0x62, 0x62, 0x62, 0x62, 0xE2, 
-0x62, 0x62, 0xE2, 0x02, 0x02, 0xFC, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0xF0, 
-0x30, 0x40, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x40, 0x00, 0x00, 0x24, 0xA4, 
-0xA4, 0xBC, 0xA4, 0x24, 0x24, 0x00, 
-0x00, 0x00, 0x24, 0xA4, 0x24, 0x24, 
-0x3C, 0x04, 0x04, 0x00, 0x00, 0x00, 
-0xB8, 0xA4, 0xA4, 0xA4, 0xBC, 0x00, 
-0x00, 0x00, 0x00, 0xFC, 0x00, 0xFC, 
-0x00, 0x44, 0x44, 0x44, 0xDC, 0x44, 
-0x04, 0x3C, 0x00, 0x00, 0x00, 0x00, 
-0xFC, 0xFE, 0xFE, 0x7E, 0x7E, 0x7E, 
-0x7E, 0x7E, 0x7E, 0x3E, 0x7E, 0xFE, 
-0xFE, 0xFE, 0x00, 0x00, 0xFE, 0xFE, 
-0xFE, 0x9E, 0x9E, 0x9E, 0x9E, 0x1E, 
-0x9E, 0x9E, 0x1E, 0xFE, 0xFE, 0xFC, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x08, 0x36, 0x41, 0x00, 0x00, 
-0x00, 0x00, 0x77, 0x00, 0x00, 0x00, 
-0x00, 0x41, 0x36, 0x08, 0x00, 0x00, 
-0x02, 0x01, 0x02, 0x04, 0x02, 0x00, 
-0x3C, 0x26, 0x23, 0x26, 0x3C, 0x00, 
-0x7F, 0x7F, 0x40, 0x41, 0x41, 0x41, 
-0x41, 0x41, 0x41, 0x41, 0x41, 0x40, 
-0x40, 0x7F, 0x00, 0x00, 0x7F, 0x7F, 
-0x40, 0x40, 0x40, 0x40, 0x40, 0x41, 
-0x40, 0x40, 0x43, 0x40, 0x40, 0x7F, 
-0x00, 0x00, 0x00, 0xF0, 0xFB, 0xFB, 
-0x00, 0x50, 0x60, 0xFF, 0xFC, 0x3C, 
-0x1E, 0x0E, 0x0C, 0xFC, 0xF8, 0xE8, 
-0xE8, 0xE8, 0x30, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x02, 0x02, 0x0D, 0x02, 
-0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x57, 0x50, 
-0x57, 0x54, 0x57, 0x10, 0x50, 0x00, 
-0x00, 0x00, 0x97, 0x94, 0x97, 0x94, 
-0xF7, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xE4, 0x14, 0xF4, 0x94, 0xF7, 0x00, 
-0x00, 0x00, 0x00, 0xFF, 0x00, 0xFF, 
-0x00, 0x38, 0xA4, 0xA4, 0xA5, 0x3C, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x7F, 0x7F, 0x7F, 0x7E, 0x7E, 0x7E, 
-0x7E, 0x7E, 0x7E, 0x7E, 0x7E, 0x7F, 
-0x7F, 0x7F, 0x00, 0x00, 0x7F, 0x7F, 
-0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0x7E, 
-0x7F, 0x7F, 0x7C, 0x7F, 0x7F, 0x7F, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xFE, 0xFE, 0x02, 0x62, 0x62, 0x62, 
-0xE2, 0x62, 0x62, 0x62, 0xC2, 0x02, 
-0x02, 0xFE, 0x00, 0x00, 0xFE, 0xFE, 
-0x02, 0x82, 0xC2, 0xE2, 0xF2, 0x82, 
-0x82, 0x82, 0x82, 0x02, 0x02, 0xFE, 
-0x00, 0x00, 0x00, 0x07, 0x7F, 0xDF, 
-0x00, 0x05, 0x03, 0x7F, 0x1F, 0x1E, 
-0x3C, 0x38, 0x18, 0x1F, 0x0F, 0x0D, 
-0x0D, 0x0D, 0x06, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x20, 0x20, 0x50, 
-0x8C, 0x50, 0x20, 0x20, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 
-0x40, 0x30, 0x40, 0x80, 0x89, 0x09, 
-0x06, 0x09, 0x09, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x1C, 0x12, 0x12, 0x12, 
-0x1E, 0x10, 0x10, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0xFF, 0x00, 0x73, 
-0x84, 0xE7, 0x94, 0x94, 0x94, 0x67, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xFE, 0xFE, 0xFE, 0x9E, 0x9E, 0x9E, 
-0x1E, 0x9E, 0x9E, 0x9E, 0x3E, 0xFE, 
-0xFE, 0xFE, 0x00, 0x00, 0xFE, 0xFE, 
-0xFE, 0x7E, 0x3E, 0x1E, 0x0E, 0x7E, 
-0x7E, 0x7E, 0x7E, 0xFE, 0xFE, 0xFE, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x3F, 0x7F, 0x40, 0x46, 0x46, 0x46, 
-0x47, 0x46, 0x46, 0x46, 0x43, 0x40, 
-0x40, 0x7F, 0x00, 0x00, 0x7F, 0x7F, 
-0x40, 0x41, 0x43, 0x47, 0x4F, 0x41, 
-0x41, 0x41, 0x41, 0x40, 0x40, 0x3F, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 
-0x06, 0x01, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x01, 0x06, 0x01, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 
-0x36, 0x08, 0x08, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x1F, 0x00, 0x0E, 
-0x10, 0x1C, 0x12, 0x12, 0x12, 0x12, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x3F, 0x7F, 0x7F, 0x79, 0x79, 0x79, 
-0x78, 0x79, 0x79, 0x79, 0x7C, 0x7F, 
-0x7F, 0x7F, 0x00, 0x00, 0x7F, 0x7F, 
-0x7F, 0x7E, 0x7C, 0x78, 0x70, 0x7E, 
-0x7E, 0x7E, 0x7E, 0x7F, 0x7F, 0x3F, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-};
diff --git a/keyboards/helix/rev2/keymaps/froggy/keymap.c b/keyboards/helix/rev2/keymaps/froggy/keymap.c
deleted file mode 100644
index 1680147157d..00000000000
--- a/keyboards/helix/rev2/keymaps/froggy/keymap.c
+++ /dev/null
@@ -1,696 +0,0 @@
-#include QMK_KEYBOARD_H
-#include <string.h>
-
-#define MIN(x, y) (((x) < (y)) ? (x) : (y))
-#define MAX(x, y) (((x) > (y)) ? (x) : (y))
-
-#define LAYOUT_half( \
-    L00, L01, L02, L03, L04, L05,       \
-    L10, L11, L12, L13, L14, L15,       \
-    L20, L21, L22, L23, L24, L25,       \
-    L30, L31, L32, L33, L34, L35, L36,  \
-    L40, L41, L42, L43, L44, L45, L46   \
-) { \
-    { L00, L01, L02, L03, L04, L05, KC_NO }, \
-    { L10, L11, L12, L13, L14, L15, KC_NO }, \
-    { L20, L21, L22, L23, L24, L25, KC_NO }, \
-    { L30, L31, L32, L33, L34, L35, L36 }, \
-    { L40, L41, L42, L43, L44, L45, L46 }, \
-    { _______, _______, _______, _______, _______, _______, KC_NO }, \
-    { _______, _______, _______, _______, _______, _______, KC_NO }, \
-    { _______, _______, _______, _______, _______, _______, KC_NO }, \
-    { _______, _______, _______, _______, _______, _______, _______ }, \
-    { _______, _______, _______, _______, _______, _______, _______ } \
-}
-
-#define DELAY_TIME  75
-static uint16_t key_timer;
-static uint16_t tap_timer;
-static uint16_t delay_registered_code;
-static uint8_t delay_mat_row;
-static uint8_t delay_mat_col;
-static bool delay_key_stat;
-static bool delay_key_pressed;
-static bool tapping_key;
-
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-// The underscores don't mean anything - you can have a layer called STUFF or any other name.
-// Layer names don't all need to be of the same length, obviously, and you can also skip them
-// entirely and just use numbers.
-#define _BASE 0
-#define _OPT 1
-#define _FUNC 2
-#define _SYM 3
-#define _NUM 4
-
-bool RGBAnimation = false; //Flag for LED Layer color Refresh.
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  EISU,
-  KANA,
-  RGBRST,
-  RGBOFF,
-  RGB1,
-  RGB2,
-  RGB3,
-  OPT_TAP_SP,
-  DESKTOP,
-  MAC,
-  WIN,
-};
-
-enum macro_keycodes {
-  KC_SAMPLEMACRO,
-};
-
-//Macros
-#define M_SAMPLE M(KC_SAMPLEMACRO)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /* Base
-   * ,-----------------------------------------.
-   * |  C+z |   ;  |   [  |   (  |   <  |   {  |
-   * |------+------+------+------+------+------|
-   * | KANA |   P  |   K  |   R  |   A  |   F  |
-   * |------+------+------+------+------+------|
-   * |  BS  |   D  |   T  |   H  |   E  |   O  |
-   * |------+------+------+------+------+------+------.
-   * | Shift|   Y  |   S  |   N  |   I  |   U  |Space |
-   * |------+------+------+------+------+------+------|
-   * | Ctrl | Alt  | Gui  | Sym  | Num  | OPT  | Ent  |
-   * `------------------------------------------------'
-   */
-  [_BASE] = LAYOUT_half(
-      LCTL(KC_Z),    KC_SCLN,       KC_LBRC,       KC_LPRN,   KC_LT,     KC_LCBR,
-      KANA,          KC_P,          KC_K,          KC_R,      KC_A,      KC_F,
-      KC_BSPC,       KC_D,          KC_T,          KC_H,      KC_E,      KC_O,
-      OSM(MOD_LSFT), KC_Y,          KC_S,          KC_N,      KC_I,      KC_U,       KC_SPC,
-      OSM(MOD_LCTL), OSM(MOD_LALT), OSM(MOD_LGUI), MO(_SYM),  MO(_NUM),  OPT_TAP_SP, KC_ENT ),
-
-  /* Opt
-   * ,-----------------------------------------.
-   * |  Esc |  :   |  ]   |  )   |  >   |  }   |
-   * |------+------+------+------+------+------|
-   * |  EISU|   J  |   M  |   B  |   '  |  Tab |
-   * |------+------+------+------+------+------|
-   * |   .  |   V  |   C  |   L  |   Z  |  Q   |
-   * |------+------+------+------+------+------+------.
-   * |      |   X  |   G  |   W  |   -  |  Del | Esc  |
-   * |------+------+------+------+------+------+------|
-   * |      |      |      |   ,  | DTOP |      |      |
-   * `------------------------------------------------'
-   */
-  [_OPT] = LAYOUT_half(
-      KC_ESC,  KC_COLN,KC_RBRC, KC_RPRN,KC_GT,     KC_RCBR,
-      EISU,    KC_J,   KC_M,    KC_B,   KC_QUOT,   KC_TAB,
-      KC_DOT,  KC_V,   KC_C,    KC_L,   KC_Z,      KC_Q,
-      _______, KC_X,   KC_G,    KC_W,   KC_MINUS,  KC_DEL,  KC_ESC,
-      _______, _______,_______, KC_COMM,DESKTOP,   _______, _______
-      ),
-
-  /* Func
-   * ,-----------------------------------------.
-   * |RGBRST|  Hue |      |  RST |  Mac |  Win |
-   * |------+------+------+------+------+------|
-   * | RGB1 | VAL+ |  F7  |  F8  |  F9  |      |
-   * |------+------+------+------+------+------|
-   * | RGB2 | VAL- |  F4  |  F5  |  F6  | F12  |
-   * |------+------+------+------+------+------+------.
-   * | RGB3 |  F10 |  F1  |  F2  |  F3  | F11  |      |
-   * |------+------+------+------+------+------+------|
-   * |RGBOFF|      |      |      |      |      |      |
-   * `------------------------------------------------'
-   */
-  [_FUNC] = LAYOUT_half(
-      RGBRST,RGB_HUI, _______, QK_BOOT, MAC,     WIN,
-      RGB1,  RGB_VAI, KC_F7,   KC_F8,   KC_F9,   _______,
-      RGB2,  RGB_VAD, KC_F4,   KC_F5,   KC_F6,   KC_F12,
-      RGB3,  KC_F10,  KC_F1,   KC_F2,   KC_F3,   KC_F11,   _______,
-      RGBOFF,_______, _______, _______, _______, _______,  _______
-      ),
-
-  /* Sym
-   * ,-----------------------------------------.
-   * |  Ins |  GRV |      |  PU  |  PD  |   ^  |
-   * |------+------+------+------+------+------|
-   * |      |   \  |   #  |   =  |   ?  |   %  |
-   * |------+------+------+------+------+------|
-   * |      |   $  |  upA |   @  |   !  |   |  |
-   * |------+------+------+------+------+------+------.
-   * |  CL  |  <-  |  dwA |  ->  |   _  |   &  |      |
-   * |------+------+------+------+------+------+------|
-   * |      |      |  PS  |      |   ~  |      |      |
-   * `------------------------------------------------'
-   */
-  [_SYM] = LAYOUT_half(
-      KC_INS,  KC_GRV,  _______, KC_PGUP, KC_PGDN, KC_CIRC,
-      _______, KC_BSLS, KC_HASH, KC_EQL,  KC_QUES, KC_PERC,
-      _______, KC_DLR,  KC_UP,   KC_AT,   KC_EXLM, KC_PIPE,
-      KC_CAPS, KC_LEFT, KC_DOWN, KC_RIGHT,KC_UNDS, KC_AMPR, _______,
-      _______, _______, KC_PSCR, _______, KC_TILD, _______, _______
-      ),
-
-  /* Raise
-   * ,-----------------------------------------.
-   * |      |      | Func | home |  End |      |
-   * |------+------+------+------+------+------|
-   * |      |   *  |  7   |  8   |  9   |  -   |
-   * |------+------+------+------+------+------|
-   * |  .   |   /  |  4   |  5   |  6   |  +   |
-   * |------+------+------+------+------+------+------.
-   * |  LN  |  0   |  1   |  2   |  3   |C+S+F1|      |
-   * |------+------+------+------+------+------+------|
-   * |      |      |      |  ,   |      |      |      |
-   * `------------------------------------------------'
-   */
-  [_NUM] = LAYOUT_half(
-      _______,  _______, OSL(_FUNC), KC_HOME, KC_END,  _______,
-      _______,  KC_ASTR, KC_P7,      KC_P8,   KC_P9,   KC_MINS,
-      KC_PDOT,  KC_SLSH, KC_P4,      KC_P5,   KC_P6,   KC_PLUS,
-      KC_NUM,   KC_P0,   KC_P1,      KC_P2,   KC_P3,   LCTL(S(KC_F1)), _______,
-      _______,  _______, KC_PDOT,    KC_COMM, _______, _______,        _______
-      )
-};
-
-#ifdef AUDIO_ENABLE
-
-float tone_qwerty[][2]     = SONG(QWERTY_SOUND);
-float tone_dvorak[][2]     = SONG(DVORAK_SOUND);
-float tone_colemak[][2]    = SONG(COLEMAK_SOUND);
-float tone_plover[][2]     = SONG(PLOVER_SOUND);
-float tone_plover_gb[][2]  = SONG(PLOVER_GOODBYE_SOUND);
-#endif
-
-// define variables for reactive RGB
-//bool TOG_STATUS = false;
-int RGB_current_mode;
-
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-bool find_mairix(uint16_t keycode, uint8_t *row, uint8_t *col){
-  for(uint8_t i=0; i<MATRIX_ROWS; i++){
-    for(uint8_t j=0; j<MATRIX_COLS; j++){
-      if( pgm_read_word(&(keymaps[_BASE][i][j]))==keycode){
-        *row = i;
-        *col = j;
-        return true;
-      }
-    }
-  }
-  return false;
-}
-
-void unregister_delay_code(void){
-  if(delay_registered_code){
-    unregister_code(delay_registered_code);
-    if (delay_registered_code & QK_LSFT){
-      unregister_code(KC_LSFT);
-    }
-    if (delay_registered_code & QK_LCTL){
-      unregister_code(KC_LCTL);
-    }
-    if (delay_registered_code & QK_LALT){
-      unregister_code(KC_LALT);
-    }
-    if (delay_registered_code & QK_LGUI){
-      unregister_code(KC_LGUI);
-    }
-    delay_registered_code=0;
-  }
-}
-
-void register_delay_code(uint8_t layer){
-  if(delay_key_stat){
-    unregister_delay_code();
-
-    uint16_t code = pgm_read_word(&(keymaps[layer][delay_mat_row][delay_mat_col]));
-    if (code & QK_LSFT){
-      register_code(KC_LSFT);
-    }
-    if (code & QK_LCTL){
-      register_code(KC_LCTL);
-    }
-    if (code & QK_LALT){
-      register_code(KC_LALT);
-    }
-    if (code & QK_LGUI){
-      register_code(KC_LGUI);
-    }
-    register_code(code);
-    delay_registered_code = code;
-    delay_key_stat = false;
-    tapping_key = true;
-  }
-}
-
-#ifdef RGBLIGHT_ENABLE
-struct keybuf {
-  char col, row;
-  char frame;
-};
-struct keybuf keybufs[256];
-unsigned char keybuf_begin, keybuf_end;
-
-int col, row;
-#endif
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-
-  #ifdef RGBLIGHT_ENABLE
-    col = record->event.key.col;
-    row = record->event.key.row;
-    if (record->event.pressed && ((row < 5 && is_keyboard_master()) || (row >= 5 && !is_keyboard_master()))) {
-      int end = keybuf_end;
-      keybufs[end].col = col;
-      keybufs[end].row = row % 5;
-      keybufs[end].frame = 0;
-      keybuf_end ++;
-    }
-  #endif
-
-  if(tap_timer&&keycode!=OPT_TAP_SP){
-    tapping_key = true;
-  }
-
-  if(keycode==delay_registered_code){
-      if (!record->event.pressed){
-        unregister_delay_code();
-      }
-  }
-
-  switch (keycode) {
-    case KC_SCLN:
-    case KC_LBRC:
-    case KC_LPRN:
-    case KC_LT:
-    case KC_LCBR:
-    case KC_P:
-    case KC_K:
-    case KC_R:
-    case KC_A:
-    case KC_F:
-    case KC_BSPC:
-    case KC_D:
-    case KC_T:
-    case KC_H:
-    case KC_E:
-    case KC_O:
-    case KC_Y:
-    case KC_S:
-    case KC_N:
-    case KC_I:
-    case KC_U:
-    case LCTL(KC_Z):
-    case KC_SPC:
-      if (record->event.pressed) {
-        register_delay_code(_BASE);
-        if(find_mairix(keycode, &delay_mat_row, &delay_mat_col)){
-          key_timer = timer_read();
-          delay_key_stat = true;
-          delay_key_pressed = true;
-        }
-      }else{
-        delay_key_pressed = false;
-      }
-      return false;
-      break;
-    case OPT_TAP_SP:
-      if (record->event.pressed) {
-        tapping_key = false;
-        register_delay_code(_OPT);
-        layer_on(_OPT);
-        tap_timer = timer_read();
-      }else{
-        layer_off(_OPT);
-        if(tapping_key==false && timer_elapsed(tap_timer) < TAPPING_TERM){
-          SEND_STRING(" ");
-        }
-        tap_timer = 0;
-      }
-      return false;
-      break;
-   case EISU:
-      if (record->event.pressed) {
-        if(keymap_config.swap_lalt_lgui==false){
-          register_code(KC_LNG2);
-        }else{
-          SEND_STRING(SS_LALT("`"));
-        }
-      } else {
-        unregister_code(KC_LNG2);
-      }
-      return false;
-      break;
-    case KANA:
-      if (record->event.pressed) {
-        if(keymap_config.swap_lalt_lgui==false){
-          register_code(KC_LNG1);
-        }else{
-          SEND_STRING(SS_LALT("`"));
-        }
-      } else {
-        unregister_code(KC_LNG1);
-      }
-      return false;
-      break;
-    case DESKTOP:
-      if (record->event.pressed) {
-        if(keymap_config.swap_lalt_lgui==false){
-          register_code(KC_F11);
-        }else{
-          SEND_STRING(SS_LGUI("d"));
-        }
-      } else {
-        unregister_code(KC_F11);
-      }
-      return false;
-      break;
-    case RGBRST:
-      #ifdef RGBLIGHT_ENABLE
-        if (record->event.pressed) {
-          eeconfig_update_rgblight_default();
-          rgblight_enable();
-          RGB_current_mode = rgblight_get_mode();
-          RGBAnimation = false;
-        }
-      #endif
-      break;
-    case RGBOFF:
-      #ifdef RGBLIGHT_ENABLE
-        if (record->event.pressed) {
-          rgblight_disable();
-        }
-      #endif
-      break;
-    case RGB1:
-      #ifdef RGBLIGHT_ENABLE
-        if (record->event.pressed) {
-          RGBAnimation = true;
-          rgblight_mode(RGBLIGHT_MODE_RAINBOW_MOOD);
-          RGB_current_mode = rgblight_get_mode();
-        }
-      #endif
-      break;
-    case RGB2:
-      #ifdef RGBLIGHT_ENABLE
-        if (record->event.pressed) {
-          RGBAnimation = true;
-          rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL + 1);
-          RGB_current_mode = rgblight_get_mode();
-        }
-      #endif
-      break;
-    case RGB3:
-      #ifdef RGBLIGHT_ENABLE
-        if (record->event.pressed) {
-          RGBAnimation = true;
-          rgblight_mode(RGBLIGHT_MODE_KNIGHT);
-          RGB_current_mode = rgblight_get_mode();
-        }
-      #endif
-      break;
-    case MAC:
-      if (record->event.pressed) {
-        keymap_config.swap_lalt_lgui = false;
-        keymap_config.swap_ralt_rgui = false;
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(ag_norm_song);
-        #endif
-      }
-      break;
-    case WIN:
-      if (record->event.pressed) {
-        keymap_config.swap_lalt_lgui = true;
-        keymap_config.swap_ralt_rgui = true;
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(ag_swap_song);
-        #endif
-      }
-      break;
-    }
-  return true;
-}
-
-
-//keyboard start-up code. Runs once when the firmware starts up.
-void matrix_init_user(void) {
-    #ifdef RGBLIGHT_ENABLE
-      RGB_current_mode = rgblight_get_mode();
-    #endif
-}
-
-
-//assign the right code to your layers for OLED display
-#define L_BASE 0
-#define L_OPT 2
-#define L_FUNC 4
-#define L_SYM 8
-#define L_NUM 16
-#define L_FNLAYER 64
-#define L_NUMLAY 128
-#define L_NLOWER 136
-#define L_NFNLAYER 192
-#define L_MOUSECURSOR 256
-
-// LED Effect
-#ifdef RGBLIGHT_ENABLE
-unsigned char rgb[7][5][3];
-void led_ripple_effect(char r, char g, char b) {
-    static int scan_count = -10;
-    static int keys[] = { 6, 6, 6, 7, 7 };
-    static int keys_sum[] = { 0, 6, 12, 18, 25 };
-
-    if (scan_count == -1) {
-      rgblight_enable_noeeprom();
-      rgblight_mode(RGBLIGHT_MODE_STATIC_LIGHT);
-    } else if (scan_count >= 0 && scan_count < 5) {
-      for (unsigned char c=keybuf_begin; c!=keybuf_end; c++) {
-        int i = c;
-        // FIXME:
-
-        int y = scan_count;
-        int dist_y = abs(y - keybufs[i].row);
-        for (int x=0; x<keys[y]; x++) {
-          int dist = abs(x - keybufs[i].col) + dist_y;
-          if (dist <= keybufs[i].frame) {
-            int elevation = MAX(0, (8 + dist - keybufs[i].frame)) << 2;
-            if (elevation) {
-              if ((rgb[x][y][0] != 255) && r) { rgb[x][y][0] = MIN(255, elevation + rgb[x][y][0]); }
-              if ((rgb[x][y][1] != 255) && g) { rgb[x][y][1] = MIN(255, elevation + rgb[x][y][1]); }
-              if ((rgb[x][y][2] != 255) && b) { rgb[x][y][2] = MIN(255, elevation + rgb[x][y][2]); }
-            }
-          }
-        }
-      }
-    } else if (scan_count == 5) {
-      for (unsigned char c=keybuf_begin; c!=keybuf_end; c++) {
-        int i = c;
-        if (keybufs[i].frame < 18) {
-          keybufs[i].frame ++;
-        } else {
-          keybuf_begin ++;
-        }
-      }
-    } else if (scan_count >= 6 && scan_count <= 10) {
-      int y = scan_count - 6;
-      for (int x=0; x<keys[y]; x++) {
-        int at = keys_sum[y] + ((y & 1) ? x : (keys[y] - x - 1));
-        led[at].r = rgb[x][y][0];
-        led[at].g = rgb[x][y][1];
-        led[at].b = rgb[x][y][2];
-      }
-      rgblight_set();
-    } else if (scan_count == 11) {
-      memset(rgb, 0, sizeof(rgb));
-    }
-    scan_count++;
-    if (scan_count >= 12) { scan_count = 0; }
-}
-#endif
-
-uint8_t layer_state_old;
-
-//runs every scan cycle (a lot)
-void matrix_scan_user(void) {
-  if(delay_key_stat && (timer_elapsed(key_timer) > DELAY_TIME)){
-    register_delay_code(_BASE);
-    if(!delay_key_pressed){
-      unregister_delay_code();
-    }
-  }
-
-  if(layer_state_old != layer_state){
-    switch (layer_state) {
-      case L_BASE:
-        break;
-      case L_OPT:
-        register_delay_code(_OPT);
-        break;
-      case L_NUM:
-        register_delay_code(_NUM);
-        break;
-      case L_SYM:
-        register_delay_code(_SYM);
-        break;
-      case L_FUNC:
-        register_delay_code(_FUNC);
-        break;
-    }
-    layer_state_old = layer_state;
-  }
-
-  #ifdef RGBLIGHT_ENABLE
-    if(!RGBAnimation){
-      switch (layer_state) {
-        case L_BASE:
-          #ifdef RGBLED_BACK
-            led_ripple_effect(0,112,127);
-          #else
-            rgblight_setrgb(0,112,127);
-          #endif
-          break;
-        case L_OPT:
-          #ifdef RGBLED_BACK
-            led_ripple_effect(127,0,100);
-          #else
-            rgblight_setrgb(127,0,100);
-          #endif
-          break;
-        case L_NUM:
-          #ifdef RGBLED_BACK
-            led_ripple_effect(127,23,0);
-          #else
-            rgblight_setrgb(127,23,0);
-          #endif
-          break;
-        case L_SYM:
-          #ifdef RGBLED_BACK
-            led_ripple_effect(0,127,0);
-          #else
-            rgblight_setrgb(0,127,0);
-          #endif
-          break;
-        case L_FUNC:
-          #ifdef RGBLED_BACK
-            led_ripple_effect(127,0,61);
-          #else
-            rgblight_setrgb(127,0,61);
-          #endif
-          break;
-        }
-    }
-  #endif
-}
-
-//OLED update loop
-#ifdef OLED_ENABLE
-
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-    return OLED_ROTATION_0;
-}
-
-// Render to OLED
-void render_status(void) {
-
-  // froggy logo
-  static char logo[4][1][17]=
-  {
-    {
-      {0x65,0x66,0x67,0x68,0x69,0x6a,0x6b,0x6c,0x6d,0x6e,0x6f,0x70,0x71,0x72,0x73,0x74,0}
-    },
-    {
-      {0x85,0x86,0x87,0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,0x90,0x91,0x92,0x93,0x94,0}
-    },
-    {
-      {0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf,0xb0,0xb1,0xb2,0xb3,0xb4,0}
-    },
-    {
-      {0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xce,0xcf,0xd0,0xd1,0xd2,0xd3,0}
-    }
-  };
-
-  static char indctr[8][2][4]=
-  {
-    // white icon
-    {
-      {0x60,0x61,0x62,0},
-      {0x63,0x64,0}
-    },
-    {
-      {0x80,0x81,0x82,0},
-      {0x83,0x84,0}
-    },
-    {
-      {0xa0,0xa1,0xa2,0},
-      {0xa3,0xa4,0}
-    },
-    {
-      {0xc0,0xc1,0xc2,0},
-      {0xc3,0xc4,0}
-    },
-    // Black icon
-    {
-      {0x75,0x76,0x77,0},
-      {0x78,0x79,0}
-    },
-    {
-      {0x95,0x96,0x97,0},
-      {0x98,0x99,0}
-    },
-    {
-      {0xb5,0xb6,0xb7,0},
-      {0xb8,0xb9,0}
-    },
-    {
-      {0xd5,0xd6,0xd7,0},
-      {0xd8,0xd9,0}
-    },
-  };
-
-  int rown = 0;
-  int rowf = 0;
-  int rowa = 0;
-  int rows = 0;
-
-  //Set Indicator icon
-  led_t led_state = host_keyboard_led_state();
-  if (led_state.num_lock) { rown = 4; } else { rown = 0; }
-  if (led_state.caps_lock) { rowa = 4; } else { rowa = 0; }
-  if (led_state.scroll_lock) { rows = 4; } else { rows = 0; }
-  if (layer_state == L_FUNC) { rowf = 4; }
-
-  oled_write(indctr[rown]  [0], false);
-  oled_write(indctr[rowf]  [1], false);
-  oled_write(logo  [0]     [0], false);
-  oled_write(indctr[rown+1][0], false);
-  oled_write(indctr[rowf+1][1], false);
-  oled_write(logo  [1]     [0], false);
-  oled_write(indctr[rowa+2][0], false);
-  oled_write(indctr[rows+2][1], false);
-  oled_write(logo  [2]     [0], false);
-  oled_write(indctr[rowa+3][0], false);
-  oled_write(indctr[rows+3][1], false);
-  oled_write(logo  [3]     [0], false);
-
-}
-
-bool oled_task_user(void) {
-
-#if DEBUG_TO_SCREEN
-  if (debug_enable) {
-    return;
-  }
-#endif
-
-  if (is_keyboard_master()) {
-    render_status();
-  }
-  return false;
-}
-
-#endif // end of OLED_ENABLE
diff --git a/keyboards/helix/rev2/keymaps/froggy/readme.md b/keyboards/helix/rev2/keymaps/froggy/readme.md
deleted file mode 100644
index 624e738a6c9..00000000000
--- a/keyboards/helix/rev2/keymaps/froggy/readme.md
+++ /dev/null
@@ -1,83 +0,0 @@
-Froggy -one hand Helix-
-======
-
-![Imgur](https://i.imgur.com/S1Dw3XW.jpg)
-
-## Features
-It is a one-handed keyboard with reference to Frogpad. Layout Designed by タクマ ([@humid](https://twitter.com/humid)).
-
-## Layout
-### Base
-```
-,-----------------------------------------.
-|  C+z |   ;  |   [  |   (  |   <  |   {  |
-|------+------+------+------+------+------|
-| KANA |   P  |   K  |   R  |   A  |   F  |
-|------+------+------+------+------+------|
-|  BS  |   D  |   T  |   H  |   E  |   O  |
-|------+------+------+------+------+------+------.
-| Shift|   Y  |   S  |   N  |   I  |   U  | Space|
-|------+------+------+------+------+------+------|
-| Ctrl |  Alt |  win |  Sym |  Num |  OPT |  Ent |
-`------------------------------------------------'
-```
-
-### Opt
-```
-,-----------------------------------------.
-|  Esc |   :  |   ]  |   )  |   >  |   }  |
-|------+------+------+------+------+------|
-| EISU |   J  |   M  |   B  |   '  |  Tab |
-|------+------+------+------+------+------|
-|   .  |   V  |   C  |   L  |   Z  |   Q  |
-|------+------+------+------+------+------+------.
-|      |   X  |   G  |   W  |   -  |  Del |  Esc |
-|------+------+------+------+------+------+------|
-|      |      |      |   ,  | DTOP |      |      |
-`------------------------------------------------'
-```
-
-### Num
-```
-,-----------------------------------------.
-|      |      | Func | home |  End |      |
-|------+------+------+------+------+------|
-|      |   *  |   7  |   8  |   9  |   -  |
-|------+------+------+------+------+------|
-|   .  |   /  |   4  |   5  |   6  |   +  |
-|------+------+------+------+------+------+------.
-|  LN  |   0  |   1  |   2  |   3  |C+S+F1|      |
-|------+------+------+------+------+------+------|
-|      |      |      |   ,  |      |      |      |
-`------------------------------------------------'
-```
-
-### Sym
-```
-,-----------------------------------------.
-|  Ins |  GRV |      |  PU  |  PD  |   ^  |
-|------+------+------+------+------+------|
-|      |   \  |   #  |   =  |   ?  |   %  |
-|------+------+------+------+------+------|
-|      |   $  |  upA |   @  |   !  |   |  |
-|------+------+------+------+------+------+------.
-|  CL  |  <-  |  dwA |  ->  |   _  |   &  |      |
-|------+------+------+------+------+------+------|
-|      |      |  PS  |      |   ~  |      |      |
- `-----------------------------------------------'
-```
-
-### Func
-```
-,-----------------------------------------.
-|RGBRST|  Hue |      |  RST |  Mac |  Win |
-|------+------+------+------+------+------|
-| RGB1 | VAL+ |  F7  |  F8  |  F9  |      |
-|------+------+------+------+------+------|
-| RGB2 | VAL- |  F4  |  F5  |  F6  |  F12 |
-|------+------+------+------+------+------+------.
-| RGB3 |  F10 |  F1  |  F2  |  F3  |  F11 |      |
-|------+------+------+------+------+------+------|
-|RGBOFF|      |      |      |      |      |      |
-`------------------------------------------------'
-```
diff --git a/keyboards/helix/rev2/keymaps/froggy/rules.mk b/keyboards/helix/rev2/keymaps/froggy/rules.mk
deleted file mode 100644
index 048ecefff38..00000000000
--- a/keyboards/helix/rev2/keymaps/froggy/rules.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-# QMK Standard Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
-#   See TOP/keyboards/helix/rules.mk for a list of options that can be set.
-#   See TOP/docs/config_options.md for more information.
-#
-LTO_ENABLE = no  # if firmware size over limit, try this option
-SPLIT_KEYBOARD = yes
-
-# Helix Spacific Build Options
-# you can uncomment and edit follows 7 Variables
-#  jp: 以下の7つの変数を必要に応じて編集し、コメントアウトをはずします。
-OLED_ENABLE = yes           # OLED_ENABLE
-LOCAL_GLCDFONT = yes        # use each keymaps "helixfont.h" insted of "common/glcdfont.c"
-LED_BACK_ENABLE = yes       # LED backlight (Enable WS2812 RGB underlight.)
-LED_UNDERGLOW_ENABLE = no   # LED underglow (Enable WS2812 RGB underlight.)
-LED_ANIMATIONS = yes        # LED animations
-# IOS_DEVICE_ENABLE = no      # connect to IOS device (iPad,iPhone)
-
-# OLED_ENABLE が yes のとき
-#   OLED_SELECT が core ならば QMK 標準の oled_dirver.c を使用します。
-#   OLED_SELECT が core 以外ならば従来どおり helix/local_drivers/ssd1306.c を使用します。
-# If OLED_ENABLE is 'yes'
-#   If OLED_SELECT is 'core', use QMK standard oled_dirver.c.
-#   If OLED_SELECT is other than 'core', use helix/local_drivers/ssd1306.c.
-OLED_SELECT = core
diff --git a/keyboards/helix/rev2/keymaps/froggy_106/config.h b/keyboards/helix/rev2/keymaps/froggy_106/config.h
deleted file mode 100644
index 9affa1d296a..00000000000
--- a/keyboards/helix/rev2/keymaps/froggy_106/config.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#undef TAPPING_TERM
-#define TAPPING_TERM 200
-#define ONESHOT_TAP_TOGGLE 5 /* Tapping this number of times holds the key until tapped this number of times again. */
-#define ONESHOT_TIMEOUT 5000 /* Time (in ms) before the one shot key is released */
-
-// the froggy keymap does not use the right hand side, so sync_timer is not needed
-#define DISABLE_SYNC_TIMER
-// For the same reason, the following are also not needed
-#undef SPLIT_LAYER_STATE_ENABLE
-#undef SPLIT_LED_STATE_ENABLE
-
-// If you need more program area, try select and reduce rgblight modes to use.
-
-// Selection of RGBLIGHT MODE to use.
-#if defined(LED_ANIMATIONS)
-   #define RGBLIGHT_EFFECT_BREATHING
-   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-   #define RGBLIGHT_EFFECT_SNAKE
-   #define RGBLIGHT_EFFECT_KNIGHT
-   #define RGBLIGHT_EFFECT_CHRISTMAS
-   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-   //#define RGBLIGHT_EFFECT_RGB_TEST
-   //#define RGBLIGHT_EFFECT_ALTERNATING
-#endif
diff --git a/keyboards/helix/rev2/keymaps/froggy_106/helixfont.h b/keyboards/helix/rev2/keymaps/froggy_106/helixfont.h
deleted file mode 100644
index 3a79a1937ba..00000000000
--- a/keyboards/helix/rev2/keymaps/froggy_106/helixfont.h
+++ /dev/null
@@ -1,235 +0,0 @@
-// This is the 'classic' fixed-space bitmap font for Adafruit_GFX since 1.0.
-// See gfxfont.h for newer custom bitmap font info.
-
-#pragma once
-
-#include "progmem.h"
-
-// Standard ASCII 5x7 font
-
-static const unsigned char font[] PROGMEM = {
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x3E, 0x5B, 0x4F, 0x5B, 0x3E, 0x00, 
-0x3E, 0x6B, 0x4F, 0x6B, 0x3E, 0x00, 
-0x1C, 0x3E, 0x7C, 0x3E, 0x1C, 0x00, 
-0x18, 0x3C, 0x7E, 0x3C, 0x18, 0x00, 
-0x1C, 0x57, 0x7D, 0x57, 0x1C, 0x00, 
-0x1C, 0x5E, 0x7F, 0x5E, 0x1C, 0x00, 
-0x00, 0x18, 0x3C, 0x18, 0x00, 0x00, 
-0xFF, 0xE7, 0xC3, 0xE7, 0xFF, 0x00, 
-0x00, 0x18, 0x24, 0x18, 0x00, 0x00, 
-0xFF, 0xE7, 0xDB, 0xE7, 0xFF, 0x00, 
-0x30, 0x48, 0x3A, 0x06, 0x0E, 0x00, 
-0x26, 0x29, 0x79, 0x29, 0x26, 0x00, 
-0x40, 0x7F, 0x05, 0x05, 0x07, 0x00, 
-0x40, 0x7F, 0x05, 0x25, 0x3F, 0x00, 
-0x5A, 0x3C, 0xE7, 0x3C, 0x5A, 0x00, 
-0x7F, 0x3E, 0x1C, 0x1C, 0x08, 0x00, 
-0x08, 0x1C, 0x1C, 0x3E, 0x7F, 0x00, 
-0x14, 0x22, 0x7F, 0x22, 0x14, 0x00, 
-0x5F, 0x5F, 0x00, 0x5F, 0x5F, 0x00, 
-0x06, 0x09, 0x7F, 0x01, 0x7F, 0x00, 
-0x00, 0x66, 0x89, 0x95, 0x6A, 0x00, 
-0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 
-0x94, 0xA2, 0xFF, 0xA2, 0x94, 0x00, 
-0x08, 0x04, 0x7E, 0x04, 0x08, 0x00, 
-0x10, 0x20, 0x7E, 0x20, 0x10, 0x00, 
-0x08, 0x08, 0x2A, 0x1C, 0x08, 0x00, 
-0x08, 0x1C, 0x2A, 0x08, 0x08, 0x00, 
-0x1E, 0x10, 0x10, 0x10, 0x10, 0x00, 
-0x0C, 0x1E, 0x0C, 0x1E, 0x0C, 0x00, 
-0x30, 0x38, 0x3E, 0x38, 0x30, 0x00, 
-0x06, 0x0E, 0x3E, 0x0E, 0x06, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x5F, 0x00, 0x00, 0x00, 
-0x00, 0x07, 0x00, 0x07, 0x00, 0x00, 
-0x14, 0x7F, 0x14, 0x7F, 0x14, 0x00, 
-0x24, 0x2A, 0x7F, 0x2A, 0x12, 0x00, 
-0x23, 0x13, 0x08, 0x64, 0x62, 0x00, 
-0x36, 0x49, 0x56, 0x20, 0x50, 0x00, 
-0x00, 0x08, 0x07, 0x03, 0x00, 0x00, 
-0x00, 0x1C, 0x22, 0x41, 0x00, 0x00, 
-0x00, 0x41, 0x22, 0x1C, 0x00, 0x00, 
-0x2A, 0x1C, 0x7F, 0x1C, 0x2A, 0x00, 
-0x08, 0x08, 0x3E, 0x08, 0x08, 0x00, 
-0x00, 0x80, 0x70, 0x30, 0x00, 0x00, 
-0x08, 0x08, 0x08, 0x08, 0x08, 0x00, 
-0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-0x20, 0x10, 0x08, 0x04, 0x02, 0x00, 
-0x3E, 0x51, 0x49, 0x45, 0x3E, 0x00, 
-0x00, 0x42, 0x7F, 0x40, 0x00, 0x00, 
-0x72, 0x49, 0x49, 0x49, 0x46, 0x00, 
-0x21, 0x41, 0x49, 0x4D, 0x33, 0x00, 
-0x18, 0x14, 0x12, 0x7F, 0x10, 0x00, 
-0x27, 0x45, 0x45, 0x45, 0x39, 0x00, 
-0x3C, 0x4A, 0x49, 0x49, 0x31, 0x00, 
-0x41, 0x21, 0x11, 0x09, 0x07, 0x00, 
-0x36, 0x49, 0x49, 0x49, 0x36, 0x00, 
-0x46, 0x49, 0x49, 0x29, 0x1E, 0x00, 
-0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 
-0x00, 0x40, 0x34, 0x00, 0x00, 0x00, 
-0x00, 0x08, 0x14, 0x22, 0x41, 0x00, 
-0x14, 0x14, 0x14, 0x14, 0x14, 0x00, 
-0x00, 0x41, 0x22, 0x14, 0x08, 0x00, 
-0x02, 0x01, 0x59, 0x09, 0x06, 0x00, 
-0x3E, 0x41, 0x5D, 0x59, 0x4E, 0x00, 
-0x7C, 0x12, 0x11, 0x12, 0x7C, 0x00, 
-0x7F, 0x49, 0x49, 0x49, 0x36, 0x00, 
-0x3E, 0x41, 0x41, 0x41, 0x22, 0x00, 
-0x7F, 0x41, 0x41, 0x41, 0x3E, 0x00, 
-0x7F, 0x49, 0x49, 0x49, 0x41, 0x00, 
-0x7F, 0x09, 0x09, 0x09, 0x01, 0x00, 
-0x3E, 0x41, 0x41, 0x51, 0x73, 0x00, 
-0x7F, 0x08, 0x08, 0x08, 0x7F, 0x00, 
-0x00, 0x41, 0x7F, 0x41, 0x00, 0x00, 
-0x20, 0x40, 0x41, 0x3F, 0x01, 0x00, 
-0x7F, 0x08, 0x14, 0x22, 0x41, 0x00, 
-0x7F, 0x40, 0x40, 0x40, 0x40, 0x00, 
-0x7F, 0x02, 0x1C, 0x02, 0x7F, 0x00, 
-0x7F, 0x04, 0x08, 0x10, 0x7F, 0x00, 
-0x3E, 0x41, 0x41, 0x41, 0x3E, 0x00, 
-0x7F, 0x09, 0x09, 0x09, 0x06, 0x00, 
-0x3E, 0x41, 0x51, 0x21, 0x5E, 0x00, 
-0x7F, 0x09, 0x19, 0x29, 0x46, 0x00, 
-0x26, 0x49, 0x49, 0x49, 0x32, 0x00, 
-0x03, 0x01, 0x7F, 0x01, 0x03, 0x00, 
-0x3F, 0x40, 0x40, 0x40, 0x3F, 0x00, 
-0x1F, 0x20, 0x40, 0x20, 0x1F, 0x00, 
-0x3F, 0x40, 0x38, 0x40, 0x3F, 0x00, 
-0x63, 0x14, 0x08, 0x14, 0x63, 0x00, 
-0x03, 0x04, 0x78, 0x04, 0x03, 0x00, 
-0x61, 0x59, 0x49, 0x4D, 0x43, 0x00, 
-0x00, 0x7F, 0x41, 0x41, 0x41, 0x00, 
-0x02, 0x04, 0x08, 0x10, 0x20, 0x00, 
-0x00, 0x41, 0x41, 0x41, 0x7F, 0x00, 
-0x04, 0x02, 0x01, 0x02, 0x04, 0x00, 
-0x40, 0x40, 0x40, 0x40, 0x40, 0x00, 
-0xFC, 0xFE, 0x02, 0x82, 0x82, 0x82, 
-0x82, 0x82, 0x82, 0xC2, 0x82, 0x02, 
-0x02, 0xFE, 0x00, 0x00, 0xFE, 0xFE, 
-0x02, 0x62, 0x62, 0x62, 0x62, 0xE2, 
-0x62, 0x62, 0xE2, 0x02, 0x02, 0xFC, 
-0x00, 0x00, 0x00, 0xF0, 0xFC, 0xFC, 
-0xFC, 0x00, 0xFC, 0xFC, 0xF0, 0x80, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0xF0, 
-0x30, 0x40, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x20, 0x00, 0x00, 0x24, 0xA4, 
-0xA4, 0xBC, 0xA4, 0x24, 0x24, 0x00, 
-0x00, 0x00, 0x24, 0xA4, 0x24, 0x24, 
-0x3C, 0x04, 0x04, 0x00, 0x00, 0x00, 
-0xB8, 0xA4, 0xA4, 0xA4, 0xBC, 0x00, 
-0x00, 0x00, 0x00, 0xFC, 0x00, 0xFC, 
-0x00, 0x44, 0x44, 0x44, 0xDC, 0x44, 
-0x04, 0x3C, 0x00, 0x00, 0x00, 0x00, 
-0xFC, 0xFE, 0xFE, 0x7E, 0x7E, 0x7E, 
-0x7E, 0x7E, 0x7E, 0x3E, 0x7E, 0xFE, 
-0xFE, 0xFE, 0x00, 0x00, 0xFE, 0xFE, 
-0xFE, 0x9E, 0x9E, 0x9E, 0x9E, 0x1E, 
-0x9E, 0x9E, 0x1E, 0xFE, 0xFE, 0xFC, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x08, 0x36, 0x41, 0x00, 0x00, 
-0x00, 0x00, 0x77, 0x00, 0x00, 0x00, 
-0x00, 0x41, 0x36, 0x08, 0x00, 0x00, 
-0x02, 0x01, 0x02, 0x04, 0x02, 0x00, 
-0x3C, 0x26, 0x23, 0x26, 0x3C, 0x00, 
-0x7F, 0x7F, 0x40, 0x41, 0x41, 0x41, 
-0x41, 0x41, 0x41, 0x41, 0x41, 0x40, 
-0x40, 0x7F, 0x00, 0x00, 0x7F, 0x7F, 
-0x40, 0x40, 0x40, 0x40, 0x40, 0x41, 
-0x40, 0x40, 0x43, 0x40, 0x40, 0x7F, 
-0x00, 0x20, 0x3C, 0x3E, 0x3E, 0x3E, 
-0x3E, 0x00, 0x3E, 0x3E, 0x3E, 0x3E, 
-0x38, 0x00, 0x00, 0xF0, 0xFB, 0xFB, 
-0x00, 0x50, 0x60, 0xFF, 0xFC, 0x3C, 
-0x1E, 0x0E, 0x0C, 0xFC, 0xF8, 0xE8, 
-0xE8, 0xE8, 0x30, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 
-0x00, 0x04, 0x04, 0x1B, 0x04, 0x04, 
-0x00, 0x00, 0x00, 0x00, 0x57, 0x50, 
-0x57, 0x54, 0x57, 0x10, 0x50, 0x00, 
-0x00, 0x00, 0x97, 0x94, 0x97, 0x94, 
-0xF7, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xE4, 0x14, 0xF4, 0x94, 0xF7, 0x00, 
-0x00, 0x00, 0x00, 0xFF, 0x00, 0xFF, 
-0x00, 0x38, 0xA4, 0xA4, 0xA5, 0x3C, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x7F, 0x7F, 0x7F, 0x7E, 0x7E, 0x7E, 
-0x7E, 0x7E, 0x7E, 0x7E, 0x7E, 0x7F, 
-0x7F, 0x7F, 0x00, 0x00, 0x7F, 0x7F, 
-0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0x7E, 
-0x7F, 0x7F, 0x7C, 0x7F, 0x7F, 0x7F, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xFE, 0xFE, 0x02, 0x62, 0x62, 0x62, 
-0xE2, 0x62, 0x62, 0x62, 0xC2, 0x02, 
-0x02, 0xFE, 0x00, 0x00, 0xFE, 0xFE, 
-0x02, 0x82, 0xC2, 0xE2, 0xF2, 0x82, 
-0x82, 0x82, 0x82, 0x02, 0x02, 0xFE, 
-0x00, 0x00, 0x00, 0x3C, 0x66, 0x66, 
-0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 
-0x00, 0x00, 0x00, 0x07, 0x7F, 0xDF, 
-0x00, 0x05, 0x03, 0x7F, 0x1F, 0x1E, 
-0x3C, 0x38, 0x18, 0x1F, 0x0F, 0x0D, 
-0x0D, 0x0D, 0x06, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x20, 0x20, 0x50, 
-0x8C, 0x50, 0x20, 0x20, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x09, 0x09, 
-0x06, 0x09, 0x09, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x1C, 0x12, 0x12, 0x12, 
-0x1E, 0x10, 0x10, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0xFF, 0x00, 0x73, 
-0x84, 0xE7, 0x94, 0x94, 0x94, 0x67, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0xFE, 0xFE, 0xFE, 0x9E, 0x9E, 0x9E, 
-0x1E, 0x9E, 0x9E, 0x9E, 0x3E, 0xFE, 
-0xFE, 0xFE, 0x00, 0x00, 0xFE, 0xFE, 
-0xFE, 0x7E, 0x3E, 0x1E, 0x0E, 0x7E, 
-0x7E, 0x7E, 0x7E, 0xFE, 0xFE, 0xFE, 
-0x00, 0x00, 0x00, 0x3C, 0x66, 0x66, 
-0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-0x00, 0x00, 0x00, 0x07, 0x7F, 0xDF, 
-0x00, 0x00, 0xE0, 0xF8, 0xFC, 0xFC, 
-0xFC, 0xFC, 0xFC, 0xFC, 0xF0, 0x80, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0xF0, 
-0x3F, 0x7F, 0x40, 0x46, 0x46, 0x46, 
-0x47, 0x46, 0x46, 0x46, 0x43, 0x40, 
-0x40, 0x7F, 0x00, 0x00, 0x7F, 0x7F, 
-0x40, 0x41, 0x43, 0x47, 0x4F, 0x41, 
-0x41, 0x41, 0x41, 0x40, 0x40, 0x3F, 
-0x00, 0x00, 0x00, 0x3E, 0x73, 0x60, 
-0x70, 0x3E, 0x07, 0x03, 0x67, 0x3E, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 
-0x06, 0x01, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 
-0x36, 0x08, 0x08, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x1F, 0x00, 0x0E, 
-0x10, 0x1C, 0x12, 0x12, 0x12, 0x12, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x3F, 0x7F, 0x7F, 0x79, 0x79, 0x79, 
-0x78, 0x79, 0x79, 0x79, 0x7C, 0x7F, 
-0x7F, 0x7F, 0x00, 0x00, 0x7F, 0x7F, 
-0x7F, 0x7E, 0x7C, 0x78, 0x70, 0x7E, 
-0x7E, 0x7E, 0x7E, 0x7F, 0x7F, 0x3F, 
-0x00, 0x00, 0x00, 0x03, 0x03, 0x03, 
-0x03, 0x3F, 0x63, 0x63, 0x63, 0x3F, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 
-0x00, 0x00, 0x07, 0x1F, 0x3F, 0x0F, 
-0x07, 0x0F, 0x3F, 0x3F, 0x0F, 0x00, 
-0x03, 0x06, 0x00, 0xF0, 0xFB, 0xFB, 
-};
diff --git a/keyboards/helix/rev2/keymaps/froggy_106/keymap.c b/keyboards/helix/rev2/keymaps/froggy_106/keymap.c
deleted file mode 100644
index d0a17cb4ae6..00000000000
--- a/keyboards/helix/rev2/keymaps/froggy_106/keymap.c
+++ /dev/null
@@ -1,810 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "keymap_japanese.h"
-#include <string.h>
-
-#define LAYOUT_half( \
-    L00, L01, L02, L03, L04, L05,       \
-    L10, L11, L12, L13, L14, L15,       \
-    L20, L21, L22, L23, L24, L25,       \
-    L30, L31, L32, L33, L34, L35, L36,  \
-    L40, L41, L42, L43, L44, L45, L46   \
-) { \
-    { L00, L01, L02, L03, L04, L05, KC_NO }, \
-    { L10, L11, L12, L13, L14, L15, KC_NO }, \
-    { L20, L21, L22, L23, L24, L25, KC_NO }, \
-    { L30, L31, L32, L33, L34, L35, L36 }, \
-    { L40, L41, L42, L43, L44, L45, L46 }, \
-    { _______, _______, _______, _______, _______, _______, KC_NO }, \
-    { _______, _______, _______, _______, _______, _______, KC_NO }, \
-    { _______, _______, _______, _______, _______, _______, KC_NO }, \
-    { _______, _______, _______, _______, _______, _______, _______ }, \
-    { _______, _______, _______, _______, _______, _______, _______ } \
-}
-
-#define DELAY_TIME  75
-static uint16_t key_timer;
-static uint16_t tap_timer;
-static uint16_t delay_registered_code;
-static uint8_t delay_registered_layer;
-static uint8_t delay_mat_row;
-static uint8_t delay_mat_col;
-static bool delay_key_stat;
-static bool delay_key_pressed;
-static bool tapping_key;
-
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-// The underscores don't mean anything - you can have a layer called STUFF or any other name.
-// Layer names don't all need to be of the same length, obviously, and you can also skip them
-// entirely and just use numbers.
-enum layer_number {
-  _BASE = 0,
-  _BASE_106,
-  _OPT,
-  _OPT_106,
-  _SYM,
-  _SYM_106,
-  _NUM,
-  _NUM_106,
-  _FUNC,
-  _LAYER_NUM,
-};
-bool RGBAnimation = false; //Flag for LED Layer color Refresh.
-
-typedef union {
-  uint32_t raw;
-  struct {
-    bool mac_mode:1;
-  };
-} user_config_t;
-user_config_t user_config;
-
-#define IS_MODE_106()   ((default_layer_state & (1UL << _BASE_106)) != 0)
-#define IS_MODE_MAC()   (user_config.mac_mode)
-#ifndef MAX
-#define MAX(X, Y) ((X) > (Y) ? (X) : (Y))
-#endif
-#ifndef MIN
-#define MIN(X, Y) ((X) < (Y) ? (X) : (Y))
-#endif
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  EISU,
-  KANA,
-  RGBRST,
-  RGBOFF,
-  RGB1,
-  RGB2,
-  RGB3,
-  OPT_TAP_SP,
-  DESKTOP,
-  MAC,
-  WIN,
-  L_SYM,
-  L_NUM,
-  TO_106,
-  TO_101,
-};
-
-enum macro_keycodes {
-  KC_SAMPLEMACRO,
-};
-
-//Macros
-#define M_SAMPLE M(KC_SAMPLEMACRO)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /* Base
-   * ,-----------------------------------------.
-   * |  C+z |   ;  |   [  |   (  |   <  |   {  |
-   * |------+------+------+------+------+------|
-   * | KANA |   P  |   K  |   R  |   A  |   F  |
-   * |------+------+------+------+------+------|
-   * |  BS  |   D  |   T  |   H  |   E  |   O  |
-   * |------+------+------+------+------+------+------.
-   * | Shift|   Y  |   S  |   N  |   I  |   U  |Space |
-   * |------+------+------+------+------+------+------|
-   * | Ctrl | Alt  | Gui  | Sym  | Num  | OPT  | Ent  |
-   * `------------------------------------------------'
-   */
-  [_BASE] = LAYOUT_half(
-      LCTL(KC_Z),    KC_SCLN,       KC_LBRC,       KC_LPRN,   KC_LT,     KC_LCBR,
-      KANA,          KC_P,          KC_K,          KC_R,      KC_A,      KC_F,
-      KC_BSPC,       KC_D,          KC_T,          KC_H,      KC_E,      KC_O,
-      OSM(MOD_LSFT), KC_Y,          KC_S,          KC_N,      KC_I,      KC_U,       KC_SPC,
-      OSM(MOD_LCTL), OSM(MOD_LALT), OSM(MOD_LGUI), L_SYM,     L_NUM,     OPT_TAP_SP, KC_ENT
-      ),
-  [_BASE_106] = LAYOUT_half(
-      LCTL(KC_Z),    JP_SCLN,       JP_LBRC,       JP_LPRN,   JP_LABK,   JP_LCBR,
-      KANA,          KC_P,          KC_K,          KC_R,      KC_A,      KC_F,
-      KC_BSPC,       KC_D,          KC_T,          KC_H,      KC_E,      KC_O,
-      OSM(MOD_LSFT), KC_Y,          KC_S,          KC_N,      KC_I,      KC_U,       KC_SPC,
-      OSM(MOD_LCTL), OSM(MOD_LALT), OSM(MOD_LGUI), L_SYM,     L_NUM,     OPT_TAP_SP, KC_ENT
-      ),
-
-  /* Opt
-   * ,-----------------------------------------.
-   * |  Esc |  :   |  ]   |  )   |  >   |  }   |
-   * |------+------+------+------+------+------|
-   * |  EISU|   J  |   M  |   B  |   '  |  Tab |
-   * |------+------+------+------+------+------|
-   * |   .  |   V  |   C  |   L  |   Z  |  Q   |
-   * |------+------+------+------+------+------+------.
-   * |      |   X  |   G  |   W  |   -  |  Del | Esc  |
-   * |------+------+------+------+------+------+------|
-   * |      |      |      |   ,  | DTOP |      |      |
-   * `------------------------------------------------'
-   */
-  [_OPT] = LAYOUT_half(
-      KC_ESC,  KC_COLN,KC_RBRC, KC_RPRN,KC_GT,     KC_RCBR,
-      EISU,    KC_J,   KC_M,    KC_B,   KC_QUOT,   KC_TAB,
-      KC_DOT,  KC_V,   KC_C,    KC_L,   KC_Z,      KC_Q,
-      _______, KC_X,   KC_G,    KC_W,   KC_MINUS,  KC_DEL,  KC_ESC,
-      _______, _______,_______, KC_COMM,DESKTOP,   _______, _______
-      ),
-  [_OPT_106] = LAYOUT_half(
-      KC_ESC,  JP_COLN,JP_RBRC, JP_RPRN,JP_RABK,   JP_RCBR,
-      EISU,    KC_J,   KC_M,    KC_B,   JP_QUOT,   KC_TAB,
-      KC_DOT,  KC_V,   KC_C,    KC_L,   KC_Z,      KC_Q,
-      _______, KC_X,   KC_G,    KC_W,   JP_MINS,   KC_DEL,  KC_ESC,
-      _______, _______,_______, KC_COMM,DESKTOP,   _______, _______
-      ),
-
-  /* Sym
-   * ,-----------------------------------------.
-   * |  Ins |  GRV |      |  PU  |  PD  |   ^  |
-   * |------+------+------+------+------+------|
-   * |      |   \  |   #  |   =  |   ?  |   %  |
-   * |------+------+------+------+------+------|
-   * |      |   $  |  upA |   @  |   !  |   |  |
-   * |------+------+------+------+------+------+------.
-   * |  CL  |  <-  |  dwA |  ->  |   _  |   &  |      |
-   * |------+------+------+------+------+------+------+
-   * |      |      |  PS  |      |   ~  |      |      |
-   * `------------------------------------------------'
-   */
-  [_SYM] = LAYOUT_half(
-      KC_INS,  KC_GRV,  _______, KC_PGUP, KC_PGDN, KC_CIRC,
-      _______, KC_BSLS, KC_HASH, KC_EQL,  KC_QUES, KC_PERC,
-      _______, KC_DLR,  KC_UP,   KC_AT,   KC_EXLM, KC_PIPE,
-      KC_CAPS, KC_LEFT, KC_DOWN, KC_RIGHT,KC_UNDS, KC_AMPR, _______,
-      _______, _______, KC_PSCR, _______, KC_TILD, _______, _______
-      ),
-  [_SYM_106] = LAYOUT_half(
-      KC_INS,  JP_GRV,  _______, KC_PGUP, KC_PGDN, JP_CIRC,
-      _______, JP_BSLS, JP_HASH, JP_EQL,  JP_QUES, JP_PERC,
-      _______, JP_DLR,  KC_UP,   JP_AT,   JP_EXLM, JP_PIPE,
-      KC_CAPS, KC_LEFT, KC_DOWN, KC_RIGHT,JP_UNDS, JP_AMPR, _______,
-      _______, _______, KC_PSCR, _______, JP_TILD, _______, _______
-      ),
-  
-  /* Raise
-   * ,-----------------------------------------.
-   * |      |      | Func | home |  End |      |
-   * |------+------+------+------+------+------|
-   * |      |   *  |  7   |  8   |  9   |  -   |
-   * |------+------+------+------+------+------|
-   * |  .   |   /  |  4   |  5   |  6   |  +   |
-   * |------+------+------+------+------+------+------.
-   * |  LN  |  0   |  1   |  2   |  3   |C+S+F1|      |
-   * |------+------+------+------+------+------+------|
-   * |      |      |  .   |  ,   |      |      |      |
-   * `------------------------------------------------'
-   */
-  [_NUM] = LAYOUT_half(
-      _______,  _______, OSL(_FUNC), KC_HOME, KC_END,  _______,
-      _______,  KC_ASTR, KC_P7,      KC_P8,   KC_P9,   KC_MINS,
-      KC_DOT,   KC_SLSH, KC_P4,      KC_P5,   KC_P6,   KC_PLUS,
-      KC_NUM,   KC_P0,   KC_P1,      KC_P2,   KC_P3,   LCTL(S(KC_F1)), _______,
-      _______,  _______, KC_PDOT,    KC_COMM, _______, _______,        _______
-      ),
-  [_NUM_106] = LAYOUT_half(
-      _______,  _______, OSL(_FUNC), KC_HOME, KC_END,  _______,
-      _______,  JP_ASTR, KC_P7,      KC_P8,   KC_P9,   JP_MINS,
-      KC_DOT,   JP_SLSH, KC_P4,      KC_P5,   KC_P6,   JP_PLUS,
-      KC_NUM,   KC_P0,   KC_P1,      KC_P2,   KC_P3,   LCTL(S(KC_F1)), _______,
-      _______,  _______, KC_PDOT,    JP_COMM, _______, _______,        _______
-      ),
-  
-  /* Func
-   * ,-----------------------------------------.
-   * |RGBRST|  Hue |To101 |  RST |  Mac |  Win |
-   * |------+------+------+------+------+------|
-   * | RGB1 | VAL+ |  F7  |  F8  |  F9  |To106 |
-   * |------+------+------+------+------+------|
-   * | RGB2 | VAL- |  F4  |  F5  |  F6  | F12  |
-   * |------+------+------+------+------+------+------.
-   * | RGB3 |  F10 |  F1  |  F2  |  F3  | F11  |      |
-   * |------+------+------+------+------+------+------|
-   * |RGBOFF|      |      |      |      |      |      |
-   * `------------------------------------------------'
-   */
-  [_FUNC] = LAYOUT_half(
-      RGBRST,RGB_HUI, TO_101,  QK_BOOT, MAC,     WIN,
-      RGB1,  RGB_VAI, KC_F7,   KC_F8,   KC_F9,   TO_106,
-      RGB2,  RGB_VAD, KC_F4,   KC_F5,   KC_F6,   KC_F12,
-      RGB3,  KC_F10,  KC_F1,   KC_F2,   KC_F3,   KC_F11,   _______,
-      RGBOFF,_______, _______, _______, _______, _______,  _______
-      )
-};
-
-void set_mac_mode(bool enable) {
-  if(enable){
-    user_config.mac_mode = true;
-    keymap_config.swap_lalt_lgui = false;
-    keymap_config.swap_ralt_rgui = false;
-  }else{
-    user_config.mac_mode = false;
-    keymap_config.swap_lalt_lgui = true;
-    keymap_config.swap_ralt_rgui = true;
-  }
-  eeconfig_update_user(user_config.raw);
-}
-
-void eeconfig_init_user(void) {
-  user_config.raw = 0;
-  eeconfig_update_user(user_config.raw);
-}
-
-void keyboard_post_init_user(void) {
-  user_config.raw = eeconfig_read_user();
-  set_mac_mode(user_config.mac_mode);
-}
-
-bool find_mairix(uint16_t keycode, uint8_t *row, uint8_t *col){
-  int base_keymap = IS_MODE_106() ? _BASE_106 : _BASE;
-  for(uint8_t i=0; i<MATRIX_ROWS; i++){
-    for(uint8_t j=0; j<MATRIX_COLS; j++){
-      if( pgm_read_word(&(keymaps[base_keymap][i][j]))==keycode){
-        *row = i;
-        *col = j;
-        return true;
-      }
-    }
-  }
-  return false;
-}
-
-void unregister_delay_code(void){
-  if(delay_registered_code){
-    unregister_code(delay_registered_code);
-    if (delay_registered_code & QK_LSFT){
-      unregister_code(KC_LSFT);
-    }
-    if (delay_registered_code & QK_LCTL){
-      unregister_code(KC_LCTL);
-    }
-    if (delay_registered_code & QK_LALT){
-      unregister_code(KC_LALT);
-    }
-    if (delay_registered_code & QK_LGUI){
-      unregister_code(KC_LGUI);
-    }
-    delay_registered_code=0;
-    delay_registered_layer=0;
-  }
-}
-
-void register_delay_code(uint8_t layer){
-  if(delay_key_stat){
-    unregister_delay_code();
-
-    uint16_t code = pgm_read_word(&(keymaps[layer][delay_mat_row][delay_mat_col]));
-    if (code & QK_LSFT){
-      register_code(KC_LSFT);
-    }
-    if (code & QK_LCTL){
-      register_code(KC_LCTL);
-    }
-    if (code & QK_LALT){
-      register_code(KC_LALT);
-    }
-    if (code & QK_LGUI){
-      register_code(KC_LGUI);
-    }
-    register_code(code);
-    delay_registered_code = code;
-    delay_registered_layer = layer;
-    delay_key_stat = false;
-    tapping_key = true;
-  }
-}
-
-#ifdef RGBLIGHT_ENABLE
-struct keybuf {
-  char col, row;
-  char frame;
-};
-struct keybuf keybufs[256];
-unsigned char keybuf_begin, keybuf_end;
-
-int col, row;
-#endif
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-
-  #ifdef RGBLIGHT_ENABLE
-    col = record->event.key.col;
-    row = record->event.key.row;
-    if (record->event.pressed && ((row < 5 && is_keyboard_master()) || (row >= 5 && !is_keyboard_master()))) {
-      int end = keybuf_end;
-      keybufs[end].col = col;
-      keybufs[end].row = row % 5;
-      keybufs[end].frame = 0;
-      keybuf_end ++;
-    }
-  #endif
-
-  if(tap_timer&&keycode!=OPT_TAP_SP){
-    tapping_key = true;
-  }
-
-  if(keycode==delay_registered_code){
-    if (!record->event.pressed){
-      unregister_delay_code();
-    }
-  }
-
-  switch (keycode) {
-    case KC_SCLN:
-    case KC_LBRC:
-    case KC_LPRN:
-    case KC_LT:
-    case KC_LCBR:
-    case KC_P:
-    case KC_K:
-    case KC_R:
-    case KC_A:
-    case KC_F:
-    case KC_BSPC:
-    case KC_D:
-    case KC_T:
-    case KC_H:
-    case KC_E:
-    case KC_O:
-    case KC_Y:
-    case KC_S:
-    case KC_N:
-    case KC_I:
-    case KC_U:
-    case LCTL(KC_Z):
-    case KC_SPC:
-    //case JP_SCLN: // == KC_SCLN
-    case JP_LBRC:
-    case JP_LPRN:
-    //case JP_LABK: // == KC_LT
-    case JP_LCBR:
-      if (IS_MODE_106()) {
-          if (keycode == KC_LBRC || keycode == KC_LPRN || keycode == KC_LCBR)
-            break;
-      }else{
-          if (keycode == JP_LBRC || keycode == JP_LPRN || keycode == JP_LCBR)
-            break;
-      }
-      if (record->event.pressed) {
-        if (IS_MODE_106())
-          register_delay_code(_BASE_106);
-        else
-          register_delay_code(_BASE);
-        if(find_mairix(keycode, &delay_mat_row, &delay_mat_col)){
-          key_timer = timer_read();
-          delay_key_stat = true;
-          delay_key_pressed = true;
-        }
-      }else{
-        delay_key_pressed = false;
-      }
-      return false;
-      break;
-    case L_SYM:
-      if (record->event.pressed) {
-        if (IS_MODE_106()) {
-          register_delay_code(_SYM_106);
-          layer_on(_SYM_106);
-        }else{
-          register_delay_code(_SYM);
-          layer_on(_SYM);
-        }
-      }else{
-        layer_off(_SYM);
-        layer_off(_SYM_106);
-        if(delay_registered_layer == _SYM || delay_registered_layer == _SYM_106) {
-          unregister_delay_code();
-        }
-      }
-      return false;
-      break;
-    case L_NUM:
-      if (record->event.pressed) {
-        if (IS_MODE_106()) {
-          register_delay_code(_NUM_106);
-          layer_on(_NUM_106);
-        }else{
-          register_delay_code(_NUM);
-          layer_on(_NUM);
-        }
-      }else{
-        layer_off(_NUM);
-        layer_off(_NUM_106);
-        if(delay_registered_layer == _NUM || delay_registered_layer == _NUM_106) {
-          unregister_delay_code();
-        }
-      }
-      return false;
-      break;
-    case OPT_TAP_SP:
-      if (record->event.pressed) {
-        tapping_key = false;
-        if (IS_MODE_106()) {
-          register_delay_code(_OPT_106);
-          layer_on(_OPT_106);
-        }else{
-          register_delay_code(_OPT);
-          layer_on(_OPT);
-        }
-        tap_timer = timer_read();
-      }else{
-        layer_off(_OPT);
-        layer_off(_OPT_106);
-        if(tapping_key==false && timer_elapsed(tap_timer) < TAPPING_TERM){
-          SEND_STRING(" ");
-        }else if(delay_registered_layer == _OPT || delay_registered_layer == _OPT_106) {
-          unregister_delay_code();
-        }
-        tap_timer = 0;
-      }
-      return false;
-      break;
-   case EISU:
-      if (record->event.pressed) {
-        if(IS_MODE_MAC()){
-          register_code(KC_LNG2);
-        }else{
-          SEND_STRING(SS_LALT("`"));
-        }
-      } else {
-        unregister_code(KC_LNG2);
-      }
-      return false;
-      break;
-    case KANA:
-      if (record->event.pressed) {
-        if(IS_MODE_MAC()){
-          register_code(KC_LNG1);
-        }else{
-          SEND_STRING(SS_LALT("`"));
-        }
-      } else {
-        unregister_code(KC_LNG1);
-      }
-      return false;
-      break;
-    case DESKTOP:
-      if (record->event.pressed) {
-        if(IS_MODE_MAC()){
-          register_code(KC_F11);
-        }else{
-          SEND_STRING(SS_LGUI("d"));
-        }
-      } else {
-        unregister_code(KC_F11);
-      }
-      return false;
-      break;
-    case RGBRST:
-      #ifdef RGBLIGHT_ENABLE
-        if (record->event.pressed) {
-          eeconfig_update_rgblight_default();
-          rgblight_enable();
-          RGBAnimation = false;
-        }
-      #endif
-      break;
-    case RGBOFF:
-      #ifdef RGBLIGHT_ENABLE
-        if (record->event.pressed) {
-          rgblight_disable();
-        }
-      #endif
-      break;
-    case RGB1:
-      #ifdef RGBLIGHT_ENABLE
-        if (record->event.pressed) {
-          RGBAnimation = true;
-          rgblight_mode(RGBLIGHT_MODE_RAINBOW_MOOD);
-        }
-      #endif
-      break;
-    case RGB2:
-      #ifdef RGBLIGHT_ENABLE
-        if (record->event.pressed) {
-          RGBAnimation = true;
-          rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL + 1);
-        }
-      #endif
-      break;
-    case RGB3:
-      #ifdef RGBLIGHT_ENABLE
-        if (record->event.pressed) {
-          RGBAnimation = true;
-          rgblight_mode(RGBLIGHT_MODE_KNIGHT);
-        }
-      #endif
-      break;
-    case MAC:
-      if (record->event.pressed) {
-        set_mac_mode(true);
-      }
-      break;
-    case WIN:
-      if (record->event.pressed) {
-        set_mac_mode(false);
-      }
-      break;
-    case TO_101:
-      if (record->event.pressed) {
-        if (IS_MODE_106()) {
-          set_single_persistent_default_layer(_BASE);
-        }
-      }
-      break;
-    case TO_106:
-      if (record->event.pressed) {
-        if (!IS_MODE_106()) {
-          set_single_persistent_default_layer(_BASE_106);
-        }
-      }
-      break;
-  }
-  return true;
-}
-
-// LED Effect
-#ifdef RGBLIGHT_ENABLE
-unsigned char rgb[7][5][3];
-void led_ripple_effect(char r, char g, char b) {
-    static int scan_count = -10;
-    static int keys[] = { 6, 6, 6, 7, 7 };
-    static int keys_sum[] = { 0, 6, 12, 18, 25 };
-
-    if (scan_count == -1) {
-      rgblight_enable_noeeprom();
-      rgblight_mode(RGBLIGHT_MODE_STATIC_LIGHT);
-    } else if (scan_count >= 0 && scan_count < 5) {
-      for (unsigned char c=keybuf_begin; c!=keybuf_end; c++) {
-        int i = c;
-        // FIXME:
-
-        int y = scan_count;
-        int dist_y = abs(y - keybufs[i].row);
-        for (int x=0; x<keys[y]; x++) {
-          int dist = abs(x - keybufs[i].col) + dist_y;
-          if (dist <= keybufs[i].frame) {
-            int elevation = MAX(0, (8 + dist - keybufs[i].frame)) << 2;
-            if (elevation) {
-              if ((rgb[x][y][0] != 255) && r) { rgb[x][y][0] = MIN(255, elevation + rgb[x][y][0]); }
-              if ((rgb[x][y][1] != 255) && g) { rgb[x][y][1] = MIN(255, elevation + rgb[x][y][1]); }
-              if ((rgb[x][y][2] != 255) && b) { rgb[x][y][2] = MIN(255, elevation + rgb[x][y][2]); }
-            }
-          }
-        }
-      }
-    } else if (scan_count == 5) {
-      for (unsigned char c=keybuf_begin; c!=keybuf_end; c++) {
-        int i = c;
-        if (keybufs[i].frame < 18) {
-          keybufs[i].frame ++;
-        } else {
-          keybuf_begin ++;
-        }
-      }
-    } else if (scan_count >= 6 && scan_count <= 10) {
-      int y = scan_count - 6;
-      for (int x=0; x<keys[y]; x++) {
-        int at = keys_sum[y] + ((y & 1) ? x : (keys[y] - x - 1));
-        led[at].r = rgb[x][y][0];
-        led[at].g = rgb[x][y][1];
-        led[at].b = rgb[x][y][2];
-      }
-      rgblight_set();
-    } else if (scan_count == 11) {
-      memset(rgb, 0, sizeof(rgb));
-    }
-    scan_count++;
-    if (scan_count >= 12) { scan_count = 0; }
-}
-#endif
-
-layer_state_t layer_state_old;
-
-//runs every scan cycle (a lot)
-void matrix_scan_user(void) {
-  if(delay_key_stat && (timer_elapsed(key_timer) > DELAY_TIME)){
-    if (IS_MODE_106())
-      register_delay_code(_BASE_106);
-    else
-      register_delay_code(_BASE);
-    if(!delay_key_pressed){
-      unregister_delay_code();
-    }
-  }
-
-  if(layer_state_old != layer_state){
-    for (int8_t i = _LAYER_NUM-1; i > _BASE_106; i--) {
-      if(IS_LAYER_ON(i)){
-        register_delay_code(i);
-        break;
-      }
-    }
-    layer_state_old = layer_state;
-  }
-
-  #ifdef RGBLIGHT_ENABLE
-    if(!RGBAnimation){
-      if(IS_LAYER_ON(_FUNC)){
-        #ifdef RGBLED_BACK
-          led_ripple_effect(127,23,0);
-        #else
-          rgblight_setrgb(127,23,0);
-        #endif
-      }else if(IS_LAYER_ON(_NUM)||IS_LAYER_ON(_NUM_106)){
-        #ifdef RGBLED_BACK
-          led_ripple_effect(127,0,61);
-        #else
-          rgblight_setrgb(127,0,61);
-        #endif
-      }else if(IS_LAYER_ON(_SYM)||IS_LAYER_ON(_SYM_106)){
-        #ifdef RGBLED_BACK
-          led_ripple_effect(0,127,0);
-        #else
-          rgblight_setrgb(0,127,0);
-        #endif
-      }else if(IS_LAYER_ON(_OPT)||IS_LAYER_ON(_OPT_106)){
-        #ifdef RGBLED_BACK
-          led_ripple_effect(127,0,100);
-        #else
-          rgblight_setrgb(127,0,100);
-        #endif
-      } else {
-        #ifdef RGBLED_BACK
-          led_ripple_effect(0,112,127);
-        #else
-          rgblight_setrgb(0,112,127);
-        #endif
-      }
-    }
-  #endif
-}
-
-//OLED update loop
-#ifdef OLED_ENABLE
-
-// Render to OLED
-void render_status(void) {
-
-  // froggy logo
-  static char logo[4][17]=
-  {
-    {0x68,0x69,0x6a,0x6b,0x6c,0x6d,0x6e,0x6f,0x70,0x71,0x72,0x73,0x74,0},
-    {0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,0x90,0x91,0x92,0x93,0x94,0},
-    {0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf,0xb0,0xb1,0xb2,0xb3,0xb4,0},
-    {0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xce,0xcf,0xd0,0xd1,0xd2,0xd3,0},
-  };
-
-  static char modectl[4][2][4]=
-  {
-    {
-      {0x65,0x66,0x67,0}, //WIN
-      {0x85,0x86,0x87,0}, //WIN
-    },
-    {
-      {0xa5,0xa6,0xa7,0}, //US(101)
-      {0xc5,0xc6,0xc7,0}, //US(101)
-    },
-    {
-      {0xbd,0xbe,0xbf,0}, //MAC
-      {0xdd,0xde,0xdf,0}, //MAC
-    },
-    {
-      {0xba,0xbb,0xbc,0}, //JP(106)
-      {0xda,0xdb,0xdc,0}, //JP(106)
-    },
-  };
-
-  static char indctr[8][2][4]=
-  {
-    // white icon
-    {
-      {0x60,0x61,0x62,0}, //NUM
-      {0x63,0x64,0}       //FUNC
-    },
-    {
-      {0x80,0x81,0x82,0}, //NUM
-      {0x83,0x84,0}       //FUNC
-    },
-    {
-      {0xa0,0xa1,0xa2,0}, //CAPS
-      {0xa3,0xa4,0}       //SCLK
-    },
-    {
-      {0xc0,0xc1,0xc2,0}, //CAPS
-      {0xc3,0xc4,0}       //SCLK
-    },
-    // Black icon
-    {
-      {0x75,0x76,0x77,0}, //NUM
-      {0x78,0x79,0}       //FUNC
-    },
-    {
-      {0x95,0x96,0x97,0}, //NUM
-      {0x98,0x99,0}       //FUNC
-    },
-    {
-      {0xb5,0xb6,0xb7,0}, //CAPS
-      {0xb8,0xb9,0}       //SCLK
-    },
-    {
-     {0xd5,0xd6,0xd7,0}, //CAPS
-     {0xd8,0xd9,0}       //SCLK
-    },
-  };
-
-  int rown = 0;
-  int rowf = 0;
-  int rowa = 0;
-  int rows = 0;
-  int rowm = 0;
-  int rowj = 1;
-
-  //Set Indicator icon
-  led_t led_state = host_keyboard_led_state();
-  if (led_state.num_lock) { rown = 4; }
-  if (led_state.caps_lock) { rowa = 4; }
-  if (led_state.scroll_lock) { rows = 4; }
-  if (IS_LAYER_ON(_FUNC)) { rowf = 4; }
-
-  //Set Mode icon
-  if (IS_MODE_MAC()) { rowm = 2; }
-  if (IS_MODE_106()) { rowj = 3; }
-
-  oled_write(indctr[rown]  [0], false);
-  oled_write(indctr[rowf]  [1], false);
-  oled_write(modectl[rowm] [0], false);
-  oled_write(logo[0],           false);
-  oled_write(indctr[rown+1][0], false);
-  oled_write(indctr[rowf+1][1], false);
-  oled_write(modectl[rowm] [1], false);
-  oled_write(logo[1],           false);
-  oled_write(indctr[rowa+2][0], false);
-  oled_write(indctr[rows+2][1], false);
-  oled_write(modectl[rowj] [0], false);
-  oled_write(logo[2],           false);
-  oled_write(indctr[rowa+3][0], false);
-  oled_write(indctr[rows+3][1], false);
-  oled_write(modectl[rowj] [1], false);
-  oled_write(logo[3],           false);
-
-}
-
-bool oled_task_user(void) {
-
-#if DEBUG_TO_SCREEN
-  if (debug_enable) {
-    return;
-  }
-#endif
-
-  if (is_keyboard_master()) {
-    render_status();
-  }
-  return false;
-}
-
-#endif // end of OLED_ENABLE
-
-// Local Variables:
-// mode: c++
-// truncate-lines: t
-// indent-tabs-mode: nil
-// End:
diff --git a/keyboards/helix/rev2/keymaps/froggy_106/readme.md b/keyboards/helix/rev2/keymaps/froggy_106/readme.md
deleted file mode 100644
index 911fb404321..00000000000
--- a/keyboards/helix/rev2/keymaps/froggy_106/readme.md
+++ /dev/null
@@ -1,85 +0,0 @@
-Froggy -one hand Helix- with 106-key mode
-======
-
-![Imgur](https://i.imgur.com/S1Dw3XW.jpg)
-
-## Features
-It is a one-handed keyboard with reference to Frogpad. Layout Designed by タクマ ([@humid](https://twitter.com/humid)).
-
-This keymap has 106-key mode, This is usable when keyboard setting of OS is OADG 106/109 keyboard.
-
-## Layout
-### Base
-```
-,-----------------------------------------.
-|  C+z |   ;  |   [  |   (  |   <  |   {  |
-|------+------+------+------+------+------|
-| KANA |   P  |   K  |   R  |   A  |   F  |
-|------+------+------+------+------+------|
-|  BS  |   D  |   T  |   H  |   E  |   O  |
-|------+------+------+------+------+------+------.
-| Shift|   Y  |   S  |   N  |   I  |   U  | Space|
-|------+------+------+------+------+------+------|
-| Ctrl |  Alt |  win |  Sym |  Num |  OPT |  Ent |
-`------------------------------------------------'
-```
-
-### Opt
-```
-,-----------------------------------------.
-|  Esc |   :  |   ]  |   )  |   >  |   }  |
-|------+------+------+------+------+------|
-| EISU |   J  |   M  |   B  |   '  |  Tab |
-|------+------+------+------+------+------|
-|   .  |   V  |   C  |   L  |   Z  |   Q  |
-|------+------+------+------+------+------+------.
-|      |   X  |   G  |   W  |   -  |  Del |  Esc |
-|------+------+------+------+------+------+------|
-|      |      |      |   ,  | DTOP |      |      |
-`------------------------------------------------'
-```
-
-### Num
-```
-,-----------------------------------------.
-|      |      | Func | home |  End |      |
-|------+------+------+------+------+------|
-|      |   *  |   7  |   8  |   9  |   -  |
-|------+------+------+------+------+------|
-|   .  |   /  |   4  |   5  |   6  |   +  |
-|------+------+------+------+------+------+------.
-|  LN  |   0  |   1  |   2  |   3  |C+S+F1|      |
-|------+------+------+------+------+------+------|
-|      |      |      |   ,  |      |      |      |
-`------------------------------------------------'
-```
-
-### Sym
-```
-,-----------------------------------------.
-|  Ins |  GRV |      |  PU  |  PD  |   ^  |
-|------+------+------+------+------+------|
-|      |   \  |   #  |   =  |   ?  |   %  |
-|------+------+------+------+------+------|
-|      |   $  |  upA |   @  |   !  |   |  |
-|------+------+------+------+------+------+------.
-|  CL  |  <-  |  dwA |  ->  |   _  |   &  |      |
-|------+------+------+------+------+------+------|
-|      |      |  PS  |      |   ~  |      |      |
- `-----------------------------------------------'
-```
-
-### Func
-```
-,-----------------------------------------.
-|RGBRST|  Hue | to101|  RST |  Mac |  Win |
-|------+------+------+------+------+------|
-| RGB1 | VAL+ |  F7  |  F8  |  F9  | to106|
-|------+------+------+------+------+------|
-| RGB2 | VAL- |  F4  |  F5  |  F6  |  F12 |
-|------+------+------+------+------+------+------.
-| RGB3 |  F10 |  F1  |  F2  |  F3  |  F11 |      |
-|------+------+------+------+------+------+------|
-|RGBOFF|      |      |      |      |      |      |
-`------------------------------------------------'
-```
diff --git a/keyboards/helix/rev2/keymaps/froggy_106/rules.mk b/keyboards/helix/rev2/keymaps/froggy_106/rules.mk
deleted file mode 100644
index b77e8af4f2a..00000000000
--- a/keyboards/helix/rev2/keymaps/froggy_106/rules.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-# QMK Standard Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
-#   See TOP/keyboards/helix/rules.mk for a list of options that can be set.
-#   See TOP/docs/config_options.md for more information.
-#
-LTO_ENABLE = yes  # if firmware size over limit, try this option
-SPLIT_KEYBOARD = yes
-
-# Helix Spacific Build Options
-# you can uncomment and edit follows 7 Variables
-#  jp: 以下の7つの変数を必要に応じて編集し、コメントアウトをはずします。
-OLED_ENABLE = yes           # OLED_ENABLE
-LOCAL_GLCDFONT = yes        # use each keymaps "helixfont.h" insted of "common/glcdfont.c"
-LED_BACK_ENABLE = yes       # LED backlight (Enable WS2812 RGB underlight.)
-LED_UNDERGLOW_ENABLE = no   # LED underglow (Enable WS2812 RGB underlight.)
-LED_ANIMATIONS = yes        # LED animations
-# IOS_DEVICE_ENABLE = no      # connect to IOS device (iPad,iPhone)
-
-# OLED_ENABLE が yes のとき
-#   OLED_SELECT が core ならば QMK 標準の oled_dirver.c を使用します。
-#   OLED_SELECT が core 以外ならば従来どおり helix/local_drivers/ssd1306.c を使用します。
-# If OLED_ENABLE is 'yes'
-#   If OLED_SELECT is 'core', use QMK standard oled_dirver.c.
-#   If OLED_SELECT is other than 'core', use helix/local_drivers/ssd1306.c.
-OLED_SELECT = core
diff --git a/keyboards/helix/rev3_5rows/info.json b/keyboards/helix/rev3_5rows/info.json
index ce1a8364f3e..57d4e11dfe5 100644
--- a/keyboards/helix/rev3_5rows/info.json
+++ b/keyboards/helix/rev3_5rows/info.json
@@ -103,8 +103,7 @@
     "split_count": [32, 32],
     "animations": {
       "rainbow_mood": true,
-      "rainbow_swirl": true,
-      "static_gradient": true
+      "rainbow_swirl": true
     }
   },
   "processor": "atmega32u4",
diff --git a/keyboards/hineybush/h87a/keymaps/gam3cat/config.h b/keyboards/hineybush/h87a/keymaps/gam3cat/config.h
deleted file mode 100644
index 334beb0ac2b..00000000000
--- a/keyboards/hineybush/h87a/keymaps/gam3cat/config.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#pragma once
-
-//Force NKRO to be enabled.
-#define FORCE_NKRO
-
-//GRAVE_ESC override for CTRL+SHIFT+ESC Windows task manager shortcut.
-//#define GRAVE_ESC_CTRL_OVERRIDE
-
-//Delay matrix scan for tap dance, reduce to activate modifier keys faster.
-//#define TAPPING_TERM 200
diff --git a/keyboards/hineybush/h87a/keymaps/gam3cat/keymap.c b/keyboards/hineybush/h87a/keymaps/gam3cat/keymap.c
deleted file mode 100644
index 6d064455b36..00000000000
--- a/keyboards/hineybush/h87a/keymaps/gam3cat/keymap.c
+++ /dev/null
@@ -1,293 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "version.h"
-
-enum layers {
-    _BL = 0,    // Base Layer
-    _WL,        // Workman Layer
-    _NL,        // Norman Layer
-    _DL,        // Dvorak Layer
-    _CL,        // Base Layer
-    _FL,        // Function Layer
-    _AL,        // Adjust Layer
-};
-
-enum custom_keycodes {
-    QMK_REV = SAFE_RANGE,
-    KC_WEB,
-    KC_SP4,
-    DYNAMIC_MACRO_RANGE
-};
-
-extern backlight_config_t backlight_config;
-
-#include "dynamic_macro.h"
-#define FN_CAPS LT(_FL, KC_CAPS)
-#define KC_DMR1 DM_REC1
-#define KC_DMR2 DM_REC2
-#define KC_DMP1 DM_PLY1
-#define KC_DMP2 DM_PLY2
-#define KC_DMRS DM_RSTP
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /*#### _BL: Base Layer - Standard TKL QWERTY layout.
-    *    .-----------------------------------------------------------------------.
-    *    |Esc|||||F1 |F2 |F3 |F4 |||F5 |F6 |F7 |F8 |||F9 |F10|F11|F12|PSc|SLk|Pau|
-    *    |-----------------------------------------------------------|-----------|
-    *    |~  |1  |2  |3  |4  |5  |6  |7  |8  |9  |0  |-  |=  |Backsp |Ins|Hom|PgU|
-    *    |-----------------------------------------------------------|-----------|
-    *    |Tab  |Q  |W  |E  |R  |T  |Y  |U  |I  |O  |P  |[  |]  |\    |Del|End|PgD|
-    *    |-----------------------------------------------------------|-----------|
-    *    |Caps  |A  |S  |D  |F  |G  |H  |J  |K  |L  |;  |'  |Return  |           |
-    *    |-----------------------------------------------------------|-----------|
-    *    |Shift   |Z  |X  |C  |V  |B  |N  |M  |,  |.  |/  |Shift |Fn |   | Up|   |
-    *    |-----------------------------------------------------------|-----------|
-    *    |Ctrl |Win|Alt  |      Space                |RAlt |Fn |Ctrl |Lft|Dwn|Rgt|
-    *    *-----------------------------------------------------------------------*
-    */
-    [_BL] = LAYOUT_all(
-        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_SCRL, KC_PAUS,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_DEL,  KC_END,  KC_PGDN,
-        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, XXXXXXX, KC_ENT,
-        KC_LSFT, XXXXXXX, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(_FL),                   KC_UP,
-        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RGUI, KC_RALT, MO(_FL), KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-    /*#### _WL: Workman Layer.
-    *    .-----------------------------------------------------------------------.
-    *    |   |||||   |   |   |   |||   |   |   |   |||   |   |   |   |   |   |   |
-    *    .-----------------------------------------------------------|-----------|
-    *    |   |   |   |   |   |   |   |   |   |   |   |-  |=  |       |   |   |   |
-    *    |-----------------------------------------------------------|-----------|
-    *    |     |Q  |D  |R  |W  |B  |J  |F  |U  |P  |;  |[  |]  |\    |   |   |   |
-    *    |-----------------------------------------------------------|-----------|
-    *    |      |A  |S  |H  |T  |G  |Y  |N  |E  |O  |I  |'  |        |           |
-    *    |-----------------------------------------------------------|-----------|
-    *    |        |Z  |X  |M  |C  |V  |K  |L  |,  |.  |/  |      |   |   |   |   |
-    *    |-----------------------------------------------------------|-----------|
-    *    |     |   |     |                           |     |   |     |   |   |   |
-    *    *-----------------------------------------------------------------------*
-    */
-    [_WL] = LAYOUT_all(
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, KC_Q   , KC_D   , KC_R   , KC_W   , KC_B   , KC_J   , KC_F   , KC_U   , KC_P   , KC_SCLN, _______, _______, _______,          _______, _______, _______,
-        _______, KC_A   , KC_S   , KC_H   , KC_T   , KC_G   , KC_Y   , KC_N   , KC_E   , KC_O   , KC_I   , _______, _______, _______,
-        _______, _______, KC_Z   , KC_X   , KC_M   , KC_C   , KC_V   , KC_K   , KC_L   , KC_COMM, KC_DOT , KC_SLSH, _______, _______,                   _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______, _______,          _______, _______, _______
-    ),
-    /*#### _NL: Norman Layer.
-    *    .-----------------------------------------------------------------------.
-    *    |   |||||   |   |   |   |||   |   |   |   |||   |   |   |   |   |   |   |
-    *    .-----------------------------------------------------------|-----------|
-    *    |   |   |   |   |   |   |   |   |   |   |   |-  |=  |       |   |   |   |
-    *    |-----------------------------------------------------------|-----------|
-    *    |     |Q  |W  |D  |F  |K  |J  |U  |R  |L  |;  |[  |]  |\    |   |   |   |
-    *    |-----------------------------------------------------------|-----------|
-    *    |      |A  |S  |E  |T  |G  |Y  |N  |I  |O  |H  |'  |        |           |
-    *    |-----------------------------------------------------------|-----------|
-    *    |        |Z  |X  |C  |V  |B  |P  |M  |,  |.  |/  |      |   |   |   |   |
-    *    |-----------------------------------------------------------|-----------|
-    *    |     |   |     |                           |     |   |     |   |   |   |
-    *    *-----------------------------------------------------------------------*
-    */
-    [_NL] = LAYOUT_all(
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, KC_Q   , KC_W   , KC_D   , KC_F   , KC_K   , KC_J   , KC_U   , KC_R   , KC_L   , KC_SCLN, _______, _______, _______,          _______, _______, _______,
-        _______, KC_A   , KC_S   , KC_E   , KC_T   , KC_G   , KC_Y   , KC_N   , KC_I   , KC_O   , KC_H   , _______, _______, _______,
-        _______, _______, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_P   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, _______, _______,                   _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______, _______,          _______, _______, _______
-    ),
-    /*#### _DL: Dvorak Layer.
-    *    .-----------------------------------------------------------------------.
-    *    |   |||||   |   |   |   |||   |   |   |   |||   |   |   |   |   |   |   |
-    *    .-----------------------------------------------------------|-----------|
-    *    |   |   |   |   |   |   |   |   |   |   |   |[  |]  |       |   |   |   |
-    *    |-----------------------------------------------------------|-----------|
-    *    |     |'  |,  |.  |P  |Y  |F  |G  |C  |R  |L  |/  |=  |\    |   |   |   |
-    *    |-----------------------------------------------------------|-----------|
-    *    |      |A  |O  |E  |U  |I  |D  |H  |T  |N  |S  |-  |        |           |
-    *    |-----------------------------------------------------------|-----------|
-    *    |        |;  |Q  |J  |K  |X  |B  |M  |W  |V  |Z  |      |   |   |   |   |
-    *    |-----------------------------------------------------------|-----------|
-    *    |     |   |     |                           |     |   |     |   |   |   |
-    *    *-----------------------------------------------------------------------*
-    */
-    [_DL] = LAYOUT_all(
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, _______, _______, _______, _______, _______,
-        _______, KC_QUOT, KC_COMM, KC_DOT , KC_P   , KC_Y   , KC_F   , KC_G   , KC_C   , KC_R   , KC_L   , KC_SLSH, KC_EQL , _______,          _______, _______, _______,
-        _______, KC_A   , KC_O   , KC_E   , KC_U   , KC_I   , KC_D   , KC_H   , KC_T   , KC_N   , KC_S   , KC_MINS, _______, _______,
-        _______, _______, KC_SCLN, KC_Q   , KC_J   , KC_K   , KC_X   , KC_B   , KC_M   , KC_W   , KC_V   , KC_Z   , _______, _______,                   _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______, _______,          _______, _______, _______
-    ),
-    /*#### _CL: Colmak Layer.
-    *    .-----------------------------------------------------------------------.
-    *    |   |||||   |   |   |   |||   |   |   |   |||   |   |   |   |   |   |   |
-    *    .-----------------------------------------------------------|-----------|
-    *    |   |   |   |   |   |   |   |   |   |   |   |-  |=  |       |   |   |   |
-    *    |-----------------------------------------------------------|-----------|
-    *    |     |Q  |W  |F  |P  |G  |J  |L  |U  |Y  |;  |[  |]  |\    |   |   |   |
-    *    |-----------------------------------------------------------|-----------|
-    *    |      |A  |R  |S  |T  |D  |H  |N  |E  |I  |O  |'  |        |           |
-    *    |-----------------------------------------------------------|-----------|
-    *    |        |Z  |X  |C  |V  |B  |K  |M  |,  |.  |/  |      |   |   |   |   |
-    *    |-----------------------------------------------------------|-----------|
-    *    |     |   |     |                           |     |   |     |   |   |   |
-    *    *-----------------------------------------------------------------------*
-    */
-    [_CL] = LAYOUT_all(
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, KC_Q   , KC_W   , KC_F   , KC_P   , KC_G   , KC_J   , KC_L   , KC_U   , KC_Y   , KC_SCLN, _______, _______, _______,          _______, _______, _______,
-        _______, KC_A   , KC_R   , KC_S   , KC_T   , KC_D   , KC_H   , KC_N   , KC_E   , KC_I   , KC_O   , _______, _______, _______,
-        _______, _______, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_K   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, _______, _______,                   _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______, _______,          _______, _______, _______
-    ),
-    /*#### _FL: Function Layer.
-    *    .-----------------------------------------------------------------------.
-    *    |   |||||   |   |   |   |||   |   |   |   |||   |VlM|VlD|VlU|   |   |   |
-    *    .-----------------------------------------------------------|-----------|
-    *    |Web|   |   |   |   |   |   |   |   |   |   |   |   |       |   |   |   |
-    *    |-----------------------------------------------------------|-----------|
-    *    |Fn_AL|   |   |   |   |   |   |   |   |   |   |   |   |     |   |   |   |
-    *    |-----------------------------------------------------------|-----------|
-    *    |      |   |   |   |   |   |   |Lft|Dwn|Up |Rgt|   |        |           |
-    *    |-----------------------------------------------------------|-----------|
-    *    |        |   |   |   |   |   |   |   |   |   |   |      |Fn |   |   |   |
-    *    |-----------------------------------------------------------|-----------|
-    *    |     |   |     |      SP4                  |     |Fn |     |WBk|   |WFw|
-    *    *-----------------------------------------------------------------------*
-    */
-    [_FL] = LAYOUT_all(
-        XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MUTE, KC_VOLD, KC_VOLU,          XXXXXXX, XXXXXXX, XXXXXXX,
-        KC_WEB,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        MO(_AL), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,                   XXXXXXX,
-        XXXXXXX, XXXXXXX, KC_MENU,                            KC_SP4,                             XXXXXXX, _______, XXXXXXX, XXXXXXX,          KC_WBAK, XXXXXXX, KC_WFWD
-    ),
-    /*#### _AL: Adjust Layer - Keymap select, LED backlight, and Dynamic Macro settings.
-    *    .-----------------------------------------------------------------------.
-    *    |Rst|||||   |   |   |   |||   |   |   |   |||   |   |   |   |   |   |   |
-    *    .-----------------------------------------------------------|-----------|
-    *    |Rev|Tog|Mod|H- |H+ |S- |S+ |V- |V+ |   |BLT|BL-|BL+|       |   |MR1|MP1|
-    *    |-----------------------------------------------------------|-----------|
-    *    |Fn_AL|_BL|_WL|   |   |   |   |   |   |   |   |   |   |     | MS|MR2|MP2|
-    *    |-----------------------------------------------------------|-----------|
-    *    |      |   |   |_DL|   |   |   |   |   |   |   |   |        |           |
-    *    |-----------------------------------------------------------|-----------|
-    *    |        |   |   |_CL|   |_BL|_NL|   |   |   |   |      |Fn |   |   |   |
-    *    |-----------------------------------------------------------|-----------|
-    *    |     |   |     |                           |     |Fn |     |   |   |   |
-    *    *-----------------------------------------------------------------------*
-    */
-    [_AL] = LAYOUT_all(
-        QK_BOOT,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX,
-        QMK_REV, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, XXXXXXX, BL_TOGG, BL_DOWN, BL_UP,   XXXXXXX, XXXXXXX, XXXXXXX, KC_DMR1, KC_DMP1,
-        _______, DF(_BL), DF(_WL), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          KC_DMRS, KC_DMR2, KC_DMP2,
-        XXXXXXX, XXXXXXX, XXXXXXX, DF(_DL), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DF(_CL), XXXXXXX, DF(_BL), DF(_NL), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,                   XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX,                            XXXXXXX,                            XXXXXXX, _______, XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX
-    ),
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case QMK_REV:
-            if (record->event.pressed) {
-                SEND_STRING(QMK_KEYBOARD "/" QMK_KEYMAP "@" QMK_VERSION ":" QMK_BUILDDATE);
-            }
-            return false;
-            break;
-        case KC_WEB:
-            if (record->event.pressed) {
-                SEND_STRING(SS_LGUI("r"));
-                wait_ms(100);
-                SEND_STRING("chrome.exe\n");
-            }
-            return false;
-            break;
-        case KC_SP4:
-            if (record->event.pressed) {
-                SEND_STRING ("    ");
-            }
-            return false;
-            break;
-    }
-    // Dynamic Macros.
-    if (!process_record_dynamic_macro(keycode, record)) {
-        return false;
-    }
-    return true;
-}
-
-void custom_backlight_level(uint8_t level) {
-    if (level > BACKLIGHT_LEVELS)
-        level = BACKLIGHT_LEVELS;
-    backlight_config.level = level;
-    backlight_config.enable = !!backlight_config.level;
-    backlight_set(backlight_config.level);
-}
-
-void matrix_init_user(void) {
-    #ifdef BACKLIGHT_ENABLE
-        custom_backlight_level(0);
-    #endif
-    #ifdef RGBLIGHT_ENABLE
-        rgblight_mode(1);
-        rgblight_sethsv_noeeprom(180,100,100);
-    #endif
-}
-
-void matrix_scan_user(void) {
-
-}
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    switch (get_highest_layer(state)) {
-        case _BL:
-            custom_backlight_level(0);
-            rgblight_sethsv_noeeprom(180,100,255);
-            break;
-        case _WL:
-        case _NL:
-        case _DL:
-        case _CL:
-            custom_backlight_level(1);
-            rgblight_sethsv_noeeprom(230,255,255);
-            break;
-        case _FL:
-            custom_backlight_level(2);
-            rgblight_sethsv_noeeprom(240,255,255);
-            break;
-        case _AL:
-            custom_backlight_level(3);
-            rgblight_sethsv_noeeprom(255,255,255);
-            break;
-        default:
-            custom_backlight_level(0);
-            rgblight_sethsv_noeeprom(180,100,100);
-            break;
-    }
-    return state;
-}
-
-void led_init_ports(void) {
-  DDRD |= (1<<5); // OUT
-  DDRE |= (1<<6); // OUT
-}
-
-bool led_update_user(led_t led_state) {
-  if (led_state.caps_lock) {
-    DDRD |= (1 << 5); PORTD &= ~(1 << 5);
-  } else {
-    DDRD &= ~(1 << 5); PORTD &= ~(1 << 5);
-  }
-  if (led_state.scroll_lock) {
-    DDRE |= (1 << 6); PORTE &= ~(1 << 6);
-  } else {
-    DDRE &= ~(1 << 6); PORTE &= ~(1 << 6);
-  }
-  return false;
-}
diff --git a/keyboards/hineybush/h87a/keymaps/gam3cat/readme.md b/keyboards/hineybush/h87a/keymaps/gam3cat/readme.md
deleted file mode 100644
index 5eb4c7d611e..00000000000
--- a/keyboards/hineybush/h87a/keymaps/gam3cat/readme.md
+++ /dev/null
@@ -1,114 +0,0 @@
-# Keymap Maintainer: Gam3cat
-make h87a:gam3cat
-## Layout Config:
-2u backspace, 2.25u lshift/enter, [2.75u rshift] or [1.75u rshift, 1u Fn].
-[1.5u, 1u, 1.5u 1x7.0u, 1.5u, 1u, 1.5u, 3x1u] or [2x1.5u, 1x7.0u, 2x1.5u, 3x1u] bottom row.
-
-## Base Layer Selection:
-(Fn+TAB+(  )): (Q)WERTY, (W)orkman, (N)orman, (D)vorak, (C)olmak
-
-### Base Layer Options:
-#### _BL: Base Layer - Standard TKL QWERTY layout.
-    .-----------------------------------------------------------------------.
-    |Esc|||||F1 |F2 |F3 |F4 |||F5 |F6 |F7 |F8 |||F9 |F10|F11|F12|PSc|SLk|Pau|
-    |-----------------------------------------------------------|-----------|
-    |~  |1  |2  |3  |4  |5  |6  |7  |8  |9  |0  |-  |=  |Backsp |Ins|Hom|PgU|
-    |-----------------------------------------------------------|-----------|
-    |Tab  |Q  |W  |E  |R  |T  |Y  |U  |I  |O  |P  |[  |]  |\    |Del|End|PgD|
-    |-----------------------------------------------------------|-----------|
-    |Caps  |A  |S  |D  |F  |G  |H  |J  |K  |L  |;  |'  |Return  |           |
-    |-----------------------------------------------------------|-----------|
-    |Shift   |Z  |X  |C  |V  |B  |N  |M  |,  |.  |/  |Shift |Fn |   | Up|   |
-    |-----------------------------------------------------------|-----------|
-    |Ctrl |Win|Alt  |      Space                |RAlt |Fn |Ctrl |Lft|Dwn|Rgt|
-    *-----------------------------------------------------------------------*
-
-#### _WL: Workman Layer.
-    .-----------------------------------------------------------------------.
-    |   |||||   |   |   |   |||   |   |   |   |||   |   |   |   |   |   |   |
-    .-----------------------------------------------------------|-----------|
-    |   |   |   |   |   |   |   |   |   |   |   |-  |=  |       |   |   |   |
-    |-----------------------------------------------------------|-----------|
-    |     |Q  |D  |R  |W  |B  |J  |F  |U  |P  |;  |[  |]  |\    |   |   |   |
-    |-----------------------------------------------------------|-----------|
-    |      |A  |S  |H  |T  |G  |Y  |N  |E  |O  |I  |'  |        |           |
-    |-----------------------------------------------------------|-----------|
-    |        |Z  |X  |M  |C  |V  |K  |L  |,  |.  |/  |      |   |   |   |   |
-    |-----------------------------------------------------------|-----------|
-    |     |   |     |                           |     |   |     |   |   |   |
-    *-----------------------------------------------------------------------*
-
-#### _NL: Norman Layer.
-    .-----------------------------------------------------------------------.
-    |   |||||   |   |   |   |||   |   |   |   |||   |   |   |   |   |   |   |
-    .-----------------------------------------------------------|-----------|
-    |   |   |   |   |   |   |   |   |   |   |   |-  |=  |       |   |   |   |
-    |-----------------------------------------------------------|-----------|
-    |     |Q  |W  |D  |F  |K  |J  |U  |R  |L  |;  |[  |]  |\    |   |   |   |
-    |-----------------------------------------------------------|-----------|
-    |      |A  |S  |E  |T  |G  |Y  |N  |I  |O  |H  |'  |        |           |
-    |-----------------------------------------------------------|-----------|
-    |        |Z  |X  |C  |V  |B  |P  |M  |,  |.  |/  |      |   |   |   |   |
-    |-----------------------------------------------------------|-----------|
-    |     |   |     |                           |     |   |     |   |   |   |
-    *-----------------------------------------------------------------------*
-
-#### _DL: Dvorak Layer.
-    .-----------------------------------------------------------------------.
-    |   |||||   |   |   |   |||   |   |   |   |||   |   |   |   |   |   |   |
-    .-----------------------------------------------------------|-----------|
-    |   |   |   |   |   |   |   |   |   |   |   |[  |]  |       |   |   |   |
-    |-----------------------------------------------------------|-----------|
-    |     |'  |,  |.  |P  |Y  |F  |G  |C  |R  |L  |/  |=  |\    |   |   |   |
-    |-----------------------------------------------------------|-----------|
-    |      |A  |O  |E  |U  |I  |D  |H  |T  |N  |S  |-  |        |           |
-    |-----------------------------------------------------------|-----------|
-    |        |;  |Q  |J  |K  |X  |B  |M  |W  |V  |Z  |      |   |   |   |   |
-    |-----------------------------------------------------------|-----------|
-    |     |   |     |                           |     |   |     |   |   |   |
-    *-----------------------------------------------------------------------*
-
-#### _CL: Colmak Layer.
-    .-----------------------------------------------------------------------.
-    |   |||||   |   |   |   |||   |   |   |   |||   |   |   |   |   |   |   |
-    .-----------------------------------------------------------|-----------|
-    |   |   |   |   |   |   |   |   |   |   |   |-  |=  |       |   |   |   |
-    |-----------------------------------------------------------|-----------|
-    |     |Q  |W  |F  |P  |G  |J  |L  |U  |Y  |;  |[  |]  |\    |   |   |   |
-    |-----------------------------------------------------------|-----------|
-    |      |A  |R  |S  |T  |D  |H  |N  |E  |I  |O  |'  |        |           |
-    |-----------------------------------------------------------|-----------|
-    |        |Z  |X  |C  |V  |B  |K  |M  |,  |.  |/  |      |   |   |   |   |
-    |-----------------------------------------------------------|-----------|
-    |     |   |     |                           |     |   |     |   |   |   |
-    *-----------------------------------------------------------------------*
-
-#### _FL: Function Layer.
-    .-----------------------------------------------------------------------.
-    |   |||||   |   |   |   |||   |   |   |   |||   |VlM|VlD|VlU|   |   |   |
-    .-----------------------------------------------------------|-----------|
-    |Web|   |   |   |   |   |   |   |   |   |   |   |   |       |   |   |   |
-    |-----------------------------------------------------------|-----------|
-    |Fn_AL|   |   |   |   |   |   |   |   |   |   |   |   |     |   |   |   |
-    |-----------------------------------------------------------|-----------|
-    |      |   |   |   |   |   |   |Lft|Dwn|Up |Rgt|   |        |           |
-    |-----------------------------------------------------------|-----------|
-    |        |   |   |   |   |   |   |   |   |   |   |      |Fn |   |   |   |
-    |-----------------------------------------------------------|-----------|
-    |     |   |     |      SP4                  |     |Fn |     |WBk|   |WFw|
-    *-----------------------------------------------------------------------*
-
-#### _AL: Adjust Layer - Keymap select, LED backlight, and Dynamic Macro settings.
-    .-----------------------------------------------------------------------.
-    |Rst|||||   |   |   |   |||   |   |   |   |||   |   |   |   |   |   |   |
-    .-----------------------------------------------------------|-----------|
-    |Rev|Tog|Mod|H- |H+ |S- |S+ |V- |V+ |   |BLT|BL-|BL+|       |   |MR1|MP1|
-    |-----------------------------------------------------------|-----------|
-    |Fn_AL|_BL|_WL|   |   |   |   |   |   |   |   |   |   |     | MS|MR2|MP2|
-    |-----------------------------------------------------------|-----------|
-    |      |   |   |_DL|   |   |   |   |   |   |   |   |        |           |
-    |-----------------------------------------------------------|-----------|
-    |        |   |   |_CL|   |_BL|_NL|   |   |   |   |      |Fn |   |   |   |
-    |-----------------------------------------------------------|-----------|
-    |     |   |     |                           |     |Fn |     |   |   |   |
-    *-----------------------------------------------------------------------*
diff --git a/keyboards/hineybush/h87a/keymaps/gam3cat/rules.mk b/keyboards/hineybush/h87a/keymaps/gam3cat/rules.mk
deleted file mode 100644
index 7b35b90178b..00000000000
--- a/keyboards/hineybush/h87a/keymaps/gam3cat/rules.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
-TAP_DANCE_ENABLE = no       # Enable TapDance functionality
-RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys(+1500)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = no         # Commands for debug and configuration
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-NKRO_ENABLE = yes           # Nkey Rollover - If this doesn't work, add this to config.h: #define FORCE_NKRO
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-UNICODE_ENABLE = no         # Unicode
-UNICODEMAP_ENABLE = no      # Enable extended unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-AUDIO_ENABLE = no           # Audio output on port C6
-#VARIABLE_TRACE = no         # Use this to debug changes to variable values
-KEY_LOCK_ENABLE = no        # This enables key lock(+260)
-SPLIT_KEYBOARD = no         # This enables split keyboard support and includes all necessary files located at quantum/split_common
diff --git a/keyboards/hotdox/keymaps/bliss/keymap.c b/keyboards/hotdox/keymaps/bliss/keymap.c
deleted file mode 100644
index b83114d0248..00000000000
--- a/keyboards/hotdox/keymaps/bliss/keymap.c
+++ /dev/null
@@ -1,173 +0,0 @@
-/* Copyright 2021 Benjamin Chausse
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-#include "version.h"
-
-enum layer_names {
-    BASE, // default layer
-    FUNC, // functions keys, numbpad, and arrows
-};
-
-enum custom_keycodes {
-  VRSN = SAFE_RANGE,
-  RGB_SLD
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Keymap 0: default layer
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |    `   |   1  |   2  |   3  |   4  |   5  |   6  |           |   7  |   8  |   9  |   0  |   -  |   =  |  BkSp  |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * | Tab    |   Q  |   W  |   E  |   R  |   T  |   {  |           |  }   |   Y  |   U  |   I  |   O  |   P  |   \    |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * | TUX    |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |   ;  | '/TUX  |
- * |--------+------+------+------+------+------|   ^  |           |  &   |------+------+------+------+------+--------|
- * | Shft/( |   Z  |   X  |   C  |   V  |   B  |      |           |      |   N  |   M  |   ,  |   .  |   /  | Shft/) |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   | Ctrl |  Alt | Caps |  MP1 | FUNC |                                       |  MR1 |  MS1 |   [  |   ]  | TFUNC |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,---------------.
- *                                        |      | Prnt |       | INS  |  HOME  |
- *                                 ,------|------|------|       |------+--------+------.
- *                                 |      |      | Vol+ |       | PgUp |        |      |
- *                                 | Space|Backsp|------|       |------|  Enter |  :   |
- *                                 |      |ace   | Vol- |       | PgDn |        |      |
- *                                 `--------------------'       `----------------------'
- *
- * MR1: Record macro 1               Prnt: Print Screen
- * MS1: Stop recording macro 1       INS: INSERT
- * MP1: Play macro 1                 TFUNC: Goto FUNC only while pressed
- * FUNC: Set FUNC as default layer
- *
- *
- */
-
-/* If it accepts an argument (i.e, is a function), it doesn't need KC_. */
-/* Otherwise, it needs KC_* */
-	[BASE] = LAYOUT_ergodox( /* layer 0: default */
-      /* Left hand */
-      KC_GRV,               KC_1,    KC_2,    KC_3,    KC_4,  KC_5, KC_6,
-      KC_TAB,               KC_Q,    KC_W,    KC_E,    KC_R,  KC_T, LSFT(KC_LBRC),
-      MT(MOD_LGUI, KC_ESC), KC_A,    KC_S,    KC_D,    KC_F,  KC_G,
-      SC_LSPO,              KC_Z,    KC_X,    KC_C,    KC_V,  KC_B, LSFT(KC_6),
-      KC_LCTL,              KC_LALT, KC_CAPS, DM_PLY1, DF(1),
-
-      KC_NO, KC_PSCR,
-      KC_VOLU,
-      KC_SPC, KC_BSPC, KC_VOLD,
-
-      /* right hand */
-      KC_7,          KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,                KC_BSPC,
-      RSFT(KC_RBRC), KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,                  KC_BSLS,
-      KC_H,          KC_J,    KC_K,    KC_L,    KC_SCLN, MT(MOD_RGUI, KC_QUOT),
-      RSFT(KC_7),    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,               SC_RSPC,
-      DM_REC1,       DM_RSTP, KC_LBRC, KC_RBRC, MO(1),
-
-      KC_INS,  KC_HOME,
-      KC_PGUP,
-      KC_PGDN, KC_ENT,  RSFT(KC_SCLN)),
-
-/* Keymap 1: function keys, numpad, and arrows
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |        |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |           |  F7  |  F8  |  F9  | F10  | F11  | F12  |        |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |      |      |  UP  |      |      |      |           |      |   /  |   7  |   8  |   9  |   -  |   \    |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      | LEFT | DOWN |RIGHT |      |------|           |------|   *  |   4  |   5  |   6  |   +  |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |      |      |      |      |      |           |      |   %  |   1  |   2  |   3  |   ,  | Shft/) |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   | Ctrl |  Alt | Caps |      | MAIN |                                       |   0  |   .  |  [   |   ]  |       |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,---------------.
- *                                        |      | Prnt |       | Ins  |  Home  |
- *                                 ,------|------|------|       |------+--------+------.
- *                                 |      |      | Vol+ |       | PgUp |        |      |
- *                                 | Space|Backsp|------|       |------|  Enter | Equal|
- *                                 |      |ace   | Vol- |       | PgDn |        |      |
- *                                 `--------------------'       `----------------------'
- */
-
-	[FUNC] = LAYOUT_ergodox( /* layer 1: func */
-    /* left hand */
-    KC_NO,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5, KC_F6,
-    KC_NO,   KC_NO,   KC_NO,   KC_UP,   KC_NO,   KC_NO, KC_NO,
-    KC_NO,   KC_NO,   KC_LEFT, KC_DOWN, KC_RGHT, KC_NO,
-    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO, KC_NO,
-    KC_LCTL, KC_LALT, KC_CAPS, KC_NO,   DF(0),
-
-    KC_NO,   KC_PSCR,
-    KC_VOLU,
-    KC_SPC,  KC_BSPC, KC_VOLD,
-
-    /* right hand */
-    KC_F7,   KC_F8,      KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NO,
-    KC_NO,   KC_PSLS,    KC_P7,   KC_P8,   KC_P9,   KC_PMNS, KC_BSLS,
-    KC_PAST, KC_P4,      KC_P5,   KC_P6,   KC_PPLS, KC_NO,
-    KC_NO,   LSFT(KC_5), KC_P1,   KC_P2,   KC_P3,   KC_PCMM, SC_RSPC,
-    KC_P0,   KC_PDOT,    KC_LBRC, KC_RBRC, KC_NO,
-
-    KC_INS,  KC_HOME,
-    KC_PGUP,
-    KC_PGDN, KC_ENT,  KC_PEQL)
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    // dynamically generate these.
-    case VRSN:
-      if (record->event.pressed) {
-        SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
-      }
-      return false;
-      break;
-    case RGB_SLD:
-      if (record->event.pressed) {
-        #ifdef RGBLIGHT_ENABLE
-          rgblight_mode(1);
-        #endif
-      }
-      return false;
-      break;
-  }
-  return true;
-}
-
-
-// Runs constantly in the background, in a loop.
-void matrix_scan_user(void) {
-
-    uint8_t layer = get_highest_layer(layer_state);
-
-    ergodox_right_led_1_off();
-    ergodox_right_led_2_off();
-    ergodox_right_led_3_off();
-    switch (layer) {
-      // TODO: Make this relevant to the ErgoDox EZ.
-        case 1:
-            ergodox_right_led_1_on();
-            break;
-        case 2:
-            ergodox_right_led_2_on();
-            break;
-        default:
-            // none
-            break;
-    }
-};
diff --git a/keyboards/hotdox/keymaps/bliss/readme.md b/keyboards/hotdox/keymaps/bliss/readme.md
deleted file mode 100644
index a31ee2826ec..00000000000
--- a/keyboards/hotdox/keymaps/bliss/readme.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# Bliss for Hotdox
-
-This keymap for the ergodox hotdox is a take on a development setup I quite
-enjoy. Developers constantly use brackets and they should therefore be
-accessible instead of hidden away behind a shift key. Also this setup aims to minimize hand travel with a layer containing a numpad as well as arrows. Finally,
-this setup incorporates a dynamic macro recorder for an easy, software agnostic way to program macros.
-
-All keybinding diagrams can be read in the `keymap.c` file. It is quite well documented.
diff --git a/keyboards/hotdox/keymaps/bliss/rules.mk b/keyboards/hotdox/keymaps/bliss/rules.mk
deleted file mode 100644
index ca616d75eed..00000000000
--- a/keyboards/hotdox/keymaps/bliss/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-VIA_ENABLE = yes
-LTO_ENABLE = yes
-
-EXTRAKEY_ENABLE = yes
-DYNAMIC_MACRO_ENABLE = yes
diff --git a/keyboards/hotdox/keymaps/eozaki/keymap.c b/keyboards/hotdox/keymaps/eozaki/keymap.c
deleted file mode 100644
index d30308fa285..00000000000
--- a/keyboards/hotdox/keymaps/eozaki/keymap.c
+++ /dev/null
@@ -1,192 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "version.h"
-
-#define BASE 0 // default layer
-#define SYMB 1 // symbols
-#define MDIA 2 // media keys
-
-enum custom_keycodes {
-  PLACEHOLDER = SAFE_RANGE, // can always be here
-  VRSN,
-  RGB_SLD
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Keymap 0: Basic layer
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * | Esc    |   1  |   2  |   3  |   4  |   5  |  ~   |           |  '   |   6  |   7  |   8  |   9  |   0  |   =    |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * | Del    |   Q  |   W  |   E  |   R  |   T  |  ~   |           |  "   |   Y  |   U  |   I  |   O  |   P  |   -    |
- * |--------+------+------+------+------+------|  `   |           |      |------+------+------+------+------+--------|
- * | Ctrl   |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |  ;   |    \   |
- * |--------+------+------+------+------+------|  {   |           |  }   |------+------+------+------+------+--------|
- * | LAlt   |   Z  |   X  |   C  |   V  |   B  |  [   |           |  ]   |   N  |   M  |   ,  |   .  |  /   | LShift |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   | LT-1 |  F4  |  F5  |  F6  |  F11 |                                       | Left | Down |  Up  | Right|  RAlt  |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |  L1  | Prev |       | Vol+ |  L2  |
- *                                 ,------|------|------|       |------+--------+------.
- *                                 |      |      | Play |       | Vol- |        |      |
- *                                 | Space|Backsp|------|       |------|  Tab   |Enter |
- *                                 |      |ace   | Next |       | Mute |        |      |
- *                                 `--------------------'       `----------------------'
- */
-// If it accepts an argument (i.e, is a function), it doesn't need KC_.
-// Otherwise, it needs KC_*
-[BASE] = LAYOUT_ergodox(  // layer 0 : default
-        // left hand
-        KC_ESC,         KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   LSFT(KC_GRV),
-        KC_DEL,         KC_Q,         KC_W,   KC_E,   KC_R,   KC_T,   KC_GRV,
-        KC_LCTL,        KC_A,         KC_S,   KC_D,   KC_F,   KC_G,
-        KC_LALT,        KC_Z,         KC_X,   KC_C,   KC_V,   KC_B,   KC_LBRC,
-        LT(SYMB, KC_F2),       KC_F4,        KC_F5,  KC_F6,  KC_F11,
-                                                   TG(SYMB),  KC_MPRV,
-                                                              KC_MPLY,
-                                               KC_SPC,KC_BSPC,KC_MNXT,
-        // right hand
-             KC_QUOT,         KC_6,   KC_7,   KC_8,   KC_9,   KC_0,             KC_EQL,
-             LSFT(KC_QUOT),  KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,             KC_MINS,
-                              KC_H,   KC_J,   KC_K,   KC_L,   LT(MDIA, KC_SCLN),KC_BSLS,
-             KC_RBRC,         KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,          KC_LSFT,
-                              KC_LEFT,KC_DOWN,KC_UP,  KC_RGHT,KC_RALT,
-             KC_VOLU,        TG(MDIA),
-             KC_VOLD,
-             KC_MUTE,KC_TAB, KC_ENT
-    ),
-/* Keymap 1: Symbol Layer
- *
- * ,---------------------------------------------------.           ,--------------------------------------------------.
- * |Version  |  F1  |  F2  |  F3  |  F4  |  F5  |      |           |      |  F6  |  F7  |  F8  |  F9  |  F10 |   F11  |
- * |---------+------+------+------+------+------+------|           |------+------+------+------+------+------+--------|
- * |         |   !  |   @  |   {  |   }  |   |  |      |           |      |   Up |   7  |   8  |   9  |   *  |   F12  |
- * |---------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |         |   #  |   $  |   (  |   )  |   `  |------|           |------| Down |   4  |   5  |   6  |   +  |        |
- * |---------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |         |   %  |   ^  |   [  |   ]  |   ~  |      |           |      |   &  |   1  |   2  |   3  |   \  |        |
- * `---------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- * | EE_CLR  |      |      |      |      |                                       |      |    . |   0  |   =  |      |
- *   `-----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |Animat|      |       |Toggle|Solid |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |Bright|Bright|      |       |      |Hue-  |Hue+  |
- *                                 |ness- |ness+ |------|       |------|      |      |
- *                                 |      |      |      |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-// SYMBOLS
-[SYMB] = LAYOUT_ergodox(
-       // left hand
-       VRSN,   KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS,
-       KC_TRNS,KC_EXLM,KC_AT,  KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS,
-       KC_TRNS,KC_HASH,KC_DLR, KC_LPRN,KC_RPRN,KC_GRV,
-       KC_TRNS,KC_PERC,KC_CIRC,KC_LBRC,KC_RBRC,KC_TILD,KC_TRNS,
-       EE_CLR, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-                                       RGB_MOD,KC_TRNS,
-                                               KC_TRNS,
-                               RGB_VAD,RGB_VAI,KC_TRNS,
-       // right hand
-       KC_TRNS, KC_F6,   KC_F7,  KC_F8,   KC_F9,   KC_F10,  KC_F11,
-       KC_TRNS, KC_UP,   KC_7,   KC_8,    KC_9,    KC_ASTR, KC_F12,
-                KC_DOWN, KC_4,   KC_5,    KC_6,    KC_PLUS, KC_TRNS,
-       KC_TRNS, KC_AMPR, KC_1,   KC_2,    KC_3,    KC_BSLS, KC_TRNS,
-                         KC_TRNS,KC_DOT,  KC_0,    KC_EQL,  KC_TRNS,
-       RGB_TOG, RGB_SLD,
-       KC_TRNS,
-       KC_TRNS, RGB_HUD, RGB_HUI
-),
-/* Keymap 2: Media and mouse keys
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |      |      | MsUp |      |      |      |           |      |      |      |      |      |      |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |MsLeft|MsDown|MsRght|      |------|           |------|      |      |      |      |      |  Play  |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |      |      |      |      |      |           |      |      |      | Prev | Next |      |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      | Lclk | Rclk |                                       |VolUp |VolDn | Mute |      |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       |      |      |Brwser|
- *                                 |      |      |------|       |------|      |Back  |
- *                                 |      |      |      |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-// MEDIA AND MOUSE
-[MDIA] = LAYOUT_ergodox(
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2,
-                                           KC_TRNS, KC_TRNS,
-                                                    KC_TRNS,
-                                  KC_TRNS, KC_TRNS, KC_TRNS,
-    // right hand
-       KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY,
-       KC_TRNS,  KC_TRNS, KC_TRNS, KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS,
-                          KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS,
-       KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_WBAK
-),
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    // dynamically generate these.
-    case VRSN:
-      if (record->event.pressed) {
-        SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
-      }
-      return false;
-      break;
-    case RGB_SLD:
-      if (record->event.pressed) {
-        #ifdef RGBLIGHT_ENABLE
-          rgblight_mode(1);
-        #endif
-      }
-      return false;
-      break;
-  }
-  return true;
-}
-
-// Runs just one time when the keyboard initializes.
-void matrix_init_user(void) {
-
-};
-
-
-// Runs constantly in the background, in a loop.
-void matrix_scan_user(void) {
-
-    uint8_t layer = get_highest_layer(layer_state);
-
-    ergodox_board_led_off();
-    ergodox_right_led_1_off();
-    ergodox_right_led_2_off();
-    ergodox_right_led_3_off();
-    switch (layer) {
-      // TODO: Make this relevant to the ErgoDox EZ.
-        case 1:
-            ergodox_right_led_1_on();
-            break;
-        case 2:
-            ergodox_right_led_2_on();
-            break;
-        default:
-            // none
-            break;
-    }
-
-};
diff --git a/keyboards/hotdox76v2/keymaps/dancxjo/config.h b/keyboards/hotdox76v2/keymaps/dancxjo/config.h
deleted file mode 100644
index fac328091d3..00000000000
--- a/keyboards/hotdox76v2/keymaps/dancxjo/config.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 2023 Travis Reed (@dancxjo)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-#define DYNAMIC_KEYMAP_LAYER_COUNT 5
-#define EE_HANDS
diff --git a/keyboards/hotdox76v2/keymaps/dancxjo/keymap.c b/keyboards/hotdox76v2/keymaps/dancxjo/keymap.c
deleted file mode 100644
index 1f55685de06..00000000000
--- a/keyboards/hotdox76v2/keymaps/dancxjo/keymap.c
+++ /dev/null
@@ -1,177 +0,0 @@
-// Copyright 2023 Travis Reed (@dancxjo)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-
-enum layer {
-    _ENGRAM = 0,
-    _QWERTY,
-    _ENGRAM_SHIFT,
-    _FUNCTION,
-    _MEDIA
-};
-
-/* Combines the compose key (right super) and the AltGr */
-#define KC_COMP MT(MOD_RALT, KC_RGUI)
-#define KC_SCMP MT(MOD_RSFT | MOD_RALT, KC_RGUI)
-
-#define KC_STAB MT(MOD_LSFT, KC_TAB)
-
-/* Use a fake shift layer since Engram switches level 2 assignments */
-#define KC_PSFT MO(_ENGRAM_SHIFT)
-
-#define KC_FUNC TT(_FUNCTION)
-#define KC_MEDI TT(_MEDIA)
-
-/* Easily switch between MacOS & other OSes*/
-#define KC_HLM1 LM(1, MOD_LCTL)
-#define KC_HLM2 LM(1, MOD_LGUI)
-#define KC_SHM1 LM(1, MOD_LCTL | MOD_LSFT)
-#define KC_SHM2 LM(1, MOD_LGUI | MOD_LSFT)
-#define KC_STRN RSFT(KC_TRNS)
-
-#define KC_FORW LGUI(KC_TAB)
-#define KC_BACK LGUI(LSFT(KC_TAB))
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-        /* Differs slightly from official Engram in that {} are the level 1 and [] are the level 2 */
-        [_ENGRAM] = LAYOUT_ergodox_pretty(
-            KC_LCBR, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    CG_NORM, KC_PAUSE, KC_6,    KC_7,    KC_8,    KC_9,   KC_0,    KC_RCBR,
-            KC_TAB,  KC_B,    KC_Y,    KC_O,    KC_U,    KC_QUOT, KC_AT,   KC_HASH,  KC_DQUO, KC_L,    KC_D,    KC_W,   KC_V,    KC_Z,
-            KC_CAPS, KC_C,    KC_I,    KC_E,    KC_A,    KC_COMM,                    KC_DOT,  KC_H,    KC_T,    KC_S,   KC_N,    KC_Q,
-            KC_PSFT, KC_G,    KC_X,    KC_J,    KC_K,    KC_MINS, KC_SLSH, KC_PSCR,  KC_QUES, KC_R,    KC_M,    KC_F,   KC_P,    KC_PSFT,
-            KC_HLM1, KC_FUNC, KC_MEDI, KC_LALT, KC_HLM2,                             KC_RGUI, KC_RALT, KC_MEDI, KC_FUNC,KC_HLM1,
-                                       KC_INS,  KC_HOME,                             KC_END,  KC_DEL,
-                                                KC_PGUP,                             KC_PGDN,
-                                       KC_ENT,  KC_ESC,  KC_LSFT,                    KC_RSFT, KC_BSPC, KC_SPC
-        ),
-        [_ENGRAM_SHIFT] = LAYOUT_ergodox_pretty(
-            KC_LBRC, KC_PIPE,    KC_EQL,     KC_TILD,    KC_PLUS,    KC_LT,   CG_SWAP, KC_STRN, KC_GT,   KC_CIRC,    KC_AMPR,    KC_PERC,    KC_ASTR,    KC_RBRC,
-            KC_STRN, RSFT(KC_B), RSFT(KC_Y), RSFT(KC_O), RSFT(KC_U), KC_LPRN, KC_GRV,  KC_DLR,  KC_RPRN, RSFT(KC_L), RSFT(KC_D), RSFT(KC_W), RSFT(KC_V), RSFT(KC_Z),
-            KC_STRN, RSFT(KC_C), RSFT(KC_I), RSFT(KC_E), RSFT(KC_A), KC_SCLN,                   KC_COLN, RSFT(KC_H), RSFT(KC_T), RSFT(KC_S), RSFT(KC_N), RSFT(KC_Q),
-            KC_TRNS, RSFT(KC_G), RSFT(KC_X), RSFT(KC_J), RSFT(KC_K), KC_UNDS, KC_BSLS, KC_STRN, KC_EXLM, RSFT(KC_R), RSFT(KC_M), RSFT(KC_F), RSFT(KC_P), KC_TRNS,
-            KC_SHM1, KC_STRN,    KC_STRN,    KC_STRN,    KC_SHM2,                               KC_STRN, KC_STRN,    KC_STRN,    KC_STRN,    KC_SHM1,
-                                             KC_STRN,    KC_STRN,                               KC_HYPR, KC_STRN,
-                                                         KC_STRN,                               KC_STRN,
-                                             KC_SHM1,    KC_STRN,    KC_STRN,                   KC_SHM2, KC_STRN, KC_STRN
-        ),
-        [_QWERTY] = LAYOUT_ergodox_pretty(
-            KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_TRNS, KC_TRNS, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
-            KC_TRNS, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_LBRC, KC_RBRC, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
-            KC_TRNS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-            KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_EQL, KC_TRNS,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                                       KC_TRNS, KC_TRNS,                            KC_TRNS, KC_TRNS,
-                                                KC_TRNS,                            KC_TRNS,
-                                       KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS
-        ),
-        [_FUNCTION] = LAYOUT_ergodox_pretty(
-            KC_PSCR, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_BRID, KC_BRIU, KC_F6,   KC_F7,   KC_F8,   KC_F9,    KC_F10, KC_PWR,
-            KC_APP,  KC_F11,  KC_F12,  KC_F13,  KC_F14,  KC_F15,  TG(1),   TG(1),   KC_F16,  KC_F17,  KC_F18,  KC_F19,   KC_F20, KC_SLEP,
-            KC_SCRL, KC_F21,  KC_F22,  KC_F23,  KC_F24,  KC_NO,                     KC_NO,   KC_NO,   KC_NO,   KC_NO,    KC_NO,  KC_WAKE,
-            KC_PAUS, KC_UNDO, KC_CUT,  KC_COPY, KC_PSTE, KC_NO,   CG_SWAP, CG_NORM, KC_NO,   KC_NO,   KC_NO,   KC_NO,    KC_NO,  QK_BOOT,
-            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,                                   KC_TRNS,   KC_TRNS,   KC_TRNS, KC_TRNS,   KC_TRNS,
-                                       RGB_SAD, RGB_HUD,                                     RGB_HUI, RGB_SAI,
-                                                RGB_RMOD,                                     RGB_MOD,
-                                       RGB_SPD, RGB_VAD, KC_TRNS,                  KC_TRNS, RGB_VAI, RGB_SPI
-        ),
-        [_MEDIA] = LAYOUT_ergodox_pretty(
-            KC_NO,   KC_NO, KC_NO,   KC_NO,   KC_NO,   KC_WREF, KC_NO, KC_NO, KC_NO,   KC_NO,   KC_NO,   KC_NO, KC_NO,   KC_NO,
-            KC_NO,   KC_NO, KC_NO,   KC_NO,   KC_WREF, KC_NO,   KC_NO, KC_NO, KC_NO,   KC_PGUP, KC_UP,   KC_PGDN, KC_MSEL, KC_NO,
-            KC_NO,   KC_NO, KC_WSTP, KC_MYCM, KC_WSCH, KC_FIND,               KC_WHOM, KC_LEFT, KC_DOWN, KC_RIGHT, KC_NO,   KC_NO,
-            KC_LSFT, KC_NO, KC_NO,   KC_CALC, KC_NO,   KC_WFAV, KC_NO, KC_NO, KC_NO,   KC_HOME, KC_MAIL, KC_END, KC_NO,   KC_NO,
-            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,                                   KC_TRNS,   KC_TRNS,   KC_TRNS, KC_TRNS,   KC_TRNS,
-                                   KC_MUTE, KC_EJCT,                                 KC_MSTP, KC_MPLY,
-                                            KC_MPRV,                                 KC_MNXT,
-                                   KC_MRWD, KC_VOLD, KC_TRNS,                        KC_TRNS, KC_VOLU, KC_MFFD
-        )
-};
-
-char* get_layer_name(uint8_t layer, bool capitalized) {
-    char *layer_name = "Unknown ";
-
-    switch (layer) {
-        case _ENGRAM:
-        case _ENGRAM_SHIFT:
-            if (capitalized) {
-                layer_name = "ENGRAM  ";
-            } else {
-                layer_name = "engram  ";
-            }
-            break;
-        case _QWERTY:
-            if (capitalized) {
-                layer_name = "QWERTY  ";
-            } else {
-                layer_name = "qwerty  ";
-            }
-            break;
-        case _MEDIA:
-            layer_name = "Media+  ";
-            break;
-        case _FUNCTION:
-            layer_name = "Function";
-            break;
-    }
-    return layer_name;
-}
-
-void render_locks(led_t led_state) {
-    oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR("    "), false);
-    oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR("    "), false);
-    oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR("    "), false);
-}
-
-void render_mods(uint8_t modifiers, uint8_t layer) {
-    oled_write_P(modifiers & MOD_MASK_GUI ? PSTR("Super") : PSTR("     "), false);
-    oled_write_P(PSTR(" "), false);
-    oled_write_P(modifiers & MOD_MASK_ALT ? PSTR("Alt") : PSTR("   "), false);
-    oled_write_P(PSTR(" "), false);
-    oled_write_P(modifiers & MOD_MASK_CTRL ? PSTR("Ctl") : PSTR("   "), false);
-    oled_write_P(PSTR(" "), false);
-
-    if (layer == _ENGRAM_SHIFT) {
-        oled_write_P(PSTR("Pseudo"), false);
-    } else {
-        oled_write_P(modifiers & MOD_MASK_SHIFT ? PSTR("Shift ") : PSTR("      "), false);
-    }
-}
-
-char* get_helm_key(void) {
-    if (keymap_config.swap_lctl_lgui) {
-        return "Super";
-    } else {
-        return "Control";
-    }
-}
-
-bool oled_task_user(void) {
-    uint8_t layer = get_highest_layer(layer_state);
-    uint8_t modifiers = get_mods()|get_oneshot_mods();
-    led_t led_state = host_keyboard_led_state();
-
-    bool real_shifted = modifiers & MOD_MASK_SHIFT;
-    bool pseudo_shifted = layer == _ENGRAM_SHIFT;
-    bool shifted = real_shifted || pseudo_shifted;
-    bool caps = led_state.caps_lock;
-    bool capitalized = (caps && !shifted) || (!caps && shifted);
-
-    oled_write_P(PSTR("Layer: "), false);
-    oled_write(get_layer_name(layer, capitalized), false);
-    oled_write_P(PSTR("\n"), false);
-
-    // Only the master knows if we've swapped the gui and ctl key
-    if (is_keyboard_master()) {
-        oled_write_P(PSTR(" Helm: "), false);
-        oled_write(get_helm_key(), false);
-    }
-
-    oled_write_P(PSTR("\n"), false);
-
-    render_mods(modifiers, layer);
-    oled_write_P(PSTR("\n"), false);
-
-    render_locks(led_state);
-
-    return false;
-}
diff --git a/keyboards/hotdox76v2/keymaps/dancxjo/rules.mk b/keyboards/hotdox76v2/keymaps/dancxjo/rules.mk
deleted file mode 100644
index bc20eb20b7c..00000000000
--- a/keyboards/hotdox76v2/keymaps/dancxjo/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-COMMAND_ENABLE = yes
-VIA_ENABLE = yes
-EXTRAKEY_ENABLE = no
-MOUSEKEY_ENABLE = no
diff --git a/keyboards/hs60/v2/hhkb/keymaps/goatmaster/config.h b/keyboards/hs60/v2/hhkb/keymaps/goatmaster/config.h
deleted file mode 100644
index 50c76489e65..00000000000
--- a/keyboards/hs60/v2/hhkb/keymaps/goatmaster/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-Copyright 2018 Yiancar
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#pragma once
-
-/* Include overwrites for specific keymap */
-
-#undef RGB_BACKLIGHT_CAPS_LOCK_INDICATOR
-#define RGB_BACKLIGHT_CAPS_LOCK_INDICATOR { .color = { .h = 0, .s = 255 }, .index = 3-1 } //red
diff --git a/keyboards/hs60/v2/hhkb/keymaps/goatmaster/keymap.c b/keyboards/hs60/v2/hhkb/keymaps/goatmaster/keymap.c
deleted file mode 100644
index 374dc6ad4b5..00000000000
--- a/keyboards/hs60/v2/hhkb/keymaps/goatmaster/keymap.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/* Copyright 2018 Yiancar
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-
-//This is the HHKB version of the PCB
-
-enum macro_keys {
-	KC_EML = SAFE_RANGE
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[0] = LAYOUT_60_hhkb( /* Base */
-    KC_ESC,   KC_1,     KC_2,  KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,  KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_GRV,  KC_BSLS,
-    KC_TAB,   KC_Q,     KC_W,  KC_E,  KC_R,  KC_T,  KC_Y,  KC_U,  KC_I,  KC_O,     KC_P,     KC_LBRC,  KC_RBRC,          KC_BSPC,
-    KC_LCTL,  KC_A,     KC_S,  KC_D,  KC_F,  KC_G,  KC_H,  KC_J,  KC_K,  KC_L,     KC_SCLN,  KC_QUOT,           KC_ENT,
-    KC_LSFT,            KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,  KC_N,  KC_M,  KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,            MO(1),
-    KC_LCTL,  KC_LGUI,  KC_LALT,                KC_SPC,                            KC_RALT,  KC_RGUI,          KC_RCTL          ),
-
-[1] = LAYOUT_60_hhkb( /* FN */
-    QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,    KC_F9,   KC_F10,   KC_F11,   KC_F12,  KC_TRNS,  KC_TRNS,
-    KC_TRNS, EF_DEC,  EF_INC,  H1_DEC,  H1_INC,  H2_DEC,  H2_INC,  BR_DEC,  BR_INC,   ES_DEC,  ES_INC,   KC_UP,    KC_TRNS,           KC_DEL,
-    KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME,  KC_PGUP, KC_LEFT,  KC_RGHT,            KC_TRNS,
-    KC_TRNS,          KC_TRNS, S1_DEC,  S1_INC,  S2_DEC,  S2_INC,  KC_TRNS, KC_TRNS,  KC_END,  KC_PGDN,  KC_DOWN,  KC_TRNS,           KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS,                 KC_TRNS,                                        KC_TRNS,  KC_TRNS,            KC_TRNS         ),
-
-[2] = LAYOUT_60_hhkb( /* Empty for dynamic keymaps */
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,            KC_TRNS,
-    KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS,                 KC_TRNS,                                        KC_TRNS,  KC_TRNS,            KC_TRNS          ),
-
-[3] = LAYOUT_60_hhkb( /* Empty for dynamic keymaps */
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,            KC_TRNS,
-    KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS,                 KC_TRNS,                                        KC_TRNS,  KC_TRNS,            KC_TRNS          ),
-};
-
-void matrix_init_user(void) {
-  //user initialization
-}
-
-void matrix_scan_user(void) {
-  //user matrix
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-  case KC_EML: //use "KC_EML" as keycode in layers above to call macro
-    if (!record->event.pressed) {
-      send_string_with_delay_P(PSTR("example@email.com"), 10); //change email value here
-    }
-  break;
-  }
-  return true;
-}
diff --git a/keyboards/hs60/v2/hhkb/keymaps/goatmaster/readme.md b/keyboards/hs60/v2/hhkb/keymaps/goatmaster/readme.md
deleted file mode 100644
index ea9803cc0bb..00000000000
--- a/keyboards/hs60/v2/hhkb/keymaps/goatmaster/readme.md
+++ /dev/null
@@ -1,6 +0,0 @@
-The default keymap for HHKB HS60 V2. VIA support enabled.
-=========================================================
-
-![Layout image](https://imgur.com/usbrQWL.png)
-
-Default layer is normal HHKB with 7U space. Fn layer is used for RGB functions, Volume control and arrow cluster
\ No newline at end of file
diff --git a/keyboards/hs60/v2/v2.c b/keyboards/hs60/v2/v2.c
index 45b1f54d5f5..5cb6f79fc7f 100644
--- a/keyboards/hs60/v2/v2.c
+++ b/keyboards/hs60/v2/v2.c
@@ -28,69 +28,69 @@ const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
  *   |  |      G location
  *   |  |      |      B location
  *   |  |      |      | */
-    {0, B_1,   A_1,   C_1}, //LA1
-    {0, E_1,   D_1,   F_1}, //LA2
-    {0, H_1,   G_1,   I_1}, //LA3
-    {0, K_1,   J_1,   L_1}, //LA4
-    {0, B_2,   A_2,   C_2}, //LA5
-    {0, E_2,   D_2,   F_2}, //LA6
-    {0, H_2,   G_2,   I_2}, //LA7
-    {0, K_2,   J_2,   L_2}, //LA8
-    {0, B_3,   A_3,   C_3}, //LA9
-    {0, E_3,   D_3,   F_3}, //LA10
-    {0, H_3,   G_3,   I_3}, //LA11
-    {0, K_3,   J_3,   L_3}, //LA12
-    {0, B_4,   A_4,   C_4}, //LA13
-    {0, E_4,   D_4,   F_4}, //LA14
-    {0, H_4,   G_4,   I_4}, //LA15
-    {0, K_4,   J_4,   L_4}, //LA16
-    {0, B_5,   A_5,   C_5}, //LA17
-    {0, E_5,   D_5,   F_5}, //LA18
-    {0, H_5,   G_5,   I_5}, //LA19
-    {0, K_5,   J_5,   L_5}, //LA20
-    {0, B_6,   A_6,   C_6}, //LA21
-    {0, E_6,   D_6,   F_6}, //LA22
-    {0, H_6,   G_6,   I_6}, //LA23
-    {0, K_6,   J_6,   L_6}, //LA24
-    {0, B_7,   A_7,   C_7}, //LA25
-    {0, E_7,   D_7,   F_7}, //LA26
-    {0, H_7,   G_7,   I_7}, //LA27
-    {0, K_7,   J_7,   L_7}, //LA28
-    {0, B_8,   A_8,   C_8}, //LA29
-    {0, E_8,   D_8,   F_8}, //LA30
-    {0, H_8,   G_8,   I_8}, //LA31
-    {0, K_8,   J_8,   L_8}, //LA32
-    {0, B_9,   A_9,   C_9}, //LA33
-    {0, E_9,   D_9,   F_9}, //LA34
-    {0, H_9,   G_9,   I_9}, //LA35
-    {0, K_9,   J_9,   L_9}, //LA36
-    {0, B_10,  A_10,  C_10}, //LA37
-    {0, E_10,  D_10,  F_10}, //LA38
-    {0, H_10,  G_10,  I_10}, //LA39
-    {0, K_10,  J_10,  L_10}, //LA40
-    {0, B_11,  A_11,  C_11}, //LA41
-    {0, E_11,  D_11,  F_11}, //LA42
-    {0, H_11,  G_11,  I_11}, //LA43
-    {0, K_11,  J_11,  L_11}, //LA44
-    {0, B_12,  A_12,  C_12}, //LA45
-    {0, E_12,  D_12,  F_12}, //LA46
-    {0, H_12,  G_12,  I_12}, //LA47
-    {0, K_12,  J_12,  L_12}, //LA48
-    {0, B_13,  A_13,  C_13}, //LA49
-    {0, E_13,  D_13,  F_13}, //LA50
-    {0, H_13,  G_13,  I_13}, //LA51
-    {0, K_13,  J_13,  L_13}, //LA52
-    {0, B_14,  A_14,  C_14}, //LA53
-    {0, E_14,  D_14,  F_14}, //LA54
-    {0, H_14,  G_14,  I_14}, //LA55
-    {0, K_14,  J_14,  L_14}, //LA56
-    {0, B_15,  A_15,  C_15}, //LA57
-    {0, E_15,  D_15,  F_15}, //LA58
-    {0, H_15,  G_15,  I_15}, //LA59
-    {0, K_15,  J_15,  L_15}, //LA60
-    {0, B_16,  A_16,  C_16}, //LA61
-    {0, E_16,  D_16,  F_16}, //LA62
-    {0, H_16,  G_16,  I_16}, //LA63
-    {0, K_16,  J_16,  L_16}, //LA64
+    {0, SW2_CS1,   SW1_CS1,   SW3_CS1}, //LA1
+    {0, SW5_CS1,   SW4_CS1,   SW6_CS1}, //LA2
+    {0, SW8_CS1,   SW7_CS1,   SW9_CS1}, //LA3
+    {0, SW11_CS1,   SW10_CS1,   SW12_CS1}, //LA4
+    {0, SW2_CS2,   SW1_CS2,   SW3_CS2}, //LA5
+    {0, SW5_CS2,   SW4_CS2,   SW6_CS2}, //LA6
+    {0, SW8_CS2,   SW7_CS2,   SW9_CS2}, //LA7
+    {0, SW11_CS2,   SW10_CS2,   SW12_CS2}, //LA8
+    {0, SW2_CS3,   SW1_CS3,   SW3_CS3}, //LA9
+    {0, SW5_CS3,   SW4_CS3,   SW6_CS3}, //LA10
+    {0, SW8_CS3,   SW7_CS3,   SW9_CS3}, //LA11
+    {0, SW11_CS3,   SW10_CS3,   SW12_CS3}, //LA12
+    {0, SW2_CS4,   SW1_CS4,   SW3_CS4}, //LA13
+    {0, SW5_CS4,   SW4_CS4,   SW6_CS4}, //LA14
+    {0, SW8_CS4,   SW7_CS4,   SW9_CS4}, //LA15
+    {0, SW11_CS4,   SW10_CS4,   SW12_CS4}, //LA16
+    {0, SW2_CS5,   SW1_CS5,   SW3_CS5}, //LA17
+    {0, SW5_CS5,   SW4_CS5,   SW6_CS5}, //LA18
+    {0, SW8_CS5,   SW7_CS5,   SW9_CS5}, //LA19
+    {0, SW11_CS5,   SW10_CS5,   SW12_CS5}, //LA20
+    {0, SW2_CS6,   SW1_CS6,   SW3_CS6}, //LA21
+    {0, SW5_CS6,   SW4_CS6,   SW6_CS6}, //LA22
+    {0, SW8_CS6,   SW7_CS6,   SW9_CS6}, //LA23
+    {0, SW11_CS6,   SW10_CS6,   SW12_CS6}, //LA24
+    {0, SW2_CS7,   SW1_CS7,   SW3_CS7}, //LA25
+    {0, SW5_CS7,   SW4_CS7,   SW6_CS7}, //LA26
+    {0, SW8_CS7,   SW7_CS7,   SW9_CS7}, //LA27
+    {0, SW11_CS7,   SW10_CS7,   SW12_CS7}, //LA28
+    {0, SW2_CS8,   SW1_CS8,   SW3_CS8}, //LA29
+    {0, SW5_CS8,   SW4_CS8,   SW6_CS8}, //LA30
+    {0, SW8_CS8,   SW7_CS8,   SW9_CS8}, //LA31
+    {0, SW11_CS8,   SW10_CS8,   SW12_CS8}, //LA32
+    {0, SW2_CS9,   SW1_CS9,   SW3_CS9}, //LA33
+    {0, SW5_CS9,   SW4_CS9,   SW6_CS9}, //LA34
+    {0, SW8_CS9,   SW7_CS9,   SW9_CS9}, //LA35
+    {0, SW11_CS9,   SW10_CS9,   SW12_CS9}, //LA36
+    {0, SW2_CS10,  SW1_CS10,  SW3_CS10}, //LA37
+    {0, SW5_CS10,  SW4_CS10,  SW6_CS10}, //LA38
+    {0, SW8_CS10,  SW7_CS10,  SW9_CS10}, //LA39
+    {0, SW11_CS10,  SW10_CS10,  SW12_CS10}, //LA40
+    {0, SW2_CS11,  SW1_CS11,  SW3_CS11}, //LA41
+    {0, SW5_CS11,  SW4_CS11,  SW6_CS11}, //LA42
+    {0, SW8_CS11,  SW7_CS11,  SW9_CS11}, //LA43
+    {0, SW11_CS11,  SW10_CS11,  SW12_CS11}, //LA44
+    {0, SW2_CS12,  SW1_CS12,  SW3_CS12}, //LA45
+    {0, SW5_CS12,  SW4_CS12,  SW6_CS12}, //LA46
+    {0, SW8_CS12,  SW7_CS12,  SW9_CS12}, //LA47
+    {0, SW11_CS12,  SW10_CS12,  SW12_CS12}, //LA48
+    {0, SW2_CS13,  SW1_CS13,  SW3_CS13}, //LA49
+    {0, SW5_CS13,  SW4_CS13,  SW6_CS13}, //LA50
+    {0, SW8_CS13,  SW7_CS13,  SW9_CS13}, //LA51
+    {0, SW11_CS13,  SW10_CS13,  SW12_CS13}, //LA52
+    {0, SW2_CS14,  SW1_CS14,  SW3_CS14}, //LA53
+    {0, SW5_CS14,  SW4_CS14,  SW6_CS14}, //LA54
+    {0, SW8_CS14,  SW7_CS14,  SW9_CS14}, //LA55
+    {0, SW11_CS14,  SW10_CS14,  SW12_CS14}, //LA56
+    {0, SW2_CS15,  SW1_CS15,  SW3_CS15}, //LA57
+    {0, SW5_CS15,  SW4_CS15,  SW6_CS15}, //LA58
+    {0, SW8_CS15,  SW7_CS15,  SW9_CS15}, //LA59
+    {0, SW11_CS15,  SW10_CS15,  SW12_CS15}, //LA60
+    {0, SW2_CS16,  SW1_CS16,  SW3_CS16}, //LA61
+    {0, SW5_CS16,  SW4_CS16,  SW6_CS16}, //LA62
+    {0, SW8_CS16,  SW7_CS16,  SW9_CS16}, //LA63
+    {0, SW11_CS16,  SW10_CS16,  SW12_CS16}, //LA64
 };
 #endif
diff --git a/keyboards/ibm/model_m/ashpil_usbc/keymaps/ashpil/config.h b/keyboards/ibm/model_m/ashpil_usbc/keymaps/ashpil/config.h
deleted file mode 100644
index 59cec330103..00000000000
--- a/keyboards/ibm/model_m/ashpil_usbc/keymaps/ashpil/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2019 ashpil
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-// place overrides here
-
-
-/* Add combos */
-#define COMBO_TERM 200
diff --git a/keyboards/ibm/model_m/ashpil_usbc/keymaps/ashpil/keymap.c b/keyboards/ibm/model_m/ashpil_usbc/keymaps/ashpil/keymap.c
deleted file mode 100644
index e8df1f0c815..00000000000
--- a/keyboards/ibm/model_m/ashpil_usbc/keymaps/ashpil/keymap.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Copyright 2019 ashpil
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT_fullsize_ansi_wkl( /* Base layer */
-    KC_ESC,           KC_F1,  KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,    KC_PSCR, KC_SCRL, KC_PAUS,
-    KC_GRV,  KC_1,    KC_2,   KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,   KC_MEDIA_PLAY_PAUSE,  KC_AUDIO_MUTE, KC_AUDIO_VOL_UP,   KC_NUM, KC_PSLS, KC_PAST, KC_PMNS,
-    KC_TAB,  KC_Q,    KC_W,   KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,   KC_MEDIA_PREV_TRACK,  KC_MEDIA_NEXT_TRACK,  KC_AUDIO_VOL_DOWN,   KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
-    KC_LCTL, KC_A,    KC_S,   KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,                                 KC_P4,   KC_P5,   KC_P6,
-    KC_LSFT,          KC_Z,   KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,            KC_UP,              KC_P1,   KC_P2,   KC_P3,   KC_PENT,
-    KC_LGUI,          KC_LALT,                           KC_SPC,                                      KC_RALT,          KC_RCTL,   KC_LEFT, KC_DOWN, KC_RGHT,   KC_P0,            KC_PDOT
-  ),
-};
-
-enum combo_events {
-  CTRL_PAUS_RESET,
-};
-
-const uint16_t PROGMEM reset_combo[] = {KC_LCTL, KC_PAUS, COMBO_END};
-
-combo_t key_combos[] = {
-  [CTRL_PAUS_RESET] = COMBO_ACTION(reset_combo),
-};
-
-void process_combo_event(uint16_t combo_index, bool pressed) {
-  switch(combo_index) {
-    case CTRL_PAUS_RESET:
-      if (pressed) {
-        reset_keyboard();
-      }
-      break;
-  }
-}
diff --git a/keyboards/ibm/model_m/ashpil_usbc/keymaps/ashpil/rules.mk b/keyboards/ibm/model_m/ashpil_usbc/keymaps/ashpil/rules.mk
deleted file mode 100644
index 23b7c173b8b..00000000000
--- a/keyboards/ibm/model_m/ashpil_usbc/keymaps/ashpil/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-COMBO_ENABLE = yes          # Reset combo
\ No newline at end of file
diff --git a/keyboards/ibm/model_m/teensypp/keymaps/iw0rm3r/keymap.c b/keyboards/ibm/model_m/teensypp/keymaps/iw0rm3r/keymap.c
deleted file mode 100644
index 4ec0a0cbc08..00000000000
--- a/keyboards/ibm/model_m/teensypp/keymaps/iw0rm3r/keymap.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright 2019 iw0rm3r
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT( /* Base layer */
-    KC_ESC,           KC_F1,  KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,    KC_PSCR, KC_SCRL, KC_PAUS,
-    KC_GRV,  KC_1,    KC_2,   KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,   KC_INS,  KC_HOME, KC_PGUP,   KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
-    KC_TAB,  KC_Q,    KC_W,   KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,   KC_DEL,  KC_END,  KC_PGDN,   KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
-    KC_LGUI, KC_A,    KC_S,   KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,                                 KC_P4,   KC_P5,   KC_P6,
-    KC_LSFT, KC_NUBS, KC_Z,   KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,            KC_UP,              KC_P1,   KC_P2,   KC_P3,   KC_CAPS,
-    KC_LCTL,          KC_LALT,                           KC_SPC,                                      KC_RALT,          KC_RCTL,   KC_LEFT, KC_DOWN, KC_RGHT,   KC_APP,           KC_PDOT
-  ),
-};
diff --git a/keyboards/ibm/model_m/teensypp/keymaps/iw0rm3r/readme.md b/keyboards/ibm/model_m/teensypp/keymaps/iw0rm3r/readme.md
deleted file mode 100644
index 17b0f40da27..00000000000
--- a/keyboards/ibm/model_m/teensypp/keymaps/iw0rm3r/readme.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# This is my personal keymap for modelm101
-
-Caps Lock is mapped as LGUI (Windows key).  
-Num Enter is mapped as Caps Lock.  
-Num0 is mapped as App key (context menu). 
\ No newline at end of file
diff --git a/keyboards/ibm/model_m/yugo_m/keymaps/an_achronism_106/keymap.c b/keyboards/ibm/model_m/yugo_m/keymaps/an_achronism_106/keymap.c
deleted file mode 100644
index a92c877814a..00000000000
--- a/keyboards/ibm/model_m/yugo_m/keymaps/an_achronism_106/keymap.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/* Copyright 2022 an_achronism <87213873+an-achronism@users.noreply.github.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-
-enum keyboard_layers {
-    _BL, // Base Layer
-    _FN  // Function Layer
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Layer 0: Default Layer
-     * ,-------------------------------------------------------------------------------------------------.
-     * |Esc|   |F1 |F2 |F3 |F4 | |F5 |F6 |F7 |F8 | |F9 |F10|F11|F12|    |PSc|ScL|Cap|                    |
-     * |                                                                                                 |
-     * |`  |1  |2  |3  |4  |5  |6  |7  |8  |9  |0  |-  |=  |BSp|Pse|    |Ins|Hom|PgU|    |Num|/  |*  |=  |
-     * |-----------------------------------------------------------|    |-----------|    |---------------|
-     * |Tab  |Q  |W  |E  |R  |T  |Y  |U  |I  |O  |P  |[  |]  |RCtrl|    |Del|End|PgD|    |7  |8  |9  |-  |
-     * |-----------------------------------------------------------|                     |---------------|
-     * |LCtrl |A  |S  |D  |F  |G  |H  |J  |K  |L  |;  |'  |#  |Rtn |                     |4  |5  |6  |+  |
-     * |-----------------------------------------------------------|                     |---------------|
-     * |LShift|\  |Z  |X  |C  |V  |B  |N  |M  |,  |.  |/  |RShift  |        |Up |        |1  |2  |3  |Ent|
-     * |-----------------------------------------------------------|        |---|        |-----------|   |
-     * |Esc/LAlt| |LGUI |           Space           |BS/Fn|  |RAlt |    |Lt |Dn |Rt |    |0  |Fn |  .|   |
-     * `-------------------------------------------------------------------------------------------------'
-     */
-    [_BL] = LAYOUT_all(
-      KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_SCRL, KC_CAPS,
-      KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_PAUS,   KC_INS,  KC_HOME, KC_PGUP,   KC_NUM,  KC_PSLS, KC_PAST, KC_PEQL,
-      KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_RCTL,            KC_DEL,  KC_END,  KC_PGDN,   KC_P7,   KC_P8,   KC_P9,   KC_PMNS,
-      KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,                                          KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
-      KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_INT1, KC_RSFT,                     KC_UP,              KC_P1,   KC_P2,   KC_P3,   KC_PENT,
-      LALT_T(KC_ESC),   KC_LGUI,                            KC_SPC,                                      LT(_FN, KC_BSPC), KC_RALT,            KC_LEFT, KC_DOWN, KC_RGHT,   KC_P0,   MO(_FN), KC_PDOT, KC_NO),
-    [_FN] = LAYOUT_all(
-      _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_MSTP, C(KC_BRK), _______, _______, _______,   KC_F10,  KC_F11,  KC_F12,  KC_PWR,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_MPRV, KC_MNXT, KC_APP,             _______, _______, _______,   KC_F7,   KC_F8,   KC_F9,   KC_SLEP,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY,                                         KC_F4,   KC_F5,   KC_F6,   KC_CALC,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                     _______,            KC_F1,   KC_F2,   KC_F3,   KC_EJCT,
-      _______,          _______,                            _______,                                     _______,          _______,            _______, _______, _______,   _______, _______, _______, _______),
-};
diff --git a/keyboards/ibm/model_m/yugo_m/keymaps/an_achronism_106/readme.md b/keyboards/ibm/model_m/yugo_m/keymaps/an_achronism_106/readme.md
deleted file mode 100644
index 6d3a7ff5d99..00000000000
--- a/keyboards/ibm/model_m/yugo_m/keymaps/an_achronism_106/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# an_achronism's custom 106-key layout (107-key if you stick the appropriate keys on RShift and JIS backslash, which are already mapped for convenience).
-
-# With the exception of a single extra matrix position between LAlt and Space which only appears on certain later membranes and is almost never actually used, the only unmapped key is the bottom right corner of the numpad (the unused lower half of the vertical 2u key most commonly used as either Enter or Field +). If you like, you can easily add that into the keymap by changing the appropriate KC_NO to whatever you want.
diff --git a/keyboards/ibm/model_m_122/ibm122m/keymaps/andresteare/keymap.c b/keyboards/ibm/model_m_122/ibm122m/keymaps/andresteare/keymap.c
deleted file mode 100644
index 6d6d09a0a5e..00000000000
--- a/keyboards/ibm/model_m_122/ibm122m/keymaps/andresteare/keymap.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright 2018 andresteare
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  // Programmer's Dvorak
-  [0] = LAYOUT(
-                     KC_F13,  KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22,  KC_F23,  KC_F24,
-                     KC_F1,   KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10,  KC_F11,  KC_F12,
-    KC_ESC, KC_NO,   KC_GRV,  KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,   KC_INS,  KC_HOME, KC_PGUP,    KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
-    KC_NO,  KC_NO,   KC_TAB,  KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_ENT,    KC_DEL,  KC_END,  KC_PGDN,    KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
-    KC_NO,  KC_NO,   KC_CAPS, KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN, KC_QUOT, KC_BSLS,                     KC_UP,               KC_P4,   KC_P5,   KC_P6,   KC_BSPC,
-    KC_NO,  KC_NO,   KC_LSFT, KC_NO,  KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,            KC_LEFT, KC_NO,   KC_RIGHT,   KC_P1,   KC_P2,   KC_P3,   KC_PENT,
-    KC_NO,  KC_NO,   KC_LCTL, KC_LALT,                                        KC_SPC,                           KC_RALT, KC_RCTL,                     KC_DOWN,             KC_P0,            KC_PDOT
-  ),
-};
diff --git a/keyboards/ibm/model_m_ssk/teensypp_ssk/keymaps/tiltowait/keymap.c b/keyboards/ibm/model_m_ssk/teensypp_ssk/keymaps/tiltowait/keymap.c
deleted file mode 100644
index 4836ad329e7..00000000000
--- a/keyboards/ibm/model_m_ssk/teensypp_ssk/keymaps/tiltowait/keymap.c
+++ /dev/null
@@ -1,116 +0,0 @@
-/* Copyright 2021 tiltowait
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-
-enum custom_layers {
-    _BASE,
-    _SECOND,
-    _NUMPAD,
-};
-
-enum custom_keycodes {
-  NUM_SCRL = SAFE_RANGE /* Dual-purpose Scroll Lock / Numlock button as on original hardware */
-};
-
-void toggle_numlock_layer(int set_state);
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_BASE] = LAYOUT( /* Base layer */
-    KC_ESC,                KC_F1,  KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_MUTE, KC_F10,  KC_VOLD, KC_VOLU,   S(G(KC_4)), NUM_SCRL, KC_PAUS,
-
-    KC_GRV,       KC_1,    KC_2,   KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS,   KC_INS,  KC_HOME,  KC_PGUP,
-    LT(_SECOND,KC_TAB), KC_Q,    KC_W,   KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,   KC_DEL,  KC_END,   KC_PGDN,
-    KC_LCTL,      KC_A,    KC_S,   KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
-    KC_LSFT,      KC_NUBS, KC_Z,   KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,            KC_UP,
-    KC_LALT,               LGUI_T(KC_ENT),                    KC_SPC,                                      KC_RALT,          KC_RCTL,   KC_LEFT, KC_DOWN,  KC_RGHT
-  ),
-  [_SECOND] = LAYOUT( /* Layer 1 */
-     KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,       KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,
-
-     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS,    S(A(KC_MINS)), KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,
-     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, C(KC_LEFT), C(KC_RGHT), KC_TRNS, KC_TRNS,    KC_TRNS,       KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,
-     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN,    KC_UP,      KC_RGHT, S(A(KC_M)), KC_TRNS,       KC_TRNS, KC_TRNS,
-     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_ENT,     KC_TRNS, KC_TRNS,    KC_TRNS,                KC_TRNS,            KC_TRNS,
-     KC_TRNS,          KC_TRNS,                            C(KC_SPC),                                            KC_TRNS,                KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS
-  ),
-  [_NUMPAD] = LAYOUT( /* Numpad Layer */
-     KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,        KC_TRNS,     KC_TRNS,    KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,
-
-     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_KP_7, KC_KP_8, KC_KP_9, KC_TRNS,        KC_KP_MINUS, KC_KP_PLUS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,
-     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_KP_4, KC_KP_5, KC_KP_6, KC_TRNS,        KC_TRNS,     KC_TRNS,    KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,
-     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_KP_1, KC_KP_2, KC_KP_3, KC_KP_ASTERISK, KC_TRNS,     KC_TRNS,    KC_TRNS,
-     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_KP_0, KC_TRNS, KC_KP_DOT,      KC_KP_SLASH,             KC_TRNS,            KC_TRNS,
-     KC_TRNS,          KC_TRNS,                            KC_TRNS,                                            KC_TRNS,                 KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS
-  ),
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  static uint16_t last_num_scroll = 0; /* For unregistering the proper key */
-
-  switch (keycode) {
-    case NUM_SCRL:
-    if (record->event.pressed) {
-      if (get_mods() & MOD_MASK_SHIFT) {
-        /* Remove the shift modifiers */
-        uint8_t shift_mods = get_mods() & (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT));
-        set_mods(get_mods() & ~(MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)) );
-
-        last_num_scroll = KC_NUM_LOCK;
-        register_code(last_num_scroll);
-        toggle_numlock_layer(-1);
-
-        /* Reset the shift modifiers */
-        set_mods(shift_mods);
-      } else {
-        last_num_scroll = KC_SCROLL_LOCK;
-        register_code(last_num_scroll);
-      }
-    } else {
-      unregister_code(last_num_scroll);
-    }
-    break;
-  }
-  return true;
-}
-
-void toggle_numlock_layer(int set_state) {
-  static uint8_t numlock_enabled = 0;
-
-  /* set_state allows us to explicitly change the numlock state
-     rather than merely toggling it. */
-  if (set_state == -1) {
-    numlock_enabled = !numlock_enabled;
-  } else {
-    numlock_enabled = set_state;
-  }
-
-  if (numlock_enabled) {
-    layer_on(_NUMPAD);
-  }
-  else {
-    layer_off(_NUMPAD);
-  }
-}
-
-bool led_update_kb(led_t led_state) {
-  static int8_t numlock_state = -1;
-
-  if (led_state.num_lock != numlock_state) {
-    numlock_state = led_state.num_lock;
-    toggle_numlock_layer(led_state.num_lock);
-  }
-  return true;
-}
diff --git a/keyboards/ibm/model_m_ssk/teensypp_ssk/keymaps/tiltowait/readme.md b/keyboards/ibm/model_m_ssk/teensypp_ssk/keymaps/tiltowait/readme.md
deleted file mode 100644
index aecdd89b82d..00000000000
--- a/keyboards/ibm/model_m_ssk/teensypp_ssk/keymaps/tiltowait/readme.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# The maintainer's personal keymap for modelm_ssk
-
-This is a keymap suitable for macOS use.
-
-* Backspace and backslash have been swapped (HHKB style)
-* Capslock is LCTRL
-* LCTRL is LALT
-* LALT is LGUI
-* Tab shifts to layer 1 on hold
-* Layer 1 has a couple of Mac shortcuts, plus Vim-style arrow keys
-* Shift+Numlock enables numlock
diff --git a/keyboards/ibnuda/alicia_cook/keymaps/rick/config.h b/keyboards/ibnuda/alicia_cook/keymaps/rick/config.h
deleted file mode 100644
index d4b4480810a..00000000000
--- a/keyboards/ibnuda/alicia_cook/keymaps/rick/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright 2021 Ibnu D. Aji
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#define COMBO_TERM  50
-#define PERMISSIVE_HOLD
-#define TAPPING_TERM 175
-#define TAPPING_TERM 175
diff --git a/keyboards/ibnuda/alicia_cook/keymaps/rick/keymap.c b/keyboards/ibnuda/alicia_cook/keymaps/rick/keymap.c
deleted file mode 100644
index 9c1f0cb63ea..00000000000
--- a/keyboards/ibnuda/alicia_cook/keymaps/rick/keymap.c
+++ /dev/null
@@ -1,246 +0,0 @@
-/* Copyright 2021 Ibnu D. Aji
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-#ifdef CONSOLE_ENABLE
-#include "print.h"
-#endif
-
-// enum for combos.
-enum combos {
-    // left hand combinations.
-    L_U_PINKY_RING,
-    L_U_RING_MIDDLE,
-    L_U_RING_INDEX,
-    L_U_MIDDLE_INDEX,
-    L_U_MIDDLE_INNER_INDEX,
-    L_U_INDEX_INNER_INDEX,
-    L_L_PINKY_RING,
-    L_L_RING_MIDDLE,
-    L_L_RING_INDEX,
-    L_L_MIDDLE_INDEX,
-    L_L_INDEX_INNER_INDEX,
-
-    L_U_RING_MIDDLE_INDEX,
-    L_L_RING_MIDDLE_INDEX,
-
-    // right hand combinations.
-    R_U_PINKY_RING,
-    R_U_RING_MIDDLE,
-    R_U_RING_INDEX,
-    R_U_MIDDLE_INDEX,
-    R_U_MIDDLE_INNER_INDEX,
-    R_U_INNER_INNER_INDEX,
-    R_L_PINKY_RING,
-    R_L_RING_MIDDLE,
-    R_L_MIDDLE_INDEX,
-    R_L_RING_INDEX,
-    R_L_INDEX_INNER_INDEX,
-
-    R_U_RING_MIDDLE_INDEX,
-    R_L_RING_MIDDLE_INDEX,
-
-    // both hands combinations.
-    B_L_MIDDLE_MIDDLE,
-};
-
-enum {
-    _BASE,
-    _LOWER,
-    _RAISE,
-    _ADJUST,
-};
-
-enum custom_keycodes {
-  BASE = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  ADJUST,
-};
-
-// keycode abstraction
-#define LUP  KC_Q
-#define LUR  KC_V
-#define LUM  KC_C
-#define LUI  KC_P
-#define LUII KC_B
-#define LMP  KC_R
-#define LMR  KC_S
-#define LMM  KC_T
-#define LMI  KC_H
-#define LMII KC_D
-#define LLP  KC_QUOT
-#define LLR  KC_J
-#define LLM  KC_G
-#define LLI  KC_K
-#define LLII KC_X
-
-#define RUP  KC_Z
-#define RUR  KC_Y
-#define RUM  KC_U
-#define RUI  KC_L
-#define RUII KC_DOT
-#define RMP  KC_O
-#define RMR  KC_I
-#define RMM  KC_A
-#define RMI  KC_N
-#define RMII KC_F
-#define RLP  KC_SLSH
-#define RLR  KC_COMM
-#define RLM  KC_W
-#define RLI  KC_M
-#define RLII KC_SCLN
-
-// thumb keys.
-#define TRAISE   TG(_RAISE)
-#define AL_ENT   ALT_T(KC_ENT)
-#define SF_BSPC  SFT_T(KC_BSPC)
-#define CT_ESC   CTL_T(KC_ESC)
-
-// home row mods.
-#define CTLR    LCTL_T(LMR)
-#define CTRR    RCTL_T(RMR)
-#define CT_LEFT LCTL_T(KC_LEFT)
-#define CT_SIX  RCTL_T(KC_6)
-
-#define SHLP    LSFT_T(LMP)
-#define SHRP    RSFT_T(RMP)
-#define SH_HASH LSFT_T(KC_HASH)
-#define SH_ZERO RSFT_T(KC_0)
-
-#define ALLM    LALT_T(LMM)
-#define ALRM    RALT_T(RMM)
-#define AL_DOWN LALT_T(KC_DOWN)
-#define AL_FIVE RALT_T(KC_5)
-
-#define GULII   RGUI_T(LMII)
-#define GURII   LGUI_T(RMII)
-#define GU_DLR  RGUI_T(KC_DLR)
-#define GU_EQL  LGUI_T(KC_EQL)
-
-// layer toggle.
-#define LW_E     LT(_LOWER, KC_E)
-#define RS_SPC   LT(_RAISE, KC_SPC)
-#define LW_RMI   LT(_LOWER, RMI)
-#define RS_LMI   LT(_RAISE, LMI)
-
-// idk, man. not used, i guess.
-#define ADDDD    MO(_ADJUST)
-
-// common shortcuts for windows and linux that i use.
-#define NXTTAB LCTL(KC_PGDN)
-#define PRVTAB LCTL(KC_PGUP)
-#define UPTAB  LCTL(LSFT(KC_PGUP))
-#define DNTAB  LCTL(LSFT(KC_PGDN))
-#define NXTWIN LALT(KC_TAB)
-#define PRVWIN LALT(LSFT(KC_TAB))
-#define CALDL  LCTL(LALT(KC_DEL))
-#define TSKMGR LCTL(LSFT(KC_ESC))
-#define EXPLR  LGUI(KC_E)
-#define LCKGUI LGUI(KC_L)
-#define CONPST LSFT(KC_INS)
-#define CLSGUI LALT(KC_F4)
-
-// left hand combinations.
-const uint16_t PROGMEM lu_p_r_combo[]     = {LUP, LUR,  COMBO_END};
-const uint16_t PROGMEM lu_r_m_combo[]     = {LUR, LUM,  COMBO_END};
-const uint16_t PROGMEM lu_r_i_combo[]     = {LUR, LUI,  COMBO_END};
-const uint16_t PROGMEM lu_m_i_combo[]     = {LUM, LUI,  COMBO_END};
-const uint16_t PROGMEM lu_m_ii_combo[]    = {LUM, LUII, COMBO_END};
-const uint16_t PROGMEM lu_i_ii_combo[]    = {LUI, LUII, COMBO_END};
-const uint16_t PROGMEM ll_p_r_combo[]     = {LLP, LLR,  COMBO_END};
-const uint16_t PROGMEM ll_r_m_combo[]     = {LLR, LLM,  COMBO_END};
-const uint16_t PROGMEM ll_r_i_combo[]     = {LLR, LLI,  COMBO_END};
-const uint16_t PROGMEM ll_m_i_combo[]     = {LLM, LLI,  COMBO_END};
-const uint16_t PROGMEM ll_i_ii_combo[]    = {LLI, LLII, COMBO_END};
-
-const uint16_t PROGMEM lu_r_m_i_combo[]   = {LUR, LUM, LUI, COMBO_END};
-const uint16_t PROGMEM ll_r_m_i_combo[]   = {LLR, LLM, LLI, COMBO_END};
-
-// right hand combinations.
-const uint16_t PROGMEM ru_p_r_combo[]      = {RUP, RUR,  COMBO_END};
-const uint16_t PROGMEM ru_r_m_combo[]      = {RUR, RUM,  COMBO_END};
-const uint16_t PROGMEM ru_r_i_combo[]      = {RUR, RUI,  COMBO_END};
-const uint16_t PROGMEM ru_m_i_combo[]      = {RUM, RUI,  COMBO_END};
-const uint16_t PROGMEM ru_m_ii_combo[]     = {RUM, RUII, COMBO_END};
-const uint16_t PROGMEM ru_i_ii_combo[]     = {RUI, RUII, COMBO_END};
-const uint16_t PROGMEM rl_p_r_combo[]      = {RLP, RLR,  COMBO_END};
-const uint16_t PROGMEM rl_r_m_combo[]      = {RLR, RLM,  COMBO_END};
-const uint16_t PROGMEM rl_r_i_combo[]      = {RLR, RLI,  COMBO_END};
-const uint16_t PROGMEM rl_m_i_combo[]      = {RLM, RLI,  COMBO_END};
-const uint16_t PROGMEM rl_i_ii_combo[]     = {RLI, RLII, COMBO_END};
-
-const uint16_t PROGMEM ru_r_m_i_combo[]   =  {RUR, RUM, RUI, COMBO_END};
-const uint16_t PROGMEM rl_r_m_i_combo[]   =  {RLR, RLM, RLI, COMBO_END};
-
-// both hand combinations.
-const uint16_t PROGMEM bl_m_m_combo[]      = {LLM, RLM, COMBO_END};
-
-combo_t key_combos[] = {
-    // left hand combinations.
-    [L_U_PINKY_RING]          = COMBO(lu_p_r_combo,  KC_TAB),
-    [L_U_RING_MIDDLE]         = COMBO(lu_r_m_combo,  KC_QUES),
-    [L_U_RING_INDEX]          = COMBO(lu_r_i_combo,  PRVTAB),
-    [L_U_MIDDLE_INDEX]        = COMBO(lu_m_i_combo,  KC_UNDS),
-    [L_U_MIDDLE_INNER_INDEX]  = COMBO(lu_m_ii_combo, KC_ENT),
-    [L_U_INDEX_INNER_INDEX]   = COMBO(lu_i_ii_combo, KC_PIPE),
-    [L_L_PINKY_RING]          = COMBO(ll_p_r_combo,  KC_ENT),
-    [L_L_RING_MIDDLE]         = COMBO(ll_r_m_combo,  LCTL(KC_W)),
-    [L_L_RING_INDEX]          = COMBO(ll_r_i_combo,  KC_TAB),
-    [L_L_MIDDLE_INDEX]        = COMBO(ll_m_i_combo,  KC_DEL),
-    [L_L_INDEX_INNER_INDEX]   = COMBO(ll_i_ii_combo, KC_TILD),
-
-    [L_U_RING_MIDDLE_INDEX]   = COMBO(lu_r_m_i_combo, KC_PIPE),
-    [L_L_RING_MIDDLE_INDEX]   = COMBO(ll_r_m_i_combo, KC_TILD),
-
-    // right hand combinations.
-    [R_U_PINKY_RING]          = COMBO(ru_p_r_combo,  KC_BSPC),
-    [R_U_RING_MIDDLE]         = COMBO(ru_r_m_combo,  KC_SLSH),
-    [R_U_RING_INDEX]          = COMBO(ru_r_i_combo,  NXTTAB),
-    [R_U_MIDDLE_INDEX]        = COMBO(ru_m_i_combo,  KC_MINS),
-    [R_U_MIDDLE_INNER_INDEX]  = COMBO(ru_m_ii_combo, KC_ENT),
-    [R_U_INNER_INNER_INDEX]   = COMBO(ru_i_ii_combo, KC_BSLS),
-    [R_L_PINKY_RING]          = COMBO(rl_p_r_combo,  KC_BSLS),
-    [R_L_RING_MIDDLE]         = COMBO(rl_r_m_combo,  KC_APP),
-    [R_L_RING_INDEX]          = COMBO(rl_r_i_combo,  LSFT(KC_TAB)),
-    [R_L_MIDDLE_INDEX]        = COMBO(rl_m_i_combo,  KC_DEL),
-    [R_L_INDEX_INNER_INDEX]   = COMBO(rl_i_ii_combo, KC_GRV),
-
-    [R_U_RING_MIDDLE_INDEX]   = COMBO(ru_r_m_i_combo, KC_BSLS),
-    [R_L_RING_MIDDLE_INDEX]   = COMBO(rl_r_m_i_combo, KC_GRV),
-
-    // both hand combinations.
-    [B_L_MIDDLE_MIDDLE]       = COMBO(bl_m_m_combo,  KC_ENT),
-};
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT_all(
-        KC_ESC, LUP,    LUR,    LUM,    LUI,    LUII,            RUII,   RUI,    RUM,    RUR,    RUP,   KC_BSPC, KC_BSPC,
-        KC_LCTL,SHLP,   CTLR,   ALLM,   RS_LMI, GULII,           GURII,  LW_RMI, ALRM,   CTRR,   SHRP,  KC_ENT,
-        KC_LSFT,LLP,    LLR,    LLM,    LLI,    LLII,            RLII,   RLI,    RLM,    RLR,    RLP,   KC_RSFT,MO(1),
-        KC_LGUI,KC_LALT,        KC_LGUI,LW_E,   SF_BSPC,         AL_ENT, RS_SPC, KC_LALT,               KC_RGUI,KC_RCTL
-    ),
-    [1] = LAYOUT_all(
-        KC_ESC, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,            KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_DEL, KC_BSPC,
-        KC_LCTL,KC_EXLM,KC_AT,  KC_HASH,KC_DLR, KC_PERC,         KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,   KC_SCLN,
-        KC_LSFT,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,            KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,KC_RSFT,MO(2),
-        KC_LGUI,KC_LALT,        KC_LGUI,LW_E,   SF_BSPC,         AL_ENT, RS_SPC, KC_LALT,                KC_RGUI,KC_RCTL
-    ),
-    [2] = LAYOUT_all(
-        KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,           KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12, KC_F13,
-        KC_LCTL,KC_EXLM,KC_AT,  KC_HASH,KC_DLR, KC_PERC,         KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,   KC_SCLN,
-        KC_LSFT,KC_Z,   KC_X,   KC_C,   KC_V,   QK_BOOT,         KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,KC_RSFT,MO(1),
-        KC_LGUI,KC_LALT,        KC_LGUI,LW_E,   SF_BSPC,         AL_ENT, RS_SPC, KC_LALT,                KC_RGUI,KC_RCTL
-    ),
-};
diff --git a/keyboards/ibnuda/alicia_cook/keymaps/rick/readme.md b/keyboards/ibnuda/alicia_cook/keymaps/rick/readme.md
deleted file mode 100644
index 2bfb2a96fae..00000000000
--- a/keyboards/ibnuda/alicia_cook/keymaps/rick/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# Rick's Keymap for Alicia Cook
diff --git a/keyboards/ibnuda/alicia_cook/keymaps/rick/rules.mk b/keyboards/ibnuda/alicia_cook/keymaps/rick/rules.mk
deleted file mode 100644
index 6ecc620954c..00000000000
--- a/keyboards/ibnuda/alicia_cook/keymaps/rick/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-COMBO_ENABLE = yes
-CONSOLE_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/ibnuda/squiggle/keymaps/rick-complicated/config.h b/keyboards/ibnuda/squiggle/keymaps/rick-complicated/config.h
deleted file mode 100644
index 2392b46be68..00000000000
--- a/keyboards/ibnuda/squiggle/keymaps/rick-complicated/config.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma once
-
-#define COMBO_TERM 100
-#define PERMISSIVE_HOLD
-
-#define LEADER_TIMEOUT 300
diff --git a/keyboards/ibnuda/squiggle/keymaps/rick-complicated/keymap.c b/keyboards/ibnuda/squiggle/keymaps/rick-complicated/keymap.c
deleted file mode 100644
index b28fc844997..00000000000
--- a/keyboards/ibnuda/squiggle/keymaps/rick-complicated/keymap.c
+++ /dev/null
@@ -1,188 +0,0 @@
-/* Copyright 2020 Ibnu D. Aji
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-
-// enum for combos.
-enum combos {
-    // left hand combinations.
-    COLON_COMMA,
-    COMMA_DOT,
-    DOT_P,
-    P_Y,
-    COMMA_P,
-    QUOT_Q,
-    Q_J,
-    J_K,
-    Q_K,
-    K_X,
-
-    // right hand combinations.
-    L_R,
-    R_C,
-    C_G,
-    R_G,
-    G_F,
-    V_W,
-    W_M,
-    V_M,
-    M_B,
-
-    // both hands combinations.
-    J_W,
-};
-
-enum {
-    _BASE,
-    _LOWER,
-    _RAISE,
-    _ADJUST,
-};
-
-enum custom_keycodes {
-  BASE = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  ADJUST,
-};
-
-// thumb keys.
-#define ALT_ENT   ALT_T(KC_ENT)
-#define SFT_ESC   SFT_T(KC_ESC)
-
-// home row mods.
-#define CT_O LCTL_T(KC_O)
-#define CT_N RCTL_T(KC_N)
-#define SH_A LSFT_T(KC_A)
-#define SH_S RSFT_T(KC_S)
-#define AL_E LALT_T(KC_E)
-#define AL_T RALT_T(KC_T)
-#define GU_I LGUI_T(KC_I)
-#define GU_D RGUI_T(KC_D)
-
-// layer toggle.
-#define LW_BSPC  LT(_LOWER, KC_BSPC)
-#define RS_SPC   LT(_RAISE, KC_SPC)
-#define RS_D     LT(_RAISE, KC_D)
-#define LW_I     LT(_LOWER, KC_I)
-
-// idk, man. not used, i guess.
-#define ADDDD    MO(_ADJUST)
-
-// common shortcuts for windows and linux that i use.
-#define NXTTAB LCTL(KC_PGDN)
-#define PRVTAB LCTL(KC_PGUP)
-#define UPTAB  LCTL(LSFT(KC_PGUP))
-#define DNTAB  LCTL(LSFT(KC_PGDN))
-#define NXTWIN LALT(KC_TAB)
-#define PRVWIN LALT(LSFT(KC_TAB))
-#define CALDL  LCTL(LALT(KC_DEL))
-#define TSKMGR LCTL(LSFT(KC_ESC))
-#define EXPLR  LGUI(KC_E)
-#define LCKGUI LGUI(KC_L)
-#define CONPST LSFT(KC_INS)
-#define CLSGUI LALT(KC_F4)
-
-// left hand combinations.
-const uint16_t PROGMEM colon_comma_combo[] = {KC_SCLN, KC_COMM, COMBO_END};
-const uint16_t PROGMEM comma_dot_combo[]   = {KC_COMM, KC_DOT, COMBO_END};
-const uint16_t PROGMEM dot_p_combo[]       = {KC_DOT, KC_P, COMBO_END};
-const uint16_t PROGMEM p_y_combo[]         = {KC_P, KC_Y, COMBO_END};
-const uint16_t PROGMEM comma_p_combo[]     = {KC_COMM, KC_P, COMBO_END};
-const uint16_t PROGMEM quot_q_combo[]      = {KC_QUOT, KC_Q, COMBO_END};
-const uint16_t PROGMEM q_j_combo[]         = {KC_Q, KC_J, COMBO_END};
-const uint16_t PROGMEM j_k_combo[]         = {KC_J, KC_K, COMBO_END};
-const uint16_t PROGMEM q_k_combo[]         = {KC_Q, KC_K, COMBO_END};
-const uint16_t PROGMEM k_x_combo[]         = {KC_K, KC_X, COMBO_END};
-
-// right hand combinations.
-const uint16_t PROGMEM l_r_combo[]         = {KC_L, KC_R, COMBO_END};
-const uint16_t PROGMEM r_c_combo[]         = {KC_R, KC_C, COMBO_END};
-const uint16_t PROGMEM c_g_combo[]         = {KC_C, KC_G, COMBO_END};
-const uint16_t PROGMEM r_g_combo[]         = {KC_R, KC_G, COMBO_END};
-const uint16_t PROGMEM g_f_combo[]         = {KC_G, KC_F, COMBO_END};
-const uint16_t PROGMEM v_w_combo[]         = {KC_V, KC_W, COMBO_END};
-const uint16_t PROGMEM w_m_combo[]         = {KC_W, KC_M, COMBO_END};
-const uint16_t PROGMEM v_m_combo[]         = {KC_V, KC_M, COMBO_END};
-const uint16_t PROGMEM m_b_combo[]         = {KC_M, KC_B, COMBO_END};
-
-// both hand combinations.
-const uint16_t PROGMEM j_w_combo[]         = {KC_J, KC_W, COMBO_END};
-
-combo_t key_combos[] = {
-    // left hand combinations.
-    [COLON_COMMA]   = COMBO(colon_comma_combo,  KC_TAB),
-    [COMMA_DOT]     = COMBO(comma_dot_combo,    KC_QUES),
-    [DOT_P]         = COMBO(dot_p_combo,        KC_UNDS),
-    [P_Y]           = COMBO(p_y_combo,          KC_PIPE),
-    [COMMA_P]       = COMBO(comma_p_combo,      PRVTAB),
-    [QUOT_Q]        = COMBO(quot_q_combo,       KC_ENT),
-    [Q_J]           = COMBO(q_j_combo,          LCTL(KC_W)),
-    [J_K]           = COMBO(j_k_combo,          KC_DEL),
-    [Q_K]           = COMBO(q_k_combo,          KC_TAB),
-    [K_X]           = COMBO(k_x_combo,          KC_TILD),
-
-    // right hand combinations.
-    [L_R]           = COMBO(l_r_combo,          KC_BSPC),
-    [R_C]           = COMBO(r_c_combo,          KC_SLSH),
-    [C_G]           = COMBO(c_g_combo,          KC_MINS),
-    [R_G]           = COMBO(r_g_combo,          NXTTAB),
-    [G_F]           = COMBO(g_f_combo,          KC_BSLS),
-    [V_W]           = COMBO(v_w_combo,          KC_APP),
-    [W_M]           = COMBO(w_m_combo,          KC_DEL),
-    [V_M]           = COMBO(v_m_combo,          LSFT(KC_TAB)),
-    [M_B]           = COMBO(m_b_combo,          KC_GRV),
-
-    // both hand combinations.
-    [J_W]           = COMBO(j_w_combo,          KC_ENT),
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[_BASE] = LAYOUT_complicated(
-    KC_SCLN,KC_COMM,KC_DOT, KC_P,   KC_Y,       KC_F,   KC_G,   KC_C,   KC_R,   KC_L,
-    SH_A,   CT_O,   AL_E,   KC_U,   GU_I,       GU_D,   KC_H,   AL_T,   CT_N,   SH_S,
-    KC_QUOT,KC_Q,   KC_J,   KC_K,   KC_X,       KC_B,   KC_M,   KC_W,   KC_V,   KC_Z,
-                            LW_BSPC,QK_LEAD,    ALT_ENT,RS_SPC,
-                            LW_BSPC,SFT_ESC,    ALT_ENT,RS_SPC
-),
-
-[_RAISE] = LAYOUT_complicated(
-    KC_EXLM,KC_AT,  KC_UP,  KC_LCBR,KC_RCBR,    KC_BSLS,KC_7,   KC_8,   KC_9,   KC_ASTR ,
-    KC_HASH,KC_LEFT,KC_DOWN,KC_RGHT,KC_DLR,     KC_EQL, KC_4,   KC_5,   KC_6,   KC_0 ,
-    KC_LBRC,KC_RBRC,KC_LPRN,KC_RPRN,KC_AMPR,    KC_GRV, KC_1,   KC_2,   KC_3,   KC_PLUS ,
-                            ADDDD  ,_______,    _______,_______,
-                            ADDDD  ,_______,    _______,_______
-),
-[_LOWER] = LAYOUT_complicated(
-    _______,_______,_______,KC_F1,  KC_F2,      KC_F3,  KC_F4,  _______,_______,_______ ,
-    KC_LSFT,KC_TAB, KC_PGUP,KC_F5,  KC_F6,      KC_F7,  KC_F8,  KC_HOME,KC_LALT,KC_ENT  ,
-    KC_CAPS,KC_SCRL,KC_PGDN,KC_F9,  KC_F10,     KC_F11, KC_F12, KC_END, KC_INS, _______ ,
-                            _______,_______,    _______,ADDDD,
-                            _______,_______,    _______,ADDDD
-),
-[_ADJUST] = LAYOUT_complicated(
-    _______,EXPLR,  KC_UP,  PRVTAB, PRVWIN,     NXTWIN, NXTTAB, _______,_______,LCKGUI,
-    TSKMGR, KC_LEFT,KC_DOWN,KC_RGHT,UPTAB,      DNTAB,  KC_ENT, KC_LGUI,_______,CALDL,
-    _______,CLSGUI, _______,CONPST, QK_BOOT,    _______,_______,_______,_______,_______,
-                            _______,_______,    _______,_______,
-                            _______,_______,    _______,_______
-),
-};
-
-void leader_end_user(void) {
-    if (leader_sequence_one_key(KC_U)) {
-        SEND_STRING(":luvu:\n");
-    }
-}
diff --git a/keyboards/ibnuda/squiggle/keymaps/rick-complicated/readme.md b/keyboards/ibnuda/squiggle/keymaps/rick-complicated/readme.md
deleted file mode 100644
index d14eb193c05..00000000000
--- a/keyboards/ibnuda/squiggle/keymaps/rick-complicated/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# goldberg keymap
-
-ricky rick's keymap on squiggle goldberg. ayyy.
diff --git a/keyboards/ibnuda/squiggle/keymaps/rick-complicated/rules.mk b/keyboards/ibnuda/squiggle/keymaps/rick-complicated/rules.mk
deleted file mode 100644
index 00c78275d97..00000000000
--- a/keyboards/ibnuda/squiggle/keymaps/rick-complicated/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-COMBO_ENABLE = yes
-LEADER_ENABLE = yes
diff --git a/keyboards/ibnuda/squiggle/keymaps/rick/config.h b/keyboards/ibnuda/squiggle/keymaps/rick/config.h
deleted file mode 100644
index 22ceb2f9967..00000000000
--- a/keyboards/ibnuda/squiggle/keymaps/rick/config.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#pragma once
-
-#define COMBO_TERM 100
-#define PERMISSIVE_HOLD
diff --git a/keyboards/ibnuda/squiggle/keymaps/rick/keymap.c b/keyboards/ibnuda/squiggle/keymaps/rick/keymap.c
deleted file mode 100644
index 75ea54c5481..00000000000
--- a/keyboards/ibnuda/squiggle/keymaps/rick/keymap.c
+++ /dev/null
@@ -1,178 +0,0 @@
-/* Copyright 2020 Ibnu D. Aji
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-
-// enum for combos.
-enum combos {
-    // left hand combinations.
-    COLON_COMMA,
-    COMMA_DOT,
-    DOT_P,
-    P_Y,
-    COMMA_P,
-    QUOT_Q,
-    Q_J,
-    J_K,
-    Q_K,
-    K_X,
-
-    // right hand combinations.
-    L_R,
-    R_C,
-    C_G,
-    R_G,
-    G_F,
-    V_W,
-    W_M,
-    V_M,
-    M_B,
-
-    // both hands combinations.
-    J_W,
-};
-
-enum {
-    _BASE,
-    _LOWER,
-    _RAISE,
-    _ADJUST,
-};
-
-enum custom_keycodes {
-  BASE = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  ADJUST,
-};
-
-// thumb keys.
-#define ALT_ENT   ALT_T(KC_ENT)
-#define SFT_ESC   SFT_T(KC_ESC)
-
-// home row mods.
-#define CT_O LCTL_T(KC_O)
-#define CT_N RCTL_T(KC_N)
-#define SH_A LSFT_T(KC_A)
-#define SH_S RSFT_T(KC_S)
-#define AL_E LALT_T(KC_E)
-#define AL_T RALT_T(KC_T)
-#define GU_I LGUI_T(KC_I)
-#define GU_D RGUI_T(KC_D)
-
-// layer toggle.
-#define LW_BSPC  LT(_LOWER, KC_BSPC)
-#define RS_SPC   LT(_RAISE, KC_SPC)
-#define RS_D     LT(_RAISE, KC_D)
-#define LW_I     LT(_LOWER, KC_I)
-
-// idk, man. not used, i guess.
-#define ADDDD    MO(_ADJUST)
-
-// common shortcuts for windows and linux that i use.
-#define NXTTAB LCTL(KC_PGDN)
-#define PRVTAB LCTL(KC_PGUP)
-#define UPTAB  LCTL(LSFT(KC_PGUP))
-#define DNTAB  LCTL(LSFT(KC_PGDN))
-#define NXTWIN LALT(KC_TAB)
-#define PRVWIN LALT(LSFT(KC_TAB))
-#define CALDL  LCTL(LALT(KC_DEL))
-#define TSKMGR LCTL(LSFT(KC_ESC))
-#define EXPLR  LGUI(KC_E)
-#define LCKGUI LGUI(KC_L)
-#define CONPST LSFT(KC_INS)
-#define CLSGUI LALT(KC_F4)
-
-// left hand combinations.
-const uint16_t PROGMEM colon_comma_combo[] = {KC_SCLN, KC_COMM, COMBO_END};
-const uint16_t PROGMEM comma_dot_combo[]   = {KC_COMM, KC_DOT, COMBO_END};
-const uint16_t PROGMEM dot_p_combo[]       = {KC_DOT, KC_P, COMBO_END};
-const uint16_t PROGMEM p_y_combo[]         = {KC_P, KC_Y, COMBO_END};
-const uint16_t PROGMEM comma_p_combo[]     = {KC_COMM, KC_P, COMBO_END};
-const uint16_t PROGMEM quot_q_combo[]      = {KC_QUOT, KC_Q, COMBO_END};
-const uint16_t PROGMEM q_j_combo[]         = {KC_Q, KC_J, COMBO_END};
-const uint16_t PROGMEM j_k_combo[]         = {KC_J, KC_K, COMBO_END};
-const uint16_t PROGMEM q_k_combo[]         = {KC_Q, KC_K, COMBO_END};
-const uint16_t PROGMEM k_x_combo[]         = {KC_K, KC_X, COMBO_END};
-
-// right hand combinations.
-const uint16_t PROGMEM l_r_combo[]         = {KC_L, KC_R, COMBO_END};
-const uint16_t PROGMEM r_c_combo[]         = {KC_R, KC_C, COMBO_END};
-const uint16_t PROGMEM c_g_combo[]         = {KC_C, KC_G, COMBO_END};
-const uint16_t PROGMEM r_g_combo[]         = {KC_R, KC_G, COMBO_END};
-const uint16_t PROGMEM g_f_combo[]         = {KC_G, KC_F, COMBO_END};
-const uint16_t PROGMEM v_w_combo[]         = {KC_V, KC_W, COMBO_END};
-const uint16_t PROGMEM w_m_combo[]         = {KC_W, KC_M, COMBO_END};
-const uint16_t PROGMEM v_m_combo[]         = {KC_V, KC_M, COMBO_END};
-const uint16_t PROGMEM m_b_combo[]         = {KC_M, KC_B, COMBO_END};
-
-// both hand combinations.
-const uint16_t PROGMEM j_w_combo[]         = {KC_J, KC_W, COMBO_END};
-
-combo_t key_combos[] = {
-    // left hand combinations.
-    [COLON_COMMA]   = COMBO(colon_comma_combo,  KC_TAB),
-    [COMMA_DOT]     = COMBO(comma_dot_combo,    KC_QUES),
-    [DOT_P]         = COMBO(dot_p_combo,        KC_UNDS),
-    [P_Y]           = COMBO(p_y_combo,          KC_PIPE),
-    [COMMA_P]       = COMBO(comma_p_combo,      PRVTAB),
-    [QUOT_Q]        = COMBO(quot_q_combo,       KC_ENT),
-    [Q_J]           = COMBO(q_j_combo,          LCTL(KC_W)),
-    [J_K]           = COMBO(j_k_combo,          KC_DEL),
-    [Q_K]           = COMBO(q_k_combo,          KC_TAB),
-    [K_X]           = COMBO(k_x_combo,          KC_TILD),
-
-    // right hand combinations.
-    [L_R]           = COMBO(l_r_combo,          KC_BSPC),
-    [R_C]           = COMBO(r_c_combo,          KC_SLSH),
-    [C_G]           = COMBO(c_g_combo,          KC_MINS),
-    [R_G]           = COMBO(r_g_combo,          NXTTAB),
-    [G_F]           = COMBO(g_f_combo,          KC_BSLS),
-    [V_W]           = COMBO(v_w_combo,          KC_APP),
-    [W_M]           = COMBO(w_m_combo,          KC_DEL),
-    [V_M]           = COMBO(v_m_combo,          LSFT(KC_TAB)),
-    [M_B]           = COMBO(m_b_combo,          KC_GRV),
-
-    // both hand combinations.
-    [J_W]           = COMBO(j_w_combo,          KC_ENT),
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[_BASE] = LAYOUT(
-    KC_SCLN,KC_COMM,KC_DOT, KC_P,   KC_Y,       KC_F,   KC_G,   KC_C,   KC_R,   KC_L,
-    SH_A,   CT_O,   AL_E,   KC_U,   GU_I,       GU_D,   KC_H,   AL_T,   CT_N,   SH_S,
-    KC_QUOT,KC_Q,   KC_J,   KC_K,   KC_X,       KC_B,   KC_M,   KC_W,   KC_V,   KC_Z,
-                            LW_BSPC,SFT_ESC,    ALT_ENT,RS_SPC
-),
-
-[_RAISE] = LAYOUT(
-    KC_EXLM,KC_AT,  KC_UP,  KC_LCBR,KC_RCBR,    KC_BSLS,KC_7,   KC_8,   KC_9,   KC_ASTR ,
-    KC_HASH,KC_LEFT,KC_DOWN,KC_RGHT,KC_DLR,     KC_EQL, KC_4,   KC_5,   KC_6,   KC_0 ,
-    KC_LBRC,KC_RBRC,KC_LPRN,KC_RPRN,KC_AMPR,    KC_GRV, KC_1,   KC_2,   KC_3,   KC_PLUS ,
-                            ADDDD  ,_______,    _______,_______
-),
-[_LOWER] = LAYOUT(
-    KC_ESC, KC_QUES,KC_UNDS,KC_F1,  KC_F2,      KC_F3,  KC_F4,  KC_MINS,KC_SLSH,KC_BSPC ,
-    KC_LSFT,KC_TAB, KC_PGUP,KC_F5,  KC_F6,      KC_F7,  KC_F8,  KC_HOME,KC_LALT,KC_ENT  ,
-    KC_CAPS,KC_SCRL,KC_PGDN,KC_F9,  KC_F10,     KC_F11, KC_F12, KC_END, KC_INS, KC_SLSH ,
-                            _______,_______,    _______,ADDDD
-),
-[_ADJUST] = LAYOUT(
-    _______,EXPLR,  KC_UP,  PRVTAB, PRVWIN,     NXTWIN, NXTTAB, _______,_______,LCKGUI,
-    TSKMGR, KC_LEFT,KC_DOWN,KC_RGHT,UPTAB,      DNTAB,  KC_ENT, KC_LGUI,_______,CALDL,
-    _______,CLSGUI, _______,CONPST, QK_BOOT,    _______,_______,_______,_______,_______,
-                            _______,_______,    _______,_______
-),
-};
diff --git a/keyboards/ibnuda/squiggle/keymaps/rick/readme.md b/keyboards/ibnuda/squiggle/keymaps/rick/readme.md
deleted file mode 100644
index aaff442b905..00000000000
--- a/keyboards/ibnuda/squiggle/keymaps/rick/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# water
-
-ricky rick's keymap. ayyy.
diff --git a/keyboards/ibnuda/squiggle/keymaps/rick/rules.mk b/keyboards/ibnuda/squiggle/keymaps/rick/rules.mk
deleted file mode 100644
index ab1e438182a..00000000000
--- a/keyboards/ibnuda/squiggle/keymaps/rick/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-COMBO_ENABLE = yes
diff --git a/keyboards/idb/idb_60/keymaps/pngu/keymap.c b/keyboards/idb/idb_60/keymaps/pngu/keymap.c
deleted file mode 100644
index 23649e791b0..00000000000
--- a/keyboards/idb/idb_60/keymaps/pngu/keymap.c
+++ /dev/null
@@ -1,27 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    [0] = LAYOUT(
-        QK_GESC,          KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_NO,
-        KC_TAB,           KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Z,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
-        LT(2, KC_CAPS),   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
-        KC_LSFT,          KC_NUBS, KC_Y,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
-        KC_LCTL,          KC_LGUI, KC_LALT,                                     KC_SPC,                             KC_RALT, KC_MENU, KC_RGUI
-    ),
-    [1] = LAYOUT(
-        QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_INS,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______,                                     _______,                            _______, _______, _______
-    ),
-    [2] = LAYOUT(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______,                                     _______,                            _______, _______, _______
-    )
-
-};
diff --git a/keyboards/idobao/id42/info.json b/keyboards/idobao/id42/info.json
index b0702aaa94d..ace2033493b 100644
--- a/keyboards/idobao/id42/info.json
+++ b/keyboards/idobao/id42/info.json
@@ -10,9 +10,7 @@
         "extrakey": true,
         "console": false,
         "command": false,
-        "nkro": true,
-        "backlight": false,
-        "rgblight": false
+        "nkro": true
     },
     "ws2812": {
         "pin": "B3"
diff --git a/keyboards/idobao/id61/info.json b/keyboards/idobao/id61/info.json
index 255e88fc056..0b1c51279de 100644
--- a/keyboards/idobao/id61/info.json
+++ b/keyboards/idobao/id61/info.json
@@ -10,9 +10,7 @@
         "console": false,
         "extrakey": true,
         "mousekey": true,
-        "nkro": true,
-        "backlight": false,
-        "rgblight": false
+        "nkro": true
     },
     "ws2812": {
         "pin": "F0"
diff --git a/keyboards/idobao/id61/keymaps/idobao/keymap.c b/keyboards/idobao/id61/keymaps/idobao/keymap.c
index bd0b500615e..3bfe1db6f43 100644
--- a/keyboards/idobao/id61/keymaps/idobao/keymap.c
+++ b/keyboards/idobao/id61/keymaps/idobao/keymap.c
@@ -186,7 +186,7 @@ void eeconfig_init_user(void) {
     ID61_update_rgb_mode();
 }
 
-void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
+bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
     // Caps Lock key stuff
 
     if (host_keyboard_led_state().caps_lock) {
@@ -204,6 +204,7 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
     } else if (user_config.rgb_disable_perkey) {
         rgb_matrix_set_color(ID61_CAPS_LOCK_KEY_INDEX, HSV_OFF);  // off
     }
+    return false;
 }
 
 #endif  // RGB_MATRIX_ENABLE
diff --git a/keyboards/idobao/id63/info.json b/keyboards/idobao/id63/info.json
index 02c4d41bf4b..573fb440303 100644
--- a/keyboards/idobao/id63/info.json
+++ b/keyboards/idobao/id63/info.json
@@ -10,9 +10,7 @@
         "console": false,
         "extrakey": true,
         "mousekey": true,
-        "nkro": true,
-        "backlight": false,
-        "rgblight": false
+        "nkro": true
     },
     "ws2812": {
         "pin": "B7"
diff --git a/keyboards/idobao/id63/keymaps/idobao/keymap.c b/keyboards/idobao/id63/keymaps/idobao/keymap.c
index 9213e4ffcf1..912da634268 100644
--- a/keyboards/idobao/id63/keymaps/idobao/keymap.c
+++ b/keyboards/idobao/id63/keymaps/idobao/keymap.c
@@ -98,7 +98,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_FN2] = LAYOUT_60_ansi_arrow(
-        KC_ESC,  KC_BRID, KC_BRIU, KC_MCON, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT,  KC_MUTE, KC_VOLD, KC_VOLU, KC_PWR,
+        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_PWR,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______,          _______,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______, _______,
diff --git a/keyboards/idobao/id67/info.json b/keyboards/idobao/id67/info.json
index 5618311141f..7c5308d3156 100644
--- a/keyboards/idobao/id67/info.json
+++ b/keyboards/idobao/id67/info.json
@@ -10,9 +10,7 @@
         "extrakey": true,
         "command": false,
         "console": false,
-        "nkro": true,
-        "backlight": false,
-        "rgblight": false
+        "nkro": true
     },
     "ws2812": {
         "pin": "F0"
diff --git a/keyboards/idobao/id67/keymaps/thewerther/config.h b/keyboards/idobao/id67/keymaps/thewerther/config.h
deleted file mode 100644
index 4cd526feeaa..00000000000
--- a/keyboards/idobao/id67/keymaps/thewerther/config.h
+++ /dev/null
@@ -1,82 +0,0 @@
-// Copyright 2021 Werther (@thewerther)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#define DRIVER_LED_UNDERGLOW 10
-#define TAPPING_TERM 500
-#define PERMISSIVE_HOLD
-
-#if defined(RGB_MATRIX_ENABLE)
-    #undef RGB_MATRIX_MAXIMUM_BRIGHTNESS
-    #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255  // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
-
-    // change saturation and hue step size
-    #undef RGBLIGHT_HUE_STEP
-    #undef RGBLIGHT_SAT_STEP
-    #define RGBLIGHT_SAT_STEP 5
-    #define RGBLIGHT_HUE_STEP 5
-
-    #define RGB_MATRIX_KEYPRESSES
-
-    // disable effects from keyboard level config.h
-    #undef ENABLE_RGB_MATRIX_ALPHAS_MODS
-    #undef ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-    #undef ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
-    #undef ENABLE_RGB_MATRIX_BREATHING
-    #undef ENABLE_RGB_MATRIX_BAND_SAT
-    #undef ENABLE_RGB_MATRIX_BAND_VAL
-    #undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-    #undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-    #undef ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-    #undef ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-    #undef ENABLE_RGB_MATRIX_CYCLE_ALL
-    #undef ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-    #undef ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-    #undef ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-    #undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-    #undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-    #undef ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-    #undef ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-    #undef ENABLE_RGB_MATRIX_DUAL_BEACON
-    #undef ENABLE_RGB_MATRIX_RAINBOW_BEACON
-    #undef ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-    #undef ENABLE_RGB_MATRIX_RAINDROPS
-    #undef ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-    #undef ENABLE_RGB_MATRIX_HUE_BREATHING
-    #undef ENABLE_RGB_MATRIX_HUE_PENDULUM
-    #undef ENABLE_RGB_MATRIX_HUE_WAVE
-    #undef ENABLE_RGB_MATRIX_PIXEL_FRACTAL
-    #undef ENABLE_RGB_MATRIX_PIXEL_RAIN
-    #undef ENABLE_RGB_MATRIX_TYPING_HEATMAP
-    #undef ENABLE_RGB_MATRIX_DIGITAL_RAIN
-    #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-    #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE
-    #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-    #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-    #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-    #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-    #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-    #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-    #undef ENABLE_RGB_MATRIX_SPLASH
-    #undef ENABLE_RGB_MATRIX_MULTISPLASH
-    #undef ENABLE_RGB_MATRIX_SOLID_SPLASH
-    #undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-
-    // only enable a few
-    #define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-    #define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-    #define ENABLE_RGB_MATRIX_DUAL_BEACON
-    #define ENABLE_RGB_MATRIX_RAINBOW_BEACON
-    #define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-    #define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-
-    // #if defined(RGB_MATRIX_KEYPRESSES) || defined(RGB_MATRIX_KEYRELEASES)
-    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE// Pulses keys hit to hue & value then fades value out
-    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE       // Static single hue, pulses keys hit to shifted hue then fades to current hue
-    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE       // Hue & value pulse near a single key hit then fades value out
-    #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH    // Hue & value pulse away from multiple key hits then fades value out
-    // #endif // # if defined(RGB_MATRIX_KEYPRESSES) || defined(RGB_MATRIX_KEYRELEASES)
-#endif // # if defined(RGB_MATRIX_ENABLE)
-
diff --git a/keyboards/idobao/id67/keymaps/thewerther/keymap.c b/keyboards/idobao/id67/keymaps/thewerther/keymap.c
deleted file mode 100644
index a47a54db375..00000000000
--- a/keyboards/idobao/id67/keymaps/thewerther/keymap.c
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2021 Werther (@thewerther)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT_65_ansi_blocker(
-        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_GRV,
-        KC_TAB,      KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,      KC_DEL,
-        KC_RALT,       KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,              KC_PGUP,
-        KC_LSFT,            KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,          KC_PGDN,
-        KC_LCTL,   KC_LGUI,   KC_LALT,                       LT(1, KC_SPC),                       MO(2),     KC_RCTL,   KC_LEFT,   KC_DOWN,    KC_RGHT
-    ),
-    [1] = LAYOUT_65_ansi_blocker(
-        _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,          _______,
-        _______,     _______, _______,  _______, _______, _______, _______, KC_PGUP, _______, _______, _______, _______, _______, _______,     _______,
-        _______,        _______, _______, KC_PGDN, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT,  _______, _______, _______,            _______,
-        _______,           _______,  _______,  _______, _______, _______, _______, _______, _______, _______,  _______,  _______,  _______,    _______,
-        _______,   _______,   _______,                      _______,                              _______,   _______,   _______,   _______,    _______
-    ),
-    [2] = LAYOUT_65_ansi_blocker(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______,     _______,
-        _______,     RGB_TOG, _______,  RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_MPLY, KC_MPRV, KC_MNXT, _______,     _______,
-        _______,        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            KC_HOME,
-        _______,         QK_BOOT,  RGB_SPI,  RGB_SPD, _______, KC_VOLD, KC_MUTE, KC_VOLU, _______, _______,  _______,  _______,  _______,      KC_END,
-        _______,   _______,   _______,                      _______,                              _______,   _______,   _______,   _______,    _______
-    )
-
-};
-
-void matrix_scan_user(void) {
-    #if defined(RGB_MATRIX_ENABLE)
-    int current_effect = rgb_matrix_get_mode();
-    if (current_effect >= RGB_MATRIX_SOLID_REACTIVE_SIMPLE && current_effect <= RGB_MATRIX_SOLID_MULTISPLASH) {
-        // set all underglow leds to current color
-        RGB current_color = hsv_to_rgb(rgb_matrix_get_hsv());
-        for (int i = RGB_MATRIX_LED_COUNT - DRIVER_LED_UNDERGLOW; i < RGB_MATRIX_LED_COUNT; i++) {
-            rgb_matrix_set_color(i, current_color.r, current_color.g, current_color.b);
-        }
-    }
-    #endif
-}
diff --git a/keyboards/idobao/id67/keymaps/thewerther/rules.mk b/keyboards/idobao/id67/keymaps/thewerther/rules.mk
deleted file mode 100644
index acd3adaa9a4..00000000000
--- a/keyboards/idobao/id67/keymaps/thewerther/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
diff --git a/keyboards/idobao/id67/keymaps/vinorodrigues/config.h b/keyboards/idobao/id67/keymaps/vinorodrigues/config.h
deleted file mode 100644
index f7ada65953c..00000000000
--- a/keyboards/idobao/id67/keymaps/vinorodrigues/config.h
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright 2022 Vino Rodrigues (@vinorodrigues)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-/*
- * IDOBAO ID67 Keymap for a ID67 Bestype, built for Mac use
- */
-
-#pragma once
-
-#ifdef RGB_MATRIX_ENABLE
-    #define ID67_DISABLE_UNDERGLOW
-
-    #ifdef RGB_MATRIX_MAXIMUM_BRIGHTNESS
-        #undef RGB_MATRIX_MAXIMUM_BRIGHTNESS
-    #endif
-    #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200  // limits maximum brightness of LEDs to x out of 255
-
-    //// #define RGB_MATRIX_KEYPRESSES
-
-    // RGB Matrix config, nit-pick a few animations. "////" = already defined in base `config.h`, `#undef` disables it
-
-    //// #define ENABLE_RGB_MATRIX_ALPHAS_MODS             // Static dual hue, speed is hue for secondary hue
-    //// #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN        // Static gradient top to bottom, speed controls how much gradient changes
-    //// #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT     // Static gradient left to right, speed controls how much gradient changes
-    //// #define ENABLE_RGB_MATRIX_BREATHING               // Single hue brightness cycling animation
-    //// #define ENABLE_RGB_MATRIX_BAND_SAT                // Single hue band fading saturation scrolling left to right
-    //// #define ENABLE_RGB_MATRIX_BAND_VAL                // Single hue band fading brightness scrolling left to right
-    //// #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT       // Single hue 3 blade spinning pinwheel fades saturation
-    //// #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL       // Single hue 3 blade spinning pinwheel fades brightness
-    //// #define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT         // Single hue spinning spiral fades saturation
-    //// #define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL         // Single hue spinning spiral fades brightness
-    //// #define ENABLE_RGB_MATRIX_CYCLE_ALL               // Full keyboard solid hue cycling through full gradient
-    //// #define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT        // Full gradient scrolling left to right
-    //// #define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN           // Full gradient scrolling top to bottom
-    //// #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN            // Full gradient scrolling out to in
-    //// #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL       // Full dual gradients scrolling out to in
-    //// #define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON  // Full gradient Chevron shaped scrolling left to right
-    //// #define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL          // Full gradient spinning pinwheel around center of keyboard
-    //// #define ENABLE_RGB_MATRIX_CYCLE_SPIRAL            // Full gradient spinning spiral around center of keyboard
-    //// #define ENABLE_RGB_MATRIX_DUAL_BEACON             // Full gradient spinning around center of keyboard
-    //// #define ENABLE_RGB_MATRIX_RAINBOW_BEACON          // Full tighter gradient spinning around center of keyboard
-    //// #define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS       // Full dual gradients spinning two halfs of keyboard
-    //// #define ENABLE_RGB_MATRIX_RAINDROPS               // Randomly changes a single key's hue
-    //// #define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS     // Randomly changes a single key's hue and saturation
-    //// #define ENABLE_RGB_MATRIX_HUE_BREATHING           // Hue shifts up a slight amount at the same time, then shifts back
-    //// #define ENABLE_RGB_MATRIX_HUE_PENDULUM            // Hue shifts up a slight amount in a wave to the right, then back to the left
-    //// #define ENABLE_RGB_MATRIX_HUE_WAVE                // Hue shifts up a slight amount and then back down in a wave to the right
-
-    #undef ENABLE_RGB_MATRIX_PIXEL_RAIN
-    #undef ENABLE_RGB_MATRIX_PIXEL_FLOW
-    //// #undef ENABLE_RGB_MATRIX_PIXEL_FRACTAL
-
-    // don't need `#if`, animation modes themselves check defines
-    // #if defined(RGB_MATRIX_FRAMEBUFFER_EFFECTS)
-    //// #define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-    //// #define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-    // #endif
-
-    // don't need `#if`, animation modes themselves check defines
-    // #if defined(RGB_MATRIX_KEYPRESSES) || defined(RGB_MATRIX_KEYRELEASES)
-    //// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE     // Pulses keys hit to hue & value then fades value out
-    //// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE            // Static single hue, pulses keys hit to shifted hue then fades to current hue
-    //// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE       // Hue & value pulse near a single key hit then fades value out
-    //// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE  // Hue & value pulse near multiple key hits then fades value out
-    //// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS      // Hue & value pulse the same column and row of a single key hit then fades value out
-    //// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS // Hue & value pulse the same column and row of multiple key hits then fades value out
-    //// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS      // Hue & value pulse away on the same column and row of a single key hit then fades value out
-    //// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS // Hue & value pulse away on the same column and row of multiple key hits then fades value out
-    //// #define ENABLE_RGB_MATRIX_SPLASH                    // Full gradient & value pulse away from a single key hit then fades value out
-    //// #define ENABLE_RGB_MATRIX_MULTISPLASH               // Full gradient & value pulse away from multiple key hits then fades value out
-    //// #define ENABLE_RGB_MATRIX_SOLID_SPLASH              // Hue & value pulse away from a single key hit then fades value out
-    //// #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH         // Hue & value pulse away from multiple key hits then fades value out
-    // #endif
-#endif
diff --git a/keyboards/idobao/id67/keymaps/vinorodrigues/keymap.c b/keyboards/idobao/id67/keymaps/vinorodrigues/keymap.c
deleted file mode 100644
index d34c70fa633..00000000000
--- a/keyboards/idobao/id67/keymaps/vinorodrigues/keymap.c
+++ /dev/null
@@ -1,272 +0,0 @@
-// Copyright 2022 Vino Rodrigues (@vinorodrigues)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-/*
- * IDOBAO ID67 Keymap for a ID67 Bestype, built for Mac use
- */
-
-#include QMK_KEYBOARD_H
-#include "version.h"
-
-enum {
-    _BASE = 0,
-    _FN1,
-    _FN2,
-    _FN3
-};
-
-enum {
-    KB_VRSN = SAFE_RANGE
-};
-
-#define LT1_C_L LT(_FN1, KC_CAPS)
-
-#ifndef MIN
-    #define MIN(a, b) (((a) < (b)) ? (a) : (b))
-#endif
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /*
-     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
-     * │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │Backspc│ ~ │
-     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
-     * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │  \  │Del│
-     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
-     * │*Caps*│ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │  Enter │PUp│  *Caps* => `LT(1, KC_CAPS)`
-     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
-     * │ Shift  │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ Shft │Up │PDn│
-     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
-     * │Ctrl│Opt │Comm│                        │Fn1 │Fn2 │ │Lf │Dn │Rt │
-     * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
-     */
-    [_BASE] = LAYOUT_65_ansi_blocker(
-        QK_GESC,  KC_1,     KC_2,    KC_3,     KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,   KC_EQL,  KC_BSPC,   KC_GRAVE,
-        KC_TAB,   KC_Q,     KC_W,    KC_E,     KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,   KC_RBRC, KC_BSLS,   KC_DELETE,
-        LT1_C_L,  KC_A,     KC_S,    KC_D,     KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,            KC_ENT,    KC_PGUP,
-        KC_LSFT,            KC_Z,    KC_X,     KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,   KC_RSFT, KC_UP,     KC_PGDN,
-        KC_LCTL,  KC_LALT,           KC_LGUI,                    KC_SPC,                             FN_MO13, FN_MO23,   KC_LEFT, KC_DOWN,   KC_RIGHT),
-
-    /*
-     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
-     * │ ~ │F1 │F2 │F3 │F4 │F5 │F6 │F7 │F8 │F9 │F10│F11│F12│ ERASE │F13│
-     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
-     * │     │   │Up │   │   │   │   │   │   │   │PSc│Hom│End│Eject│Ins│
-     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
-     * │ Caps │Lf │Dn │Rt │   │   │   │   │   │   │PUp│PDn│ enter  │Hom│
-     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
-     * │  Shft  │   │   │   │   │   │   │   │   │Ins│Del│Shift │   │End│
-     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
-     * │ctrl│opt │comm│                        │    │Fn3 │ │   │   │   │
-     * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
-     */
-    [_FN1] = LAYOUT_65_ansi_blocker(
-        KC_GRAVE, KC_F1,    KC_F2,   KC_F3,    KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,    KC_F12,  KC_ERAS,   KC_F13,
-        _______,  XXXXXXX,  KC_UP,   XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PSCR, KC_HOME,   KC_END,  KC_EJCT,   KC_INS,
-        KC_CAPS,  KC_LEFT,  KC_DOWN, KC_RIGHT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PGUP, KC_PGDN,            KC_PENT,   KC_HOME,
-        KC_RSFT,            XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_INS,  KC_DELETE, KC_LSFT, _______,   KC_END,
-        KC_RCTL,  KC_RALT,           KC_RGUI,                    _______,                            _______, _______,   _______, _______,   _______),
-
-    /*
-     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
-     * │Esc│SB-│SB+│mMC│mLP│Br-│Br+│Prv│Ply│Nxt│Mut│Vl-│Vl+│  out  │F14│
-     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
-     * │ Tog │Mod│   │   │   │   │   │   │   │   │   │   │   │     │PSc│
-     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
-     * │      │mod│   │   │   │   │   │   │   │   │Hu+│Sa+│        │SLk│
-     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
-     * │        │   │   │   │   │   │   │   │   │Hu-│Sa-│      │Br+│Pau│
-     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
-     * │    │    │    │                        │Fn3 │    │ │Sp-│Br-│Sp+│
-     * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
-     */
-    [_FN2] = LAYOUT_65_ansi_blocker(
-        KC_ESC,   KC_BRID,  KC_BRIU, KC_MCON,  KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD,   KC_VOLU, KC_OUT,    KC_F14,
-        RGB_TOG,  RGB_MOD,  XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   XXXXXXX, XXXXXXX,   KC_PSCR,
-        XXXXXXX,  RGB_RMOD, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUI, RGB_SAI,            XXXXXXX,   KC_SCRL,
-        XXXXXXX,            XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUD, RGB_SAD,   XXXXXXX, RGB_VAI,   KC_PAUS,
-        XXXXXXX,  XXXXXXX,           XXXXXXX,                    XXXXXXX,                            XXXXXXX, XXXXXXX,   RGB_SPD, RGB_VAD,   RGB_SPI),
-
-    /*
-     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
-     * │RST│M01│M02│M03│M04│M05│M06│M07│M08│M09│M10│M11│M12│ Power │F15│
-     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
-     * │     │   │   │   │   │   │   │   │   │   │   │   │   │Sleep│   │
-     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
-     * │      │   │   │   │   │   │   │   │   │   │   │   │ Debug  │   │
-     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
-     * │        │   │   │   │Ver│   │   │   │   │   │   │      │M00│   │
-     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
-     * │    │    │    │          Wake          │    │    │ │M13│M14│M15│
-     * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
-     */
-    [_FN3] = LAYOUT_65_ansi_blocker(
-        QK_BOOT,  MC_1,     MC_2,    MC_3,    MC_4,    MC_5,    MC_6,    MC_7,    MC_8,    MC_9,    MC_10,   MC_11,     MC_12,   KC_PWR,    KC_F15,
-        XXXXXXX,  XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   XXXXXXX, KC_SLEP,   XXXXXXX,
-        XXXXXXX,  XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,            DB_TOGG,   XXXXXXX,
-        XXXXXXX,            XXXXXXX, XXXXXXX, XXXXXXX, KB_VRSN, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   XXXXXXX, MC_0,      XXXXXXX,
-        XXXXXXX,  XXXXXXX,           XXXXXXX,                   KC_WAKE,                            XXXXXXX, XXXXXXX,   MC_13,   MC_14,     MC_15)
-};
-
-#ifdef RGB_MATRIX_ENABLE
-
-/*
- * RGB Stuff
- */
-
-#ifdef RGBLIGHT_VAL_STEP
-    #define RGB_BRIGHTER_BY RGBLIGHT_VAL_STEP
-#else
-    #define RGB_BRIGHTER_BY 26  // about 10%
-#endif
-
-#define LED_FLAG_ALPHA_KEY 0x10  // Alpha keys (for Caps Lock)
-#define LED_FLAG_LAYER_IND 0x20  // Layer indicator
-
-const uint8_t g_led_config_new_flags[RGB_MATRIX_LED_COUNT] = {
-    // Extended LED Index to Flag
-    // ** Remember: on ID67 this is in reverse order
-    0x21, 0x01, 0x01, 0x01, 0x01,                   0x04,             0x01,       0x01, 0x21,  // Spc row
-    0x21, 0x01, 0x01, 0x04, 0x04, 0x04, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14,       0x21,  // ZXC row
-    0x21, 0x01,       0x04, 0x04, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x29,  // ASD row
-    0x21, 0x04, 0x04, 0x04, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x21,  // QWE row
-    0x21, 0x01, 0x04, 0x04, 0x04, 0x04, 0x24, 0x24, 0x24, 0x24, 0x04, 0x04, 0x04, 0x04, 0x21   // 123 row
-};
-
-#define ID67_CAPS_LOCK_KEY_INDEX 36  // position of Caps Lock key
-
-bool isRGBOff = false;
-bool isCapsBlink = false;
-static uint16_t recording_timer;
-
-void keyboard_pre_init_user(void) {
-    // override `config.h` flags with new values
-    for (int i = 0; i < RGB_MATRIX_LED_COUNT; i++) g_led_config.flags[i] = g_led_config_new_flags[i];
-}
-
-void keyboard_post_init_user(void) {
-    isRGBOff = false;
-}
-
-bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
-
-    uint8_t v = MIN( rgblight_get_val() + RGB_BRIGHTER_BY, 0xFF );
-    uint8_t current_layer = get_highest_layer(layer_state);
-
-    // Caps Lock key stuff
-
-    if (host_keyboard_led_state().caps_lock) {
-        if (isRGBOff) {
-            rgb_matrix_set_color(ID67_CAPS_LOCK_KEY_INDEX, v, v, v);  // white
-        } else {
-            // Caps Lock key/LED
-            if (timer_elapsed(recording_timer) > 500) {
-                isCapsBlink = !isCapsBlink;
-                recording_timer = timer_read();
-            }
-            if (isCapsBlink) {
-                rgb_matrix_set_color(ID67_CAPS_LOCK_KEY_INDEX, v, v, v);  // white
-            }
-
-            // Alpha keys/LEDs
-            for (uint8_t i = led_min; i <= led_max; i++) {
-                if ((g_led_config.flags[i] & LED_FLAG_ALPHA_KEY) != 0)  {
-                    rgb_matrix_set_color(i, v, 0, 0);  //red
-                }
-            }
-        }
-    } else if (isRGBOff) {
-        uint8_t r = 0;
-        uint8_t g = 0;
-        uint8_t b = 0;
-
-        if ((g_led_config.flags[ID67_CAPS_LOCK_KEY_INDEX] & LED_FLAG_LAYER_IND) != 0) {
-            switch (current_layer) {
-                case _FN1: b = v; break;  // blue
-                case _FN2: g = v; break;  // green
-                case _FN3: r = v; break;  // red
-            }
-        }
-
-        rgb_matrix_set_color(ID67_CAPS_LOCK_KEY_INDEX, r, g, b);  // off
-    }
-
-    // Layer indicator stuff
-
-    switch (current_layer) {
-        case _FN1:
-            for (uint8_t i = led_min; i <= led_max; i++) {
-                if ((g_led_config.flags[i] & LED_FLAG_LAYER_IND) != 0) {
-                    rgb_matrix_set_color(i, 0, 0, v);  // blue
-                }
-            }
-            break;
-
-        case _FN2:
-            for (uint8_t i = led_min; i <= led_max; i++) {
-                if ((g_led_config.flags[i] & LED_FLAG_LAYER_IND) != 0) {
-                    rgb_matrix_set_color(i, 0, v, 0);  // green
-                }
-            }
-            break;
-
-        case _FN3:
-            for (uint8_t i = led_min; i <= led_max; i++) {
-                if ((g_led_config.flags[i] & LED_FLAG_LAYER_IND) != 0) {
-                    rgb_matrix_set_color(i, v, 0, 0);  // red
-                }
-            }
-            break;
-
-        default:
-            if (isRGBOff) {
-                // switch layer indicators off only if in OFF mode
-                for (uint8_t i = led_min; i <= led_max; i++) {
-                    if ((g_led_config.flags[i] & LED_FLAG_LAYER_IND) != 0) {
-                        rgb_matrix_set_color(i, 0, 0, 0);  // red
-                    }
-                }
-            }
-            break;
-    }
-    return false;
-}
-
-#endif
-
-/*
- * Mac Fn-key stuff
- */
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-
-    switch (keycode) {
-        // handle RGB toggle key
-        case RGB_TOG:
-            if (record->event.pressed) {
-                switch (rgb_matrix_get_flags()) {
-                    case LED_FLAG_ALL:
-                        isRGBOff = true;
-                        rgb_matrix_set_flags(LED_FLAG_INDICATOR | LED_FLAG_LAYER_IND);
-                        rgb_matrix_set_color_all(0, 0, 0);
-                        break;
-                    default:
-                        isRGBOff = false;
-                        rgb_matrix_set_flags(LED_FLAG_ALL);
-                        rgb_matrix_enable_noeeprom();  // turn the lights back on
-                }
-            }
-            return false;
-
-        // print firmware version
-        case KB_VRSN:
-            if (!get_mods()) {
-                if (!record->event.pressed) {
-                    SEND_STRING(QMK_KEYBOARD ":" QMK_KEYMAP " (v" QMK_VERSION ")");
-                }
-            }
-            return false;
-
-        default:
-            return true; /* Process all other keycodes normally */
-    }
-}
diff --git a/keyboards/idobao/id67/keymaps/vinorodrigues/rules.mk b/keyboards/idobao/id67/keymaps/vinorodrigues/rules.mk
deleted file mode 100644
index cf6371fda0f..00000000000
--- a/keyboards/idobao/id67/keymaps/vinorodrigues/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-LTO_ENABLE = yes
-VIA_ENABLE = yes
-NKRO_ENABLE = no  # N-Key Rollover must be OFF for mac keys to work
diff --git a/keyboards/idobao/id75/v1/keymaps/greenshadowmaker/keyboard-layout-editor-gsm-idobo.json b/keyboards/idobao/id75/v1/keymaps/greenshadowmaker/keyboard-layout-editor-gsm-idobo.json
deleted file mode 100644
index 19c0780463d..00000000000
--- a/keyboards/idobao/id75/v1/keymaps/greenshadowmaker/keyboard-layout-editor-gsm-idobo.json
+++ /dev/null
@@ -1,190 +0,0 @@
-[
-  {
-    "name": "gsm-idobo",
-    "notes": "Massdrop xd75\n\nFront Legend = \"Adust\" layer (both lower and Raise)"
-  },
-  [
-    {
-      "a": 3
-    },
-    "Esc\n\n\n\nreset",
-    {
-      "t": "#0000ff\n#ff0000",
-      "a": 4
-    },
-    "\nF1\n\n\n\n\n\n\n\n1 !",
-    "\nF2\n\n\n\n\n\n\n\n2 @",
-    "\nF3\n\n\n\n\n\n\n\n3 #",
-    "\nF4\n\n\n\n\n\n\n\n4 $",
-    "\nF5\n\n\n\n\n\n\n\n5 %",
-    {
-      "t": "#000000",
-      "a": 7
-    },
-    "= +",
-    "",
-    "- _",
-    {
-      "t": "#0000ff\n#ff0000",
-      "a": 0
-    },
-    "\nF6\n\n\nrgbplain\n\n\n\n\n6 ^",
-    "\nF7\n\n\nrgbtest\n\n\n\n\n7 &",
-    "\nF8\n\n\nrgbmode\n\n\n\n\n8 *",
-    {
-      "a": 4
-    },
-    "\nF9\n\n\n\n\n\n\n\n9 (",
-    "\nF10\n\n\n\n\n\n\n\n0 )",
-    {
-      "t": "#000000",
-      "a": 7
-    },
-    "Bksp"
-  ],
-  [
-    "Tab",
-    "Q",
-    {
-      "t": "#0000ff\n#ff0000",
-      "a": 4
-    },
-    "PgUp\nUP\n\n\n\n\n\n\n\nW",
-    {
-      "t": "#000000",
-      "a": 7
-    },
-    "E",
-    {
-      "a": 3
-    },
-    "R\n\n\n\nrgb_tog",
-    "T\n\n\n\nbl_tog",
-    {
-      "a": 7
-    },
-    "",
-    "",
-    "[ {",
-    "T",
-    "Y",
-    "I",
-    "O",
-    "P",
-    "]"
-  ],
-  [
-    {
-      "c": "#0000ff",
-      "t": "#ffffff"
-    },
-    "Raise",
-    {
-      "c": "#cccccc",
-      "t": "#0000ff\n#ff0000",
-      "a": 4
-    },
-    "Home\nLEFT\n\n\n\n\n\n\n\nA",
-    {
-      "a": 0
-    },
-    "PgDwn\nDOWN\n\n\nrgb_hai\n\n\n\n\nS",
-    "End\nRIGHT\n\n\nrgb_sai\n\n\n\n\nD",
-    {
-      "t": "#000000",
-      "a": 3
-    },
-    "F\n\n\n\nrgb_vai",
-    "G\n\n\n\nbl_inc",
-    {
-      "a": 7
-    },
-    "",
-    "UP",
-    "PrtScr",
-    "H",
-    "J",
-    "K",
-    "L",
-    "; :",
-    "' \""
-  ],
-  [
-    {
-      "a": 3
-    },
-    "Shift\n\n\n\neep_rst",
-    {
-      "a": 7
-    },
-    "Z",
-    {
-      "a": 3
-    },
-    "X\n\n\n\nrgb_hud",
-    "C\n\n\n\nrgb_sad",
-    "V\n\n\n\nrgb_vad",
-    "B\n\n\n\nbl_dec",
-    {
-      "a": 7
-    },
-    "LEFT",
-    "DOWN",
-    "RIGHT",
-    "N",
-    "M",
-    ", <",
-    ". >",
-    "/ ?",
-    {
-      "a": 6
-    },
-    "Shift"
-  ],
-  [
-    {
-      "a": 7
-    },
-    "` ~",
-    "\\ |",
-    "Alt",
-    "Ctrl",
-    {
-      "c": "#ff0000"
-    },
-    "Lower",
-    {
-      "c": "#eb7c15"
-    },
-    "Space",
-    {
-      "c": "#cccccc",
-      "t": "#0000ff\n#ff0000",
-      "a": 4
-    },
-    "\nApp\n\n\n\n\n\n\n\nOS",
-    {
-      "t": "#000000",
-      "a": 7
-    },
-    "Del",
-    "Enter",
-    {
-      "c": "#eb7c15"
-    },
-    "Space",
-    {
-      "c": "#0000ff",
-      "t": "#ffffff"
-    },
-    "Raise",
-    {
-      "c": "#cccccc",
-      "t": "#000000"
-    },
-    "Left",
-    "Down",
-    "Up",
-    "Right"
-  ]
-]
\ No newline at end of file
diff --git a/keyboards/idobao/id75/v1/keymaps/greenshadowmaker/keymap.c b/keyboards/idobao/id75/v1/keymaps/greenshadowmaker/keymap.c
deleted file mode 100644
index 84830e47c65..00000000000
--- a/keyboards/idobao/id75/v1/keymaps/greenshadowmaker/keymap.c
+++ /dev/null
@@ -1,128 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum custom_keycodes {
-  LOWER = SAFE_RANGE,
-  RAISE,
-};
-
-enum layer_names {
-  _QWERTY,
-  _LOWER,
-  _RAISE,
-  _ADJUST,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* QWERTY
- * .--------------------------------------------------------------------------------------------------------------------------------------.
- * | ESC    | 1      | 2      | 3      | 4      | 5      | =      |        | -      | 6      | 7      | 8      | 9      | 0      | BACKSP |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
- * | TAB    | Q      | W      | E      | R      | T      |        |        | [      | Y      | U      | I      | O      | P      | ]      |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------|
- * | RAISE  | A      | S      | D      | F      | G      |        | UP     | PrtScr | H      | J      | K      | L      | ;      | '      |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
- * | LSHIFT | Z      | X      | C      | V      | B      | LEFT   | DOWN   | RIGHT  | N      | M      | ,      | .      | /      | RSHIFT |
- * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+--------+-----------------+--------+--------|
- * | `      | \      | LALT   | LCTRL  | LOWER  | SPACE  | LGUI   | DEL    | ENTER  | SPACE  | RAISE  |  LEFT  |  DOWN  |  UP    | RIGHT  |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_ortho_5x15( 
-    KC_ESC,     KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_EQL,  XXXXXXX,   KC_MINS,   KC_6,    KC_7,    KC_8,       KC_9,     KC_0, KC_BSPC,  
-    KC_TAB,     KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    XXXXXXX, XXXXXXX,   KC_LBRC,   KC_Y,    KC_U,    KC_I,       KC_O,     KC_P, KC_RBRC,  
-     RAISE,     KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    XXXXXXX,   KC_UP,   KC_PSCR,   KC_H,    KC_J,    KC_K,       KC_L,  KC_SCLN, KC_QUOT, 
-   KC_LSFT,     KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_LEFT, KC_DOWN,   KC_RGHT,   KC_N,    KC_M,    KC_COMM,  KC_DOT,  KC_SLSH, KC_RSFT, 
-  KC_GRAVE,  KC_BSLS, KC_LALT, KC_LCTL,   LOWER,  KC_SPC,    KC_LGUI,  KC_DEL,    KC_ENT, KC_SPC,   RAISE,    KC_LEFT,  KC_DOWN,   KC_UP, KC_RGHT  
-),
-
-
-/* LOWER
- * .--------------------------------------------------------------------------------------------------------------------------------------.
- * |        | F1     | F2     | F3     | F4     | F5     |        |        |        | F6     | F7     | F8     | F9     | F10    |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |  UP    |        |        |        |        |        |        |        |        |        | PR SCR |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | RAISE  | LEFT   |  DOWN  |  RIGHT |        |        |        |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |        |        | LOWER  |        |  APP   |        |        |        |  RAISE |        |        |        |        |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_ortho_5x15( 
-    XXXXXXX,   KC_F1,   KC_F2,   KC_F3, XXXXXXX,   KC_F5, XXXXXXX, XXXXXXX, XXXXXXX,    KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10, XXXXXXX,  
-    XXXXXXX, XXXXXXX,   KC_UP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  
-      RAISE, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   LOWER, XXXXXXX,  KC_APP, XXXXXXX, XXXXXXX,  XXXXXXX,   RAISE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX  
-),
-
- /* RAISE
- * .--------------------------------------------------------------------------------------------------------------------------------------.
- * |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |  pgup  |        |        |        |        |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | RAISE  | home   |  pgdn  | end    |        |        |        |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |        |        | LOWER  |        |        |        |        |        |  RAISE |        |        |        |        |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_ortho_5x15( 
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  
-    XXXXXXX, XXXXXXX,   KC_UP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  
-      RAISE, KC_HOME, KC_PGDN,  KC_END, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   LOWER, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX,   RAISE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX  
-),
-
-
- /* ADJUST
- * .--------------------------------------------------------------------------------------------------------------------------------------.
- * | QK_BOOT  |        |        |        |        |        |        |        |        |rgbplain|rgbtest | rgbmode|        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |        |        |rgb tog | bl_tog |        |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | RAISE  |        | rgb hi | rgb sai|rgb vai | bl inc |        |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | EEP Rst|        | rgb hd | rgb sad|rgb vad | bl dec |        |        |        |        |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        |        |        | LOWER  |        |        |        |        |        |  RAISE |        |        |        |        |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_ortho_5x15( 
-    QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  RGB_M_P, RGB_M_T, RGB_MOD, XXXXXXX, XXXXXXX, XXXXXXX,  
-  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, BL_TOGG, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  
-    RAISE, XXXXXXX, RGB_HUI, RGB_SAI, RGB_VAI,  BL_UP,  XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 
-  EE_CLR,  XXXXXXX, RGB_HUD, RGB_SAD, RGB_VAD,  BL_DOWN,XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 
-  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   LOWER, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX,   RAISE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX  
-),
-
-
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-  }
-  return true;
-}
diff --git a/keyboards/idobao/id75/v1/keymaps/greenshadowmaker/readme.md b/keyboards/idobao/id75/v1/keymaps/greenshadowmaker/readme.md
deleted file mode 100644
index 7b6f654c71f..00000000000
--- a/keyboards/idobao/id75/v1/keymaps/greenshadowmaker/readme.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# GreenShadowMaker keymap for idobo
-
-make idobo:greenshadowmaker:dfu
-
-Note: keyboard-layout-editor-gsm-idobo.json shoudl be the matching layout for http://www.keyboard-layout-editor.com
diff --git a/keyboards/idobao/id75/v1/keymaps/greenshadowmaker/rules.mk b/keyboards/idobao/id75/v1/keymaps/greenshadowmaker/rules.mk
deleted file mode 100644
index f6587a835e3..00000000000
--- a/keyboards/idobao/id75/v1/keymaps/greenshadowmaker/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-MOUSEKEY_ENABLE = no       # Mouse keys(+4700)
-COMMAND_ENABLE = no        # Commands for debug and configuration
-RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
diff --git a/keyboards/idobao/id80/v2/ansi/keymaps/msf/config.h b/keyboards/idobao/id80/v2/ansi/keymaps/msf/config.h
deleted file mode 100644
index 2a432a5b2e4..00000000000
--- a/keyboards/idobao/id80/v2/ansi/keymaps/msf/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2021 msf@github
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/*
-  Set any config.h overrides for your specific keymap here.
-  See config.h options at https://docs.qmk.fm/#/config_options?id=the-configh-file
-*/
-#pragma once
-
-#define COMBO_TERM 200
diff --git a/keyboards/idobao/id80/v2/ansi/keymaps/msf/keymap.c b/keyboards/idobao/id80/v2/ansi/keymaps/msf/keymap.c
deleted file mode 100644
index bdcb153413f..00000000000
--- a/keyboards/idobao/id80/v2/ansi/keymaps/msf/keymap.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/* Copyright 2021 Miguel Filipe <miguel.filipe@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT_ansi(
-        KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,     KC_F5,   KC_VOLD, KC_VOLU, KC_F8,     KC_F9,   KC_F10,  KC_PSTE, KC_PSCR,    KC_DEL,    MO(1),
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,            KC_HOME,
-        KC_TAB,      KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,        KC_END,
-        KC_CAPS,       KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
-        KC_LSFT,            KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,
-        KC_LCTL,   KC_LGUI,   KC_LALT,                       KC_SPC,                              KC_RALT,     KC_RCTL,        KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-    [1] = LAYOUT_ansi(
-        QK_BOOT,   KC_CALC, _______, _______, _______,    KC_MUTE, KC_F6, KC_F7, KC_MPLY,      KC_MSTP, KC_BRID, KC_BRIU, KC_F11,     KC_F12,    _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            KC_INS,
-        _______,     RGB_TOG, _______, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______,        KC_DEL,
-        _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______,            _______, _______, BL_DOWN, BL_TOGG, BL_UP,   NK_TOGG, _______, _______, _______, _______, _______,          BL_UP,
-        _______,   _______,   _______,                      _______,                              _______,     _______,        BL_TOGG, BL_DOWN, BL_STEP
-    ),
-    [2] = LAYOUT_ansi(
-        _______,   _______, _______, _______, _______,   _______, _______, _______, _______,   _______, _______, _______, _______,    _______,   _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______,
-        _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,        _______,
-        _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______,   _______,   _______,                      _______,                              _______,     _______,        _______, _______, _______
-    ),
-};
-
-enum combos {
-  SLSHDN_PGDN,
-  SLSHUP_PGUP,
-  RALTBKSPC_DELETE,
-};
-
-const uint16_t PROGMEM slashDown_combo[] = {KC_SLSH, KC_DOWN, COMBO_END};
-const uint16_t PROGMEM slashUp_combo[] = {KC_SLSH, KC_UP, COMBO_END};
-const uint16_t PROGMEM raltBackspace_combo[] = {KC_RALT, KC_BSPC, COMBO_END};
-
-combo_t key_combos[] = {
-  [SLSHDN_PGDN] = COMBO(slashDown_combo, KC_PGDN),
-  [SLSHUP_PGUP] = COMBO(slashUp_combo, KC_PGUP),
-  [RALTBKSPC_DELETE] = COMBO(raltBackspace_combo, KC_DEL),
-};
diff --git a/keyboards/idobao/id80/v2/ansi/keymaps/msf/readme.md b/keyboards/idobao/id80/v2/ansi/keymaps/msf/readme.md
deleted file mode 100644
index 7ab300f672b..00000000000
--- a/keyboards/idobao/id80/v2/ansi/keymaps/msf/readme.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# slightly modified:
-- some key combos
-- don't use f-keys,
-- pgup/down, home/end tweaks
diff --git a/keyboards/idobao/id80/v2/ansi/keymaps/msf/rules.mk b/keyboards/idobao/id80/v2/ansi/keymaps/msf/rules.mk
deleted file mode 100644
index ab1e438182a..00000000000
--- a/keyboards/idobao/id80/v2/ansi/keymaps/msf/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-COMBO_ENABLE = yes
diff --git a/keyboards/idobao/id80/v3/ansi/info.json b/keyboards/idobao/id80/v3/ansi/info.json
index 5cca0260ea0..19dc8c67a70 100644
--- a/keyboards/idobao/id80/v3/ansi/info.json
+++ b/keyboards/idobao/id80/v3/ansi/info.json
@@ -10,9 +10,7 @@
         "extrakey": true,
         "console": false,
         "command": false,
-        "nkro": true,
-        "backlight": false,
-        "rgblight": false
+        "nkro": true
     },
     "rgb_matrix": {
         "animations": {
diff --git a/keyboards/idobao/id87/v2/info.json b/keyboards/idobao/id87/v2/info.json
index cb94ee763e9..4a6099207c2 100644
--- a/keyboards/idobao/id87/v2/info.json
+++ b/keyboards/idobao/id87/v2/info.json
@@ -10,9 +10,7 @@
         "extrakey": true,
         "console": false,
         "command": false,
-        "nkro": true,
-        "backlight": false,
-        "rgblight": false
+        "nkro": true
     },
     "ws2812": {
         "pin": "E2"
diff --git a/keyboards/idobao/id87/v2/keymaps/idobao/keymap.c b/keyboards/idobao/id87/v2/keymaps/idobao/keymap.c
index 53871f9161c..4f7dec65b69 100644
--- a/keyboards/idobao/id87/v2/keymaps/idobao/keymap.c
+++ b/keyboards/idobao/id87/v2/keymaps/idobao/keymap.c
@@ -77,7 +77,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘
      */
     [1] = LAYOUT_tkl_ansi(
-        QK_BOOT,          KC_BRID,  KC_BRIU, KC_MCON, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______,
+        QK_BOOT,          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_HUI, _______,
         _______, RGB_TOG, RGB_MOD,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_HUD, RGB_SAI,
         _______, _______, RGB_RMOD, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
diff --git a/keyboards/idobao/montex/v2/info.json b/keyboards/idobao/montex/v2/info.json
index 774cde114f9..aefc3e45611 100755
--- a/keyboards/idobao/montex/v2/info.json
+++ b/keyboards/idobao/montex/v2/info.json
@@ -10,9 +10,7 @@
         "console": false,
         "extrakey": true,
         "mousekey": true,
-        "nkro": true,
-        "backlight": false,
-        "rgblight": false
+        "nkro": true
     },
     "ws2812": {
         "pin": "B1"
diff --git a/keyboards/idyllic/tinny50_rgb/info.json b/keyboards/idyllic/tinny50_rgb/info.json
index 5407bd9c26a..b3eb34a4c0c 100644
--- a/keyboards/idyllic/tinny50_rgb/info.json
+++ b/keyboards/idyllic/tinny50_rgb/info.json
@@ -16,9 +16,6 @@
         "console": false,
         "command": false,
         "nkro": true,
-        "backlight": false,
-        "rgblight": false,
-        "audio": false,
         "rgb_matrix": true
     },
     "diode_direction": "COL2ROW",
diff --git a/keyboards/illuminati/is0/keymaps/ctrlaltdel/keymap.c b/keyboards/illuminati/is0/keymaps/ctrlaltdel/keymap.c
deleted file mode 100644
index 4ba60a99590..00000000000
--- a/keyboards/illuminati/is0/keymaps/ctrlaltdel/keymap.c
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2019 Ryota Goto
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT( /* Base */
-    LCTL(LALT(KC_DEL))
-  ),
-};
diff --git a/keyboards/illuminati/is0/keymaps/ctrlaltdel/readme.md b/keyboards/illuminati/is0/keymaps/ctrlaltdel/readme.md
deleted file mode 100644
index 5d9e162c1c2..00000000000
--- a/keyboards/illuminati/is0/keymaps/ctrlaltdel/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# The ctrlaltdel keymap for is0
-
-A simple keymap to send Ctrl + Alt + Del on keypress.
\ No newline at end of file
diff --git a/keyboards/illusion/rosa/keymaps/oggi/keymap.c b/keyboards/illusion/rosa/keymaps/oggi/keymap.c
deleted file mode 100644
index 3ddf9b8d2c6..00000000000
--- a/keyboards/illusion/rosa/keymaps/oggi/keymap.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-Copyright 2021 Brandon Lee
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include QMK_KEYBOARD_H
-
-enum layer_names {
-    _BASE,
-    _FN
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_BASE] = LAYOUT_60_ansi_tsangan_split_rshift(
-        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS,    KC_EQL,     KC_BSPC,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,     KC_LBRC,    KC_RBRC,    KC_BSLS,
-        KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,  KC_QUOT,    KC_ENT,
-        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT,    MO(1),
-        KC_LGUI, KC_TRNS, KC_LALT,                                    KC_SPC,                                      KC_RALT, KC_TRNS, KC_RCTL
-    ),
-    [_FN] = LAYOUT_60_ansi_tsangan_split_rshift(
-        KC_TRNS, KC_F1, KC_F2,  KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS,
-        KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_RIGHT, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DOWN, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,                                    KC_TRNS,                                      KC_TRNS, KC_TRNS, KC_TRNS
-    )
-};
\ No newline at end of file
diff --git a/keyboards/illusion/rosa/keymaps/oggi/readme.md b/keyboards/illusion/rosa/keymaps/oggi/readme.md
deleted file mode 100644
index 54db9b5630f..00000000000
--- a/keyboards/illusion/rosa/keymaps/oggi/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# Oggi's custom Rosa keymap
\ No newline at end of file
diff --git a/keyboards/ilumkb/simpler61/simpler61.c b/keyboards/ilumkb/simpler61/simpler61.c
index cb35e554280..99cefc7844c 100644
--- a/keyboards/ilumkb/simpler61/simpler61.c
+++ b/keyboards/ilumkb/simpler61/simpler61.c
@@ -18,71 +18,71 @@
 
 #ifdef RGB_MATRIX_ENABLE
 const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
-    {0,  CS3_SW1,  CS2_SW1,  CS1_SW1},
-    {0,  CS3_SW2,  CS2_SW2,  CS1_SW2},
-    {0,  CS3_SW3,  CS2_SW3,  CS1_SW3},
-    {0,  CS3_SW4,  CS2_SW4,  CS1_SW4},
-    {0,  CS3_SW5,  CS2_SW5,  CS1_SW5},
-    {0,  CS3_SW6,  CS2_SW6,  CS1_SW6},
-    {0,  CS3_SW7,  CS2_SW7,  CS1_SW7},
-    {0,  CS3_SW8,  CS2_SW8,  CS1_SW8},
-    {0,  CS3_SW9,  CS2_SW9,  CS1_SW9},
-    {0, CS18_SW9, CS17_SW9, CS16_SW9},
-    {0, CS18_SW8, CS17_SW8, CS16_SW8},
-    {0, CS18_SW7, CS17_SW7, CS16_SW7},
-    {0, CS18_SW6, CS17_SW6, CS16_SW6},
-    {0, CS18_SW5, CS17_SW5, CS16_SW5},
+    {0,  SW1_CS3,  SW1_CS2,  SW1_CS1},
+    {0,  SW2_CS3,  SW2_CS2,  SW2_CS1},
+    {0,  SW3_CS3,  SW3_CS2,  SW3_CS1},
+    {0,  SW4_CS3,  SW4_CS2,  SW4_CS1},
+    {0,  SW5_CS3,  SW5_CS2,  SW5_CS1},
+    {0,  SW6_CS3,  SW6_CS2,  SW6_CS1},
+    {0,  SW7_CS3,  SW7_CS2,  SW7_CS1},
+    {0,  SW8_CS3,  SW8_CS2,  SW8_CS1},
+    {0,  SW9_CS3,  SW9_CS2,  SW9_CS1},
+    {0, SW9_CS18, SW9_CS17, SW9_CS16},
+    {0, SW8_CS18, SW8_CS17, SW8_CS16},
+    {0, SW7_CS18, SW7_CS17, SW7_CS16},
+    {0, SW6_CS18, SW6_CS17, SW6_CS16},
+    {0, SW5_CS18, SW5_CS17, SW5_CS16},
 
-    {0,  CS6_SW1,  CS5_SW1,  CS4_SW1},
-    {0,  CS6_SW2,  CS5_SW2,  CS4_SW2},
-    {0,  CS6_SW3,  CS5_SW3,  CS4_SW3},
-    {0,  CS6_SW4,  CS5_SW4,  CS4_SW4},
-    {0,  CS6_SW5,  CS5_SW5,  CS4_SW5},
-    {0,  CS6_SW6,  CS5_SW6,  CS4_SW6},
-    {0,  CS6_SW7,  CS5_SW7,  CS4_SW7},
-    {0,  CS6_SW8,  CS5_SW8,  CS4_SW8},
-    {0,  CS6_SW9,  CS5_SW9,  CS4_SW9},
-	{0, CS21_SW9, CS20_SW9, CS19_SW9},
-    {0, CS21_SW8, CS20_SW8, CS19_SW8},
-    {0, CS21_SW7, CS20_SW7, CS19_SW7},
-    {0, CS21_SW6, CS20_SW6, CS19_SW6},
-    {0, CS21_SW5, CS20_SW5, CS19_SW5},
+    {0,  SW1_CS6,  SW1_CS5,  SW1_CS4},
+    {0,  SW2_CS6,  SW2_CS5,  SW2_CS4},
+    {0,  SW3_CS6,  SW3_CS5,  SW3_CS4},
+    {0,  SW4_CS6,  SW4_CS5,  SW4_CS4},
+    {0,  SW5_CS6,  SW5_CS5,  SW5_CS4},
+    {0,  SW6_CS6,  SW6_CS5,  SW6_CS4},
+    {0,  SW7_CS6,  SW7_CS5,  SW7_CS4},
+    {0,  SW8_CS6,  SW8_CS5,  SW8_CS4},
+    {0,  SW9_CS6,  SW9_CS5,  SW9_CS4},
+	{0, SW9_CS21, SW9_CS20, SW9_CS19},
+    {0, SW8_CS21, SW8_CS20, SW8_CS19},
+    {0, SW7_CS21, SW7_CS20, SW7_CS19},
+    {0, SW6_CS21, SW6_CS20, SW6_CS19},
+    {0, SW5_CS21, SW5_CS20, SW5_CS19},
 
-    {0,  CS9_SW1,  CS8_SW1,  CS7_SW1},
-    {0,  CS9_SW2,  CS8_SW2,  CS7_SW2},
-    {0,  CS9_SW3,  CS8_SW3,  CS7_SW3},
-    {0,  CS9_SW4,  CS8_SW4,  CS7_SW4},
-    {0,  CS9_SW5,  CS8_SW5,  CS7_SW5},
-    {0,  CS9_SW6,  CS8_SW6,  CS7_SW6},
-    {0,  CS9_SW7,  CS8_SW7,  CS7_SW7},
-    {0,  CS9_SW8,  CS8_SW8,  CS7_SW8},
-    {0,  CS9_SW9,  CS8_SW9,  CS7_SW9},
-    {0, CS24_SW9, CS23_SW9, CS22_SW9},
-	{0, CS24_SW8, CS23_SW8, CS22_SW8},
-    {0, CS24_SW7, CS23_SW7, CS22_SW7},
-	{0, CS24_SW5, CS23_SW5, CS22_SW5},
+    {0,  SW1_CS9,  SW1_CS8,  SW1_CS7},
+    {0,  SW2_CS9,  SW2_CS8,  SW2_CS7},
+    {0,  SW3_CS9,  SW3_CS8,  SW3_CS7},
+    {0,  SW4_CS9,  SW4_CS8,  SW4_CS7},
+    {0,  SW5_CS9,  SW5_CS8,  SW5_CS7},
+    {0,  SW6_CS9,  SW6_CS8,  SW6_CS7},
+    {0,  SW7_CS9,  SW7_CS8,  SW7_CS7},
+    {0,  SW8_CS9,  SW8_CS8,  SW8_CS7},
+    {0,  SW9_CS9,  SW9_CS8,  SW9_CS7},
+    {0, SW9_CS24, SW9_CS23, SW9_CS22},
+	{0, SW8_CS24, SW8_CS23, SW8_CS22},
+    {0, SW7_CS24, SW7_CS23, SW7_CS22},
+	{0, SW5_CS24, SW5_CS23, SW5_CS22},
 
-    {0, CS12_SW1, CS11_SW1, CS10_SW1},
-    {0, CS12_SW2, CS11_SW2, CS10_SW2},
-    {0, CS12_SW3, CS11_SW3, CS10_SW3},
-    {0, CS12_SW4, CS11_SW4, CS10_SW4},
-    {0, CS12_SW5, CS11_SW5, CS10_SW5},
-    {0, CS12_SW6, CS11_SW6, CS10_SW6},
-    {0, CS12_SW7, CS11_SW7, CS10_SW7},
-    {0, CS12_SW8, CS11_SW8, CS10_SW8},
-    {0, CS12_SW9, CS11_SW9, CS10_SW9},
-    {0, CS27_SW9, CS26_SW9, CS25_SW9},
-	{0, CS27_SW8, CS26_SW8, CS25_SW8},
-    {0, CS27_SW7, CS26_SW7, CS25_SW7},
-    {0, CS27_SW5, CS26_SW5, CS25_SW5},
+    {0, SW1_CS12, SW1_CS11, SW1_CS10},
+    {0, SW2_CS12, SW2_CS11, SW2_CS10},
+    {0, SW3_CS12, SW3_CS11, SW3_CS10},
+    {0, SW4_CS12, SW4_CS11, SW4_CS10},
+    {0, SW5_CS12, SW5_CS11, SW5_CS10},
+    {0, SW6_CS12, SW6_CS11, SW6_CS10},
+    {0, SW7_CS12, SW7_CS11, SW7_CS10},
+    {0, SW8_CS12, SW8_CS11, SW8_CS10},
+    {0, SW9_CS12, SW9_CS11, SW9_CS10},
+    {0, SW9_CS27, SW9_CS26, SW9_CS25},
+	{0, SW8_CS27, SW8_CS26, SW8_CS25},
+    {0, SW7_CS27, SW7_CS26, SW7_CS25},
+    {0, SW5_CS27, SW5_CS26, SW5_CS25},
 
-    {0, CS15_SW1, CS14_SW1, CS13_SW1},
-    {0, CS15_SW2, CS14_SW2, CS13_SW2},
-    {0, CS15_SW3, CS14_SW3, CS13_SW3},
-    {0, CS15_SW6, CS14_SW6, CS13_SW6},
-    {0, CS30_SW8, CS29_SW8, CS28_SW8},
-    {0, CS30_SW7, CS29_SW7, CS28_SW7},
-    {0, CS30_SW5, CS29_SW5, CS28_SW5},
+    {0, SW1_CS15, SW1_CS14, SW1_CS13},
+    {0, SW2_CS15, SW2_CS14, SW2_CS13},
+    {0, SW3_CS15, SW3_CS14, SW3_CS13},
+    {0, SW6_CS15, SW6_CS14, SW6_CS13},
+    {0, SW8_CS30, SW8_CS29, SW8_CS28},
+    {0, SW7_CS30, SW7_CS29, SW7_CS28},
+    {0, SW5_CS30, SW5_CS29, SW5_CS28},
 };
 
 led_config_t g_led_config = {
diff --git a/keyboards/ilumkb/simpler64/simpler64.c b/keyboards/ilumkb/simpler64/simpler64.c
index 173423cf7e6..21892a55f49 100644
--- a/keyboards/ilumkb/simpler64/simpler64.c
+++ b/keyboards/ilumkb/simpler64/simpler64.c
@@ -18,74 +18,74 @@
 
 #ifdef RGB_MATRIX_ENABLE
 const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
-    {0,  CS3_SW1,  CS2_SW1,  CS1_SW1},
-    {0,  CS3_SW2,  CS2_SW2,  CS1_SW2},
-    {0,  CS3_SW3,  CS2_SW3,  CS1_SW3},
-    {0,  CS3_SW4,  CS2_SW4,  CS1_SW4},
-    {0,  CS3_SW5,  CS2_SW5,  CS1_SW5},
-    {0,  CS3_SW6,  CS2_SW6,  CS1_SW6},
-    {0,  CS3_SW7,  CS2_SW7,  CS1_SW7},
-    {0,  CS3_SW8,  CS2_SW8,  CS1_SW8},
-    {0,  CS3_SW9,  CS2_SW9,  CS1_SW9},
-    {0, CS18_SW9, CS17_SW9, CS16_SW9},
-    {0, CS18_SW8, CS17_SW8, CS16_SW8},
-    {0, CS18_SW7, CS17_SW7, CS16_SW7},
-    {0, CS18_SW6, CS17_SW6, CS16_SW6},
-    {0, CS18_SW5, CS17_SW5, CS16_SW5},
+    {0,  SW1_CS3,  SW1_CS2,  SW1_CS1},
+    {0,  SW2_CS3,  SW2_CS2,  SW2_CS1},
+    {0,  SW3_CS3,  SW3_CS2,  SW3_CS1},
+    {0,  SW4_CS3,  SW4_CS2,  SW4_CS1},
+    {0,  SW5_CS3,  SW5_CS2,  SW5_CS1},
+    {0,  SW6_CS3,  SW6_CS2,  SW6_CS1},
+    {0,  SW7_CS3,  SW7_CS2,  SW7_CS1},
+    {0,  SW8_CS3,  SW8_CS2,  SW8_CS1},
+    {0,  SW9_CS3,  SW9_CS2,  SW9_CS1},
+    {0, SW9_CS18, SW9_CS17, SW9_CS16},
+    {0, SW8_CS18, SW8_CS17, SW8_CS16},
+    {0, SW7_CS18, SW7_CS17, SW7_CS16},
+    {0, SW6_CS18, SW6_CS17, SW6_CS16},
+    {0, SW5_CS18, SW5_CS17, SW5_CS16},
 
-    {0,  CS6_SW1,  CS5_SW1,  CS4_SW1},
-    {0,  CS6_SW2,  CS5_SW2,  CS4_SW2},
-    {0,  CS6_SW3,  CS5_SW3,  CS4_SW3},
-    {0,  CS6_SW4,  CS5_SW4,  CS4_SW4},
-    {0,  CS6_SW5,  CS5_SW5,  CS4_SW5},
-    {0,  CS6_SW6,  CS5_SW6,  CS4_SW6},
-    {0,  CS6_SW7,  CS5_SW7,  CS4_SW7},
-    {0,  CS6_SW8,  CS5_SW8,  CS4_SW8},
-    {0,  CS6_SW9,  CS5_SW9,  CS4_SW9},
-	{0, CS21_SW9, CS20_SW9, CS19_SW9},
-    {0, CS21_SW8, CS20_SW8, CS19_SW8},
-    {0, CS21_SW7, CS20_SW7, CS19_SW7},
-    {0, CS21_SW6, CS20_SW6, CS19_SW6},
-    {0, CS21_SW5, CS20_SW5, CS19_SW5},
+    {0,  SW1_CS6,  SW1_CS5,  SW1_CS4},
+    {0,  SW2_CS6,  SW2_CS5,  SW2_CS4},
+    {0,  SW3_CS6,  SW3_CS5,  SW3_CS4},
+    {0,  SW4_CS6,  SW4_CS5,  SW4_CS4},
+    {0,  SW5_CS6,  SW5_CS5,  SW5_CS4},
+    {0,  SW6_CS6,  SW6_CS5,  SW6_CS4},
+    {0,  SW7_CS6,  SW7_CS5,  SW7_CS4},
+    {0,  SW8_CS6,  SW8_CS5,  SW8_CS4},
+    {0,  SW9_CS6,  SW9_CS5,  SW9_CS4},
+	{0, SW9_CS21, SW9_CS20, SW9_CS19},
+    {0, SW8_CS21, SW8_CS20, SW8_CS19},
+    {0, SW7_CS21, SW7_CS20, SW7_CS19},
+    {0, SW6_CS21, SW6_CS20, SW6_CS19},
+    {0, SW5_CS21, SW5_CS20, SW5_CS19},
 
-    {0,  CS9_SW1,  CS8_SW1,  CS7_SW1},
-    {0,  CS9_SW2,  CS8_SW2,  CS7_SW2},
-    {0,  CS9_SW3,  CS8_SW3,  CS7_SW3},
-    {0,  CS9_SW4,  CS8_SW4,  CS7_SW4},
-    {0,  CS9_SW5,  CS8_SW5,  CS7_SW5},
-    {0,  CS9_SW6,  CS8_SW6,  CS7_SW6},
-    {0,  CS9_SW7,  CS8_SW7,  CS7_SW7},
-    {0,  CS9_SW8,  CS8_SW8,  CS7_SW8},
-    {0,  CS9_SW9,  CS8_SW9,  CS7_SW9},
-    {0, CS24_SW9, CS23_SW9, CS22_SW9},
-	{0, CS24_SW8, CS23_SW8, CS22_SW8},
-    {0, CS24_SW7, CS23_SW7, CS22_SW7},
-	{0, CS24_SW5, CS23_SW5, CS22_SW5},
+    {0,  SW1_CS9,  SW1_CS8,  SW1_CS7},
+    {0,  SW2_CS9,  SW2_CS8,  SW2_CS7},
+    {0,  SW3_CS9,  SW3_CS8,  SW3_CS7},
+    {0,  SW4_CS9,  SW4_CS8,  SW4_CS7},
+    {0,  SW5_CS9,  SW5_CS8,  SW5_CS7},
+    {0,  SW6_CS9,  SW6_CS8,  SW6_CS7},
+    {0,  SW7_CS9,  SW7_CS8,  SW7_CS7},
+    {0,  SW8_CS9,  SW8_CS8,  SW8_CS7},
+    {0,  SW9_CS9,  SW9_CS8,  SW9_CS7},
+    {0, SW9_CS24, SW9_CS23, SW9_CS22},
+	{0, SW8_CS24, SW8_CS23, SW8_CS22},
+    {0, SW7_CS24, SW7_CS23, SW7_CS22},
+	{0, SW5_CS24, SW5_CS23, SW5_CS22},
 
-    {0, CS12_SW1, CS11_SW1, CS10_SW1},
-    {0, CS12_SW2, CS11_SW2, CS10_SW2},
-    {0, CS12_SW3, CS11_SW3, CS10_SW3},
-    {0, CS12_SW4, CS11_SW4, CS10_SW4},
-    {0, CS12_SW5, CS11_SW5, CS10_SW5},
-    {0, CS12_SW6, CS11_SW6, CS10_SW6},
-    {0, CS12_SW7, CS11_SW7, CS10_SW7},
-    {0, CS12_SW8, CS11_SW8, CS10_SW8},
-    {0, CS12_SW9, CS11_SW9, CS10_SW9},
-    {0, CS27_SW9, CS26_SW9, CS25_SW9},
-    {0, CS27_SW8, CS26_SW8, CS25_SW8},
-	{0, CS27_SW7, CS26_SW7, CS25_SW7},
-    {0, CS27_SW6, CS26_SW6, CS25_SW6},
-    {0, CS27_SW5, CS26_SW5, CS25_SW5},
+    {0, SW1_CS12, SW1_CS11, SW1_CS10},
+    {0, SW2_CS12, SW2_CS11, SW2_CS10},
+    {0, SW3_CS12, SW3_CS11, SW3_CS10},
+    {0, SW4_CS12, SW4_CS11, SW4_CS10},
+    {0, SW5_CS12, SW5_CS11, SW5_CS10},
+    {0, SW6_CS12, SW6_CS11, SW6_CS10},
+    {0, SW7_CS12, SW7_CS11, SW7_CS10},
+    {0, SW8_CS12, SW8_CS11, SW8_CS10},
+    {0, SW9_CS12, SW9_CS11, SW9_CS10},
+    {0, SW9_CS27, SW9_CS26, SW9_CS25},
+    {0, SW8_CS27, SW8_CS26, SW8_CS25},
+	{0, SW7_CS27, SW7_CS26, SW7_CS25},
+    {0, SW6_CS27, SW6_CS26, SW6_CS25},
+    {0, SW5_CS27, SW5_CS26, SW5_CS25},
 
-    {0, CS15_SW1, CS14_SW1, CS13_SW1},
-    {0, CS15_SW2, CS14_SW2, CS13_SW2},
-    {0, CS15_SW3, CS14_SW3, CS13_SW3},
-    {0, CS15_SW6, CS14_SW6, CS13_SW6},
-    {0, CS30_SW9, CS29_SW9, CS28_SW9},
-    {0, CS30_SW8, CS29_SW8, CS28_SW8},
-    {0, CS30_SW7, CS29_SW7, CS28_SW7},
-    {0, CS30_SW6, CS29_SW6, CS28_SW6},
-    {0, CS30_SW5, CS29_SW5, CS28_SW5},
+    {0, SW1_CS15, SW1_CS14, SW1_CS13},
+    {0, SW2_CS15, SW2_CS14, SW2_CS13},
+    {0, SW3_CS15, SW3_CS14, SW3_CS13},
+    {0, SW6_CS15, SW6_CS14, SW6_CS13},
+    {0, SW9_CS30, SW9_CS29, SW9_CS28},
+    {0, SW8_CS30, SW8_CS29, SW8_CS28},
+    {0, SW7_CS30, SW7_CS29, SW7_CS28},
+    {0, SW6_CS30, SW6_CS29, SW6_CS28},
+    {0, SW5_CS30, SW5_CS29, SW5_CS28},
 };
 
 led_config_t g_led_config = {
diff --git a/keyboards/inett_studio/sq80/hotswap_layout_i/info.json b/keyboards/inett_studio/sq80/hotswap_layout_i/info.json
new file mode 100644
index 00000000000..f9e61e716aa
--- /dev/null
+++ b/keyboards/inett_studio/sq80/hotswap_layout_i/info.json
@@ -0,0 +1,129 @@
+{
+    "keyboard_name": "SQUARE 80 % Hotswap Layout I",
+    "manufacturer": "iNETT Studio",
+    "url": "https://geekhack.org/index.php?topic=100769.0",
+    "maintainer": "Wraul",
+    "usb": {
+        "vid": "0x694E",
+        "pid": "0x6060",
+        "device_version": "0.0.1"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "matrix_pins": {
+        "cols": [ "C7", "C6", "B6", "B3", "B4", "D7", "D6", "E6", "F0", "F1", "F4", "F5", "F7", "D5", "D3" ],
+        "rows": ["B0", "B1", "B2", "F6", "B5", "D4"]
+    },
+    "diode_direction": "COL2ROW",
+    "indicators": {
+        "caps_lock": "D0",
+        "scroll_lock": "D1",
+        "num_lock": "D2",
+        "on_state": 0
+    },
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "community_layouts": ["tkl_ansi"],
+    "layouts": {
+        "LAYOUT_tkl_ansi": {
+            "layout": [
+                { "matrix": [0, 0], "x": 0, "y": 0 },
+                { "matrix": [0, 1], "x": 2, "y": 0 },
+                { "matrix": [0, 2], "x": 3, "y": 0 },
+                { "matrix": [0, 3], "x": 4, "y": 0 },
+                { "matrix": [0, 4], "x": 5, "y": 0 },
+                { "matrix": [0, 5], "x": 6.5, "y": 0 },
+                { "matrix": [0, 6], "x": 7.5, "y": 0 },
+                { "matrix": [0, 7], "x": 8.5, "y": 0 },
+                { "matrix": [0, 8], "x": 9.5, "y": 0 },
+                { "matrix": [0, 9], "x": 11, "y": 0 },
+                { "matrix": [0, 10], "x": 12, "y": 0 },
+                { "matrix": [0, 11], "x": 13, "y": 0 },
+                { "matrix": [0, 12], "x": 14, "y": 0 },
+                { "matrix": [0, 13], "x": 15.25, "y": 0 },
+                { "matrix": [0, 14], "x": 16.25, "y": 0 },
+                { "matrix": [3, 14], "x": 17.25, "y": 0 },
+
+                { "matrix": [5, 0], "x": 0, "y": 1.5 },
+                { "matrix": [1, 0], "x": 1, "y": 1.5 },
+                { "matrix": [1, 1], "x": 2, "y": 1.5 },
+                { "matrix": [1, 2], "x": 3, "y": 1.5 },
+                { "matrix": [1, 3], "x": 4, "y": 1.5 },
+                { "matrix": [1, 4], "x": 5, "y": 1.5 },
+                { "matrix": [1, 5], "x": 6, "y": 1.5 },
+                { "matrix": [1, 6], "x": 7, "y": 1.5 },
+                { "matrix": [1, 7], "x": 8, "y": 1.5 },
+                { "matrix": [1, 8], "x": 9, "y": 1.5 },
+                { "matrix": [1, 9], "x": 10, "y": 1.5 },
+                { "matrix": [1, 10], "x": 11, "y": 1.5 },
+                { "matrix": [1, 11], "x": 12, "y": 1.5 },
+                { "matrix": [1, 12], "w": 2, "x": 13, "y": 1.5 },
+                { "matrix": [1, 13], "x": 15.25, "y": 1.5 },
+                { "matrix": [1, 14], "x": 16.25, "y": 1.5 },
+                { "matrix": [3, 13], "x": 17.25, "y": 1.5 },
+
+                { "matrix": [5, 1], "w": 1.5, "x": 0, "y": 2.5 },
+                { "matrix": [2, 0], "x": 1.5, "y": 2.5 },
+                { "matrix": [2, 1], "x": 2.5, "y": 2.5 },
+                { "matrix": [2, 2], "x": 3.5, "y": 2.5 },
+                { "matrix": [2, 3], "x": 4.5, "y": 2.5 },
+                { "matrix": [2, 4], "x": 5.5, "y": 2.5 },
+                { "matrix": [2, 5], "x": 6.5, "y": 2.5 },
+                { "matrix": [2, 6], "x": 7.5, "y": 2.5 },
+                { "matrix": [2, 7], "x": 8.5, "y": 2.5 },
+                { "matrix": [2, 8], "x": 9.5, "y": 2.5 },
+                { "matrix": [2, 9], "x": 10.5, "y": 2.5 },
+                { "matrix": [2, 10], "x": 11.5, "y": 2.5 },
+                { "matrix": [2, 11], "x": 12.5, "y": 2.5 },
+                { "matrix": [2, 12], "w": 1.5, "x": 13.5, "y": 2.5 },
+                { "matrix": [2, 13], "x": 15.25, "y": 2.5 },
+                { "matrix": [2, 14], "x": 16.25, "y": 2.5 },
+                { "matrix": [4, 14], "x": 17.25, "y": 2.5 },
+
+                { "matrix": [5, 2], "w": 1.75, "x": 0, "y": 3.5 },
+                { "matrix": [3, 0], "x": 1.75, "y": 3.5 },
+                { "matrix": [3, 1], "x": 2.75, "y": 3.5 },
+                { "matrix": [3, 2], "x": 3.75, "y": 3.5 },
+                { "matrix": [3, 3], "x": 4.75, "y": 3.5 },
+                { "matrix": [3, 4], "x": 5.75, "y": 3.5 },
+                { "matrix": [3, 5], "x": 6.75, "y": 3.5 },
+                { "matrix": [3, 6], "x": 7.75, "y": 3.5 },
+                { "matrix": [3, 7], "x": 8.75, "y": 3.5 },
+                { "matrix": [3, 8], "x": 9.75, "y": 3.5 },
+                { "matrix": [3, 9], "x": 10.75, "y": 3.5 },
+                { "matrix": [3, 10], "x": 11.75, "y": 3.5 },
+                { "matrix": [3, 11], "w": 2.25, "x": 12.75, "y": 3.5 },
+
+                { "matrix": [5, 3], "w": 2.25, "x": 0, "y": 4.5 },
+                { "matrix": [4, 0], "x": 2.25, "y": 4.5 },
+                { "matrix": [4, 1], "x": 3.25, "y": 4.5 },
+                { "matrix": [4, 2], "x": 4.25, "y": 4.5 },
+                { "matrix": [4, 3], "x": 5.25, "y": 4.5 },
+                { "matrix": [4, 4], "x": 6.25, "y": 4.5 },
+                { "matrix": [4, 5], "x": 7.25, "y": 4.5 },
+                { "matrix": [4, 6], "x": 8.25, "y": 4.5 },
+                { "matrix": [4, 7], "x": 9.25, "y": 4.5 },
+                { "matrix": [4, 8], "x": 10.25, "y": 4.5 },
+                { "matrix": [4, 9], "x": 11.25, "y": 4.5 },
+                { "matrix": [4, 10], "w": 2.75, "x": 12.25, "y": 4.5 },
+                { "matrix": [4, 13], "x": 16.25, "y": 4.5 },
+
+                { "matrix": [5, 4], "w": 1.25, "x": 0, "y": 5.5 },
+                { "matrix": [5, 5], "w": 1.25, "x": 1.25, "y": 5.5 },
+                { "matrix": [5, 6], "w": 1.25, "x": 2.5, "y": 5.5 },
+                { "matrix": [5, 7], "w": 6.25, "x": 3.75, "y": 5.5 },
+                { "matrix": [5, 8], "w": 1.25, "x": 10, "y": 5.5 },
+                { "matrix": [5, 9], "w": 1.25, "x": 11.25, "y": 5.5 },
+                { "matrix": [5, 10], "w": 1.25, "x": 12.5, "y": 5.5 },
+                { "matrix": [5, 11], "w": 1.25, "x": 13.75, "y": 5.5 },
+                { "matrix": [5, 12], "x": 15.25, "y": 5.5 },
+                { "matrix": [5, 13], "x": 16.25, "y": 5.5 },
+                { "matrix": [5, 14], "x": 17.25, "y": 5.5 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/inett_studio/sq80/hotswap_layout_i/keymaps/default/keymap.json b/keyboards/inett_studio/sq80/hotswap_layout_i/keymaps/default/keymap.json
new file mode 100644
index 00000000000..3b3555d62c4
--- /dev/null
+++ b/keyboards/inett_studio/sq80/hotswap_layout_i/keymaps/default/keymap.json
@@ -0,0 +1,18 @@
+{
+    "keyboard": "inett_studio/sq80/hotswap_layout_i",
+    "keymap": "default",
+    "layout": "LAYOUT_tkl_ansi",
+    "layers": [
+        [
+            "KC_ESC",  "KC_F1",   "KC_F2",   "KC_F3",   "KC_F4",              "KC_F5",   "KC_F6",   "KC_F7",   "KC_F8",   "KC_F9",   "KC_F10",  "KC_F11",  "KC_F12",  "KC_PSCR", "KC_SCRL", "KC_PAUS",
+            "KC_GRV",  "KC_1",    "KC_2",    "KC_3",    "KC_4",    "KC_5",    "KC_6",    "KC_7",    "KC_8",    "KC_9",    "KC_0",    "KC_MINS", "KC_EQL",  "KC_BSPC", "KC_INS" , "KC_HOME", "KC_PGUP",
+            "KC_TAB",  "KC_Q",    "KC_W",    "KC_E",    "KC_R",    "KC_T",    "KC_Y",    "KC_U",    "KC_I",    "KC_O",    "KC_P",    "KC_LBRC", "KC_RBRC", "KC_BSLS", "KC_DEL" , "KC_END",  "KC_PGDN",
+            "KC_CAPS", "KC_A",    "KC_S",    "KC_D",    "KC_F",    "KC_G",    "KC_H",    "KC_J",    "KC_K",    "KC_L",    "KC_SCLN", "KC_QUOT",            "KC_ENT",
+            "KC_LSFT", "KC_Z",    "KC_X",    "KC_C",    "KC_V",    "KC_B",    "KC_N",    "KC_M",    "KC_COMM", "KC_DOT",  "KC_SLSH",            "KC_RSFT",                       "KC_UP",
+            "KC_LCTL", "KC_LGUI", "KC_LALT",                       "KC_SPC",                                   "KC_RALT", "KC_RGUI", "KC_APP",  "KC_RCTL",            "KC_LEFT", "KC_DOWN", "KC_RGHT"
+        ]
+    ],
+    "author": "Wraul",
+    "notes": "",
+    "version": 1
+}
diff --git a/keyboards/inett_studio/sq80/hotswap_layout_i/keymaps/via/keymap.json b/keyboards/inett_studio/sq80/hotswap_layout_i/keymaps/via/keymap.json
new file mode 100644
index 00000000000..da50359f649
--- /dev/null
+++ b/keyboards/inett_studio/sq80/hotswap_layout_i/keymaps/via/keymap.json
@@ -0,0 +1,23 @@
+{
+    "keyboard": "inett_studio/sq80/hotswap_layout_i",
+    "keymap": "via",
+    "layout": "LAYOUT_tkl_ansi",
+    "config": {
+        "features": {
+            "via": true
+        }
+    },
+    "layers": [
+        [
+            "KC_ESC",  "KC_F1",   "KC_F2",   "KC_F3",   "KC_F4",              "KC_F5",   "KC_F6",   "KC_F7",   "KC_F8",   "KC_F9",   "KC_F10",  "KC_F11",  "KC_F12",  "KC_PSCR", "KC_SCRL", "KC_PAUS",
+            "KC_GRV",  "KC_1",    "KC_2",    "KC_3",    "KC_4",    "KC_5",    "KC_6",    "KC_7",    "KC_8",    "KC_9",    "KC_0",    "KC_MINS", "KC_EQL",  "KC_BSPC", "KC_INS" , "KC_HOME", "KC_PGUP",
+            "KC_TAB",  "KC_Q",    "KC_W",    "KC_E",    "KC_R",    "KC_T",    "KC_Y",    "KC_U",    "KC_I",    "KC_O",    "KC_P",    "KC_LBRC", "KC_RBRC", "KC_BSLS", "KC_DEL" , "KC_END",  "KC_PGDN",
+            "KC_CAPS", "KC_A",    "KC_S",    "KC_D",    "KC_F",    "KC_G",    "KC_H",    "KC_J",    "KC_K",    "KC_L",    "KC_SCLN", "KC_QUOT",            "KC_ENT",
+            "KC_LSFT", "KC_Z",    "KC_X",    "KC_C",    "KC_V",    "KC_B",    "KC_N",    "KC_M",    "KC_COMM", "KC_DOT",  "KC_SLSH",            "KC_RSFT",                       "KC_UP",
+            "KC_LCTL", "KC_LGUI", "KC_LALT",                       "KC_SPC",                                   "KC_RALT", "KC_RGUI", "KC_APP",  "KC_RCTL",            "KC_LEFT", "KC_DOWN", "KC_RGHT"
+        ]
+    ],
+    "author": "Wraul",
+    "notes": "",
+    "version": 1
+}
diff --git a/keyboards/inett_studio/sq80/hotswap_layout_i/rules.mk b/keyboards/inett_studio/sq80/hotswap_layout_i/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/inett_studio/sq80/hotswap_layout_i/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/inett_studio/sq80/readme.md b/keyboards/inett_studio/sq80/readme.md
new file mode 100644
index 00000000000..5e10ace9043
--- /dev/null
+++ b/keyboards/inett_studio/sq80/readme.md
@@ -0,0 +1,34 @@
+# FOX × iNETT Studio SQUARE 80%
+
+![sq80](https://i.imgur.com/LM1aSMEh.jpg)
+
+_A TKL keyboard from the iNETT Studio's SQUARE series._
+
+-   Keyboard Maintainer: [Wraul](https://github.com/Wraul)
+-   Hardware Supported: The QMK compatible hot swappable PCB offered during the GB
+-   Hardware Availability: [Geekhack Group Buy](https://geekhack.org/index.php?topic=100769.0)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make inett_studio/sq80:default
+
+Flashing example for this keyboard:
+
+    make inett_studio/sq80:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+The PCB is delivered with a forked version of QMK.  
+At this moment it is not apparent if the stock firmware comes with a keybinding for entering the bootloader.
+
+Enter the bootloader with the stock firmware:
+
+-   **Physical reset button**: Briefly press the button on the back of the PCB
+
+After flashing it is possible to enter the bootloader in 3 ways:
+
+-   **Bootmagic reset**: Hold down the escape key and plug in the keyboard
+-   **Physical reset button**: Briefly press the button on the back of the PCB
+-   **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/inett_studio/sq80/rules.mk b/keyboards/inett_studio/sq80/rules.mk
new file mode 100644
index 00000000000..d4f8260d939
--- /dev/null
+++ b/keyboards/inett_studio/sq80/rules.mk
@@ -0,0 +1 @@
+DEFAULT_FOLDER = inett_studio/sq80/hotswap_layout_i
diff --git a/keyboards/inland/kb83/kb83.c b/keyboards/inland/kb83/kb83.c
index 427a9a5e2d0..65093a3c383 100644
--- a/keyboards/inland/kb83/kb83.c
+++ b/keyboards/inland/kb83/kb83.c
@@ -25,107 +25,107 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {1, A_1,   B_1,   C_1},
-    {1, A_2,   B_2,   C_2},
-    {1, A_3,   B_3,   C_3},
-    {1, A_4,   B_4,   C_4},
-    {1, A_5,   B_5,   C_5},
-    {1, A_6,   B_6,   C_6},
-    {1, A_7,   B_7,   C_7},
-    {1, A_8,   B_8,   C_8},
-    {1, A_9,   B_9,   C_9},
-    {1, A_10,  B_10,  C_10},
-    {1, A_11,  B_11,  C_11},
-    {1, A_12,  B_12,  C_12},
-    {1, A_13,  B_13,  C_13},
-    {1, A_14,  B_14,  C_14},
+    {1, CB1_CA1,   CB2_CA1,   CB3_CA1},
+    {1, CB1_CA2,   CB2_CA2,   CB3_CA2},
+    {1, CB1_CA3,   CB2_CA3,   CB3_CA3},
+    {1, CB1_CA4,   CB2_CA4,   CB3_CA4},
+    {1, CB1_CA5,   CB2_CA5,   CB3_CA5},
+    {1, CB1_CA6,   CB2_CA6,   CB3_CA6},
+    {1, CB1_CA7,   CB2_CA7,   CB3_CA7},
+    {1, CB1_CA8,   CB2_CA8,   CB3_CA8},
+    {1, CB1_CA9,   CB2_CA9,   CB3_CA9},
+    {1, CB1_CA10,  CB2_CA10,  CB3_CA10},
+    {1, CB1_CA11,  CB2_CA11,  CB3_CA11},
+    {1, CB1_CA12,  CB2_CA12,  CB3_CA12},
+    {1, CB1_CA13,  CB2_CA13,  CB3_CA13},
+    {1, CB1_CA14,  CB2_CA14,  CB3_CA14},
 
-    {0, A_1,   B_1,   C_1},
-    {0, A_2,   B_2,   C_2},
-    {0, A_3,   B_3,   C_3},
-    {0, A_4,   B_4,   C_4},
-    {0, A_5,   B_5,   C_5},
-    {0, A_6,   B_6,   C_6},
-    {0, A_7,   B_7,   C_7},
-    {0, A_8,   B_8,   C_8},
-    {0, A_9,   B_9,   C_9},
-    {0, A_10,  B_10,  C_10},
-    {0, A_11,  B_11,  C_11},
-    {0, A_12,  B_12,  C_12},
-    {0, A_13,  B_13,  C_13},
-    {0, A_14,  B_14,  C_14},
-    {1, D_1,   E_1,   F_1},
+    {0, CB1_CA1,   CB2_CA1,   CB3_CA1},
+    {0, CB1_CA2,   CB2_CA2,   CB3_CA2},
+    {0, CB1_CA3,   CB2_CA3,   CB3_CA3},
+    {0, CB1_CA4,   CB2_CA4,   CB3_CA4},
+    {0, CB1_CA5,   CB2_CA5,   CB3_CA5},
+    {0, CB1_CA6,   CB2_CA6,   CB3_CA6},
+    {0, CB1_CA7,   CB2_CA7,   CB3_CA7},
+    {0, CB1_CA8,   CB2_CA8,   CB3_CA8},
+    {0, CB1_CA9,   CB2_CA9,   CB3_CA9},
+    {0, CB1_CA10,  CB2_CA10,  CB3_CA10},
+    {0, CB1_CA11,  CB2_CA11,  CB3_CA11},
+    {0, CB1_CA12,  CB2_CA12,  CB3_CA12},
+    {0, CB1_CA13,  CB2_CA13,  CB3_CA13},
+    {0, CB1_CA14,  CB2_CA14,  CB3_CA14},
+    {1, CB4_CA1,   CB5_CA1,   CB6_CA1},
     
-    {0, D_1,   E_1,   F_1},
-    {0, D_2,   E_2,   F_2},
-    {0, D_3,   E_3,   F_3},
-    {0, D_4,   E_4,   F_4},
-    {0, D_5,   E_5,   F_5},
-    {0, D_6,   E_6,   F_6},
-    {0, D_7,   E_7,   F_7},
-    {0, D_8,   E_8,   F_8},
-    {0, D_9,   E_9,   F_9},
-    {0, D_10,  E_10,  F_10},
-    {0, D_11,  E_11,  F_11},
-    {0, D_12,  E_12,  F_12},
-    {0, D_13,  E_13,  F_13},
-    {0, D_14,  E_14,  F_14},
-    {1, D_2,   E_2,   F_2},
+    {0, CB4_CA1,   CB5_CA1,   CB6_CA1},
+    {0, CB4_CA2,   CB5_CA2,   CB6_CA2},
+    {0, CB4_CA3,   CB5_CA3,   CB6_CA3},
+    {0, CB4_CA4,   CB5_CA4,   CB6_CA4},
+    {0, CB4_CA5,   CB5_CA5,   CB6_CA5},
+    {0, CB4_CA6,   CB5_CA6,   CB6_CA6},
+    {0, CB4_CA7,   CB5_CA7,   CB6_CA7},
+    {0, CB4_CA8,   CB5_CA8,   CB6_CA8},
+    {0, CB4_CA9,   CB5_CA9,   CB6_CA9},
+    {0, CB4_CA10,  CB5_CA10,  CB6_CA10},
+    {0, CB4_CA11,  CB5_CA11,  CB6_CA11},
+    {0, CB4_CA12,  CB5_CA12,  CB6_CA12},
+    {0, CB4_CA13,  CB5_CA13,  CB6_CA13},
+    {0, CB4_CA14,  CB5_CA14,  CB6_CA14},
+    {1, CB4_CA2,   CB5_CA2,   CB6_CA2},
 
-    {0, G_1,   H_1,   I_1},
-    {0, G_2,   H_2,   I_2},
-    {0, G_3,   H_3,   I_3},
-    {0, G_4,   H_4,   I_4},
-    {0, G_5,   H_5,   I_5},
-    {0, G_6,   H_6,   I_6},
-    {0, G_7,   H_7,   I_7},
-    {0, G_8,   H_8,   I_8},
-    {0, G_9,   H_9,   I_9},
-    {0, G_10,  H_10,  I_10},
-    {0, G_11,  H_11,  I_11},
-    {0, G_12,  H_12,  I_12},
-    {0, G_13,  H_13,  I_13},
-    {1, D_3,   E_3,   F_3},
+    {0, CB7_CA1,   CB8_CA1,   CB9_CA1},
+    {0, CB7_CA2,   CB8_CA2,   CB9_CA2},
+    {0, CB7_CA3,   CB8_CA3,   CB9_CA3},
+    {0, CB7_CA4,   CB8_CA4,   CB9_CA4},
+    {0, CB7_CA5,   CB8_CA5,   CB9_CA5},
+    {0, CB7_CA6,   CB8_CA6,   CB9_CA6},
+    {0, CB7_CA7,   CB8_CA7,   CB9_CA7},
+    {0, CB7_CA8,   CB8_CA8,   CB9_CA8},
+    {0, CB7_CA9,   CB8_CA9,   CB9_CA9},
+    {0, CB7_CA10,  CB8_CA10,  CB9_CA10},
+    {0, CB7_CA11,  CB8_CA11,  CB9_CA11},
+    {0, CB7_CA12,  CB8_CA12,  CB9_CA12},
+    {0, CB7_CA13,  CB8_CA13,  CB9_CA13},
+    {1, CB4_CA3,   CB5_CA3,   CB6_CA3},
  
-    {0, J_1,   K_1,   L_1},
-    {0, J_2,   K_2,   L_2},
-    {0, J_3,   K_3,   L_3},
-    {0, J_4,   K_4,   L_4},
-    {0, J_5,   K_5,   L_5},
-    {0, J_6,   K_6,   L_6},
-    {0, J_7,   K_7,   L_7},
-    {0, J_8,   K_8,   L_8},
-    {0, J_9,   K_9,   L_9},
-    {0, J_10,  K_10,  L_10},
-    {0, J_11,  K_11,  L_11},
-    {0, J_12,  K_12,  L_12},
-    {1, D_7,   E_7,   F_7},
-    {1, D_4,   E_4,   F_4},
+    {0, CB10_CA1,   CB11_CA1,   CB12_CA1},
+    {0, CB10_CA2,   CB11_CA2,   CB12_CA2},
+    {0, CB10_CA3,   CB11_CA3,   CB12_CA3},
+    {0, CB10_CA4,   CB11_CA4,   CB12_CA4},
+    {0, CB10_CA5,   CB11_CA5,   CB12_CA5},
+    {0, CB10_CA6,   CB11_CA6,   CB12_CA6},
+    {0, CB10_CA7,   CB11_CA7,   CB12_CA7},
+    {0, CB10_CA8,   CB11_CA8,   CB12_CA8},
+    {0, CB10_CA9,   CB11_CA9,   CB12_CA9},
+    {0, CB10_CA10,  CB11_CA10,  CB12_CA10},
+    {0, CB10_CA11,  CB11_CA11,  CB12_CA11},
+    {0, CB10_CA12,  CB11_CA12,  CB12_CA12},
+    {1, CB4_CA7,   CB5_CA7,   CB6_CA7},
+    {1, CB4_CA4,   CB5_CA4,   CB6_CA4},
 
-    {0, J_13,  K_13,  L_13},
-    {0, J_14,  K_14,  L_14},
-    {0, J_15,  K_15,  L_15},
-    {0, J_16,  K_16,  L_16},
+    {0, CB10_CA13,  CB11_CA13,  CB12_CA13},
+    {0, CB10_CA14,  CB11_CA14,  CB12_CA14},
+    {0, CB10_CA15,  CB11_CA15,  CB12_CA15},
+    {0, CB10_CA16,  CB11_CA16,  CB12_CA16},
 
-    {0, G_14,  H_14,  I_14},
-    {0, G_15,  H_15,  I_15},
-    {0, G_16,  H_16,  I_16},
+    {0, CB7_CA14,  CB8_CA14,  CB9_CA14},
+    {0, CB7_CA15,  CB8_CA15,  CB9_CA15},
+    {0, CB7_CA16,  CB8_CA16,  CB9_CA16},
 
-    {0, D_15,  E_15,  F_15},
-    {1, D_6,   E_6,   F_6},
-    {1, D_5,   E_5,   F_5},
+    {0, CB4_CA15,  CB5_CA15,  CB6_CA15},
+    {1, CB4_CA6,   CB5_CA6,   CB6_CA6},
+    {1, CB4_CA5,   CB5_CA5,   CB6_CA5},
 
-    {1, G_1,   H_1,   I_1},
-    {1, G_2,   H_2,   I_2},
-    {1, G_3,   H_3,   I_3},
-    {1, G_4,   H_4,   I_4},
-    {1, G_5,   H_5,   I_5},
+    {1, CB7_CA1,   CB8_CA1,   CB9_CA1},
+    {1, CB7_CA2,   CB8_CA2,   CB9_CA2},
+    {1, CB7_CA3,   CB8_CA3,   CB9_CA3},
+    {1, CB7_CA4,   CB8_CA4,   CB9_CA4},
+    {1, CB7_CA5,   CB8_CA5,   CB9_CA5},
    
-    {1, J_1,   K_1,   L_1},
-    {1, J_2,   K_2,   L_2},
-    {1, J_3,   K_3,   L_3},
-    {1, J_4,   K_4,   L_4},
-    {1, J_5,   K_5,   L_5},
+    {1, CB10_CA1,   CB11_CA1,   CB12_CA1},
+    {1, CB10_CA2,   CB11_CA2,   CB12_CA2},
+    {1, CB10_CA3,   CB11_CA3,   CB12_CA3},
+    {1, CB10_CA4,   CB11_CA4,   CB12_CA4},
+    {1, CB10_CA5,   CB11_CA5,   CB12_CA5},
 };
 
 led_config_t g_led_config = {
diff --git a/keyboards/inland/mk47/mk47.c b/keyboards/inland/mk47/mk47.c
index 959330e6f83..ca417af19f2 100644
--- a/keyboards/inland/mk47/mk47.c
+++ b/keyboards/inland/mk47/mk47.c
@@ -23,56 +23,56 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, D_1,   E_1,   F_1},
-    {0, D_2,   E_2,   F_2},
-    {0, D_3,   E_3,   F_3},
-    {0, D_4,   E_4,   F_4},
-    {0, D_5,   E_5,   F_5},
-    {0, D_6,   E_6,   F_6},
-    {0, D_7,   E_7,   F_7},
-    {0, D_8,   E_8,   F_8},
-    {0, D_9,   E_9,   F_9},
-    {0, D_10,  E_10,  F_10},
-    {0, D_11,  E_11,  F_11},
-    {0, D_12,  E_12,  F_12},
+    {0, CB4_CA1,   CB5_CA1,   CB6_CA1},
+    {0, CB4_CA2,   CB5_CA2,   CB6_CA2},
+    {0, CB4_CA3,   CB5_CA3,   CB6_CA3},
+    {0, CB4_CA4,   CB5_CA4,   CB6_CA4},
+    {0, CB4_CA5,   CB5_CA5,   CB6_CA5},
+    {0, CB4_CA6,   CB5_CA6,   CB6_CA6},
+    {0, CB4_CA7,   CB5_CA7,   CB6_CA7},
+    {0, CB4_CA8,   CB5_CA8,   CB6_CA8},
+    {0, CB4_CA9,   CB5_CA9,   CB6_CA9},
+    {0, CB4_CA10,  CB5_CA10,  CB6_CA10},
+    {0, CB4_CA11,  CB5_CA11,  CB6_CA11},
+    {0, CB4_CA12,  CB5_CA12,  CB6_CA12},
 
-    {0, G_1,   H_1,   I_1},
-    {0, G_2,   H_2,   I_2},
-    {0, G_3,   H_3,   I_3},
-    {0, G_4,   H_4,   I_4},
-    {0, G_5,   H_5,   I_5},
-    {0, G_6,   H_6,   I_6},
-    {0, G_7,   H_7,   I_7},
-    {0, G_8,   H_8,   I_8},
-    {0, G_9,   H_9,   I_9},
-    {0, G_10,  H_10,  I_10},
-    {0, G_11,  H_11,  I_11},
-    {0, G_12,  H_12,  I_12},
+    {0, CB7_CA1,   CB8_CA1,   CB9_CA1},
+    {0, CB7_CA2,   CB8_CA2,   CB9_CA2},
+    {0, CB7_CA3,   CB8_CA3,   CB9_CA3},
+    {0, CB7_CA4,   CB8_CA4,   CB9_CA4},
+    {0, CB7_CA5,   CB8_CA5,   CB9_CA5},
+    {0, CB7_CA6,   CB8_CA6,   CB9_CA6},
+    {0, CB7_CA7,   CB8_CA7,   CB9_CA7},
+    {0, CB7_CA8,   CB8_CA8,   CB9_CA8},
+    {0, CB7_CA9,   CB8_CA9,   CB9_CA9},
+    {0, CB7_CA10,  CB8_CA10,  CB9_CA10},
+    {0, CB7_CA11,  CB8_CA11,  CB9_CA11},
+    {0, CB7_CA12,  CB8_CA12,  CB9_CA12},
 
-    {0, J_1,   K_1,   L_1},
-    {0, J_2,   K_2,   L_2},
-    {0, J_3,   K_3,   L_3},
-    {0, J_4,   K_4,   L_4},
-    {0, J_5,   K_5,   L_5},
-    {0, J_6,   K_6,   L_6},
-    {0, J_7,   K_7,   L_7},
-    {0, J_8,   K_8,   L_8},
-    {0, J_9,   K_9,   L_9},
-    {0, J_10,  K_10,  L_10},
-    {0, J_11,  K_11,  L_11},
-    {0, J_12,  K_12,  L_12},
+    {0, CB10_CA1,   CB11_CA1,   CB12_CA1},
+    {0, CB10_CA2,   CB11_CA2,   CB12_CA2},
+    {0, CB10_CA3,   CB11_CA3,   CB12_CA3},
+    {0, CB10_CA4,   CB11_CA4,   CB12_CA4},
+    {0, CB10_CA5,   CB11_CA5,   CB12_CA5},
+    {0, CB10_CA6,   CB11_CA6,   CB12_CA6},
+    {0, CB10_CA7,   CB11_CA7,   CB12_CA7},
+    {0, CB10_CA8,   CB11_CA8,   CB12_CA8},
+    {0, CB10_CA9,   CB11_CA9,   CB12_CA9},
+    {0, CB10_CA10,  CB11_CA10,  CB12_CA10},
+    {0, CB10_CA11,  CB11_CA11,  CB12_CA11},
+    {0, CB10_CA12,  CB11_CA12,  CB12_CA12},
 
-    {0, J_13,  K_13,  L_13},
-    {0, J_14,  K_14,  L_14},
-    {0, J_15,  K_15,  L_15},
-    {0, J_16,  K_16,  L_16},
-    {0, D_13,  E_13,  F_13},
-    {0, D_14,  E_14,  F_14},
-    {0, D_15,  E_15,  F_15},
-    {0, G_13,  H_13,  I_13},
-    {0, G_14,  H_14,  I_14},
-    {0, G_15,  H_15,  I_15},
-    {0, G_16,  H_16,  I_16},
+    {0, CB10_CA13,  CB11_CA13,  CB12_CA13},
+    {0, CB10_CA14,  CB11_CA14,  CB12_CA14},
+    {0, CB10_CA15,  CB11_CA15,  CB12_CA15},
+    {0, CB10_CA16,  CB11_CA16,  CB12_CA16},
+    {0, CB4_CA13,  CB5_CA13,  CB6_CA13},
+    {0, CB4_CA14,  CB5_CA14,  CB6_CA14},
+    {0, CB4_CA15,  CB5_CA15,  CB6_CA15},
+    {0, CB7_CA13,  CB8_CA13,  CB9_CA13},
+    {0, CB7_CA14,  CB8_CA14,  CB9_CA14},
+    {0, CB7_CA15,  CB8_CA15,  CB9_CA15},
+    {0, CB7_CA16,  CB8_CA16,  CB9_CA16},
 };
 
 #endif
diff --git a/keyboards/inland/v83p/v83p.c b/keyboards/inland/v83p/v83p.c
index d0440036150..e14b082ceb8 100644
--- a/keyboards/inland/v83p/v83p.c
+++ b/keyboards/inland/v83p/v83p.c
@@ -12,107 +12,107 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |   |     G location
  *   |   |     |     B location
  *   |   |     |     | */
-    {1, A_1,   B_1,   C_1},
-    {1, A_2,   B_2,   C_2},
-    {1, A_3,   B_3,   C_3},
-    {1, A_4,   B_4,   C_4},
-    {1, A_5,   B_5,   C_5},
-    {1, A_6,   B_6,   C_6},
-    {1, A_7,   B_7,   C_7},
-    {1, A_8,   B_8,   C_8},
-    {1, A_9,   B_9,   C_9},
-    {1, A_10,  B_10,  C_10},
-    {1, A_11,  B_11,  C_11},
-    {1, A_12,  B_12,  C_12},
-    {1, A_13,  B_13,  C_13},
-    {1, A_14,  B_14,  C_14},
+    {1, CB1_CA1,   CB2_CA1,   CB3_CA1},
+    {1, CB1_CA2,   CB2_CA2,   CB3_CA2},
+    {1, CB1_CA3,   CB2_CA3,   CB3_CA3},
+    {1, CB1_CA4,   CB2_CA4,   CB3_CA4},
+    {1, CB1_CA5,   CB2_CA5,   CB3_CA5},
+    {1, CB1_CA6,   CB2_CA6,   CB3_CA6},
+    {1, CB1_CA7,   CB2_CA7,   CB3_CA7},
+    {1, CB1_CA8,   CB2_CA8,   CB3_CA8},
+    {1, CB1_CA9,   CB2_CA9,   CB3_CA9},
+    {1, CB1_CA10,  CB2_CA10,  CB3_CA10},
+    {1, CB1_CA11,  CB2_CA11,  CB3_CA11},
+    {1, CB1_CA12,  CB2_CA12,  CB3_CA12},
+    {1, CB1_CA13,  CB2_CA13,  CB3_CA13},
+    {1, CB1_CA14,  CB2_CA14,  CB3_CA14},
 
-    {0, A_1,   B_1,   C_1},
-    {0, A_2,   B_2,   C_2},
-    {0, A_3,   B_3,   C_3},
-    {0, A_4,   B_4,   C_4},
-    {0, A_5,   B_5,   C_5},
-    {0, A_6,   B_6,   C_6},
-    {0, A_7,   B_7,   C_7},
-    {0, A_8,   B_8,   C_8},
-    {0, A_9,   B_9,   C_9},
-    {0, A_10,  B_10,  C_10},
-    {0, A_11,  B_11,  C_11},
-    {0, A_12,  B_12,  C_12},
-    {0, A_13,  B_13,  C_13},
-    {0, A_14,  B_14,  C_14},
-    {1, D_1,   E_1,   F_1},
+    {0, CB1_CA1,   CB2_CA1,   CB3_CA1},
+    {0, CB1_CA2,   CB2_CA2,   CB3_CA2},
+    {0, CB1_CA3,   CB2_CA3,   CB3_CA3},
+    {0, CB1_CA4,   CB2_CA4,   CB3_CA4},
+    {0, CB1_CA5,   CB2_CA5,   CB3_CA5},
+    {0, CB1_CA6,   CB2_CA6,   CB3_CA6},
+    {0, CB1_CA7,   CB2_CA7,   CB3_CA7},
+    {0, CB1_CA8,   CB2_CA8,   CB3_CA8},
+    {0, CB1_CA9,   CB2_CA9,   CB3_CA9},
+    {0, CB1_CA10,  CB2_CA10,  CB3_CA10},
+    {0, CB1_CA11,  CB2_CA11,  CB3_CA11},
+    {0, CB1_CA12,  CB2_CA12,  CB3_CA12},
+    {0, CB1_CA13,  CB2_CA13,  CB3_CA13},
+    {0, CB1_CA14,  CB2_CA14,  CB3_CA14},
+    {1, CB4_CA1,   CB5_CA1,   CB6_CA1},
 
-    {0, D_1,   E_1,   F_1},
-    {0, D_2,   E_2,   F_2},
-    {0, D_3,   E_3,   F_3},
-    {0, D_4,   E_4,   F_4},
-    {0, D_5,   E_5,   F_5},
-    {0, D_6,   E_6,   F_6},
-    {0, D_7,   E_7,   F_7},
-    {0, D_8,   E_8,   F_8},
-    {0, D_9,   E_9,   F_9},
-    {0, D_10,  E_10,  F_10},
-    {0, D_11,  E_11,  F_11},
-    {0, D_12,  E_12,  F_12},
-    {0, D_13,  E_13,  F_13},
-    {0, D_14,  E_14,  F_14},
-    {1, D_2,   E_2,   F_2},
+    {0, CB4_CA1,   CB5_CA1,   CB6_CA1},
+    {0, CB4_CA2,   CB5_CA2,   CB6_CA2},
+    {0, CB4_CA3,   CB5_CA3,   CB6_CA3},
+    {0, CB4_CA4,   CB5_CA4,   CB6_CA4},
+    {0, CB4_CA5,   CB5_CA5,   CB6_CA5},
+    {0, CB4_CA6,   CB5_CA6,   CB6_CA6},
+    {0, CB4_CA7,   CB5_CA7,   CB6_CA7},
+    {0, CB4_CA8,   CB5_CA8,   CB6_CA8},
+    {0, CB4_CA9,   CB5_CA9,   CB6_CA9},
+    {0, CB4_CA10,  CB5_CA10,  CB6_CA10},
+    {0, CB4_CA11,  CB5_CA11,  CB6_CA11},
+    {0, CB4_CA12,  CB5_CA12,  CB6_CA12},
+    {0, CB4_CA13,  CB5_CA13,  CB6_CA13},
+    {0, CB4_CA14,  CB5_CA14,  CB6_CA14},
+    {1, CB4_CA2,   CB5_CA2,   CB6_CA2},
 
-    {0, G_1,   H_1,   I_1},
-    {0, G_2,   H_2,   I_2},
-    {0, G_3,   H_3,   I_3},
-    {0, G_4,   H_4,   I_4},
-    {0, G_5,   H_5,   I_5},
-    {0, G_6,   H_6,   I_6},
-    {0, G_7,   H_7,   I_7},
-    {0, G_8,   H_8,   I_8},
-    {0, G_9,   H_9,   I_9},
-    {0, G_10,  H_10,  I_10},
-    {0, G_11,  H_11,  I_11},
-    {0, G_12,  H_12,  I_12},
-    {0, G_13,  H_13,  I_13},
-    {1, D_3,   E_3,   F_3},
+    {0, CB7_CA1,   CB8_CA1,   CB9_CA1},
+    {0, CB7_CA2,   CB8_CA2,   CB9_CA2},
+    {0, CB7_CA3,   CB8_CA3,   CB9_CA3},
+    {0, CB7_CA4,   CB8_CA4,   CB9_CA4},
+    {0, CB7_CA5,   CB8_CA5,   CB9_CA5},
+    {0, CB7_CA6,   CB8_CA6,   CB9_CA6},
+    {0, CB7_CA7,   CB8_CA7,   CB9_CA7},
+    {0, CB7_CA8,   CB8_CA8,   CB9_CA8},
+    {0, CB7_CA9,   CB8_CA9,   CB9_CA9},
+    {0, CB7_CA10,  CB8_CA10,  CB9_CA10},
+    {0, CB7_CA11,  CB8_CA11,  CB9_CA11},
+    {0, CB7_CA12,  CB8_CA12,  CB9_CA12},
+    {0, CB7_CA13,  CB8_CA13,  CB9_CA13},
+    {1, CB4_CA3,   CB5_CA3,   CB6_CA3},
 
-    {0, J_1,   K_1,   L_1},
-    {0, J_2,   K_2,   L_2},
-    {0, J_3,   K_3,   L_3},
-    {0, J_4,   K_4,   L_4},
-    {0, J_5,   K_5,   L_5},
-    {0, J_6,   K_6,   L_6},
-    {0, J_7,   K_7,   L_7},
-    {0, J_8,   K_8,   L_8},
-    {0, J_9,   K_9,   L_9},
-    {0, J_10,  K_10,  L_10},
-    {0, J_11,  K_11,  L_11},
-    {0, J_12,  K_12,  L_12},
-    {1, D_7,   E_7,   F_7},
-    {1, D_4,   E_4,   F_4},
+    {0, CB10_CA1,   CB11_CA1,   CB12_CA1},
+    {0, CB10_CA2,   CB11_CA2,   CB12_CA2},
+    {0, CB10_CA3,   CB11_CA3,   CB12_CA3},
+    {0, CB10_CA4,   CB11_CA4,   CB12_CA4},
+    {0, CB10_CA5,   CB11_CA5,   CB12_CA5},
+    {0, CB10_CA6,   CB11_CA6,   CB12_CA6},
+    {0, CB10_CA7,   CB11_CA7,   CB12_CA7},
+    {0, CB10_CA8,   CB11_CA8,   CB12_CA8},
+    {0, CB10_CA9,   CB11_CA9,   CB12_CA9},
+    {0, CB10_CA10,  CB11_CA10,  CB12_CA10},
+    {0, CB10_CA11,  CB11_CA11,  CB12_CA11},
+    {0, CB10_CA12,  CB11_CA12,  CB12_CA12},
+    {1, CB4_CA7,   CB5_CA7,   CB6_CA7},
+    {1, CB4_CA4,   CB5_CA4,   CB6_CA4},
 
-    {0, J_13,  K_13,  L_13},
-    {0, J_14,  K_14,  L_14},
-    {0, J_15,  K_15,  L_15},
-    {0, J_16,  K_16,  L_16},
+    {0, CB10_CA13,  CB11_CA13,  CB12_CA13},
+    {0, CB10_CA14,  CB11_CA14,  CB12_CA14},
+    {0, CB10_CA15,  CB11_CA15,  CB12_CA15},
+    {0, CB10_CA16,  CB11_CA16,  CB12_CA16},
 
-    {0, G_14,  H_14,  I_14},
-    {0, G_15,  H_15,  I_15},
-    {0, G_16,  H_16,  I_16},
+    {0, CB7_CA14,  CB8_CA14,  CB9_CA14},
+    {0, CB7_CA15,  CB8_CA15,  CB9_CA15},
+    {0, CB7_CA16,  CB8_CA16,  CB9_CA16},
 
-    {0, D_15,  E_15,  F_15},
-    {1, D_6,   E_6,   F_6},
-    {1, D_5,   E_5,   F_5},
+    {0, CB4_CA15,  CB5_CA15,  CB6_CA15},
+    {1, CB4_CA6,   CB5_CA6,   CB6_CA6},
+    {1, CB4_CA5,   CB5_CA5,   CB6_CA5},
 
-    {1, G_1,   H_1,   I_1},
-    {1, G_2,   H_2,   I_2},
-    {1, G_3,   H_3,   I_3},
-    {1, G_4,   H_4,   I_4},
-    {1, G_5,   H_5,   I_5},
+    {1, CB7_CA1,   CB8_CA1,   CB9_CA1},
+    {1, CB7_CA2,   CB8_CA2,   CB9_CA2},
+    {1, CB7_CA3,   CB8_CA3,   CB9_CA3},
+    {1, CB7_CA4,   CB8_CA4,   CB9_CA4},
+    {1, CB7_CA5,   CB8_CA5,   CB9_CA5},
 
-    {1, J_1,   K_1,   L_1},
-    {1, J_2,   K_2,   L_2},
-    {1, J_3,   K_3,   L_3},
-    {1, J_4,   K_4,   L_4},
-    {1, J_5,   K_5,   L_5},
+    {1, CB10_CA1,   CB11_CA1,   CB12_CA1},
+    {1, CB10_CA2,   CB11_CA2,   CB12_CA2},
+    {1, CB10_CA3,   CB11_CA3,   CB12_CA3},
+    {1, CB10_CA4,   CB11_CA4,   CB12_CA4},
+    {1, CB10_CA5,   CB11_CA5,   CB12_CA5},
 };
 #endif
 
diff --git a/keyboards/input_club/ergodox_infinity/keymaps/nordic_ergo/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/nordic_ergo/keymap.c
deleted file mode 100644
index ec3972c0ae5..00000000000
--- a/keyboards/input_club/ergodox_infinity/keymaps/nordic_ergo/keymap.c
+++ /dev/null
@@ -1,243 +0,0 @@
-// Nordic layout for Ergodox infinity
-#include QMK_KEYBOARD_H
-#include "version.h"
-#include "keymap_nordic.h"
-#include "keymap_german.h"
-
-enum layer_names {
-    BASE,
-    FUNCL,
-    SYMB,
-    MDIA
-};
-
-enum custom_keycodes {
-    VRSN = SAFE_RANGE,
-    RGB_SLD
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Keymap 0: Basic layer
- *
- *
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |  Esc   |   1  |   2  |   3  |   4  |   5  |  §½  |           | PRSC |   6  |   7  |   8  |   9  |   0  |   -    |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |  Tab   |   Q  |   W  |   E  |   R  |   T  |  L1  |           |  L1  |   Y  |   U  |   I  |   O  |   P  |   Å    |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |  Caps  |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |   Ö  |   Ä    |
- * |--------+------+------+------+------+------|  L2  |           |  L2  |------+------+------+------+------+--------|
- * | LShift |   Z  |   X  |   C  |   V  |   B  |      |           |      |   N  |   M  |   ,  |   .  |  -   | RShift |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   | Ctrl |  ¨^  |  <|>  | LGui | Alt  |                                       | Ctrl |  Alt  |  ´`  |   +  | RGui |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        | LEFT |RIGHT |       | DOWN | UP   |
- *                                 ,------+------+------|       |------+--------+------.
- *                                 |      |      | Home |       | PgUp |        |      |
- *                                 | Space|Del   |------|       |------|  Enter | Bkspc|
- *                                 |      |      | End  |       | PgDn |        |      |
- *                                 `--------------------'       `----------------------'
- */
-
-[BASE] = LAYOUT_ergodox(  // layer 0 : default
-    // left hand
-    KC_ESC,   KC_1,   KC_2,   KC_3,   KC_4,  KC_5,   KC_GRV,
-    KC_TAB,   KC_Q,   KC_W,   KC_E,   KC_R,  KC_T,   TG(1),
-    KC_CAPS,  KC_A,   KC_S,   KC_D,   KC_F,  KC_G,
-    KC_LSFT,  KC_Z,   KC_X,   KC_C,   KC_V,  KC_B,   MO(2),
-    KC_LCTL,  MO(3),  KC_EQL, KC_LGUI, KC_LALT,
-                                            KC_NUM,   KC_SCRL,
-                                            KC_HOME,
-                                            KC_SPC,   KC_DEL, KC_END,
-
-    // right hand
-    KC_BSLS,  KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,
-    TG(1),    KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC,
-              KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,
-    MO(2),    KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,KC_NUBS,
-    KC_LEFT,  KC_DOWN, KC_UP, KC_RIGHT, KC_RBRC,
-    KC_RGUI,  KC_RALT,
-    KC_PGUP,
-    KC_PGDN,  KC_ENT, KC_BSPC
-),
-/* Keymap 1: Basic layer with functions
- *
- *
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |        |  F1  |  F2  |  F3  |  F4  |  F5  |  F11 |           | F12  |  F6  |  F7  |  F8  |  F9  |   0  |        |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |      |      |      |      |------|           |------|      |      |      |      |      |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |  ¨   |       |     |       |                                       |      |       |      |      |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
- *                                 ,------+------+------|       |------+--------+------.
- *                                 |      |      |      |       |      |        |      |
- *                                 |      |      |------|       |------|        |      |
- *                                 |      |      |      |       |      |        |      |
- *                                 `--------------------'       `----------------------'
- */
-
-[FUNCL] = LAYOUT_ergodox(  // layer 1 : functions
-    // left hand
-    _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F11,
-    _______,  _______,  _______,  _______,  _______,  _______,  _______,
-    _______,  _______,  _______,  _______,  _______,  _______,
-    _______,  _______,  _______,  _______,  _______,  _______,  _______,
-    _______,  _______,  _______,  _______,  _______,
-                                            _______,  _______,
-                                            _______,
-                                            _______,  _______,  _______,
-    // right hand
-    KC_F12,   KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   _______,
-    _______,  _______,  _______,  _______,  _______,  _______,  _______,
-    _______,  _______,  _______,  _______,  _______,  _______,
-    _______,  _______,  _______,  _______,  _______,  _______,  _______,
-    _______,  _______,  _______,  _______,  _______,
-    _______,  _______,
-    _______,
-    _______,  _______,  _______
-),
-
-/* Keymap 2: Symbol Layer
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |        |  F1  |  F2  |  F3  |  F4  |  F5  |      |           |      |  F6  |  F7  |  F8  |  F9  |  F10 |   F11  |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |   !  |   @  |   {  |   }  |   |  |      |           |      |   Up |   7  |   8  |   9  |   *  |   F12  |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |   #  |   $  |   (  |   )  |   `  |------|           |------| Down |   4  |   5  |   6  |   +  |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |   %  |   ^  |   [  |   ]  |   ~  |      |           |      |   &  |   1  |   2  |   3  |   \  |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      |      |      |                                       |      |    . |   0  |   =  |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |Animat| BLTOG|       |Toggle|Solid |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |Bright|Bright|  BL+ |       |      |Hue-  |Hue+  |
- *                                 |ness- |ness+ |------|       |------|      |      |
- *                                 |      |      |  BL- |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-// SYMBOLS
-[SYMB] = LAYOUT_ergodox(
-   // left hand
-   _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F11,
-   _______,  DE_EXLM,  DE_AT,    DE_LCBR,  DE_RCBR,  DE_PIPE,  _______,
-   _______,  DE_HASH,  DE_DLR,   DE_LPRN,  DE_RPRN,  DE_GRV,
-   _______,  DE_PERC,  DE_CIRC,  DE_LBRC,  DE_RBRC,  DE_TILD,  _______,
-   _______,  _______,  _______,  _______,  _______,
-                                           RGB_MOD,  BL_TOGG,
-                                           BL_UP, 
-                                           RGB_VAD,  RGB_VAI,  BL_DOWN,
-   // right hand
-   KC_F12,   KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,
-   _______,  KC_UP,    KC_7,     KC_8,     KC_9,     DE_ASTR,  _______,
-             KC_DOWN,  KC_4,     KC_5,     KC_6,     DE_PLUS,  _______,
-   _______,  DE_AMPR,  KC_1,     KC_2,     KC_3,     DE_BSLS,  _______,
-   _______,  KC_DOT,   KC_0,     DE_EQL,   _______,
-   RGB_TOG,  RGB_SLD,
-   _______,
-   _______,  RGB_HUD,  RGB_HUI
-),
-
-/* Keymap 3: Media and mouse keys
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * | QK_BOOT  |  F1  |  F2  |  F3  |  F4  |  F5  |      |           |      |  F6  |  F7  |  F8  |  F9  |  F10 |   F11  |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |      | Lclk | MsUp | Rclk |      |      |           |      |      |VolDwn| Mute |VolUp |      |   F12  |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        | Btn4 |MsLeft|MsDown|MsRght| Btn5 |------|           |------|      | Prev | Stop | Play | Next |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |WhRght|WhDown| WhUp |WhLeft|WhClk |      |           |      |BwSrch|BwBack|BwHome|BwRefr|BwFwd |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |MsAcl0|MsAcl1|MsAcl2|                                       |      |      |      |      |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       |      |Brwser|Brwser|
- *                                 | Lclk | Rclk |------|       |------|Back  |Forwd |
- *                                 |      |      |      |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-
-// MEDIA AND MOUSE
-[MDIA] = LAYOUT_ergodox(
-   QK_BOOT,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F11,
-   _______,  _______,  KC_BTN1,  KC_MS_U,  KC_BTN2,  _______,  _______,
-   _______,  KC_BTN4,  KC_MS_L,  KC_MS_D,  KC_MS_R,  KC_BTN5,
-   _______,  KC_WH_L,  KC_WH_D,  KC_WH_U,  KC_WH_R,  KC_BTN3,  _______,
-   _______,  _______,  KC_ACL0,  KC_ACL1,  KC_ACL2,
-                                           _______,  _______,
-                                           _______,
-                                           KC_BTN1,  KC_BTN2,  _______,
-   // right hand
-   KC_F12,   KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   _______,
-   _______, _______,   KC_VOLD,  KC_MUTE,  KC_VOLU,  _______,  _______,
-            _______,   KC_MPRV,  KC_MSTP,  KC_MPLY,  KC_MNXT,  _______,
-   _______, KC_WSCH,   KC_WBAK,  KC_WHOM,  KC_WREF,  KC_WFWD,  _______,
-   _______, _______,   _______,  _______,  _______,
-   _______, _______,
-   _______,
-   _______, KC_WBAK, KC_WFWD
-),
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case VRSN:
-            if (record->event.pressed) {
-                SEND_STRING(QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
-            }
-            return false;
-            break;
-        case RGB_SLD:
-            if (record->event.pressed) {
-#ifdef RGBLIGHT_ENABLE
-                rgblight_mode(1);
-#endif
-            }
-            return false;
-            break;
-    }
-    return true;
-}
-
-// Runs just one time when the keyboard initializes.
-void matrix_init_user(void){
-
-};
-
-// Runs constantly in the background, in a loop.
-void matrix_scan_user(void) {
-    uint8_t layer = get_highest_layer(layer_state);
-
-    ergodox_board_led_off();
-    ergodox_right_led_1_off();
-    ergodox_right_led_2_off();
-    ergodox_right_led_3_off();
-    switch (layer) {
-        case 1:
-            ergodox_right_led_1_on();
-            break;
-        case 2:
-            ergodox_right_led_2_on();
-            break;
-        case 3:
-            ergodox_right_led_3_on();
-            break;
-        default:
-            break;
-    }
-};
diff --git a/keyboards/input_club/ergodox_infinity/keymaps/nordic_ergo/readme.md b/keyboards/input_club/ergodox_infinity/keymaps/nordic_ergo/readme.md
deleted file mode 100644
index 2ed52686491..00000000000
--- a/keyboards/input_club/ergodox_infinity/keymaps/nordic_ergo/readme.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Nordic Ergodox Infinity layout
-
-QWERTY Nordic layout for ergodox infinity.
-
-Features:
-
-- Basic ISO Nordic qwerty layout.
-- Backlight control.
-- Still work in progress.
\ No newline at end of file
diff --git a/keyboards/input_club/ergodox_infinity/keymaps/trulyergonomic/README.md b/keyboards/input_club/ergodox_infinity/keymaps/trulyergonomic/README.md
deleted file mode 100644
index 1e248742ee1..00000000000
--- a/keyboards/input_club/ergodox_infinity/keymaps/trulyergonomic/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Truly Ergonomic like layout
-
-A basic ErgoDox layout that imitates the Truly Ergonomic keyboard layout.
diff --git a/keyboards/input_club/ergodox_infinity/keymaps/trulyergonomic/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/trulyergonomic/keymap.c
deleted file mode 100644
index bbc24ea27f9..00000000000
--- a/keyboards/input_club/ergodox_infinity/keymaps/trulyergonomic/keymap.c
+++ /dev/null
@@ -1,159 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "debug.h"
-#include "action_layer.h"
-#include "version.h"
-
-#define BASE  0 // default layer
-#define EXTRA 1 // extra
-
-enum custom_keycodes {
-  PLACEHOLDER = SAFE_RANGE, // can always be here
-  EPRM,
-  VRSN,
-  RGB_SLD
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Keymap 0: Basic layer
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |  ESC   |   1  |   2  |   3  |   4  |   5  | LGui |           | LGui |   6  |   7  |   8  |   9  |   0  |   -    |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * | Tab    |   Q  |   W  |   E  |   R  |   T  |  Del |           | Tab  |   Y  |   U  |   I  |   O  |   P  |   =    |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * | LShift |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |   ;  | RShift |
- * |--------+------+------+------+------+------| Back |           | Back |------+------+------+------+------+--------|
- * | LCtrl  |   Z  |   X  |   C  |   V  |   B  | space|           | space|   N  |   M  |   ,  |   .  |   '  | RCtrl  |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   | LAlt | Home | PgUp | PgDn |  End |                                       | Left |  Up  | Down | Rigth| RAlt |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.        ,-------------.
- *                                        |  ~   |   |  |        |   [  |   ]  |
- *                                 ,------|------|------|        |------+------+------.
- *                                 |      |      |  L1  |        | Grv  |      |      |
- *                                 | Space|Enter |------|        |------| Enter|Space |
- *                                 |      |      |  /   |        |   \  |      |      |
- *                                 `--------------------'        `--------------------'
- */
-// If it accepts an argument (i.e, is a function), it doesn't need KC_.
-// Otherwise, it needs KC_*
-[BASE] = LAYOUT_ergodox(  // layer 0 : default
-        // left hand
-        KC_ESC,    KC_1,      KC_2,      KC_3,      KC_4,     KC_5,   KC_LGUI,
-        KC_TAB,    KC_Q,      KC_W,      KC_E,      KC_R,     KC_T,   KC_DEL,
-        KC_LSFT,   KC_A,      KC_S,      KC_D,      KC_F,     KC_G,
-        KC_LCTL,   KC_Z,      KC_X,      KC_C,      KC_V,     KC_B,   KC_BSPC,
-        KC_LALT,   KC_HOME,   KC_PGUP,   KC_PGDN,   KC_END,
-                                                    KC_TILD,  KC_PIPE,
-                                                              TG(EXTRA),
-                                         KC_SPC,    KC_ENT,   KC_SLSH,
-        // right hand
-             KC_LGUI,   KC_6,      KC_7,      KC_8,      KC_9,      KC_0,      KC_MINS,
-             KC_TAB,    KC_Y,      KC_U,      KC_I,      KC_O,      KC_P,      KC_EQL,
-                        KC_H,      KC_J,      KC_K,      KC_L,      KC_SCLN,   KC_RSFT,
-             KC_BSPC,   KC_N,      KC_M,      KC_COMM,   KC_DOT,    KC_QUOT,   KC_RCTL,
-                                   KC_LEFT,   KC_UP,     KC_DOWN,   KC_RGHT,   KC_RALT,
-             KC_LBRC,   KC_RBRC,
-             KC_GRV,
-             KC_BSLS,   KC_ENT,    KC_SPC
-    ),
-/* Keymap 1: Extra Layer
- *
- * ,---------------------------------------------------.           ,--------------------------------------------------.
- * |         |  F1  |  F2  |  F3  |  F4  |  F5  |      |           | PSCR |  F6  |  F7  |  F8  |  F9  |  F10 |   F11  |
- * |---------+------+------+------+------+------+------|           |------+------+------+------+------+------+--------|
- * |         |   !  |   @  |   {  |   }  |   |  |      |           |      |   Up |   7  |   8  |   9  |   *  |   F12  |
- * |---------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |  Caps   |   #  |   $  |   (  |   )  |   `  |------|           |------| Down |   4  |   5  |   6  |   +  |        |
- * |---------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |         |   %  |   ^  |   [  |   ]  |   ~  |      |           |      |   &  |   1  |   2  |   3  |   \  |        |
- * `---------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |       |      |      |      |      |                                       |   0  |   ,  |   .  |   =  |      |
- *   `-----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |VolUp |VolDn |       | Prev | Next |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       | Stop |Bright|Bright|
- *                                 | Mute |Pause |------|       |------|ness- |ness+ |
- *                                 |      |      |      |       | Play |      |      |
- *                                 `--------------------'       `--------------------'
- */
-// SYMBOLS
-[EXTRA] = LAYOUT_ergodox(
-       // left hand
-       KC_TRNS,KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS,
-       KC_TRNS,KC_EXLM,KC_AT,  KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS,
-       KC_CAPS,KC_HASH,KC_DLR, KC_LPRN,KC_RPRN,KC_GRV,
-       KC_TRNS,KC_PERC,KC_CIRC,KC_LBRC,KC_RBRC,KC_TILD,KC_TRNS,
-       KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-                                       KC_VOLU,KC_VOLD,
-                                               KC_TRNS,
-                               KC_MUTE,KC_PAUS,KC_TRNS,
-       // right hand
-       KC_PSCR, KC_F6,   KC_F7,  KC_F8,   KC_F9,   KC_F10,  KC_F11,
-       KC_TRNS, KC_UP,   KC_7,   KC_8,    KC_9,    KC_ASTR, KC_F12,
-                KC_DOWN, KC_4,   KC_5,    KC_6,    KC_PLUS, KC_TRNS,
-       KC_TRNS, KC_AMPR, KC_1,   KC_2,    KC_3,    KC_BSLS, KC_TRNS,
-                         KC_0,   KC_COMM, KC_DOT,  KC_EQL,  KC_TRNS,
-       KC_MPRV, KC_MNXT,
-       KC_STOP,
-       KC_MPLY, RGB_VAD, RGB_VAI
-),
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    // dynamically generate these.
-    case EPRM:
-      if (record->event.pressed) {
-        eeconfig_init();
-      }
-      return false;
-      break;
-    case VRSN:
-      if (record->event.pressed) {
-        SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
-      }
-      return false;
-      break;
-    case RGB_SLD:
-      if (record->event.pressed) {
-        #ifdef RGBLIGHT_ENABLE
-          rgblight_mode(1);
-        #endif
-      }
-      return false;
-      break;
-  }
-  return true;
-}
-
-// Runs just one time when the keyboard initializes.
-void matrix_init_user(void) {
-
-};
-
-
-// Runs constantly in the background, in a loop.
-void matrix_scan_user(void) {
-
-    uint8_t layer = get_highest_layer(layer_state);
-
-    ergodox_board_led_off();
-    ergodox_right_led_1_off();
-    ergodox_right_led_2_off();
-    ergodox_right_led_3_off();
-    switch (layer) {
-      // TODO: Make this relevant to the ErgoDox EZ.
-        case 1:
-            ergodox_right_led_1_on();
-            break;
-        case 2:
-            ergodox_right_led_2_on();
-            break;
-        default:
-            // none
-            break;
-    }
-
-};
diff --git a/keyboards/input_club/infinity60/keymaps/depariel/keymap.c b/keyboards/input_club/infinity60/keymaps/depariel/keymap.c
deleted file mode 100755
index 22ac4fa5fa9..00000000000
--- a/keyboards/input_club/infinity60/keymaps/depariel/keymap.c
+++ /dev/null
@@ -1,87 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Layer 0: Default Layer
-     * ,-----------------------------------------------------------.
-     * |Esc|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|  \|  `|
-     * |-----------------------------------------------------------|
-     * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]| Bksp|
-     * |-----------------------------------------------------------|
-     * |Contro|  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Enter   |
-     * |-----------------------------------------------------------|
-     * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift |Fn2|
-     * |-----------------------------------------------------------'
-     * |Fn2 |Gui |Alt |         Space           |RAlt|Prv|PlPs|Next|
-     * `-----------------------------------------------------------'
-     */
-    [0] = LAYOUT_60_ansi_split_bs_rshift(
-        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,            KC_BSLS,  KC_GRV,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,           KC_BSPC,
-        KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, LT(5, KC_ENT),
-        SC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SC_RSPC, MO(4),
-        MO(4),   KC_LGUI, KC_LALT,               LT(3, KC_SPC),                 KC_RALT, KC_MPRV, KC_MPLY, KC_MNXT),
-
-    /* Layer 1: "Toggle" off SpaceFn for League of Legends
-     */
-    [1] = LAYOUT_60_ansi_split_bs_rshift(
-        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS,  KC_GRV,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,
-        KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
-        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(4),
-        MO(4),   KC_LGUI, KC_LALT,                   KC_SPC,                    KC_RALT, KC_MPRV, KC_MPLY, KC_MNXT),
-           
-    /* Layer 2: "Toggle" off SpaceFn for MapleRoyals
-     */
-    [2] = LAYOUT_60_ansi_split_bs_rshift(
-        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS,  KC_GRV,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,
-        KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
-        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_UP,   KC_LSFT,
-        MO(4),   KC_LGUI, KC_LALT,                   KC_SPC,                    KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT),
-
-    /* Layer 3: FN layer 1
-     */ 
-    [3] = LAYOUT_60_ansi_split_bs_rshift(
-        KC_NO,           KC_F1,   KC_F2,   KC_F3,   KC_F4,          KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NO,   KC_NO,
-        KC_NO,           KC_BTN1, KC_MS_U, KC_BTN2, LALT(KC_F4),    KC_HOME, KC_PGUP, KC_PSCR, KC_SCRL, KC_UP,   KC_NO,   KC_LPRN, KC_RPRN, KC_DEL,
-        MO(6),           KC_MS_L, KC_MS_D, KC_MS_R, KC_NO,          KC_END,  KC_PGDN, KC_TILD, KC_LEFT, KC_DOWN, KC_RGHT, KC_NO,   KC_NO,
-        LGUI(KC_SPC),    KC_NO,   KC_NO,   KC_NO,   KC_NO,          KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_CALC, KC_MENU, KC_TRNS, TG(4),
-        KC_TRNS,         KC_TRNS, KC_TRNS,                       LT(3, KC_SPC),                KC_TRNS, KC_VOLD, KC_MUTE, KC_VOLU),
-    
-    /* Layer 4: FN layer 2
-     */ 
-    [4] = LAYOUT_60_ansi_split_bs_rshift(
-        KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_PMNS, KC_PPLS, KC_PSLS, TG(2),
-        KC_CAPS, KC_NO,   KC_UP,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_PSCR, KC_NO,   KC_P7,   KC_P8,   KC_P9,   KC_PAST, KC_BSPC,
-        KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_P4,   KC_P5,   KC_P6,   KC_PENT,
-        KC_LSFT, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_P1,   KC_P2,   KC_P3,   KC_RSFT, MO(4),
-        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                   KC_P0,   KC_PDOT, KC_NO,   TG(1)),
-    
-    /* Layer 5: FN layer 3
-     */ 
-    [5] = LAYOUT_60_ansi_split_bs_rshift(
-        KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,            KC_NO,   KC_NO,
-        KC_TAB , KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_NO,            KC_TRNS,
-        KC_TRNS, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_F17,  KC_F18,  KC_F19,  KC_F20,  LT(5, KC_ENT),
-        KC_TRNS, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_F21,  KC_F22,  KC_F23,  KC_F24,  KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                   KC_RALT, KC_NO,   KC_NO,  KC_NO),
-    
-    /* Layer 6: FN layer 4
-     */ 
-    [6] = LAYOUT_60_ansi_split_bs_rshift(
-        KC_NO,                 KC_NO,            KC_NO,          KC_NO,            KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
-        LCTL(LSFT(KC_TAB)),    KC_NO,            LGUI(KC_UP),    KC_NO,            KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
-        MO(6),                 LGUI(KC_LEFT),    LGUI(KC_DOWN),  LGUI(KC_RGHT),    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
-        KC_TRNS,               KC_NO,            KC_NO,          KC_NO,            KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_TRNS, KC_TRNS,
-        KC_TRNS,               KC_TRNS,          KC_TRNS,                   KC_TRNS,                 KC_TRNS, KC_NO,   KC_NO,   KC_NO),
-};
-
-// Runs just one time when the keyboard initializes.
-void matrix_init_user(void) {
-
-};
-
-// Runs constantly in the background, in a loop.
-void matrix_scan_user(void) {
-
-};
diff --git a/keyboards/input_club/k_type/is31fl3733-dual.h b/keyboards/input_club/k_type/is31fl3733-dual.h
index b7e3eb54e7e..be6e4f9ce95 100644
--- a/keyboards/input_club/k_type/is31fl3733-dual.h
+++ b/keyboards/input_club/k_type/is31fl3733-dual.h
@@ -129,206 +129,206 @@ void is31fl3733_flush(void);
 #define IS31FL3733_SYNC_MASTER 0b01
 #define IS31FL3733_SYNC_SLAVE 0b10
 
-#define A_1 0x00
-#define A_2 0x01
-#define A_3 0x02
-#define A_4 0x03
-#define A_5 0x04
-#define A_6 0x05
-#define A_7 0x06
-#define A_8 0x07
-#define A_9 0x08
-#define A_10 0x09
-#define A_11 0x0A
-#define A_12 0x0B
-#define A_13 0x0C
-#define A_14 0x0D
-#define A_15 0x0E
-#define A_16 0x0F
+#define SW1_CS1 0x00
+#define SW1_CS2 0x01
+#define SW1_CS3 0x02
+#define SW1_CS4 0x03
+#define SW1_CS5 0x04
+#define SW1_CS6 0x05
+#define SW1_CS7 0x06
+#define SW1_CS8 0x07
+#define SW1_CS9 0x08
+#define SW1_CS10 0x09
+#define SW1_CS11 0x0A
+#define SW1_CS12 0x0B
+#define SW1_CS13 0x0C
+#define SW1_CS14 0x0D
+#define SW1_CS15 0x0E
+#define SW1_CS16 0x0F
 
-#define B_1 0x10
-#define B_2 0x11
-#define B_3 0x12
-#define B_4 0x13
-#define B_5 0x14
-#define B_6 0x15
-#define B_7 0x16
-#define B_8 0x17
-#define B_9 0x18
-#define B_10 0x19
-#define B_11 0x1A
-#define B_12 0x1B
-#define B_13 0x1C
-#define B_14 0x1D
-#define B_15 0x1E
-#define B_16 0x1F
+#define SW2_CS1 0x10
+#define SW2_CS2 0x11
+#define SW2_CS3 0x12
+#define SW2_CS4 0x13
+#define SW2_CS5 0x14
+#define SW2_CS6 0x15
+#define SW2_CS7 0x16
+#define SW2_CS8 0x17
+#define SW2_CS9 0x18
+#define SW2_CS10 0x19
+#define SW2_CS11 0x1A
+#define SW2_CS12 0x1B
+#define SW2_CS13 0x1C
+#define SW2_CS14 0x1D
+#define SW2_CS15 0x1E
+#define SW2_CS16 0x1F
 
-#define C_1 0x20
-#define C_2 0x21
-#define C_3 0x22
-#define C_4 0x23
-#define C_5 0x24
-#define C_6 0x25
-#define C_7 0x26
-#define C_8 0x27
-#define C_9 0x28
-#define C_10 0x29
-#define C_11 0x2A
-#define C_12 0x2B
-#define C_13 0x2C
-#define C_14 0x2D
-#define C_15 0x2E
-#define C_16 0x2F
+#define SW3_CS1 0x20
+#define SW3_CS2 0x21
+#define SW3_CS3 0x22
+#define SW3_CS4 0x23
+#define SW3_CS5 0x24
+#define SW3_CS6 0x25
+#define SW3_CS7 0x26
+#define SW3_CS8 0x27
+#define SW3_CS9 0x28
+#define SW3_CS10 0x29
+#define SW3_CS11 0x2A
+#define SW3_CS12 0x2B
+#define SW3_CS13 0x2C
+#define SW3_CS14 0x2D
+#define SW3_CS15 0x2E
+#define SW3_CS16 0x2F
 
-#define D_1 0x30
-#define D_2 0x31
-#define D_3 0x32
-#define D_4 0x33
-#define D_5 0x34
-#define D_6 0x35
-#define D_7 0x36
-#define D_8 0x37
-#define D_9 0x38
-#define D_10 0x39
-#define D_11 0x3A
-#define D_12 0x3B
-#define D_13 0x3C
-#define D_14 0x3D
-#define D_15 0x3E
-#define D_16 0x3F
+#define SW4_CS1 0x30
+#define SW4_CS2 0x31
+#define SW4_CS3 0x32
+#define SW4_CS4 0x33
+#define SW4_CS5 0x34
+#define SW4_CS6 0x35
+#define SW4_CS7 0x36
+#define SW4_CS8 0x37
+#define SW4_CS9 0x38
+#define SW4_CS10 0x39
+#define SW4_CS11 0x3A
+#define SW4_CS12 0x3B
+#define SW4_CS13 0x3C
+#define SW4_CS14 0x3D
+#define SW4_CS15 0x3E
+#define SW4_CS16 0x3F
 
-#define E_1 0x40
-#define E_2 0x41
-#define E_3 0x42
-#define E_4 0x43
-#define E_5 0x44
-#define E_6 0x45
-#define E_7 0x46
-#define E_8 0x47
-#define E_9 0x48
-#define E_10 0x49
-#define E_11 0x4A
-#define E_12 0x4B
-#define E_13 0x4C
-#define E_14 0x4D
-#define E_15 0x4E
-#define E_16 0x4F
+#define SW5_CS1 0x40
+#define SW5_CS2 0x41
+#define SW5_CS3 0x42
+#define SW5_CS4 0x43
+#define SW5_CS5 0x44
+#define SW5_CS6 0x45
+#define SW5_CS7 0x46
+#define SW5_CS8 0x47
+#define SW5_CS9 0x48
+#define SW5_CS10 0x49
+#define SW5_CS11 0x4A
+#define SW5_CS12 0x4B
+#define SW5_CS13 0x4C
+#define SW5_CS14 0x4D
+#define SW5_CS15 0x4E
+#define SW5_CS16 0x4F
 
-#define F_1 0x50
-#define F_2 0x51
-#define F_3 0x52
-#define F_4 0x53
-#define F_5 0x54
-#define F_6 0x55
-#define F_7 0x56
-#define F_8 0x57
-#define F_9 0x58
-#define F_10 0x59
-#define F_11 0x5A
-#define F_12 0x5B
-#define F_13 0x5C
-#define F_14 0x5D
-#define F_15 0x5E
-#define F_16 0x5F
+#define SW6_CS1 0x50
+#define SW6_CS2 0x51
+#define SW6_CS3 0x52
+#define SW6_CS4 0x53
+#define SW6_CS5 0x54
+#define SW6_CS6 0x55
+#define SW6_CS7 0x56
+#define SW6_CS8 0x57
+#define SW6_CS9 0x58
+#define SW6_CS10 0x59
+#define SW6_CS11 0x5A
+#define SW6_CS12 0x5B
+#define SW6_CS13 0x5C
+#define SW6_CS14 0x5D
+#define SW6_CS15 0x5E
+#define SW6_CS16 0x5F
 
-#define G_1 0x60
-#define G_2 0x61
-#define G_3 0x62
-#define G_4 0x63
-#define G_5 0x64
-#define G_6 0x65
-#define G_7 0x66
-#define G_8 0x67
-#define G_9 0x68
-#define G_10 0x69
-#define G_11 0x6A
-#define G_12 0x6B
-#define G_13 0x6C
-#define G_14 0x6D
-#define G_15 0x6E
-#define G_16 0x6F
+#define SW7_CS1 0x60
+#define SW7_CS2 0x61
+#define SW7_CS3 0x62
+#define SW7_CS4 0x63
+#define SW7_CS5 0x64
+#define SW7_CS6 0x65
+#define SW7_CS7 0x66
+#define SW7_CS8 0x67
+#define SW7_CS9 0x68
+#define SW7_CS10 0x69
+#define SW7_CS11 0x6A
+#define SW7_CS12 0x6B
+#define SW7_CS13 0x6C
+#define SW7_CS14 0x6D
+#define SW7_CS15 0x6E
+#define SW7_CS16 0x6F
 
-#define H_1 0x70
-#define H_2 0x71
-#define H_3 0x72
-#define H_4 0x73
-#define H_5 0x74
-#define H_6 0x75
-#define H_7 0x76
-#define H_8 0x77
-#define H_9 0x78
-#define H_10 0x79
-#define H_11 0x7A
-#define H_12 0x7B
-#define H_13 0x7C
-#define H_14 0x7D
-#define H_15 0x7E
-#define H_16 0x7F
+#define SW8_CS1 0x70
+#define SW8_CS2 0x71
+#define SW8_CS3 0x72
+#define SW8_CS4 0x73
+#define SW8_CS5 0x74
+#define SW8_CS6 0x75
+#define SW8_CS7 0x76
+#define SW8_CS8 0x77
+#define SW8_CS9 0x78
+#define SW8_CS10 0x79
+#define SW8_CS11 0x7A
+#define SW8_CS12 0x7B
+#define SW8_CS13 0x7C
+#define SW8_CS14 0x7D
+#define SW8_CS15 0x7E
+#define SW8_CS16 0x7F
 
-#define I_1 0x80
-#define I_2 0x81
-#define I_3 0x82
-#define I_4 0x83
-#define I_5 0x84
-#define I_6 0x85
-#define I_7 0x86
-#define I_8 0x87
-#define I_9 0x88
-#define I_10 0x89
-#define I_11 0x8A
-#define I_12 0x8B
-#define I_13 0x8C
-#define I_14 0x8D
-#define I_15 0x8E
-#define I_16 0x8F
+#define SW9_CS1 0x80
+#define SW9_CS2 0x81
+#define SW9_CS3 0x82
+#define SW9_CS4 0x83
+#define SW9_CS5 0x84
+#define SW9_CS6 0x85
+#define SW9_CS7 0x86
+#define SW9_CS8 0x87
+#define SW9_CS9 0x88
+#define SW9_CS10 0x89
+#define SW9_CS11 0x8A
+#define SW9_CS12 0x8B
+#define SW9_CS13 0x8C
+#define SW9_CS14 0x8D
+#define SW9_CS15 0x8E
+#define SW9_CS16 0x8F
 
-#define J_1 0x90
-#define J_2 0x91
-#define J_3 0x92
-#define J_4 0x93
-#define J_5 0x94
-#define J_6 0x95
-#define J_7 0x96
-#define J_8 0x97
-#define J_9 0x98
-#define J_10 0x99
-#define J_11 0x9A
-#define J_12 0x9B
-#define J_13 0x9C
-#define J_14 0x9D
-#define J_15 0x9E
-#define J_16 0x9F
+#define SW10_CS1 0x90
+#define SW10_CS2 0x91
+#define SW10_CS3 0x92
+#define SW10_CS4 0x93
+#define SW10_CS5 0x94
+#define SW10_CS6 0x95
+#define SW10_CS7 0x96
+#define SW10_CS8 0x97
+#define SW10_CS9 0x98
+#define SW10_CS10 0x99
+#define SW10_CS11 0x9A
+#define SW10_CS12 0x9B
+#define SW10_CS13 0x9C
+#define SW10_CS14 0x9D
+#define SW10_CS15 0x9E
+#define SW10_CS16 0x9F
 
-#define K_1 0xA0
-#define K_2 0xA1
-#define K_3 0xA2
-#define K_4 0xA3
-#define K_5 0xA4
-#define K_6 0xA5
-#define K_7 0xA6
-#define K_8 0xA7
-#define K_9 0xA8
-#define K_10 0xA9
-#define K_11 0xAA
-#define K_12 0xAB
-#define K_13 0xAC
-#define K_14 0xAD
-#define K_15 0xAE
-#define K_16 0xAF
+#define SW11_CS1 0xA0
+#define SW11_CS2 0xA1
+#define SW11_CS3 0xA2
+#define SW11_CS4 0xA3
+#define SW11_CS5 0xA4
+#define SW11_CS6 0xA5
+#define SW11_CS7 0xA6
+#define SW11_CS8 0xA7
+#define SW11_CS9 0xA8
+#define SW11_CS10 0xA9
+#define SW11_CS11 0xAA
+#define SW11_CS12 0xAB
+#define SW11_CS13 0xAC
+#define SW11_CS14 0xAD
+#define SW11_CS15 0xAE
+#define SW11_CS16 0xAF
 
-#define L_1 0xB0
-#define L_2 0xB1
-#define L_3 0xB2
-#define L_4 0xB3
-#define L_5 0xB4
-#define L_6 0xB5
-#define L_7 0xB6
-#define L_8 0xB7
-#define L_9 0xB8
-#define L_10 0xB9
-#define L_11 0xBA
-#define L_12 0xBB
-#define L_13 0xBC
-#define L_14 0xBD
-#define L_15 0xBE
-#define L_16 0xBF
+#define SW12_CS1 0xB0
+#define SW12_CS2 0xB1
+#define SW12_CS3 0xB2
+#define SW12_CS4 0xB3
+#define SW12_CS5 0xB4
+#define SW12_CS6 0xB5
+#define SW12_CS7 0xB6
+#define SW12_CS8 0xB7
+#define SW12_CS9 0xB8
+#define SW12_CS10 0xB9
+#define SW12_CS11 0xBA
+#define SW12_CS12 0xBB
+#define SW12_CS13 0xBC
+#define SW12_CS14 0xBD
+#define SW12_CS15 0xBE
+#define SW12_CS16 0xBF
diff --git a/keyboards/input_club/k_type/k_type.c b/keyboards/input_club/k_type/k_type.c
index c1377ebe61c..85bdc7ea739 100644
--- a/keyboards/input_club/k_type/k_type.c
+++ b/keyboards/input_club/k_type/k_type.c
@@ -21,133 +21,133 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    include "is31fl3733-dual.h"
 
 const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
-    { 0, B_1,  A_1,  C_1  },
-    { 0, B_2,  A_2,  C_2  },
-    { 0, B_3,  A_3,  C_3  },
-    { 0, B_4,  A_4,  C_4  },
-    { 0, B_5,  A_5,  C_5  },
-    { 0, B_6,  A_6,  C_6  },
-    { 0, B_7,  A_7,  C_7  },
-    { 0, B_8,  A_8,  C_8  },
-    { 0, B_9,  A_9,  C_9  },
-    { 0, B_10, A_10, C_10 },
-    { 0, B_11, A_11, C_11 },
-    { 0, B_12, A_12, C_12 },
-    { 0, B_13, A_13, C_13 },
-    { 0, B_14, A_14, C_14 },
-    { 0, B_15, A_15, C_15 },
-    { 0, B_16, A_16, C_16 },
+    { 0, SW2_CS1,  SW1_CS1,  SW3_CS1  },
+    { 0, SW2_CS2,  SW1_CS2,  SW3_CS2  },
+    { 0, SW2_CS3,  SW1_CS3,  SW3_CS3  },
+    { 0, SW2_CS4,  SW1_CS4,  SW3_CS4  },
+    { 0, SW2_CS5,  SW1_CS5,  SW3_CS5  },
+    { 0, SW2_CS6,  SW1_CS6,  SW3_CS6  },
+    { 0, SW2_CS7,  SW1_CS7,  SW3_CS7  },
+    { 0, SW2_CS8,  SW1_CS8,  SW3_CS8  },
+    { 0, SW2_CS9,  SW1_CS9,  SW3_CS9  },
+    { 0, SW2_CS10, SW1_CS10, SW3_CS10 },
+    { 0, SW2_CS11, SW1_CS11, SW3_CS11 },
+    { 0, SW2_CS12, SW1_CS12, SW3_CS12 },
+    { 0, SW2_CS13, SW1_CS13, SW3_CS13 },
+    { 0, SW2_CS14, SW1_CS14, SW3_CS14 },
+    { 0, SW2_CS15, SW1_CS15, SW3_CS15 },
+    { 0, SW2_CS16, SW1_CS16, SW3_CS16 },
 
-    { 0, 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, SW5_CS1,  SW4_CS1,  SW6_CS1  },
+    { 0, SW5_CS2,  SW4_CS2,  SW6_CS2  },
+    { 0, SW5_CS3,  SW4_CS3,  SW6_CS3  },
+    { 0, SW5_CS4,  SW4_CS4,  SW6_CS4  },
+    { 0, SW5_CS5,  SW4_CS5,  SW6_CS5  },
+    { 0, SW5_CS6,  SW4_CS6,  SW6_CS6  },
+    { 0, SW5_CS7,  SW4_CS7,  SW6_CS7  },
+    { 0, SW5_CS8,  SW4_CS8,  SW6_CS8  },
+    { 0, SW5_CS9,  SW4_CS9,  SW6_CS9  },
+    { 0, SW5_CS10, SW4_CS10, SW6_CS10 },
+    { 0, SW5_CS11, SW4_CS11, SW6_CS11 },
+    { 0, SW5_CS12, SW4_CS12, SW6_CS12 },
+    { 0, SW5_CS13, SW4_CS13, SW6_CS13 },
+    { 0, SW5_CS14, SW4_CS14, SW6_CS14 },
+    { 0, SW5_CS15, SW4_CS15, SW6_CS15 },
+    { 0, SW5_CS16, SW4_CS16, SW6_CS16 },
 
-    { 0, 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, SW8_CS1,  SW7_CS1,  SW9_CS1  },
+    { 0, SW8_CS2,  SW7_CS2,  SW9_CS2  },
+    { 0, SW8_CS3,  SW7_CS3,  SW9_CS3  },
+    { 0, SW8_CS4,  SW7_CS4,  SW9_CS4  },
+    { 0, SW8_CS5,  SW7_CS5,  SW9_CS5  },
+    { 0, SW8_CS6,  SW7_CS6,  SW9_CS6  },
+    { 0, SW8_CS7,  SW7_CS7,  SW9_CS7  },
+    { 0, SW8_CS8,  SW7_CS8,  SW9_CS8  },
+    { 0, SW8_CS9,  SW7_CS9,  SW9_CS9  },
+    { 0, SW8_CS10, SW7_CS10, SW9_CS10 },
+    { 0, SW8_CS11, SW7_CS11, SW9_CS11 },
+    { 0, SW8_CS12, SW7_CS12, SW9_CS12 },
+    { 0, SW8_CS13, SW7_CS13, SW9_CS13 },
+    { 0, SW8_CS14, SW7_CS14, SW9_CS14 },
+    { 0, SW8_CS15, SW7_CS15, SW9_CS15 },
+    { 0, SW8_CS16, SW7_CS16, SW9_CS16 },
 
-    { 0, K_1,  J_1,  L_1  },
-    { 0, K_2,  J_2,  L_2  },
-    { 0, K_3,  J_3,  L_3  },
-    { 0, K_4,  J_4,  L_4  },
-    { 0, K_5,  J_5,  L_5  },
-    { 0, K_6,  J_6,  L_6  },
-    { 0, K_7,  J_7,  L_7  },
-    { 0, K_8,  J_8,  L_8  },
-    { 0, K_9,  J_9,  L_9  },
-    { 0, K_10, J_10, L_10 },
-    { 0, K_11, J_11, L_11 },
-    { 0, K_12, J_12, L_12 },
-    { 0, K_13, J_13, L_13 },
-    { 0, K_14, J_14, L_14 },
-    { 0, K_15, J_15, L_15 },
-    { 0, K_16, J_16, L_16 },
+    { 0, SW11_CS1,  SW10_CS1,  SW12_CS1  },
+    { 0, SW11_CS2,  SW10_CS2,  SW12_CS2  },
+    { 0, SW11_CS3,  SW10_CS3,  SW12_CS3  },
+    { 0, SW11_CS4,  SW10_CS4,  SW12_CS4  },
+    { 0, SW11_CS5,  SW10_CS5,  SW12_CS5  },
+    { 0, SW11_CS6,  SW10_CS6,  SW12_CS6  },
+    { 0, SW11_CS7,  SW10_CS7,  SW12_CS7  },
+    { 0, SW11_CS8,  SW10_CS8,  SW12_CS8  },
+    { 0, SW11_CS9,  SW10_CS9,  SW12_CS9  },
+    { 0, SW11_CS10, SW10_CS10, SW12_CS10 },
+    { 0, SW11_CS11, SW10_CS11, SW12_CS11 },
+    { 0, SW11_CS12, SW10_CS12, SW12_CS12 },
+    { 0, SW11_CS13, SW10_CS13, SW12_CS13 },
+    { 0, SW11_CS14, SW10_CS14, SW12_CS14 },
+    { 0, SW11_CS15, SW10_CS15, SW12_CS15 },
+    { 0, SW11_CS16, SW10_CS16, SW12_CS16 },
 
     // Driver 2 is on I2C2
-    { 1, B_1,  A_1,  C_1  },
-    { 1, B_2,  A_2,  C_2  },
-    { 1, B_3,  A_3,  C_3  },
-    { 1, B_4,  A_4,  C_4  },
-    { 1, B_5,  A_5,  C_5  },
-    { 1, B_6,  A_6,  C_6  },
-    { 1, B_7,  A_7,  C_7  },
-    { 1, B_8,  A_8,  C_8  },
-    { 1, B_9,  A_9,  C_9  },
-    { 1, B_10, A_10, C_10 },
-    { 1, B_11, A_11, C_11 },
-    { 1, B_12, A_12, C_12 },
-    { 1, B_13, A_13, C_13 },
-    { 1, B_14, A_14, C_14 },
-    { 1, B_15, A_15, C_15 },
-    { 1, B_16, A_16, C_16 },
+    { 1, SW2_CS1,  SW1_CS1,  SW3_CS1  },
+    { 1, SW2_CS2,  SW1_CS2,  SW3_CS2  },
+    { 1, SW2_CS3,  SW1_CS3,  SW3_CS3  },
+    { 1, SW2_CS4,  SW1_CS4,  SW3_CS4  },
+    { 1, SW2_CS5,  SW1_CS5,  SW3_CS5  },
+    { 1, SW2_CS6,  SW1_CS6,  SW3_CS6  },
+    { 1, SW2_CS7,  SW1_CS7,  SW3_CS7  },
+    { 1, SW2_CS8,  SW1_CS8,  SW3_CS8  },
+    { 1, SW2_CS9,  SW1_CS9,  SW3_CS9  },
+    { 1, SW2_CS10, SW1_CS10, SW3_CS10 },
+    { 1, SW2_CS11, SW1_CS11, SW3_CS11 },
+    { 1, SW2_CS12, SW1_CS12, SW3_CS12 },
+    { 1, SW2_CS13, SW1_CS13, SW3_CS13 },
+    { 1, SW2_CS14, SW1_CS14, SW3_CS14 },
+    { 1, SW2_CS15, SW1_CS15, SW3_CS15 },
+    { 1, SW2_CS16, SW1_CS16, SW3_CS16 },
 
-    { 1, E_1,  D_1,  F_1  },
-    { 1, E_2,  D_2,  F_2  },
-    { 1, E_3,  D_3,  F_3  },
-    { 1, E_4,  D_4,  F_4  },
-    { 1, E_5,  D_5,  F_5  },
-    { 1, E_6,  D_6,  F_6  },
-    { 1, E_7,  D_7,  F_7  },
-    { 1, E_8,  D_8,  F_8  },
-    { 1, E_9,  D_9,  F_9  },
-    { 1, E_10, D_10, F_10 },
-    { 1, E_11, D_11, F_11 },
-    { 1, E_12, D_12, F_12 },
-    { 1, E_13, D_13, F_13 },
-    { 1, E_14, D_14, F_14 },
-    { 1, E_15, D_15, F_15 },
-    { 1, E_16, D_16, F_16 },
+    { 1, SW5_CS1,  SW4_CS1,  SW6_CS1  },
+    { 1, SW5_CS2,  SW4_CS2,  SW6_CS2  },
+    { 1, SW5_CS3,  SW4_CS3,  SW6_CS3  },
+    { 1, SW5_CS4,  SW4_CS4,  SW6_CS4  },
+    { 1, SW5_CS5,  SW4_CS5,  SW6_CS5  },
+    { 1, SW5_CS6,  SW4_CS6,  SW6_CS6  },
+    { 1, SW5_CS7,  SW4_CS7,  SW6_CS7  },
+    { 1, SW5_CS8,  SW4_CS8,  SW6_CS8  },
+    { 1, SW5_CS9,  SW4_CS9,  SW6_CS9  },
+    { 1, SW5_CS10, SW4_CS10, SW6_CS10 },
+    { 1, SW5_CS11, SW4_CS11, SW6_CS11 },
+    { 1, SW5_CS12, SW4_CS12, SW6_CS12 },
+    { 1, SW5_CS13, SW4_CS13, SW6_CS13 },
+    { 1, SW5_CS14, SW4_CS14, SW6_CS14 },
+    { 1, SW5_CS15, SW4_CS15, SW6_CS15 },
+    { 1, SW5_CS16, SW4_CS16, SW6_CS16 },
 
-    { 1, H_1,  G_1,  I_1  },
-    { 1, H_2,  G_2,  I_2  },
-    { 1, H_3,  G_3,  I_3  },
-    { 1, H_4,  G_4,  I_4  },
-    { 1, H_5,  G_5,  I_5  },
-    { 1, H_6,  G_6,  I_6  },
-    { 1, H_7,  G_7,  I_7  },
-    { 1, H_8,  G_8,  I_8  },
-    { 1, H_9,  G_9,  I_9  },
-    { 1, H_10, G_10, I_10 },
-    { 1, H_11, G_11, I_11 },
-    { 1, H_12, G_12, I_12 },
-    { 1, H_13, G_13, I_13 },
-    { 1, H_14, G_14, I_14 },
-    { 1, H_15, G_15, I_15 },
-    { 1, H_16, G_16, I_16 },
+    { 1, SW8_CS1,  SW7_CS1,  SW9_CS1  },
+    { 1, SW8_CS2,  SW7_CS2,  SW9_CS2  },
+    { 1, SW8_CS3,  SW7_CS3,  SW9_CS3  },
+    { 1, SW8_CS4,  SW7_CS4,  SW9_CS4  },
+    { 1, SW8_CS5,  SW7_CS5,  SW9_CS5  },
+    { 1, SW8_CS6,  SW7_CS6,  SW9_CS6  },
+    { 1, SW8_CS7,  SW7_CS7,  SW9_CS7  },
+    { 1, SW8_CS8,  SW7_CS8,  SW9_CS8  },
+    { 1, SW8_CS9,  SW7_CS9,  SW9_CS9  },
+    { 1, SW8_CS10, SW7_CS10, SW9_CS10 },
+    { 1, SW8_CS11, SW7_CS11, SW9_CS11 },
+    { 1, SW8_CS12, SW7_CS12, SW9_CS12 },
+    { 1, SW8_CS13, SW7_CS13, SW9_CS13 },
+    { 1, SW8_CS14, SW7_CS14, SW9_CS14 },
+    { 1, SW8_CS15, SW7_CS15, SW9_CS15 },
+    { 1, SW8_CS16, SW7_CS16, SW9_CS16 },
 
-    { 1, K_1,  J_1,  L_1  },
-    { 1, K_2,  J_2,  L_2  },
-    { 1, K_3,  J_3,  L_3  },
-    { 1, K_4,  J_4,  L_4  },
-    { 1, K_5,  J_5,  L_5  },
-    { 1, K_6,  J_6,  L_6  },
-    { 1, K_7,  J_7,  L_7  }
+    { 1, SW11_CS1,  SW10_CS1,  SW12_CS1  },
+    { 1, SW11_CS2,  SW10_CS2,  SW12_CS2  },
+    { 1, SW11_CS3,  SW10_CS3,  SW12_CS3  },
+    { 1, SW11_CS4,  SW10_CS4,  SW12_CS4  },
+    { 1, SW11_CS5,  SW10_CS5,  SW12_CS5  },
+    { 1, SW11_CS6,  SW10_CS6,  SW12_CS6  },
+    { 1, SW11_CS7,  SW10_CS7,  SW12_CS7  }
 };
 
 led_config_t g_led_config = {
diff --git a/keyboards/input_club/k_type/keymaps/andrew-fahmy/config.h b/keyboards/input_club/k_type/keymaps/andrew-fahmy/config.h
deleted file mode 100644
index 50522716871..00000000000
--- a/keyboards/input_club/k_type/keymaps/andrew-fahmy/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2021 Andrew Fahmy
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_RAINDROPS
-#define RGB_MATRIX_LED_FLUSH_LIMIT 100
diff --git a/keyboards/input_club/k_type/keymaps/andrew-fahmy/keymap.c b/keyboards/input_club/k_type/keymaps/andrew-fahmy/keymap.c
deleted file mode 100644
index 264c760414e..00000000000
--- a/keyboards/input_club/k_type/keymaps/andrew-fahmy/keymap.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/* Copyright 2021 Andrew Fahmy
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-enum layer_names {
-    _MAIN,
-    _L1
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_MAIN] = LAYOUT_tkl_ansi(
-        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_SCRL, KC_PAUS,
-
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_INS,  KC_HOME, KC_PGUP,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_DEL,  KC_END,  KC_PGDN,
-        MO(_L1), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
-        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,                   KC_UP,
-        KC_LCTL, _______, KC_LALT,                            KC_SPC,                             KC_RALT, MO(_L1), KC_APP,  KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-    [_L1] = LAYOUT_tkl_ansi(
-        QK_BOOT,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          RGB_TOG, RGB_MOD, _______,
-
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, _______,          RGB_HUI, RGB_SAI, RGB_VAI,
-        _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          RGB_HUD, RGB_SAD, RGB_VAD,
-        _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______,          _______,
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,                   _______,
-        _______, KC_LGUI, _______,                            _______,                            _______, _______, _______, _______,          _______, _______, _______
-    )
-};
-
-void keyboard_post_init_user(void) {
-    // Customise these values to desired behaviour
-    // debug_enable=true;
-    // debug_matrix=true;
-    // debug_keyboard=true;
-    // debug_mouse=true;
-}
-
-#ifdef RGB_MATRIX_ENABLE
-// Turn off SDB
-void keyboard_pre_init_user(void) {
-    palSetPadMode(GPIOB, 16, PAL_MODE_OUTPUT_PUSHPULL);
-    palSetPad(GPIOB, 16);
-}
-
-#endif
diff --git a/keyboards/input_club/k_type/keymaps/andrew-fahmy/rules.mk b/keyboards/input_club/k_type/keymaps/andrew-fahmy/rules.mk
deleted file mode 100644
index aad92997d0f..00000000000
--- a/keyboards/input_club/k_type/keymaps/andrew-fahmy/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-RGB_MATRIX_ENABLE = yes
diff --git a/keyboards/input_club/whitefox/keymaps/matt3o/keymap.c b/keyboards/input_club/whitefox/keymaps/matt3o/keymap.c
deleted file mode 100644
index 76237d4d30c..00000000000
--- a/keyboards/input_club/whitefox/keymaps/matt3o/keymap.c
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
-Copyright 2015 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include QMK_KEYBOARD_H
-
-enum custom_keycodes {
-    AL_FILE = SAFE_RANGE,
-    AL_WWW,
-    AL_HELP,
-    AL_CMD
-};
-
-const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Layer 0: Default Layer
-     * ,---------------------------------------------------------------.
-     * |Esc|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|  \|  `|Ins|
-     * |---------------------------------------------------------------|
-     * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|Backs|Del|
-     * |---------------------------------------------------------------|
-     * |CapsLo|  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Enter   |PgU|
-     * |---------------------------------------------------------------|
-     * |Shif|   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift |Up |PgD|
-     * |---------------------------------------------------------------|
-     * |Ctrl|Gui |Alt |         Space    |Fn0 |Alt |Gui |  |Lef|Dow|Rig|
-     * `---------------------------------------------------------------'
-     */
-    [0] = LAYOUT(
-        KC_ESC, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,KC_EQL, KC_BSLS,KC_GRV, KC_MUTE,
-        KC_TAB, KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC,KC_RBRC,KC_BSPC,     KC_DEL,
-        MO(1),  KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,KC_NUHS,KC_ENT,      KC_PGUP,
-        KC_LSFT,KC_NUBS,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,KC_RSFT,     KC_UP,  KC_PGDN,
-        KC_LCTL,KC_LGUI,KC_LALT,               KC_SPC,           KC_RALT,MO(2),  KC_RCTL,     KC_LEFT,KC_DOWN,KC_RGHT
-    ),
-    [1] = LAYOUT(
-        KC_TRNS,KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12, KC_TRNS,KC_TRNS,KC_TRNS,
-        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_DEL ,     KC_INS ,
-        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,     KC_VOLU,
-        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,     KC_PGUP,KC_VOLD,
-        KC_TRNS,KC_TRNS,KC_TRNS,               KC_TRNS,          KC_TRNS,KC_TRNS,KC_TRNS,     KC_HOME,KC_PGDN,KC_END
-    ),
-    [2] = LAYOUT(
-        KC_SLEP,KC_P1,  KC_P2,  KC_P3,  KC_P4,  KC_P5,  KC_P6,  KC_P7,  KC_P8,  KC_P9,  KC_P0,  KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_NO,
-        KC_TRNS,KC_TRNS,AL_WWW ,AL_HELP ,KC_TRNS,AL_CMD ,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_PSCR,KC_TRNS,KC_TRNS,KC_TRNS,     KC_NO,
-        KC_CAPS,KC_TRNS,KC_TRNS,KC_TRNS,AL_FILE ,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,     KC_TRNS,
-        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_CALC,KC_TRNS,KC_TRNS,KC_TRNS,KC_MAIL,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,     KC_TRNS,KC_TRNS,
-        KC_TRNS,KC_TRNS,KC_TRNS,               KC_TRNS,          KC_TRNS,KC_TRNS,KC_TRNS,     KC_TRNS,KC_TRNS,KC_TRNS
-    ),
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case AL_FILE:
-            if (record->event.pressed) {
-                host_consumer_send(0x1B4); // AL File Browser
-            } else {
-                host_consumer_send(0);
-            }
-            return false;
-        case AL_WWW:
-            if (record->event.pressed) {
-                host_consumer_send(0x196); // AL Internet Browser
-            } else {
-                host_consumer_send(0);
-            }
-            return false;
-        case AL_HELP:
-            if (record->event.pressed) {
-                host_consumer_send(0x1A6); // AL Integrated Help Center
-            } else {
-                host_consumer_send(0);
-            }
-            return false;
-        case AL_CMD:
-            if (record->event.pressed) {
-                host_consumer_send(0x1A0); // AL Command Line Processor/Run
-            } else {
-                host_consumer_send(0);
-            }
-            return false;
-    }
-    return true;
-}
diff --git a/keyboards/input_club/whitefox/keymaps/mattrighetti/keymap.c b/keyboards/input_club/whitefox/keymaps/mattrighetti/keymap.c
deleted file mode 100644
index 584719ed253..00000000000
--- a/keyboards/input_club/whitefox/keymaps/mattrighetti/keymap.c
+++ /dev/null
@@ -1,81 +0,0 @@
-
- /*
- Copyright 2021 Mattia Righetti
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Base layer
-    * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
-    * │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ \ │ ` │   │
-    * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
-    * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │Bspc │Del│
-    * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
-    * │Caps  │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ Enter  │PgU│
-    * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
-    * │ LShift │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │RSfRCt│ ↑ │PgD│
-    * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
-    * │LCtl│LAlt│LGUI│         Space          │RAlt│Lay1│ │ ← │ ↓ │ → │
-    * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
-    */
-    [0] = LAYOUT_truefox(
-        KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_GRV, KC_BSLS, _______,
-        KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, KC_DEL,
-        KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP,
-        KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN,
-        KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-    /* Function layer
-    * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐
-    * │   │F1 │F2 │F3 │F4 │F5 │F6 │F7 │F8 │F9 │F10│F11│F12│   │   │     │
-    * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼─────┤
-    * │     │   │ ↑ │   │   │   │   │   │   │   │   │   │   │Reset│     │
-    * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼─────┤
-    * │      │ ← │ ↓ │ → │   │   │   │   │   │   │   │   │        │     │
-    * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼─────┤
-    * │        │VoU│VoD│VoM│   │   │   │   │   │   │   │      │   │     │
-    * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼─────┤
-    * │    │    │    │                        │Lay2│    │ │   │   │     │
-    * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴─────┘
-    */
-    [1] = LAYOUT_truefox(
-        _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______,
-        _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______,
-        _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, MO(2), KC_TRNS, _______, _______, _______
-    ),
-    /* Third layer
-    * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
-    * │   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │
-    * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
-    * │     │1  │2  │3  │4  │5  │6  │7  │8  │9  │0  │   │   │     │   │
-    * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
-    * │      │   │   │   │   │   │   │   │   │   │   │   │        │   │
-    * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
-    * │        │   │   │   │   │   │   │   │   │   │   │      │   │   │
-    * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
-    * │    │    │    │                        │    │    │ │   │   │   │
-    * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
-    */
-    [2] = LAYOUT_truefox(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______
-    )
-};
diff --git a/keyboards/input_club/whitefox/keymaps/mattrighetti/rules.mk b/keyboards/input_club/whitefox/keymaps/mattrighetti/rules.mk
deleted file mode 100644
index 7a421cc9ae5..00000000000
--- a/keyboards/input_club/whitefox/keymaps/mattrighetti/rules.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-
-# Keyboard-specific features
-BACKLIGHT_ENABLE   = no
-VISUALIZER_ENABLE  = no
-
-# Firmware size reduction
-GRAVE_ESC_ENABLE   = no
-MAGIC_ENABLE       = no
-SPACE_CADET_ENABLE = no
diff --git a/keyboards/input_club/whitefox/keymaps/truefox/keymap.c b/keyboards/input_club/whitefox/keymaps/truefox/keymap.c
deleted file mode 100644
index 2af54673119..00000000000
--- a/keyboards/input_club/whitefox/keymaps/truefox/keymap.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
-Copyright 2015 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /*
-     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
-     * │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ ~ │ \ │PrS│
-     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
-     * │Tab  │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │Backs│Del│
-     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
-     * │Caps  │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │Enter   │PgU│
-     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
-     * │Shift   │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │Shift │ ↑ │PgD│
-     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
-     * │Ctrl│GUI │Alt │                        │Alt │Fn  │ │ ← │ ↓ │ → │
-     * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
-     */
-    [0] = LAYOUT_65_ansi_blocker_split_bs(
-        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV, KC_BSLS, KC_PSCR,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,         KC_DEL,
-        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,     KC_ENT,               KC_PGUP,
-        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,     KC_UP,       KC_PGDN,
-        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, MO(1),                KC_LEFT, KC_DOWN,     KC_RGHT
-    ),
-    /*
-     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
-     * │Fla│F1 │F2 │F3 │F4 │F5 │F6 │F7 │F8 │F9 │F10│F11│F12│PrS│ \ │Mut│
-     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
-     * │Tab  │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │Delet│Del│
-     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
-     * │Caps  │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │Enter   │Vl+│
-     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
-     * │Shift   │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │Shift │PgU│Vl-│
-     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
-     * │Ctrl│GUI │Alt │                        │Alt │Fn  │ │Hom│PgD│End│
-     * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
-     */
-    [1] = LAYOUT_65_ansi_blocker_split_bs(
-        QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, KC_MUTE,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,           _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______,               KC_VOLU,
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     KC_PGUP,      KC_VOLD,
-        _______, _______, _______,                            _______,                   _______, _______,              KC_HOME, KC_PGDN,      KC_END
-    )
-};
diff --git a/keyboards/jacky_studio/piggy60/rev2/config.h b/keyboards/jacky_studio/piggy60/rev2/config.h
index 2747834991f..8c9b292fb42 100644
--- a/keyboards/jacky_studio/piggy60/rev2/config.h
+++ b/keyboards/jacky_studio/piggy60/rev2/config.h
@@ -19,5 +19,5 @@
 #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 WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM7
+#define WS2812_PWM_DMA_CHANNEL 7
diff --git a/keyboards/jc65/v32u4/keymaps/coth/keymap.c b/keyboards/jc65/v32u4/keymaps/coth/keymap.c
deleted file mode 100644
index 025c585852f..00000000000
--- a/keyboards/jc65/v32u4/keymaps/coth/keymap.c
+++ /dev/null
@@ -1,25 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT(
-      QK_GESC, KC_1,    KC_2,   KC_3,     KC_4,     KC_5,     KC_6,    KC_7,  KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_GRV, KC_INS,
-      KC_TAB,  KC_Q,    KC_W,   KC_E,     KC_R,     KC_T,     KC_Y,    KC_U,  KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC, KC_DEL,
-      KC_LCTL, KC_A,    KC_S,   KC_D,     KC_F,     KC_G,     KC_H,    KC_J,  KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,  KC_PGUP,
-      KC_LSFT, KC_NUBS, KC_Z,   KC_X,     KC_C,     KC_V,     KC_B,    KC_N,  KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_PGDN,
-      KC_LALT, KC_LCTL, KC_LGUI, KC_SPACE, KC_SPACE, KC_SPACE, MO(1),  KC_NO, MO(2),  KC_LEFT, KC_DOWN, KC_RGHT
-      ),
-  [1] = LAYOUT(
-      KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,    KC_F10,  KC_F11,   KC_F12,  KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, KC_BTN2, KC_MS_U, KC_BTN1, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_UP,   KC_HOME,  KC_END,  KC_DEL,  KC_TRNS,
-      KC_CAPS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_UP,   KC_LEFT,  KC_DOWN, KC_RGHT, KC_TRNS, KC_VOLU,
-      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN,  KC_PGUP, KC_TRNS,  KC_TRNS, KC_PGUP, KC_VOLD,
-      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME,  KC_PGDN, KC_END
-      ),
-  [2] = LAYOUT(
-      RGB_TOG, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, RGB_MOD, RGB_RMOD, BL_STEP, BL_TOGG, KC_TRNS, KC_TRNS, QK_BOOT,
-      KC_TRNS, RGB_HUI, RGB_SAI, RGB_VAI, KC_TRNS,  RGB_TOG,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_UP,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, RGB_HUD, RGB_SAD, RGB_VAD, KC_TRNS,  RGB_HUD,  RGB_HUI, KC_TRNS, KC_TRNS, KC_TRNS, BL_DOWN,  KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAD,  RGB_VAI,  KC_TRNS, KC_TRNS, RGB_MOD, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS
-      ),
-};
diff --git a/keyboards/jc65/v32u4/keymaps/coth/readme.md b/keyboards/jc65/v32u4/keymaps/coth/readme.md
deleted file mode 100644
index 3d621859e7a..00000000000
--- a/keyboards/jc65/v32u4/keymaps/coth/readme.md
+++ /dev/null
@@ -1,14 +0,0 @@
-ChildoftheHorn's Keymap
-===
- 
-Layer 1: "HHKB Mac" Split backspace, 6.25u space, caps is cntl
-
-Layer 2: V60++ with mouse controls on WASD
-
-Layer 3: RGB control on number row, LED controls, and Reset
-
-Keymap Maintainer: [Stacy Devino](https://github.com/childofthehorn)
-
-Difference from base layout: Primarily the HHKB-ness
-
-Intended usage: Daily driver for programming 
diff --git a/keyboards/jc65/v32u4/keymaps/dead_encryption/keymap.c b/keyboards/jc65/v32u4/keymaps/dead_encryption/keymap.c
deleted file mode 100644
index 0fca214f772..00000000000
--- a/keyboards/jc65/v32u4/keymaps/dead_encryption/keymap.c
+++ /dev/null
@@ -1,35 +0,0 @@
-#include QMK_KEYBOARD_H
-// How long (in ms) to wait between animation steps for the breathing mode
-const uint8_t RGBLED_BREATHING_INTERVALS[] PROGMEM = {30, 20, 10, 5};
-
-// How long (in ms) to wait between animation steps for the rainbow mode
-const uint8_t RGBLED_RAINBOW_MOOD_INTERVALS[] PROGMEM = {120, 60, 30};
-
-// How long (in ms) to wait between animation steps for the swirl mode
-const uint8_t RGBLED_RAINBOW_SWIRL_INTERVALS[] PROGMEM = {30, 20, 3};
-
-// How long (in ms) to wait between animation steps for the snake mode
-const uint8_t RGBLED_SNAKE_INTERVALS[] PROGMEM = {100, 50, 20};
-
-// How long (in ms) to wait between animation steps for the knight modes
-const uint8_t RGBLED_KNIGHT_INTERVALS[] PROGMEM = {127, 63, 31};
-
-// These control which colors are selected for the gradient mode
-const uint8_t RGBLED_GRADIENT_RANGES[] PROGMEM = {255, 170, 127, 85, 64};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT(
-      QK_GESC, KC_1,    KC_2,   KC_3,     KC_4,     KC_5,     KC_6,    KC_7,  KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_GRV, KC_PSCR,
-      KC_TAB,  KC_Q,    KC_W,   KC_E,     KC_R,     KC_T,     KC_Y,    KC_U,  KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC, KC_PGUP,
-      KC_CAPS, KC_A,    KC_S,   KC_D,     KC_F,     KC_G,     KC_H,    KC_J,  KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,  KC_PGDN,
-      KC_LSFT, KC_NUBS, KC_Z,   KC_X,     KC_C,     KC_V,     KC_B,    KC_N,  KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_DEL,
-      KC_LCTL, KC_LGUI, KC_LALT, KC_SPACE, KC_SPACE, KC_SPACE, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
-      ),
-  [1] = LAYOUT(
-      QK_BOOT,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,    KC_F10,  KC_F11,  KC_F12,  KC_INS, KC_PAUS, KC_TRNS,
-      KC_TRNS, RGB_TOG, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, RGB_MOD, KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS,
-      KC_TRNS, RGB_HUI, RGB_SAI, RGB_VAI, RGB_HUD, RGB_SAD, RGB_VAD, KC_DOWN, KC_HOME, KC_PGUP,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, BL_TOGG, BL_STEP, BL_UP,   BL_DOWN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END,   KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, KC_TRNS, KC_MPRV, KC_MPLY, KC_MPLY, KC_MPLY, KC_MNXT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-      ),
-};
diff --git a/keyboards/jc65/v32u4/keymaps/dead_encryption/readme.md b/keyboards/jc65/v32u4/keymaps/dead_encryption/readme.md
deleted file mode 100644
index b48075db9f8..00000000000
--- a/keyboards/jc65/v32u4/keymaps/dead_encryption/readme.md
+++ /dev/null
@@ -1,10 +0,0 @@
-Dead's Keymap
-===
-
-Split backspace, 6.25u space, 2 Function Layers, reset + rgb controls on layer(2)
-
-Intended usage: This is my daily driver keymap
-
-===
-
-Encryption Complete
\ No newline at end of file
diff --git a/keyboards/jc65/v32u4/keymaps/gam3cat/config.h b/keyboards/jc65/v32u4/keymaps/gam3cat/config.h
deleted file mode 100644
index e4df94be701..00000000000
--- a/keyboards/jc65/v32u4/keymaps/gam3cat/config.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#pragma once
-
-//Force NKRO to be enabled.
-#define FORCE_NKRO
-
-//GRAVE_ESC override for CTRL+SHIFT+ESC Windows task manager shortcut.
-#define GRAVE_ESC_CTRL_OVERRIDE
-
-//Delay matrix scan for tap dance, reduce to activate modifier keys faster.
-//#define TAPPING_TERM 200
diff --git a/keyboards/jc65/v32u4/keymaps/gam3cat/keymap.c b/keyboards/jc65/v32u4/keymaps/gam3cat/keymap.c
deleted file mode 100644
index e0046073c64..00000000000
--- a/keyboards/jc65/v32u4/keymaps/gam3cat/keymap.c
+++ /dev/null
@@ -1,258 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "version.h"
-
-enum layers {
-    _BL = 0,    // Base Layer
-    _WL,        // Workman Layer
-    _NL,        // Norman Layer
-    _DL,        // Dvorak Layer
-    _CL,        // Base Layer
-    _FL,        // Function Layer
-    _AL,        // Adjust Layer
-};
-
-enum custom_keycodes {
-    QMK_REV = SAFE_RANGE,
-    KC_WEB,
-    KC_SP4,
-    DYNAMIC_MACRO_RANGE
-};
-
-extern backlight_config_t backlight_config;
-
-#include "dynamic_macro.h"
-#define FN_CAPS LT(_FL, KC_CAPS)
-#define KC_DMR1 DM_REC1
-#define KC_DMR2 DM_REC2
-#define KC_DMP1 DM_PLY1
-#define KC_DMP2 DM_PLY2
-#define KC_DMRS DM_RSTP
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /*#### _BL: Base Layer - Mostly standard 65% QWERTY layout.
-    *  .---------------------------------------------------------------.
-    *  |GrE|1  |2  |3  |4  |5  |6  |7  |8  |9  |0  |-  |=  |Backsp |Ins|
-    *  |---------------------------------------------------------------|
-    *  |Tab  |Q  |W  |E  |R  |T  |Y  |U  |I  |O  |P  |[  |]  |\    |Del|
-    *  |---------------------------------------------------------------|
-    *  |FnCaps|A  |S  |D  |F  |G  |H  |J  |K  |L  |;  |'  |Return  |PgU|
-    *  |---------------------------------------------------------------|
-    *  |Shift   |Z  |X  |C  |V  |B  |N  |M  |,  |.  |/  |Shift |Up |PgD|
-    *  |---------------------------------------------------------------|
-    *  |Ctrl|Gui |Alt |      Space             |RAlt |Ctrl |Lft|Dwn|Rgt|
-    *  *---------------------------------------------------------------*
-    */
-    [_BL] = LAYOUT(
-        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  XXXXXXX, KC_BSPC, KC_INS,
-        KC_TAB,           KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
-        FN_CAPS,          KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,           KC_PGUP,
-        KC_LSFT, XXXXXXX, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   KC_PGDN,
-        KC_LCTL, KC_LGUI,          KC_LALT, KC_SPC,           KC_SPC,           KC_SPC,           KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-    /*#### _WL: Workman Layer.
-    *  .---------------------------------------------------------------.
-    *  |   |   |   |   |   |   |   |   |   |   |   |-  |=  |       |   |
-    *  |---------------------------------------------------------------|
-    *  |     |Q  |D  |R  |W  |B  |J  |F  |U  |P  |;  |[  |]  |\    |   |
-    *  |---------------------------------------------------------------|
-    *  |      |A  |S  |H  |T  |G  |Y  |N  |E  |O  |I  |'  |        |   |
-    *  |---------------------------------------------------------------|
-    *  |        |Z  |X  |M  |C  |V  |K  |L  |,  |.  |/  |      |   |   |
-    *  |---------------------------------------------------------------|
-    *  |    |    |    |                        |     |     |   |   |   |
-    *  *---------------------------------------------------------------*
-    */
-    [_WL] = LAYOUT(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______,          KC_Q   , KC_D   , KC_R   , KC_W   , KC_B   , KC_J   , KC_F   , KC_U   , KC_P   , KC_SCLN, _______, _______, _______, _______,
-        _______,          KC_A   , KC_S   , KC_H   , KC_T   , KC_G   , KC_Y   , KC_N   , KC_E   , KC_O   , KC_I   , _______, _______,          _______,
-        _______, _______, KC_Z   , KC_X   , KC_M   , KC_C   , KC_V   , KC_K   , KC_L   , KC_COMM, KC_DOT , KC_SLSH,          _______, _______, _______,
-        _______, _______,          _______, _______,          _______,          _______,          _______, _______, _______, _______, _______, _______
-    ),
-    /*#### _NL: Norman Layer.
-    *  .---------------------------------------------------------------.
-    *  |   |   |   |   |   |   |   |   |   |   |   |-  |=  |       |   |
-    *  |---------------------------------------------------------------|
-    *  |     |Q  |W  |D  |F  |K  |J  |U  |R  |L  |;  |[  |]  |\    |   |
-    *  |---------------------------------------------------------------|
-    *  |      |A  |S  |E  |T  |G  |Y  |N  |I  |O  |H  |'  |        |   |
-    *  |---------------------------------------------------------------|
-    *  |        |Z  |X  |C  |V  |B  |P  |M  |,  |.  |/  |      |   |   |
-    *  |---------------------------------------------------------------|
-    *  |    |    |    |                        |     |     |   |   |   |
-    *  *---------------------------------------------------------------*
-    */
-    [_NL] = LAYOUT(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______,          KC_Q   , KC_W   , KC_D   , KC_F   , KC_K   , KC_J   , KC_U   , KC_R   , KC_L   , KC_SCLN, _______, _______, _______, _______,
-        _______,          KC_A   , KC_S   , KC_E   , KC_T   , KC_G   , KC_Y   , KC_N   , KC_I   , KC_O   , KC_H   , _______, _______,          _______,
-        _______, _______, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_P   , KC_M   , KC_COMM, KC_DOT , KC_SLSH,          _______, _______, _______,
-        _______, _______,          _______, _______,          _______,          _______,          _______, _______, _______, _______, _______, _______
-    ),
-    /*#### _DL: Dvorak Layer.
-    *  .---------------------------------------------------------------.
-    *  |   |   |   |   |   |   |   |   |   |   |   |[  |]  |       |   |
-    *  |---------------------------------------------------------------|
-    *  |     |'  |,  |.  |P  |Y  |F  |G  |C  |R  |L  |/  |=  |\    |   |
-    *  |---------------------------------------------------------------|
-    *  |      |A  |O  |E  |U  |I  |D  |H  |T  |N  |S  |-  |        |   |
-    *  |---------------------------------------------------------------|
-    *  |        |;  |Q  |J  |K  |X  |B  |M  |W  |V  |Z  |      |   |   |
-    *  |---------------------------------------------------------------|
-    *  |    |    |    |                        |     |     |   |   |   |
-    *  *---------------------------------------------------------------*
-    */
-    [_DL] = LAYOUT(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, _______, _______, _______,
-        _______,          KC_QUOT, KC_COMM, KC_DOT , KC_P   , KC_Y   , KC_F   , KC_G   , KC_C   , KC_R   , KC_L   , KC_SLSH, KC_EQL , _______, _______,
-        _______,          KC_A   , KC_O   , KC_E   , KC_U   , KC_I   , KC_D   , KC_H   , KC_T   , KC_N   , KC_S   , KC_MINS, _______,          _______,
-        _______, _______, KC_SCLN, KC_Q   , KC_J   , KC_K   , KC_X   , KC_B   , KC_M   , KC_W   , KC_V   , KC_Z   ,          _______, _______, _______,
-        _______, _______,          _______, _______,          _______,          _______,          _______, _______, _______, _______, _______, _______
-    ),
-    /*#### _CL: Colmak Layer.
-    *  .---------------------------------------------------------------.
-    *  |   |   |   |   |   |   |   |   |   |   |   |-  |=  |       |   |
-    *  |---------------------------------------------------------------|
-    *  |     |Q  |W  |F  |P  |G  |J  |L  |U  |Y  |;  |[  |]  |\    |   |
-    *  |---------------------------------------------------------------|
-    *  |      |A  |R  |S  |T  |D  |H  |N  |E  |I  |O  |'  |        |   |
-    *  |---------------------------------------------------------------|
-    *  |        |Z  |X  |C  |V  |B  |K  |M  |,  |.  |/  |      |   |   |
-    *  |---------------------------------------------------------------|
-    *  |    |    |    |                        |     |     |   |   |   |
-    *  *---------------------------------------------------------------*
-    */
-    [_CL] = LAYOUT(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______,          KC_Q   , KC_W   , KC_F   , KC_P   , KC_G   , KC_J   , KC_L   , KC_U   , KC_Y   , KC_SCLN, _______, _______, _______, _______,
-        _______,          KC_A   , KC_R   , KC_S   , KC_T   , KC_D   , KC_H   , KC_N   , KC_E   , KC_I   , KC_O   , _______, _______,          _______,
-        _______, _______, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_K   , KC_M   , KC_COMM, KC_DOT , KC_SLSH,          _______, _______, _______,
-        _______, _______,          _______, _______,          _______,          _______,          _______, _______, _______, _______, _______, _______
-    ),
-    /*#### _FL: Function Layer.
-    *  .---------------------------------------------------------------.
-    *  |Web|F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|SLock  |PSc|
-    *  |---------------------------------------------------------------|
-    *  |Fn_AL|   |   |   |   |   |   |   |   |   |   |   |   |     |Pau|
-    *  |---------------------------------------------------------------|
-    *  |FnCaps|   |   |   |   |   |Lft|Dwn|Up |Rgt|   |   |        |Hme|
-    *  |---------------------------------------------------------------|
-    *  |        |   |   |   |   |   |   |   |   |   |   |VlMute|VlU|End|
-    *  |---------------------------------------------------------------|
-    *  |    |    |Menu|      SP4               |     |     |WBk|VlD|WFw|
-    *  *---------------------------------------------------------------*
-    */
-    [_FL] = LAYOUT(
-        KC_WEB,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  XXXXXXX, KC_SCRL, KC_PSCR,
-        MO(_AL),          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PAUS,
-        _______,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, XXXXXXX, XXXXXXX, XXXXXXX,          KC_HOME,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          KC_MUTE, KC_VOLU, KC_END,
-        XXXXXXX, XXXXXXX,          KC_MENU, KC_SP4,           KC_SP4,           KC_SP4,           XXXXXXX, XXXXXXX, XXXXXXX, KC_WBAK, KC_VOLD, KC_WFWD
-    ),
-    /*#### _AL: Adjust Layer - Keymap select, RGB Underglow, LED backlight, and Dynamic Macro settings.
-    *  .---------------------------------------------------------------.
-    *  |Rev|Tog|Mod|H- |H+ |S- |S+ |V- |V+ |   |BLT|BL-|BL+|       |MP1|
-    *  |---------------------------------------------------------------|
-    *  |Fn_AL|_BL|_WL|   |   |   |   |   |   |   |   |   |   |     |MR1|
-    *  |---------------------------------------------------------------|
-    *  |FnCaps|   |   |_DL|   |   |   |   |   |   |   |   |        |MS |
-    *  |---------------------------------------------------------------|
-    *  |        |   |   |_CL|   |_BL|_NL|   |   |   |   |      |   |MR2|
-    *  |---------------------------------------------------------------|
-    *  |Rst |    |    |                        |     |     |   |   |MP2|
-    *  *---------------------------------------------------------------*
-    */
-    [_AL] = LAYOUT(
-        QMK_REV, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, XXXXXXX, BL_TOGG, BL_DOWN, BL_UP,   XXXXXXX, XXXXXXX, KC_DMP1,
-        _______,          DF(_BL), DF(_WL), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_DMR1,
-        _______,          XXXXXXX, XXXXXXX, DF(_DL), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          KC_DMRS,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DF(_CL), XXXXXXX, DF(_BL), DF(_NL), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX, KC_DMR2,
-        QK_BOOT, XXXXXXX,          XXXXXXX, XXXXXXX,          XXXXXXX,          XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_DMP2
-    ),
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case QMK_REV:
-            if (record->event.pressed) {
-                SEND_STRING(QMK_KEYBOARD "/" QMK_KEYMAP "@" QMK_VERSION ":" QMK_BUILDDATE);
-            }
-            return false;
-            break;
-        case KC_WEB:
-            if (record->event.pressed) {
-                SEND_STRING(SS_LGUI("r"));
-                wait_ms(100);
-                SEND_STRING("chrome.exe https://geekhack.org/index.php?topic=86756.new;topicseen#new\n");
-            }
-            return false;
-            break;
-        case KC_SP4:
-            if (record->event.pressed) {
-                SEND_STRING ("    ");
-            }
-            return false;
-            break;
-    }
-    // Dynamic Macros.
-    if (!process_record_dynamic_macro(keycode, record)) {
-        return false;
-    }
-    return true;
-}
-
-void custom_backlight_level(uint8_t level) {
-    if (level > BACKLIGHT_LEVELS)
-        level = BACKLIGHT_LEVELS;
-    backlight_config.level = level;
-    backlight_config.enable = !!backlight_config.level;
-    backlight_set(backlight_config.level);
-}
-
-void matrix_init_user(void) {
-    #ifdef BACKLIGHT_ENABLE
-        custom_backlight_level(0);
-    #endif
-    #ifdef RGBLIGHT_ENABLE
-        rgblight_mode(1);
-        rgblight_sethsv_noeeprom(180,100,100);
-    #endif
-}
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    switch (get_highest_layer(state)) {
-       case _BL:
-           custom_backlight_level(0);
-           rgblight_sethsv_noeeprom(180,100,255);
-           break;
-       case _WL:
-           custom_backlight_level(1);
-           rgblight_sethsv_noeeprom(180,95,240);
-           break;
-       case _NL:
-           custom_backlight_level(1);
-           rgblight_sethsv_noeeprom(180,90,225);
-           break;
-       case _DL:
-           custom_backlight_level(1);
-           rgblight_sethsv_noeeprom(180,85,210);
-           break;
-       case _CL:
-           custom_backlight_level(1);
-           rgblight_sethsv_noeeprom(180,80,195);
-           break;
-       case _FL:
-           custom_backlight_level(2);
-           rgblight_sethsv_noeeprom(230,255,255);
-           break;
-       case _AL:
-           custom_backlight_level(3);
-           rgblight_sethsv_noeeprom(250,255,255);
-           break;
-       default:
-           custom_backlight_level(0);
-           rgblight_sethsv_noeeprom(180,100,100);
-           break;
-    }
-    return state;
-}
diff --git a/keyboards/jc65/v32u4/keymaps/gam3cat/readme.md b/keyboards/jc65/v32u4/keymaps/gam3cat/readme.md
deleted file mode 100644
index e79ce4ff7fd..00000000000
--- a/keyboards/jc65/v32u4/keymaps/gam3cat/readme.md
+++ /dev/null
@@ -1,105 +0,0 @@
-# Keymap Maintainer: Gam3cat
-make jc65/v32u4:gam3cat
-## Layout Config:
-2u backspace, 2.25u left shift/enter, 1.75u right shift.
-(2x1.5u, 1x7.0u, 2x1.5u, 3x1u), (3x1.25u, 1x6.25u, 2x1.5u, 3x1u), or
-(3x1.25u, 1x6.25u, 6x1u) bottom row.
-
-    FN_CAPS = MO(_FL) when held, CAPS when tapped.
-    GRAVE_ESC + GUI = `
-    GRAVE_ESC + SHIFT = ~
-
-## Base Layer Selection:
-(Caps+TAB+(  )): (Q)WERTY, (W)orkman, (N)orman, (D)vorak, (C)olmak
-
-### Base Layer Options:
-#### _BL: Base Layer - Mostly standard 65% QWERTY layout.
-    .---------------------------------------------------------------.
-    |GrE|1  |2  |3  |4  |5  |6  |7  |8  |9  |0  |-  |=  |Backsp |Ins|
-    |---------------------------------------------------------------|
-    |Tab  |Q  |W  |E  |R  |T  |Y  |U  |I  |O  |P  |[  |]  |\    |Del|
-    |---------------------------------------------------------------|
-    |FnCaps|A  |S  |D  |F  |G  |H  |J  |K  |L  |;  |'  |Return  |PgU|
-    |---------------------------------------------------------------|
-    |Shift   |Z  |X  |C  |V  |B  |N  |M  |,  |.  |/  |Shift |Up |PgD|
-    |---------------------------------------------------------------|
-    |Ctrl|Gui |Alt |      Space             |RAlt |Ctrl |Lft|Dwn|Rgt|
-    *---------------------------------------------------------------*
-
-#### _WL: Workman Layer.
-    .---------------------------------------------------------------.
-    |   |   |   |   |   |   |   |   |   |   |   |-  |=  |       |   |
-    |---------------------------------------------------------------|
-    |     |Q  |D  |R  |W  |B  |J  |F  |U  |P  |;  |[  |]  |\    |   |
-    |---------------------------------------------------------------|
-    |      |A  |S  |H  |T  |G  |Y  |N  |E  |O  |I  |'  |        |   |
-    |---------------------------------------------------------------|
-    |        |Z  |X  |M  |C  |V  |K  |L  |,  |.  |/  |      |   |   |
-    |---------------------------------------------------------------|
-    |    |    |    |                        |     |     |   |   |   |
-    *---------------------------------------------------------------*
-
-#### _NL: Norman Layer.
-    .---------------------------------------------------------------.
-    |   |   |   |   |   |   |   |   |   |   |   |-  |=  |       |   |
-    |---------------------------------------------------------------|
-    |     |Q  |W  |D  |F  |K  |J  |U  |R  |L  |;  |[  |]  |\    |   |
-    |---------------------------------------------------------------|
-    |      |A  |S  |E  |T  |G  |Y  |N  |I  |O  |H  |'  |        |   |
-    |---------------------------------------------------------------|
-    |        |Z  |X  |C  |V  |B  |P  |M  |,  |.  |/  |      |   |   |
-    |---------------------------------------------------------------|
-    |    |    |    |                        |     |     |   |   |   |
-    *---------------------------------------------------------------*
-
-#### _DL: Dvorak Layer.
-    .---------------------------------------------------------------.
-    |   |   |   |   |   |   |   |   |   |   |   |[  |]  |       |   |
-    |---------------------------------------------------------------|
-    |     |'  |,  |.  |P  |Y  |F  |G  |C  |R  |L  |/  |=  |\    |   |
-    |---------------------------------------------------------------|
-    |      |A  |O  |E  |U  |I  |D  |H  |T  |N  |S  |-  |        |   |
-    |---------------------------------------------------------------|
-    |        |;  |Q  |J  |K  |X  |B  |M  |W  |V  |Z  |      |   |   |
-    |---------------------------------------------------------------|
-    |    |    |    |                        |     |     |   |   |   |
-    *---------------------------------------------------------------*
-
-#### _CL: Colmak Layer.
-    .---------------------------------------------------------------.
-    |   |   |   |   |   |   |   |   |   |   |   |-  |=  |       |   |
-    |---------------------------------------------------------------|
-    |     |Q  |W  |F  |P  |G  |J  |L  |U  |Y  |;  |[  |]  |\    |   |
-    |---------------------------------------------------------------|
-    |      |A  |R  |S  |T  |D  |H  |N  |E  |I  |O  |'  |        |   |
-    |---------------------------------------------------------------|
-    |        |Z  |X  |C  |V  |B  |K  |M  |,  |.  |/  |      |   |   |
-    |---------------------------------------------------------------|
-    |    |    |    |                        |     |     |   |   |   |
-    *---------------------------------------------------------------*
-
-#### _FL: Function Layer.
-    .---------------------------------------------------------------.
-    |Web|F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|SLock  |PSc|
-    |---------------------------------------------------------------|
-    |Fn_AL|   |   |   |   |   |   |   |   |   |   |   |   |     |Pau|
-    |---------------------------------------------------------------|
-    |FnCaps|   |   |   |   |   |Lft|Dwn|Up |Rgt|   |   |        |Hme|
-    |---------------------------------------------------------------|
-    |        |   |   |   |   |   |   |   |   |   |   |VlMute|VlU|End|
-    |---------------------------------------------------------------|
-    |    |    |Menu|      SP4               |     |     |WBk|VlD|WFw|
-    *---------------------------------------------------------------*
-
-#### _AL: Adjust Layer - Keymap select, RGB Underglow, LED backlight, and Dynamic Macro settings.
-    .---------------------------------------------------------------.
-    |Rev|Tog|Mod|H- |H+ |S- |S+ |V- |V+ |   |BLT|BL-|BL+|       |MP1|
-    |---------------------------------------------------------------|
-    |Fn_AL|_BL|_WL|   |   |   |   |   |   |   |   |   |   |     |MR1|
-    |---------------------------------------------------------------|
-    |FnCaps|   |   |_DL|   |   |   |   |   |   |   |   |        |MS |
-    |---------------------------------------------------------------|
-    |        |   |   |_CL|   |_BL|_NL|   |   |   |   |      |   |MR2|
-    |---------------------------------------------------------------|
-    |Rst |    |    |                        |     |     |   |   |MP2|
-    *---------------------------------------------------------------*
diff --git a/keyboards/jc65/v32u4/keymaps/gam3cat/rules.mk b/keyboards/jc65/v32u4/keymaps/gam3cat/rules.mk
deleted file mode 100644
index 5ff16d47103..00000000000
--- a/keyboards/jc65/v32u4/keymaps/gam3cat/rules.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
-TAP_DANCE_ENABLE = no       # Enable TapDance functionality
-RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys(+1500)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = no         # Commands for debug and configuration
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-NKRO_ENABLE = yes           # Nkey Rollover - If this doesn't work, add this to config.h: #define FORCE_NKRO
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-UNICODE_ENABLE = no         # Unicode
-UNICODEMAP_ENABLE = no      # Enable extended unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-AUDIO_ENABLE = no           # Audio output on port C6#VARIABLE_TRACE = no         # Use this to debug changes to variable values
-KEY_LOCK_ENABLE = no        # This enables key lock(+260)
-SPLIT_KEYBOARD = no         # This enables split keyboard support and includes all necessary files located at quantum/split_common
diff --git a/keyboards/jc65/v32u4/keymaps/na7thana/keymap.c b/keyboards/jc65/v32u4/keymaps/na7thana/keymap.c
deleted file mode 100644
index 70ae80044d1..00000000000
--- a/keyboards/jc65/v32u4/keymaps/na7thana/keymap.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT(
-      QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_NO, KC_BSLS, KC_HOME,
-      KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, KC_PGUP,
-      KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN,
-      KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, MO(1),
-      KC_LCTL, KC_LALT, KC_LALT, KC_SPACE, KC_SPACE, KC_SPACE, KC_SPACE, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
-      ),
-  [1] = LAYOUT(
-      QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_END, KC_DEL, KC_TRNS,
-      KC_CAPS, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU,
-      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_MNXT, KC_MPLY, KC_MPLY, KC_VOLU, KC_TRNS,
-      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_VOLD, KC_TRNS
-      ),
-};
diff --git a/keyboards/jc65/v32u4/keymaps/na7thana/readme.md b/keyboards/jc65/v32u4/keymaps/na7thana/readme.md
deleted file mode 100644
index 13430a630b8..00000000000
--- a/keyboards/jc65/v32u4/keymaps/na7thana/readme.md
+++ /dev/null
@@ -1,10 +0,0 @@
-Default Keymap
-===
-
-Super simple default keymap with only a base layer.
-
-Keymap Maintainer: [Ethan Madden](https://github.com/jetpacktuxedo)
-
-Difference from base layout: This is (as close as I can tell) the same as the layout that ships on the boards other than default underglow color.
-
-Intended usage: This is mostly provided for testing before you build your own keymap and as a reference to a stock(ish) configuration
diff --git a/keyboards/jd40/keymaps/vanagon/README.md b/keyboards/jd40/keymaps/vanagon/README.md
deleted file mode 100644
index 09a4e23a6ee..00000000000
--- a/keyboards/jd40/keymaps/vanagon/README.md
+++ /dev/null
@@ -1,17 +0,0 @@
-Vanagon
-===
-Port of [evangs'](https://thevankeyboards.com) [MiniVan layout](https://www.massdrop.com/talk/115/where-did-all-my-keys-go-a-look-into-the-function-layers-of-the-mini-van) to the JD40. Includes colon/semicolon support, which is missing from the MiniVan layout.
-
-This layout uses a 44 key configuration similar to the following:
-
-```
-,------+------+------+------+------+------+------+------+------+------+------+------.
-|      |      |      |      |      |      |      |      |      |      |      |      |
-|------`------`------`------`------`------`------`------`------`------`------`------|
-|       |      |      |      |      |      |      |      |      |      |            |
-|-------`------`------`------`------`------`------`------`------`------`------------|
-|         |      |      |      |      |      |       |      |      |      |         |
-|---------`------`------`------`------`------'-------`------`------`------`---------|
-|      |      |      |       |            |            |       |      |      |      |
-`------+------+------+-------+----^^^-----+----^^^-----+-------+------+------+------'
-```
diff --git a/keyboards/jd40/keymaps/vanagon/config.h b/keyboards/jd40/keymaps/vanagon/config.h
deleted file mode 100644
index ed09b50ee4d..00000000000
--- a/keyboards/jd40/keymaps/vanagon/config.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#include "../../config.h"
-
-#define LAYOUT_VANAGON(\
-	K01, K02, K03, K04, K05, K06, K07, K08, K09, K10, K11, K12, \
-	K13, K14, K15, K16, K17, K18, K19, K20, K21, K22, K23, \
-	K24, K25, K26, K27, K28, K29, K30, K31, K32, K33, K34, \
-	K35, K36, K37, K38, K39, K40, K41, K42, K43, K44 \
-) { \
-	{ K01, K02, K03, K04, K05, K06, K07, K08, K09, K10, K11, K12 }, \
-	{ K13, K14, K15, K16, K17, K18, K19, K20, K21, K22, K23 }, \
-	{ K24, K25, K26, K27, K28, K29, K30, K31, K32, K33, K34 }, \
-	{ K35, K36, K37, K38, K39, KC_NO, K40, K41, K42, K43, K44 } \
-}
diff --git a/keyboards/jd40/keymaps/vanagon/keymap.c b/keyboards/jd40/keymaps/vanagon/keymap.c
deleted file mode 100644
index 5f1cfc35795..00000000000
--- a/keyboards/jd40/keymaps/vanagon/keymap.c
+++ /dev/null
@@ -1,26 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "action_layer.h"
-
-enum
-{
-    _BL = 0,
-    _AL1,
-    _AL2,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_BL] = LAYOUT_VANAGON(
-        KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
-        MO(_AL1), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, MO(_AL1),
-        SC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,
-        MO(_AL2), KC_LCTL, KC_LALT, KC_LGUI, KC_ENT, KC_SPC, KC_RGUI, KC_RALT, SC_RSPC, MO(_AL2)),
-    [_AL1] = LAYOUT_VANAGON(
-        KC_GRV, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LBRC, KC_RBRC, KC_TRNS,
-        KC_TRNS, KC_BSLS, KC_QUOT, KC_MINS, KC_EQL, KC_COLN, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT, KC_TRNS,
-        KC_TRNS, KC_ESC, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-    [_AL2] = LAYOUT_VANAGON(
-        KC_TILD, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS,
-        KC_TRNS, KC_PIPE, KC_DQT, KC_UNDS, KC_PLUS, KC_SCLN, KC_TRNS, KC_4, KC_5, KC_6, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_0, KC_1, KC_2, KC_3, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)};
diff --git a/keyboards/jd45/keymaps/mjt6u/config.h b/keyboards/jd45/keymaps/mjt6u/config.h
deleted file mode 100644
index 41d1557c6f1..00000000000
--- a/keyboards/jd45/keymaps/mjt6u/config.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-#define USB_MAX_POWER_CONSUMPTION 50
diff --git a/keyboards/jd45/keymaps/mjt6u/keymap.c b/keyboards/jd45/keymaps/mjt6u/keymap.c
deleted file mode 100644
index 30c6daaf390..00000000000
--- a/keyboards/jd45/keymaps/mjt6u/keymap.c
+++ /dev/null
@@ -1,153 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum jd45_layers
-{
-    _QWERTY,
-    _QWERTYNUMMODS,
-    _NUMSYM,
-    _FUNCTION,
-    _NUMPAD,
-    _FKEYNUMPAD,
-    _ADJUST
-};
-
-enum jd45_keycodes
-{
-    NUMSYM = SAFE_RANGE,
-    MACSLEEP,
-    USEFNMODS,
-    USENUMMODS,
-    DYNAMIC_MACRO_RANGE,
-};
-
-#include "dynamic_macro.h"
-
-#define LONGPRESS_DELAY 150
-#define LAYER_TOGGLE_DELAY 900
-
-#define __MOD__ KC_TRNS
-#define F_FNSPC LT(_NUMSYM, KC_SPC)
-#define F_NUMSPC LT(_NUMPAD, KC_SPC)
-#define F_FNTAB LT(_FUNCTION, KC_TAB)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT(
-    F_FNTAB,       KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,          KC_MINS,     KC_BSPC,
-    CTL_T(KC_ESC), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,                    LT(_ADJUST, KC_QUOT),
-    KC_LSFT,       KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,                    SFT_T(KC_ENT),
-    XXXXXXX,       KC_LALT, KC_LGUI, XXXXXXX,          XXXXXXX,          F_FNSPC,          XXXXXXX, MO(_FUNCTION), MO(_ADJUST), XXXXXXX
-  ),
-
-  [_QWERTYNUMMODS] = LAYOUT(
-    F_FNTAB,       KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,     KC_I,    KC_O,    KC_P,            KC_MINS,     KC_BSPC,
-    CTL_T(KC_ESC), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,     KC_K,    KC_L,    KC_SCLN,                      LT(_ADJUST, KC_QUOT),
-    KC_LSFT,       KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,     KC_COMM, KC_DOT,  KC_SLSH,                      SFT_T(KC_ENT),
-    XXXXXXX,       KC_LALT, KC_LGUI, XXXXXXX,          XXXXXXX,          F_NUMSPC,          XXXXXXX, MO(_FKEYNUMPAD), MO(_ADJUST), XXXXXXX
-  ),
-
-  [_NUMSYM] = LAYOUT(
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______, KC_DEL,
-    __MOD__, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______,          _______,
-    _______, _______, _______, _______, _______, KC_SPC,  KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,          _______,
-    XXXXXXX, __MOD__, __MOD__, XXXXXXX,          XXXXXXX,          _______,          XXXXXXX, __MOD__, __MOD__, XXXXXXX
-  ),
-
-  [_FUNCTION] = LAYOUT(
-    __MOD__, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-    __MOD__, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT, _______,          _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-    XXXXXXX, __MOD__, __MOD__, XXXXXXX,          XXXXXXX,          _______,          XXXXXXX, __MOD__, __MOD__, XXXXXXX
-  ),
-
-  [_NUMPAD] = LAYOUT(
-    KC_GRV,  _______, KC_UP,   _______, KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_PSCR, KC_LBRC, KC_RBRC,
-    _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_4,    KC_5,    KC_6,    KC_INS,  KC_HOME, KC_PGUP, _______,          _______,
-    _______, _______, _______, _______, KC_1,    KC_2,    KC_3,    KC_DEL,  KC_END,  KC_PGDN, _______,          _______,
-    XXXXXXX, _______, _______, XXXXXXX,          XXXXXXX,          _______,          XXXXXXX, __MOD__, __MOD__, XXXXXXX
-  ),
-
-  [_FKEYNUMPAD] = LAYOUT(
-    _______, _______, KC_VOLU, _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, _______, _______,
-    _______, KC_MPRV, KC_VOLD, KC_MNXT, KC_F4,   KC_F5,   KC_F6,   KC_J,    KC_K,    KC_L,    KC_SCLN,          _______,
-    _______, _______, _______, _______, KC_F1,   KC_F2,   KC_F3,   KC_MUTE, KC_MPRV, KC_MNXT, KC_MSTP,          _______,
-    XXXXXXX, _______, _______, XXXXXXX,          XXXXXXX,          _______,          XXXXXXX, __MOD__, __MOD__, XXXXXXX
-  ),
-
-  [_ADJUST] = LAYOUT(
-    _______, QK_BOOT, _______, _______, _______,   _______, _______,    DM_REC1,  DM_REC2,  _______,  KC_PSCR, _______, _______,
-    _______, _______, _______, _______, USEFNMODS, _______, _______,    DM_PLY1,  DM_PLY2, MACSLEEP, _______,          _______,
-    _______, _______, _______, _______, _______,   _______, USENUMMODS, _______,         _______,         _______,  _______,          _______,
-    XXXXXXX, _______, _______, XXXXXXX,            XXXXXXX,             _______,                          XXXXXXX, __MOD__,  __MOD__, XXXXXXX
-  )
-};
-
-void persistent_default_layer_set(uint16_t default_layer)
-{
-    eeconfig_update_default_layer(default_layer);
-    default_layer_set(default_layer);
-}
-
-static bool singular_key = false;
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record)
-{
-    uint16_t macro_kc = (keycode == MO(_ADJUST) ? DM_RSTP : keycode);
-    if (!process_record_dynamic_macro(macro_kc, record))
-    {
-        return false;
-    }
-    println(" ");
-    print("process record");
-
-    switch (keycode)
-    {
-    case MACSLEEP:
-        if (record->event.pressed)
-        {
-            // ACTION_MODS_KEY(MOD_LCTL | MOD_LSFT, KC_PWR);
-            register_code(KC_RSFT);
-            register_code(KC_RCTL);
-            register_code(KC_PWR);
-            unregister_code(KC_PWR);
-            unregister_code(KC_RCTL);
-            unregister_code(KC_RSFT);
-        }
-        return false;
-        break;
-    case USEFNMODS:
-        if (record->event.pressed)
-        {
-            persistent_default_layer_set(1UL << _QWERTY);
-#ifdef AUDIO_ENABLE
-            PLAY_SONG(tone_fnpc);
-#endif
-            print("Space-FN");
-        }
-        return false;
-        break;
-    case USENUMMODS:
-        if (record->event.pressed)
-        {
-            persistent_default_layer_set(1UL << _QWERTYNUMMODS);
-#ifdef AUDIO_ENABLE
-            PLAY_SONG(tone_fnmac);
-#endif
-            print("Space-Numpad");
-        }
-        return false;
-        break;
-    default:
-        singular_key = false;
-        break;
-    }
-
-    return true;
-};
-
-void matrix_init_user(void)
-{
-#ifdef AUDIO_ENABLE
-    startup_user();
-#endif
-    // debug_enable = true;
-}
diff --git a/keyboards/jd45/keymaps/mjt6u/readme.md b/keyboards/jd45/keymaps/mjt6u/readme.md
deleted file mode 100644
index a43ddf5fcac..00000000000
--- a/keyboards/jd45/keymaps/mjt6u/readme.md
+++ /dev/null
@@ -1,23 +0,0 @@
-# Mike's JD45 with 6u Spacebar
-
-- Early draft of numsym that misses a lot of symbols
-- Numpad layer available for evaluation
-- Works with iPhone Camera Adapter
-- Dynamic macros
-
-## Layers
-
-Qwerty for letters and mods.
-
-Qwertymods layer switches some Modifiers around
-
-Numsym puts the number keys across the top row like a Planck. Arrows are on hjkl
-which makes the other NumSym dynamic from my other boards fall apart
-
-Function layer replaces the top row numbers with Fkeys.
-
-Numpad layer makes a number pad in the center.
-
-Fkeynumpad replaces the numpad numbers with Fkeys.
-
-Adjust layer has macros and configuration.
diff --git a/keyboards/jd45/keymaps/mjt6u/rules.mk b/keyboards/jd45/keymaps/mjt6u/rules.mk
deleted file mode 100644
index 1d2e0f09e18..00000000000
--- a/keyboards/jd45/keymaps/mjt6u/rules.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = yes        # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-
-DEBUG_ENABLE = yes
-
diff --git a/keyboards/jels/boaty/info.json b/keyboards/jels/boaty/info.json
index ca6257f6ef6..6d85c5bd4f7 100644
--- a/keyboards/jels/boaty/info.json
+++ b/keyboards/jels/boaty/info.json
@@ -16,8 +16,7 @@
         "mousekey": false,
         "extrakey": true,
         "console": false,
-        "command": false,
-        "backlight": false
+        "command": false
     },
     "matrix_pins": {
         "cols": ["B1", "C0", "C1", "C2", "D4", "D1", "D0", "C5", "C4", "C3", "D5"],
diff --git a/keyboards/jkdlab/binary_monkey/keymaps/ascii/keymap.c b/keyboards/jkdlab/binary_monkey/keymaps/ascii/keymap.c
deleted file mode 100644
index e10df7ce08c..00000000000
--- a/keyboards/jkdlab/binary_monkey/keymaps/ascii/keymap.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright 2021 JKDLAB. <jkdlab.co@gmail.com>
- * Copyright 2021 Jaehee <ljh34210329@gmail.com>
- * 
- * This program is free software: you can redistribute it and/or modify 
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License,
- * or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see https://www.gnu.org/licenses/.
- */
- 
-#include QMK_KEYBOARD_H
-
-char ascii = 0;
-
-enum custom_keycodes {
-    BIN_0 = SAFE_RANGE,
-    BIN_1,
-    BIN_RETURN
-};
-
-enum layers {
-    _BASE = 0
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_BASE] = LAYOUT(
-        BIN_0,   BIN_1,
-          BIN_RETURN
-    )
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t* record) {
-    switch (keycode) {
-        case BIN_0:
-            if (record->event.pressed) {   
-                ascii = ascii << 1;
-            }
-
-            return true;
-        case BIN_1:
-            if (record->event.pressed) {
-                    ascii = ascii << 1;
-                    ++ascii;
-                }
-
-            return true;
-        case BIN_RETURN:
-            if (record->event.pressed) {
-                char str[2] = { ascii & 127, '\0' };
-
-                send_string(str);
-
-                ascii = 0;
-            }
-
-            return true;
-        default:
-            return true;
-    }
-
-    return true;
-}
diff --git a/keyboards/jorne/post_config.h b/keyboards/jorne/post_config.h
index 4a4c71517a7..7d159c0de20 100644
--- a/keyboards/jorne/post_config.h
+++ b/keyboards/jorne/post_config.h
@@ -2,18 +2,18 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
 
-#ifndef BOOTMAGIC_LITE_ROW
-#    define BOOTMAGIC_LITE_ROW 0
+#ifndef BOOTMAGIC_ROW
+#    define BOOTMAGIC_ROW 0
 #endif
-#ifndef BOOTMAGIC_LITE_COLUMN
-#    define BOOTMAGIC_LITE_COLUMN 1
+#ifndef BOOTMAGIC_COLUMN
+#    define BOOTMAGIC_COLUMN 1
 #endif
 
-#ifndef BOOTMAGIC_LITE_ROW_RIGHT
-#    define BOOTMAGIC_LITE_ROW_RIGHT 4
+#ifndef BOOTMAGIC_ROW_RIGHT
+#    define BOOTMAGIC_ROW_RIGHT 4
 #endif
-#ifndef BOOTMAGIC_LITE_COLUMN_RIGHT
-#    define BOOTMAGIC_LITE_COLUMN_RIGHT 1
+#ifndef BOOTMAGIC_COLUMN_RIGHT
+#    define BOOTMAGIC_COLUMN_RIGHT 1
 #endif
 
 #ifdef RGBLIGHT_ENABLE
diff --git a/keyboards/joshajohnson/hub16/keymaps/peepeetee/config.h b/keyboards/joshajohnson/hub16/keymaps/peepeetee/config.h
deleted file mode 100644
index 62b0df937bb..00000000000
--- a/keyboards/joshajohnson/hub16/keymaps/peepeetee/config.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
-Copyright 2019 Josh Johnson
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#define RGBLIGHT_SLEEP         /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== customize breathing effect ==*/
-//   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
-//   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
-//   /*==== use exp() and sin() ====*/
-//   #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
-//   #define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
-// #endif
-
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCE 20
-
-// Time out one shot layers after 3 seconds
-#define ONESHOT_TIMEOUT 3000
-
-// Undef and redefine default brightness to half of 255
-#undef RGBLIGHT_LIMIT_VAL
-#define RGBLIGHT_LIMIT_VAL 255
-
-//Define a preview timeout for RGB reviews
-#define PREVIEW_TIMEOUT 5000
-
-// Enable Light Layers implementation
-#define RGBLIGHT_LAYERS
-// Allow Light Layers to override RGB off configuration
-#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
diff --git a/keyboards/joshajohnson/hub16/keymaps/peepeetee/keymap.c b/keyboards/joshajohnson/hub16/keymaps/peepeetee/keymap.c
deleted file mode 100644
index dac88c8482e..00000000000
--- a/keyboards/joshajohnson/hub16/keymaps/peepeetee/keymap.c
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
-Copyright 2019 Josh Johnson 2021 peepeetee
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include QMK_KEYBOARD_H
-
-#if defined(RGBLIGHT_ENABLE) && defined(RGBLIGHT_LAYERS)
-static uint32_t rgb_preview_timer = 0;
-#endif
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-
-        // Layer 0 - Base Layer (F13 to F24, and One Shot Layer 1,2,3 or Toggle Layer 4)
-        [0] = LAYOUT(
-                        KC_MPLY, KC_MUTE,
-                TG(3), TG(2), TG(1), TG(0),
-                KC_PSCR, KC_SCRL, KC_PAUS, A(KC_F4),
-                KC_INS, KC_HOME, KC_PGUP, KC_F12,    //Transparent to let you go between layers
-                KC_DEL, A(KC_F4), KC_PGDN, KC_CALCULATOR
-
-		),
-
-        [1] = LAYOUT(
-                        KC_MPLY, KC_MUTE,
-                KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
-                KC_F7, KC_F8, KC_F9,                KC_F10,
-                KC_F4, KC_F5, KC_F6,                KC_F11,
-                KC_F1,      KC_F2,      KC_F3,      KC_F12         //Transparent to let you go between layers
-        ),
-
-
-                //Layer 5 - Keyboard Lights, Programming and Special Functions
-        [2] = LAYOUT(
-                        KC_MPLY, KC_MUTE,
-                KC_TRNS,  KC_TRNS, KC_TRNS,   KC_TRNS,         //Transparent to let you go between layers
-                RGB_MOD,  RGB_HUI, RGB_SAI,   RGB_VAI,
-                RGB_RMOD, RGB_HUD, RGB_SAD,   RGB_VAD,
-                RGB_TOG,  EE_CLR,  QK_BOOT,   KC_TRNS
-        ),
-
-        [3] = LAYOUT(
-                        KC_MPLY, KC_MUTE,
-                KC_TRNS,  KC_TRNS, KC_TRNS,   KC_TRNS,         //Transparent to let you go between layers
-                RGB_MOD,  RGB_HUI, RGB_SAI,   RGB_VAI,
-                RGB_RMOD, RGB_HUD, RGB_SAD,   RGB_VAD,
-                RGB_TOG,  EE_CLR,  QK_BOOT,   KC_TRNS
-        )
-
-
-        //Layer 0 - Base Layer (F13 to F24, and One Shot Layer 1,2,3 or Toggle Layer 4)
-        // [0] = LAYOUT(
-        //                 KC_MPLY, KC_MUTE,
-        //         KC_F13, KC_F14, KC_F15, KC_F16,
-        //         KC_F17, KC_F18, KC_F19, KC_F20,
-        //         KC_F21, KC_F22, KC_F23, KC_F24,
-        //         OSL(1), OSL(2), OSL(3), TG(4)    //Transparent to let you go between layers
-		// ),
-
-        // [1] = LAYOUT(
-        //                 KC_MPLY, KC_MUTE,
-        //         LALT(KC_F13), LALT(KC_F14), LALT(KC_F15), LALT(KC_F16),
-        //         LALT(KC_F17), LALT(KC_F18), LALT(KC_F19), LALT(KC_F20),
-        //         LALT(KC_F21), LALT(KC_F22), LALT(KC_F23), LALT(KC_F24),
-        //         KC_TRNS,      KC_TRNS,      KC_TRNS,      KC_TRNS         //Transparent to let you go between layers
-        // ),
-
-        //Layer 2 - Shift + Function Key Layer
-        // [2] = LAYOUT(
-        //                 KC_MPLY, KC_MUTE,
-        //         LSFT(KC_F13), LSFT(KC_F14), LSFT(KC_F15), LSFT(KC_F16),
-        //         LSFT(KC_F17), LSFT(KC_F18), LSFT(KC_F19), LSFT(KC_F20),
-        //         LSFT(KC_F21), LSFT(KC_F22), LSFT(KC_F23), LSFT(KC_F24),
-        //         KC_TRNS,      KC_TRNS,      KC_TRNS,      KC_TRNS         //Transparent to let you go between layers
-        // ),
-
-        // //Layer 3 - Control + Function Key
-        // [3] = LAYOUT(
-        //                 KC_MPLY, KC_MUTE,
-        //         LCTL(KC_F13), LCTL(KC_F14), LCTL(KC_F15), LCTL(KC_F16),
-        //         LCTL(KC_F17), LCTL(KC_F18), LCTL(KC_F19), LCTL(KC_F20),
-        //         LCTL(KC_F21), LCTL(KC_F22), LCTL(KC_F23), LCTL(KC_F24),
-        //         KC_TRNS,      KC_TRNS,      KC_TRNS,      KC_TRNS         //Transparent to let you go between layers
-        // ),
-
-        // //Layer 4 - Multimedia
-        // [4] = LAYOUT(
-        //                 KC_MPLY, KC_MUTE,
-        //         KC_MPRV, KC_MPLY, KC_U,   KC_K,
-        //         KC_NO,   KC_NO,   KC_ENT, KC_X,
-        //         KC_NO,   QK_BOOT, LSFT(KC_HASH),   KC_J,
-        //         TG(5),   KC_TRNS, KC_TRNS,   KC_TRNS         //Transparent to let you go between layers
-        // ),
-
-        // //Layer 5 - Keyboard Lights, Programming and Special Functions
-        // [5] = LAYOUT(
-        //                 KC_MPLY, KC_MUTE,
-        //         RGB_MOD,  RGB_HUI, RGB_SAI,   RGB_VAI,
-        //         RGB_RMOD, RGB_HUD, RGB_SAD,   RGB_VAD,
-        //         RGB_TOG,  EE_CLR,  QK_BOOT,   KC_LSFT,
-        //         KC_TRNS,  KC_TRNS, KC_TRNS,   KC_TRNS         //Transparent to let you go between layers
-        // ),
-};
-
-const rgblight_segment_t PROGMEM my_layer0_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-        {0,16,HSV_WHITE}
-    );
-const rgblight_segment_t PROGMEM my_layer1_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-        {0,16,HSV_ORANGE}
-    );
- const rgblight_segment_t PROGMEM my_layer2_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-         {0,16,HSV_RED}
-     );
- const rgblight_segment_t PROGMEM my_layer3_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-         {0,16,HSV_BLUE}
-     );
-// const rgblight_segment_t PROGMEM my_layer4_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-//         {0,16,HSV_WHITE}
-//     );
-// const rgblight_segment_t PROGMEM my_layer5_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-//         {0,16,HSV_TEAL}
-//     );
-const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
-        my_layer0_layer,
-        my_layer1_layer,
-        my_layer2_layer,
-        my_layer3_layer//,
-        // my_layer4_layer,
-        // my_layer5_layer
-    );
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (index == 0) { /* Left Encoder */
-        if (clockwise) {
-            tap_code(KC_MPRV);
-        } else {
-            tap_code(KC_MNXT);
-        }
-    } else if (index == 1) { /* Right Encoder */
-        if (clockwise) {
-            tap_code(KC_VOLD);
-        } else {
-            tap_code(KC_VOLU);
-        }
-    }
-    return true;
-}
-void post_process_record_user(uint16_t keycode, keyrecord_t *record) {
-    // Allow for a preview of changes when modifying RGB
-# if defined(RGBLIGHT_ENABLE) && defined(RGBLIGHT_LAYERS)
-  switch (keycode) {
-    case RGB_TOG ... QK_VELOCIKEY_TOGGLE:
-      for (uint8_t i = 0; i < RGBLIGHT_MAX_LAYERS; i++) {
-        rgblight_set_layer_state(i, false);
-      }
-      rgb_preview_timer = timer_read32();
-      break;
-  }
-# endif
-  return;
-}
-
-//Set the appropriate layer color
-layer_state_t layer_state_set_user(layer_state_t state) {
-    rgblight_set_layer_state(0, false);
-    rgblight_set_layer_state(1, layer_state_cmp(state, 1));
-    rgblight_set_layer_state(2, layer_state_cmp(state, 2));
-    rgblight_set_layer_state(3, layer_state_cmp(state, 3));
-    // rgblight_set_layer_state(4, layer_state_cmp(state, 4));
-    // rgblight_set_layer_state(5, layer_state_cmp(state, 5));
-    return state;
-}
-
-void keyboard_post_init_user(void) {
-	//Enable the LED layers
-	rgblight_layers = my_rgb_layers;
-	layer_state_set_user(layer_state);
-}
-
-void matrix_scan_user(void) {
-# if defined(RGBLIGHT_ENABLE) && defined(RGBLIGHT_LAYERS)
-    // Allow preview for
-    if (rgb_preview_timer && TIMER_DIFF_32(timer_read32(), rgb_preview_timer) > PREVIEW_TIMEOUT) {
-        rgb_preview_timer = 0;
-        default_layer_state_set_user(default_layer_state);
-        layer_state_set_user(layer_state);
-        led_update_user((led_t) host_keyboard_leds());
-    }
-# endif
-}
-
-//EEPROM Reset Function
-void eeconfig_init_user(void) {
-  rgblight_enable(); // Enable RGB by default
-  rgblight_sethsv(HSV_ORANGE);  // Set it to orange by default
-}
diff --git a/keyboards/joshajohnson/hub16/keymaps/peepeetee/rules.mk b/keyboards/joshajohnson/hub16/keymaps/peepeetee/rules.mk
deleted file mode 100644
index f6737b8e4ab..00000000000
--- a/keyboards/joshajohnson/hub16/keymaps/peepeetee/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
\ No newline at end of file
diff --git a/keyboards/jukaie/jk01/jk01.c b/keyboards/jukaie/jk01/jk01.c
index 96db3b804e9..913e77a55e7 100644
--- a/keyboards/jukaie/jk01/jk01.c
+++ b/keyboards/jukaie/jk01/jk01.c
@@ -25,99 +25,99 @@ const aw20216s_led_t PROGMEM g_aw20216s_leds[AW20216S_LED_COUNT] = {
  *   |     |          G location
  *   |     |          |          B location
  *   |     |          |          | */
-    //{0, CS1_SW4,   CS2_SW4,   CS3_SW4},   //   0, k00, Esc
+    //{0, SW4_CS1,   SW4_CS2,   SW4_CS3},   //   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, SW1_CS1,   SW1_CS2,   SW1_CS3},   //   1, k13, Esc
+    {0, SW2_CS1,   SW2_CS2,   SW2_CS3},   //   2, k26, F1
+    {0, SW3_CS1,   SW3_CS2,   SW3_CS3},   //   3, k36, F2
+    {0, SW4_CS1,   SW4_CS2,   SW4_CS3},   //   4, k31, F3
+    {0, SW5_CS1,   SW5_CS2,   SW5_CS3},   //   5, k33, F4
+    {0, SW6_CS1,   SW6_CS2,   SW6_CS3},   //   6, k07, F5
+    {0, SW7_CS1,   SW7_CS2,   SW7_CS3},   //   7, k63, F6
+    {0, SW8_CS1,   SW8_CS2,   SW8_CS3},   //   8, k71, F7
+    {0, SW9_CS1,   SW9_CS2,   SW9_CS3},   //   9, k76, F8
+    {0, SW10_CS1,  SW10_CS2,  SW10_CS3},  //  10, ka6, F9
+    {0, SW11_CS1,  SW11_CS2,  SW11_CS3},  //  11, ka7, F10
+    {0, SW12_CS1,  SW12_CS2,  SW12_CS3},  //  12, ka3, F11
+    {1, SW1_CS1,   SW1_CS2,   SW1_CS3},   //  13, ka5, F12
+    {1, SW2_CS4,   SW2_CS5,   SW2_CS6},   //  14, k97, Printscreen
+    {1, SW5_CS4,   SW5_CS5,   SW5_CS6},   //  15, k02, Del
 
-    {0, 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, SW1_CS4,   SW1_CS5,   SW1_CS6},   //  16, k16, `
+    {0, SW2_CS4,   SW2_CS5,   SW2_CS6},   //  17, k17, 1
+    {0, SW3_CS4,   SW3_CS5,   SW3_CS6},   //  18, k27, 2
+    {0, SW4_CS4,   SW4_CS5,   SW4_CS6},   //  19, k37, 3
+    {0, SW5_CS4,   SW5_CS5,   SW5_CS6},   //  20, k47, 4
+    {0, SW6_CS4,   SW6_CS5,   SW6_CS6},   //  21, k46, 5
+    {0, SW7_CS4,   SW7_CS5,   SW7_CS6},   //  22, k56, 6
+    {0, SW8_CS4,   SW8_CS5,   SW8_CS6},   //  23, k57, 7
+    {0, SW9_CS4,   SW9_CS5,   SW9_CS6},   //  24, k67, 8
+    {0, SW10_CS4,  SW10_CS5,  SW10_CS6},  //  25, k77, 9
+    {0, SW11_CS4,  SW11_CS5,  SW11_CS6},  //  26, k87, 0
+    {0, SW12_CS4,  SW12_CS5,  SW12_CS6},  //  27, k86, -
+    {1, SW5_CS1,   SW5_CS2,   SW5_CS3},   //  28, k66, =
+    {1, SW7_CS1,   SW7_CS2,   SW7_CS3},   //  29, ka1, Backspace
+    {1, SW2_CS1,   SW2_CS2,   SW2_CS3},   //  30, kc6, Home
 
-    {0, 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, SW1_CS7,   SW1_CS8,   SW1_CS9},   //  31, k11, Tab
+    {0, SW2_CS7,   SW2_CS8,   SW2_CS9},   //  32, k10, Q
+    {0, SW3_CS7,   SW3_CS8,   SW3_CS9},   //  33, k20, W
+    {0, SW4_CS7,   SW4_CS8,   SW4_CS9},   //  34, k30, E
+    {0, SW5_CS7,   SW5_CS8,   SW5_CS9},   //  35, k40, R
+    {0, SW6_CS7,   SW6_CS8,   SW6_CS9},   //  36, k41, T
+    {0, SW7_CS7,   SW7_CS8,   SW7_CS9},   //  37, k51, Y
+    {0, SW8_CS7,   SW8_CS8,   SW8_CS9},   //  38, k50, U
+    {0, SW9_CS7,   SW9_CS8,   SW9_CS9},   //  39, k60, I
+    {0, SW10_CS7,  SW10_CS8,  SW10_CS9},  //  40, k70, O
+    {0, SW11_CS7,  SW11_CS8,  SW11_CS9},  //  41, k80, P
+    {0, SW12_CS7,  SW12_CS8,  SW12_CS9},  //  42, k81, [
+    {1, SW8_CS1,   SW8_CS2,   SW8_CS3},   //  43, k61, ]
+    {1, SW9_CS1,   SW9_CS2,   SW9_CS3},   //  44, ka2, "\\"
+    {1, SW3_CS4,   SW3_CS5,   SW3_CS6},   //  45, k65, End
 
-    {0, 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, SW1_CS10,  SW1_CS11,  SW1_CS12},  //  46, k21, Caps Lock
+    {0, SW2_CS10,  SW2_CS11,  SW2_CS12},  //  47, k12, A
+    {0, SW3_CS10,  SW3_CS11,  SW3_CS12},  //  48, k22, S
+    {0, SW4_CS10,  SW4_CS11,  SW4_CS12},  //  49, k32, D
+    {0, SW5_CS10,  SW5_CS11,  SW5_CS12},  //  50, k42, F
+    {0, SW6_CS10,  SW6_CS11,  SW6_CS12},  //  51, k43, G
+    {0, SW7_CS10,  SW7_CS11,  SW7_CS12},  //  52, k53, H
+    {0, SW8_CS10,  SW8_CS11,  SW8_CS12},  //  53, k52, J
+    {0, SW9_CS10,  SW9_CS11,  SW9_CS12},  //  54, k62, K
+    {0, SW10_CS10, SW10_CS11, SW10_CS12}, //  55, k72, L
+    {0, SW11_CS10, SW11_CS11, SW11_CS12}, //  56, k82, ;
+    {0, SW12_CS10, SW12_CS11, SW12_CS12}, //  57, k83, '
+    {1, SW11_CS1,  SW11_CS2,  SW11_CS3},  //  58, ka4, Enter
+    {1, SW4_CS4,   SW4_CS5,   SW4_CS6},   //  59, k15, PgUp
 
-    {0, 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, SW1_CS13,  SW1_CS14,  SW1_CS15},  //  60, k00, Shift_L
+    {0, SW2_CS13,  SW2_CS14,  SW2_CS15},  //  61, k14, Z
+    {0, SW3_CS13,  SW3_CS14,  SW3_CS15},  //  62, k24, X
+    {0, SW4_CS13,  SW4_CS14,  SW4_CS15},  //  63, k34, C
+    {0, SW5_CS13,  SW5_CS14,  SW5_CS15},  //  64, k44, V
+    {0, SW6_CS13,  SW6_CS14,  SW6_CS15},  //  65, k45, B
+    {0, SW7_CS13,  SW7_CS14,  SW7_CS15},  //  66, k55, N
+    {0, SW8_CS13,  SW8_CS14,  SW8_CS15},  //  67, k54, M
+    {0, SW9_CS13,  SW9_CS14,  SW9_CS15},  //  68, k64, ,
+    {0, SW10_CS13, SW10_CS14, SW10_CS15}, //  69, k74, .
+    {0, SW11_CS13, SW11_CS14, SW11_CS15}, //  70, k85, /
+    {1, SW8_CS4,   SW8_CS5,   SW8_CS6},   //  71, k91, Shift_R
+    {1, SW9_CS4,   SW9_CS5,   SW9_CS6},   //  72, k35, Up
+    {1, SW7_CS4,   SW7_CS5,   SW7_CS6},   //  73, k25, PgDn
 
-    {0, 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
+    {0, SW1_CS16,  SW1_CS17,  SW1_CS18},  //  74, k06, Ctrl_L
+    {0, SW2_CS16,  SW2_CS17,  SW2_CS18},  //  75, k90, Win_L
+    {0, SW3_CS16,  SW3_CS17,  SW3_CS18},  //  76, k93, Alt_L
+    {0, SW6_CS16,  SW6_CS17,  SW6_CS18},  //  77, k94, Space
+    {0, SW9_CS16,  SW9_CS17,  SW9_CS18},  //  78, k95, Alt_R
+    {0, SW10_CS16, SW10_CS17, SW10_CS18}, //  79, k92, FN
+    {0, SW12_CS16, SW12_CS17, SW12_CS18}, //  80, k04, Ctrl_R
+    {1, SW10_CS4,  SW10_CS5,  SW10_CS6},  //  81, k03, Left
+    {1, SW11_CS4,  SW11_CS5,  SW11_CS6},  //  82, k73, Down
+    {1, SW5_CS10,  SW5_CS11,  SW5_CS12},  //  83, k05, Right
 
-    {1, CS10_SW10, CS11_SW10, CS12_SW10}, //  84, kb0, Z1
-    {1, CS10_SW11, CS11_SW11, CS12_SW11}, //  85, kb1, Z2
+    {1, SW10_CS10, SW10_CS11, SW10_CS12}, //  84, kb0, Z1
+    {1, SW11_CS10, SW11_CS11, SW11_CS12}, //  85, kb1, Z2
 };
 
 #endif
diff --git a/keyboards/junco/keymaps/deluxe/config.h b/keyboards/junco/keymaps/deluxe/config.h
deleted file mode 100644
index db185a48498..00000000000
--- a/keyboards/junco/keymaps/deluxe/config.h
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright 2022 Dane Skalski (@Daneski13)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-/* Indicator LEDs */
-// LED index for caps lock key on the extension layer
-#define CAPS_LOCK_LED_INDEX 25
-// LED index for num lock key on the symbol layer
-#define NUM_LOCK_LED_INDEX 62
-// LED index for key that sticks the adjust layer
-#define ADJST_LED_INDEX 19
-
-// Number of Layers that can be used by VIA.
-// Change this if you want more layers
-#define DYNAMIC_KEYMAP_LAYER_COUNT 6
-
-/* - Encoder settings - */
-#ifdef ENCODER_ENABLE
-#    define ENCODER_RESOLUTION 4
-#endif
-#ifdef ENCODER_MAP_ENABLE
-// Key delay for encoders (necessary for some keycodes)
-#    define ENCODER_MAP_KEY_DELAY 10
-#endif
-
-/*
-    - RGB Stuff -
-    All effects can be found in the QMK docs:
-    https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
-*/
-#ifdef RGB_MATRIX_ENABLE
-
-// Allows the indicator LEDs to work
-#    define SPLIT_LED_STATE_ENABLE
-#    define SPLIT_LAYER_STATE_ENABLE
-
-// Default effect when EEPROM cleared
-#    define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-
-// Turns off RGB effects when there is no longer a USB connection
-#    define RGB_MATRIX_SLEEP
-
-// Throttling of RGB to increase keyboard responsiveness, set to 1.5x the default limits
-#    define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 6 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
-#    define RGB_MATRIX_LED_FLUSH_LIMIT 24                               // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms), the default, is equivalent to limiting to 60fps
-
-// Key press reactive animations
-#    define SPLIT_TRANSPORT_MIRROR // Necessary setting for key press animations
-#    define RGB_MATRIX_KEYPRESSES  // Enables key press effects
-#    define ENABLE_RGB_MATRIX_MULTISPLASH
-
-// Normal effects
-#    define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-#    define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-#    define ENABLE_RGB_MATRIX_PIXEL_RAIN
-
-#endif
diff --git a/keyboards/junco/keymaps/deluxe/keymap.c b/keyboards/junco/keymaps/deluxe/keymap.c
deleted file mode 100644
index 42b6429b971..00000000000
--- a/keyboards/junco/keymaps/deluxe/keymap.c
+++ /dev/null
@@ -1,329 +0,0 @@
-// Copyright 2022 Dane Skalski (@Daneski13)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-
-// Layers enum
-enum junco_layers { _QWERTY, _COLEMAK_DH, _SYMB, _EXT, _ADJUST };
-
-// Custom keycodes
-enum custom_keycodes {
-    // Keycode for toggling between macOS and Windows key mappings
-    // Actually just an alias to the GUI and Alt swap Magic keycode
-    KC_OS = MAGIC_TOGGLE_ALT_GUI,
-    // Keycode for swapping the base layer between QWERTY and Colemak-DH
-    KC_TOGGLE_BASE = SAFE_RANGE,
-    // Keycode for redo action (Ctrl + Y on windows, Ctrl + Shift + Z on macOS)
-    KC_REDO,
-    // Keycodes for next/previous word
-    KC_WNXT,
-    KC_WPRV,
-    // Keycode for sticking/unsticking the adjust layer
-    KC_ADJST
-};
-
-/* LED indicators */
-bool is_caps_lock_enabled(void) { // Caps lock
-    return (host_keyboard_led_state().caps_lock);
-}
-bool is_num_lock_enabled(void) { // Num lock
-    return (host_keyboard_led_state().num_lock);
-}
-bool is_adjust_layer_sticky(layer_state_t state) { // Adjust layer sticky
-    // Checks if the state is equal to just the adjust layer being active.
-    // Doing it this way can leverage SPLIT_LAYER_STATE_ENABLE
-    return (state == (1UL << _ADJUST)) ? true : false;
-}
-// Indicator color based on the RGB Matrix mode
-RGB indicator_color(void) {
-    RGB rgb;
-    // Normally the indicator color is white to stand out in the RGB rainbow.
-    // When using the custom RGB mode that already is white, the indicator color
-    // is green to stand out.
-    if (rgb_matrix_config.mode == RGB_MATRIX_CUSTOM_WHITE_UNDERGLOW_CYCLE) {
-        // Green
-        rgb.r = 0;
-        rgb.g = 255;
-        rgb.b = 0;
-    } else {
-        // White
-        rgb.r = 255;
-        rgb.g = 255;
-        rgb.b = 255;
-    }
-    return rgb;
-}
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    // clang-format off
-    /*
-        Traditional QWERTY
-        ┌───┬───┬───┬───┬───┬───┐               ┌───┬───┬───┬───┬───┬───┐
-        │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │               │ 6 │ 7 │ 8 │ 9 │ 0 │ - │
-        ├───┼───┼───┼───┼───┼───┤               ├───┼───┼───┼───┼───┼───┤
-        │Tab│ Q │ W │ E │ R │ T │               │ Y │ U │ I │ O │ P │Ent│
-        ├───┼───┼───┼───┼───┼───┤               ├───┼───┼───┼───┼───┼───┤
-        │Esc│ A │ S │ D │ F │ G │               │ H │ J │ K │ L │ ; │ ' │
-        ├───┼───┼───┼───┼───┼───┼───┐       ┌───┼───┼───┼───┼───┼───┼───┤
-        │Sft│ Z │ X │ C │ V │ B │Mut│       │▶⏸ │ N │ M │ , │ . │ / │Sft│
-        └───┴───┴───┴───┴───┴───┴───┘       └───┴───┴───┴───┴───┴───┴───┘
-                ┌───┬───┬───┬───┬───┐       ┌───┬───┬───┬───┬───┐
-                │Ctr│Win│Alt│Del│Spc│       │Sft│Bsp│Alt│Win│Ctr│
-                └───┴───┴───┴───┴───┘       └───┴───┴───┴───┴───┘
-                For macOS - GUI (cmd) and Alt (opt) swapped
-    */
-    [_QWERTY] = LAYOUT_split4x6_r1(
-        KC_GRAVE, KC_1, KC_2,    KC_3,    KC_4,    KC_5,                                KC_6,               KC_7,    KC_8,    KC_9,   KC_0,         KC_MINUS,
-        KC_TAB,   KC_Q, KC_W,    KC_E,    KC_R,    KC_T,                                KC_Y,               KC_U,    KC_I,    KC_O,   KC_P,         KC_ENTER,
-        KC_ESC,   KC_A, KC_S,    KC_D,    KC_F,    KC_G,                                KC_H,               KC_J,    KC_K,    KC_L,   KC_SEMICOLON, KC_QUOTE,
-        KC_LSFT,  KC_Z, KC_X,    KC_C,    KC_V,    KC_B,             KC_MUTE,  KC_MPLY, KC_N,               KC_M,    KC_COMM, KC_DOT, KC_SLSH,      KC_RSFT,
-                        KC_LCTL, KC_LGUI, KC_LALT, LT(_EXT, KC_DEL), KC_SPC,   KC_RSFT, LT(_SYMB, KC_BSPC), KC_RALT, KC_RGUI, KC_RCTL
-    ),
-
-    /*
-        Colemak-DH
-        ┌───┬───┬───┬───┬───┬───┐               ┌───┬───┬───┬───┬───┬───┐
-        │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │               │ 6 │ 7 │ 8 │ 9 │ 0 │ - │
-        ├───┼───┼───┼───┼───┼───┤               ├───┼───┼───┼───┼───┼───┤
-        │Tab│ Q │ W │ F │ P │ B │               │ J │ L │ U │ Y │ ; │Ent│
-        ├───┼───┼───┼───┼───┼───┤               ├───┼───┼───┼───┼───┼───┤
-        │Esc│ A │ R │ S │ T │ G │               │ M │ N │ E │ I │ O │ ' │
-        ├───┼───┼───┼───┼───┼───┼───┐       ┌───┼───┼───┼───┼───┼───┼───┤
-        │Sft│ Z │ X │ C │ D │ V │Mut│       │▶⏸ │ K │ H │ , │ . │ / │Sft│
-        └───┴───┴───┴───┴───┴───┴───┘       └───┴───┴───┴───┴───┴───┴───┘
-                ┌───┬───┬───┬───┬───┐       ┌───┬───┬───┬───┬───┐
-                │Ctr│Win│Alt│Del│Spc│       │Sft│Bsp│Alt│Win│Ctr│
-                └───┴───┴───┴───┴───┘       └───┴───┴───┴───┴───┘
-                For macOS - GUI/Win (cmd) and Alt (opt) swapped
-    */
-    [_COLEMAK_DH] = LAYOUT_split4x6_r1(
-        KC_GRAVE, KC_1, KC_2,    KC_3,    KC_4,    KC_5,                                KC_6,               KC_7,    KC_8,    KC_9,   KC_0,         KC_MINUS,
-        KC_TAB,   KC_Q, KC_W,    KC_F,    KC_P,    KC_B,                                KC_J,               KC_L,    KC_U,    KC_Y,   KC_SEMICOLON, KC_ENTER,
-        KC_ESC,   KC_A, KC_R,    KC_S,    KC_T,    KC_G,                                KC_M,               KC_N,    KC_E,    KC_I,   KC_O,         KC_QUOTE,
-        KC_LSFT,  KC_Z, KC_X,    KC_C,    KC_D,    KC_V,             KC_MUTE,  KC_MPLY, KC_K,               KC_H,    KC_COMM, KC_DOT, KC_SLSH,      KC_RSFT,
-                        KC_LCTL, KC_LGUI, KC_LALT, LT(_EXT, KC_DEL), KC_SPC,   KC_RSFT, LT(_SYMB, KC_BSPC), KC_RALT, KC_RGUI, KC_RCTL
-    ),
-
-    /*
-        Symbols/Numpad Layer
-        ┌───┬───┬───┬───┬───┬───┐               ┌───┬───┬───┬───┬───┬───┐
-        │F1 │F2 │F3 │F4 │F5 │F6 │               │F7 │F8 │F9 │F10│F11│F12│
-        ├───┼───┼───┼───┼───┼───┤               ├───┼───┼───┼───┼───┼───┤
-        │Tab│ ! │ @ │ # │ $ │ % │               │ * │ 7 │ 8 │ 9 │ + │Ent│
-        ├───┼───┼───┼───┼───┼───┤               ├───┼───┼───┼───┼───┼───┤
-        │ \ │ _ │ [ │ { │ ( │ ^ │               │ = │ 4 │ 5 │ 6 │ 0 │NUM│
-        ├───┼───┼───┼───┼───┼───┼───┐       ┌───┼───┼───┼───┼───┼───┼───┤
-        │___│ | │ ] │ } │ ) │ & │___│       │___│ / │ 1 │ 2 │ 3 │ - │___│
-        └───┴───┴───┴───┴───┴───┴───┘       └───┴───┴───┴───┴───┴───┴───┘
-                ┌───┬───┬───┬───┬───┐       ┌───┬───┬───┬───┬───┐
-                │___│___│___│___│___│       │___│___│___│___│___│
-                └───┴───┴───┴───┴───┘       └───┴───┴───┴───┴───┘
-    */
-    [_SYMB] = LAYOUT_split4x6_r1(
-        KC_F1,    KC_F2,    KC_F3,   KC_F4,      KC_F5,    KC_F6,                       KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,
-        KC_TAB,   KC_EXLM,  KC_AT,   KC_HASH,    KC_DLR,   KC_PERC,                     KC_PAST,  KC_P7,    KC_P8,    KC_P9,    KC_PPLS,  KC_ENTER,
-        KC_BSLS,  KC_UNDS,  KC_LBRC, KC_LCBR,    KC_LPRN,  KC_CIRC,                     KC_PEQL,  KC_P4,    KC_P5,    KC_P6,    KC_P0,    KC_NUM,
-        _______,  KC_PIPE,  KC_RBRC, KC_RCBR,    KC_RPRN,  KC_AMPR, _______,  _______,  KC_PSLS,  KC_P1,    KC_P2,    KC_P3,    KC_PMNS,  _______,
-                            _______, _______,    _______,  _______, _______,  _______,  _______,  _______,  _______,  _______
-    ),
-
-    /*
-        Extension/Function Layer
-        ┌────┬────┬────┬────┬────┬────┐               ┌────┬────┬────┬────┬────┬────┐
-        │ F1 │ F2 │ F3 │ F4 │ F5 │ F6 │               │ F7 │ F8 │ F9 │ F10│ F11│ F12│
-        ├────┼────┼────┼────┼────┼────┤               ├────┼────┼────┼────┼────┼────┤
-        │ ⇤  │PGUP│End │ ↑  │Home│    │               │BRIU│ F7 │ F8 │ F9 │ F10│____│
-        ├────┼────┼────┼────┼────┼────┤               ├────┼────┼────┼────┼────┼────┤
-        │Cps │PGDN│ ←  │ ↓  │ →  │    │               │BRID│ F4 │ F5 │ F6 │ F11│____│
-        ├────┼────┼────┼────┼────┼────┼────┐     ┌────┼────┼────┼────┼────┼────┼────┤
-        │____│    │    │    │    │    │____│     │____│    │ F1 │ F2 │ F3 │ F12│____│
-        └────┴────┴────┴────┴────┴────┴────┘     └────┴────┴────┴────┴────┴────┴────┘
-                      ┌───┬───┬───┬───┬───┐       ┌───┬───┬───┬───┬───┐
-                      │___│___│___│___│___│       │___│___│___│___│___│
-                      └───┴───┴───┴───┴───┘       └───┴───┴───┴───┴───┘
-    */
-    [_EXT] = LAYOUT_split4x6_r1(
-        KC_F1,     KC_F2,      KC_F3,      KC_F4,      KC_F5,       KC_F6,                       KC_F7,   KC_F8,    KC_F9,   KC_F10,  KC_F11,   KC_F12,
-        S(KC_TAB), KC_PGUP,    KC_END,     KC_UP,      KC_HOME,     _______,                     KC_BRIU, KC_F7,    KC_F8,   KC_F9,   KC_F10,   _______,
-        KC_CAPS,   KC_PGDN,    KC_LEFT,    KC_DOWN,    KC_RIGHT,    _______,                     KC_BRID, KC_F4,    KC_F5,   KC_F6,   KC_F11,   _______,
-        _______,   _______,    _______,    _______,    _______,     _______, _______,  _______,  _______, KC_F1,    KC_F2,   KC_F3,   KC_F12,   _______,
-                               _______,    _______,    _______,     _______, _______,  _______,  _______, _______,  _______, _______
-    ),
-
-    /*
-        Adjust Layer, Keyboard Settings
-        ┌────┬────┬────┬────┬────┬────┐               ┌────┬────┬────┬────┬────┬────┐
-        │    │    │    │    │    │    │               │    │    │    │    │    │    │
-        ├────┼────┼────┼────┼────┼────┤               ├────┼────┼────┼────┼────┼────┤
-        │SpdU│HueU│SatU│ValU│Rnxt│Stck│               │    │EClr│Rbt │DBUG│BOOT│    │
-        ├────┼────┼────┼────┼────┼────┤               ├────┼────┼────┼────┼────┼────┤
-        │SpdD│HueD│SatD│ValD│Rprv│RTgl│               │    │LOUT│ OS │    │    │    │
-        ├────┼────┼────┼────┼────┼────┼────┐     ┌────┼────┼────┼────┼────┼────┼────┤
-        │    │    │    │    │    │    │RTgl│     │    │    │    │    │    │    │    │
-        └────┴────┴────┴────┴────┴────┴────┘     └────┴────┴────┴────┴────┴────┴────┘
-                       ┌───┬───┬───┬───┬───┐     ┌───┬───┬───┬───┬───┐
-                       │___│___│___│___│___│     │___│___│___│___│___│
-                       └───┴───┴───┴───┴───┘     └───┴───┴───┴───┴───┘
-    */
-    [_ADJUST] = LAYOUT_split4x6_r1(
-        KC_NO,     KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,                       KC_NO,       KC_NO,          KC_NO,   KC_NO,      KC_NO,    KC_NO,
-        RGB_SPI,   RGB_HUI,    RGB_SAI,    RGB_VAI,    RGB_MOD,    KC_ADJST,                    KC_NO,       EE_CLR,         QK_RBT,  DB_TOGG,    QK_BOOT,  KC_NO,
-        RGB_SPD,   RGB_HUD,    RGB_SAD,    RGB_VAD,    RGB_RMOD,   RGB_TOG,                     KC_NO,       KC_TOGGLE_BASE, KC_OS,   KC_NO,      KC_NO, KC_NO,
-        KC_NO,     KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,   RGB_TOG,  KC_NO,    KC_NO,       KC_NO,          KC_NO,   KC_NO,      KC_NO,    KC_NO,
-                               _______,    _______,    _______,    _______, _______,  _______,  _______,     _______,        _______, _______
-    )
-    // clang-format on
-};
-
-/*
-    --- Rotary Encoder Mappings ---
-
-    Encoder mappings go from leftmost encoder to rightmost encoder on the physical board.
-    index 0 is the the optional leftmost encoder on the left half, index 1 is the right encoder
-    on the left half (by the thumb keys), index 2 is the left encoder on the right half (by the
-    thumb keys), and index 3 is the optional rightmost encoder on the right half.
-
-    If you are only using the 2 required encoders by the thumb keys, you only need to worry about
-    index 1 and index 2.
-
-    Note that the key to be sent for counter-clockwise rotation (CCW) goes first and then the key for
-    clockwise (CW) within ENCODER_CCW_CW.
-*/
-#ifdef ENCODER_MAP_ENABLE
-// clang-format off
-
-// Base layer encoder mappings:
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
-    // Base layers
-    //                index 0: mouse wheel up (CCW)/down (CW)     index 1: volume up/down           index 2: media prev/next          index 3: mouse wheel left/right
-    [_QWERTY] =     { ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(KC_WH_L, KC_WH_R) },
-    [_COLEMAK_DH] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
-
-    // Passes through to base layer
-    [_SYMB] =       { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
-    //                                                                                    undo/redo                         previous word/next word
-    [_EXT] =        { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_UNDO, KC_REDO), ENCODER_CCW_CW(KC_WPRV, KC_WNXT) },
-    //                RGB Speed down/up                 RGB previous mode/next mode        RGB brightness down/up
-    [_ADJUST] =     { ENCODER_CCW_CW(RGB_SPD, RGB_SPI), ENCODER_CCW_CW(RGB_RMOD, RGB_MOD), ENCODER_CCW_CW(RGB_VAD, RGB_VAI), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
-    // clang-format on
-};
-
-#endif
-
-// Called whenever a layer is changed
-layer_state_t layer_state_set_user(layer_state_t state) {
-    // Make sure the adjust layer isn't sticky
-    if (is_adjust_layer_sticky(state)) return state;
-
-    // When both the symbol and extension layer keys are held, the Adjust layer is active.
-    return update_tri_layer_state(state, _SYMB, _EXT, _ADJUST);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        // Toggle base layer
-        case KC_TOGGLE_BASE:
-            if (record->event.pressed) {
-                // Toggle swapping base layers between Colemak-DH and QWERTY.
-                // When base layer is QWERTY, swap to Colemak-DH and vice-versa
-                if (get_highest_layer(default_layer_state) == _QWERTY) {
-                    default_layer_set(1UL << _COLEMAK_DH);
-                } else {
-                    default_layer_set(1UL << _QWERTY);
-                }
-            }
-            return false;
-
-        // Override undo in favor of the more modern undo action
-        case KC_UNDO:
-            if (record->event.pressed) {
-                // Use the correct modifier for macOS or Windows
-                uint16_t mod = keymap_config.swap_lalt_lgui ? KC_LGUI : KC_LCTL;
-                // Send Ctrl+Z/Cmd+Z
-                register_code(mod);
-                tap_code_delay(KC_Z, 10);
-                unregister_code(mod);
-            }
-            return false;
-
-        //  Redo action
-        case KC_REDO:
-            if (record->event.pressed) {
-                // Whether or not macOS mapping is enabled
-                if (keymap_config.swap_lalt_lgui) {
-                    // macOS - Send Cmd+Shift+Z
-                    register_code(KC_LGUI);
-                    register_code(KC_LSFT);
-                    tap_code_delay(KC_Z, 10);
-                    unregister_code(KC_LSFT);
-                    unregister_code(KC_LGUI);
-                } else {
-                    // Windows - Send Ctrl+Y
-                    register_code(KC_LCTL);
-                    tap_code_delay(KC_Y, 10);
-                    unregister_code(KC_LCTL);
-                }
-            }
-            return false;
-
-        // Next word
-        case KC_WNXT:
-            if (record->event.pressed) {
-                // Use the correct modifier for macOS or Windows
-                uint16_t mod = keymap_config.swap_lalt_lgui ? KC_LALT : KC_LCTL;
-                // Send Ctrl+Right/Option+Right
-                register_code(mod);
-                tap_code_delay(KC_RGHT, 10);
-                unregister_code(mod);
-            }
-            return false;
-
-        // Previous word
-        case KC_WPRV:
-            if (record->event.pressed) {
-                // Use the correct modifier for macOS or Windows
-                uint16_t mod = keymap_config.swap_lalt_lgui ? KC_LALT : KC_LCTL;
-                // Send Ctrl+Left/Option+Left
-                register_code(mod);
-                tap_code_delay(KC_LEFT, 10);
-                unregister_code(mod);
-            }
-            return false;
-
-        // Stick / Unstick the adjust layer
-        case KC_ADJST:
-            if (record->event.pressed) {
-                // If currently not sticky, we want only the adjust layer to be active to make it stick.
-                // Otherwise we want the default layer, un-stick.
-                is_adjust_layer_sticky(layer_state) ? layer_state_set(default_layer_state) : layer_move(_ADJUST);
-                dprintf("Adjust layer is now %s\n", is_adjust_layer_sticky(layer_state) ? "stuck" : "un-stuck");
-            }
-            return false;
-        default:
-            return true;
-    }
-}
-
-/* Indicators (Caps Lock / Num Lock / Adjust Layer Sticky) */
-bool rgb_matrix_indicators_user(void) {
-    layer_state_t curr_layer_state = layer_state;
-    layer_state_t layer            = get_highest_layer(curr_layer_state);
-    RGB           rgb              = indicator_color();
-
-    /* Only show the indicator on their respective layers */
-    // Caps Lock is only on the extension layer
-    if (is_caps_lock_enabled() && layer == _EXT) {
-        rgb_matrix_set_color(CAPS_LOCK_LED_INDEX, rgb.r, rgb.g, rgb.b);
-    }
-
-    // Num Lock is only on the symbol layer
-    if (is_num_lock_enabled() && layer == _SYMB) {
-        rgb_matrix_set_color(NUM_LOCK_LED_INDEX, rgb.r, rgb.g, rgb.b);
-    }
-
-    // If the adjust layer is stuck/sticky, light it up. Don't need to care about
-    // checking the layer since it can only be active on the adjust layer anyway
-    if (is_adjust_layer_sticky(curr_layer_state)) rgb_matrix_set_color(ADJST_LED_INDEX, rgb.r, rgb.g, rgb.b);
-
-    return false;
-}
diff --git a/keyboards/junco/keymaps/deluxe/readme.md b/keyboards/junco/keymaps/deluxe/readme.md
deleted file mode 100644
index d52d315f7d4..00000000000
--- a/keyboards/junco/keymaps/deluxe/readme.md
+++ /dev/null
@@ -1,43 +0,0 @@
-# Deluxe Junco Keymap
-
-This is my personal keymap for Junco at time of writing. It departs from the [default layout](../default/README.md) with the encoder mappings and some extra keycodes. This keymap also adds indicators when caps lock and num lock are enabled. When enabled, that key will become a static white (green on the white backlight mode) but only when the layer that respective key is on is active.
-
-I wanted that classic rainbow barf RGB effect for the underglow even if the per-key lighting is something else, so I added 2 custom RGB matrix animations: white per-key lighting with rainbow underglow and pixel rain with rainbow underglow.
-
-Here are some gifs of the animations:
-
-![White + Underglow Animation](https://i.imgur.com/2vCiZz0.gif)
-
-![Pixel Rain + Underglow Animation](https://i.imgur.com/f6t0OfD.gif)
-
-## Base Layers
-
-The base layers are the same as the default layout, except the right side's left encoder (by the thumb keys) is now media controls. Since I am using all 4 encoders it doesn't make sense to have 2 mouse scroll up/down, but for someone with just 2 encoders it may make sense to have media controls on a layer.
-
-QWERTY:
-
-![QWERTY Layer](https://i.imgur.com/vkS9Tceh.png)
-
-Colemak-DH:
-
-![Colemak-DH Layer](https://i.imgur.com/5YYgaUAh.png)
-
-## Symbol Layer
-
-Symbol layer is identical to the default layout.
-
-![Symbol Layer](https://i.imgur.com/6F35Z4Wh.png)
-
-## Extension Layer
-
-Encoders on the right side become undo/redo and scrolling horizontally by word.
-
-![Extension Layer](https://i.imgur.com/0VCStS8h.png)
-
-## Adjust Layer
-
-Pressing "Stick Adj Layer" will "stick" the adjust layer so you can use the rotary encoders for RGB settings rather than holding down both backspace and delete. To go back to the default layer, press that stick key again or press and release either Del or Backspace. When the adjust layer is currently "sticky" the sticky key will become the indicator color mentioned earlier.
-
-"Toggle Base" will toggle between QWERTY and Colemak-DH and toggle OS will toggle between macOS and Windows key-mappings (swapping WIN/Command with Alt/Option by the thumb keys and properly mapping redo/word scrolling).
-
-![Adjust layer](https://i.imgur.com/71ftNoNh.png)
diff --git a/keyboards/junco/keymaps/deluxe/rgb_matrix_user.inc b/keyboards/junco/keymaps/deluxe/rgb_matrix_user.inc
deleted file mode 100644
index 3efe5067497..00000000000
--- a/keyboards/junco/keymaps/deluxe/rgb_matrix_user.inc
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright 2022 Dane Skalski (@Daneski13)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-RGB_MATRIX_EFFECT(WHITE_UNDERGLOW_CYCLE)
-RGB_MATRIX_EFFECT(PIXEL_RAIN_UNDERGLOW_CYCLE)
-
-#ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-
-// This is a modified version of the effect_runner_dx_dy_dist function from rgb_matrix
-// that only applies the effect to the underglow LEDs of this keyboard
-static bool underglow_effect_runner(effect_params_t* params, dx_dy_dist_f underglow_effect_func, bool backlight_white) {
-    RGB_MATRIX_USE_LIMITS(led_min, led_max);
-
-    HSV hsv = rgb_matrix_config.hsv;
-    HSV white = {0, 0, hsv.v};
-    RGB rgb = rgb_matrix_hsv_to_rgb(white);
-    uint8_t time = scale16by8(g_rgb_timer, rgb_matrix_config.speed / 2);
-    for (uint8_t i = led_min; i < led_max; i++) {
-        // Underglow LEDs are indicies 0 - 7 and 37 - 44
-        if ((i <= 7) || (37 <= i && i <= 44)) {
-            // Apply the maths and colors to the underglow LEDs
-            RGB_MATRIX_TEST_LED_FLAGS();
-            int16_t dx   = g_led_config.point[i].x - k_rgb_matrix_center.x;
-            int16_t dy   = g_led_config.point[i].y - k_rgb_matrix_center.y;
-            uint8_t dist = sqrt16(dx * dx + dy * dy);
-            RGB     rgb  = rgb_matrix_hsv_to_rgb(underglow_effect_func(hsv, dx, dy, dist, time));
-            rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
-        } else {
-            // Set the backlight to white if needed
-            if (!backlight_white) continue;
-            rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
-        }
-    }
-    return rgb_matrix_check_finished_leds(led_max);
-}
-
-// Solid white but the underglow is a rainbow spiral
-static bool WHITE_UNDERGLOW_CYCLE(effect_params_t* params) {
-    return underglow_effect_runner(params, &CYCLE_SPIRAL_math, true);
-}
-
-// Pixel rain effect but the underglow is a rainbow spiral
-static bool PIXEL_RAIN_UNDERGLOW_CYCLE(effect_params_t* params) {
-    PIXEL_RAIN(params);
-    return underglow_effect_runner(params, &CYCLE_SPIRAL_math, false);
-}
-
-#endif
diff --git a/keyboards/junco/keymaps/deluxe/rules.mk b/keyboards/junco/keymaps/deluxe/rules.mk
deleted file mode 100644
index b788c6155b4..00000000000
--- a/keyboards/junco/keymaps/deluxe/rules.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# Enables Audio control and System control Keycodes
-EXTRAKEY_ENABLE = yes
-# Enables Mousekeys
-MOUSEKEY_ENABLE = yes
-# Encoder Support
-ENCODER_ENABLE = yes
-# Use Enocoder Mapping
-ENCODER_MAP_ENABLE = yes
-
-# Enables RGB Lighting Effects
-RGB_MATRIX_ENABLE = yes
-
-# Allows use of `qmk console` for debugging
-CONSOLE_ENABLE = yes
-
-# Enables VIA
-VIA_ENABLE = yes
-
-# Custom RGB Matrix Effect
-RGB_MATRIX_CUSTOM_USER = yes
diff --git a/keyboards/junco/rev1/post_config.h b/keyboards/junco/rev1/post_config.h
index bcc15a941a0..d9fa5e4c603 100644
--- a/keyboards/junco/rev1/post_config.h
+++ b/keyboards/junco/rev1/post_config.h
@@ -7,9 +7,9 @@
 // Top left for left side is default in core
 
 // Top right for right side
-#ifndef BOOTMAGIC_LITE_ROW_RIGHT
-#    define BOOTMAGIC_LITE_ROW_RIGHT 5
+#ifndef BOOTMAGIC_ROW_RIGHT
+#    define BOOTMAGIC_ROW_RIGHT 5
 #endif
-#ifndef BOOTMAGIC_LITE_COLUMN_RIGHT
-#    define BOOTMAGIC_LITE_COLUMN_RIGHT 0
+#ifndef BOOTMAGIC_COLUMN_RIGHT
+#    define BOOTMAGIC_COLUMN_RIGHT 0
 #endif
diff --git a/keyboards/kabedon/kabedon98e/config.h b/keyboards/kabedon/kabedon98e/config.h
index 514a1121b35..8eb549c134d 100644
--- a/keyboards/kabedon/kabedon98e/config.h
+++ b/keyboards/kabedon/kabedon98e/config.h
@@ -17,8 +17,8 @@
 
 #define WS2812_PWM_DRIVER PWMD3
 #define WS2812_PWM_CHANNEL 1
-#define WS2812_DMA_STREAM STM32_DMA1_STREAM3
-#define WS2812_DMA_CHANNEL 3
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM3
+#define WS2812_PWM_DMA_CHANNEL 3
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/kagizaraya/scythe/keymaps/forties/keymap.c b/keyboards/kagizaraya/scythe/keymaps/forties/keymap.c
deleted file mode 100644
index 024bc9d952d..00000000000
--- a/keyboards/kagizaraya/scythe/keymaps/forties/keymap.c
+++ /dev/null
@@ -1,193 +0,0 @@
-/* Copyright 2019 ENDO Katsuhiro <ka2hiro@kagizaraya.jp>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-
-// Defines the keycodes used by our macros in process_record_user
-enum layer_names {
-    _QWERTY,
-    _HAPPY,
-    _LOWER,
-    _RAISE,
-    _ADJUST,
-};
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  HAPPY,
-  LOWER,
-  RAISE,
-  ADJUST,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Qwerty
- *
- *           ,------------------------------------------------.       ,------------------------------------------------.
- *           |  Esc |   1  |   2  |   3  |   4  |   5  |   -  |       |   =  |   6  |   7  |   8  |   9  |   0  |   \  |
- *           |------+------+------+------+------+------+------|       |------+------+------+------+------+------+------|
- *           |  Tab |   Q  |   W  |   E  |   R  |   T  |   [  |       |   ]  |   Y  |   U  |   I  |   O  |   P  | BkSp |
- *           |------+------+------+------+------+------+------|       |------+------+------+------+------+------+------|
- *           | Ctrl |   A  |   S  |   D  |   F  |   G  |   `  |       |   '  |   H  |   J  |   K  |   L  |   ;  |Enter |
- *           |------+------+------+------+------+------+------|       |------+------+------+------+------+------+------+------.
- *           |Shift |   Z  |   X  |   C  |   V  |   B  | Caps |       |  Del |   N  |   M  |   ,  |   .  |   /  |Shift | Fn   |
- *           `--------------------+------+------+------+------|       |------+------+------+------+------+------+------+------'
- *                                | LAlt | LGUI | LOWER|Ctr/Esc|      |Spc/Sft | RAISE| LGUI | LAlt |
- *                                `---------------------------'       `---------------------------'
- */
-[_QWERTY] = LAYOUT(
-  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_MINS,      KC_EQL,  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSLS,
-  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_LBRC,      KC_RBRC, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-  KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_GRV,       KC_QUOT, KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT,
-  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_CAPS,      KC_DEL,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,  HAPPY,
-                             KC_LALT, KC_LGUI, LOWER,   MT(MOD_LCTL, KC_ESC),      MT(MOD_LSFT, KC_SPC),  RAISE,   KC_RGUI, KC_RALT
-),
-
-/* Happy
- *
- *           ,------------------------------------------------.       ,------------------------------------------------.
- *           |  Pwr |  F1  |  F2  |  F3  |  F4  |  F5  |      |       |      |  F6  |  F7  |  F8  |  F9  |  F0  |  Del |
- *           |------+------+------+------+------+------+------|       |------+------+------+------+------+------+------|
- *           | Caps |  F11 |  F12 |BLTOGG|      |BL INC|BL DEC|       |      |      | Psc  | Slk  | Pus  | Up   |  Ins |
- *           |------+------+------+------+------+------+------|       |------+------+------+------+------+------+------|
- *           |      | Vol- | Vol+ | Mute |RGBHUI|RGBSAI|RGBVAI|       |   *  |   /  | Home | PgUp | Left | Right|      |
- *           |------+------+------+------+------+------+------|       +------+------+------+------+------+------+------+------.
- *           |      |RGBTOG|RGBMOD|RGBRMD|RGBHUD|RGBSAD|RGBVAD|       |   +  |   -  | End  | PgDn | Down |      |      |      |
- *           `--------------------+------+------+------+------|       |------+------+------+------+------+------+------+------'
- *                                |      |      |      |      |       |      |      |      |      |
- *                                `---------------------------'       `---------------------------'
- */
-[_HAPPY] = LAYOUT(
-  KC_PWR,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   _______,      _______, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_DEL,
-  KC_CAPS, KC_F10,  KC_F12,  BL_TOGG, _______, BL_UP  , BL_DOWN,      _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   KC_INS,
-  _______, KC_VOLD, KC_VOLU, KC_MUTE, RGB_HUI, RGB_SAI, RGB_VAI,      KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______,
-  _______, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_HUD, RGB_SAD, RGB_VAD,      KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN,  _______, _______, _______,
-                             _______, _______, _______, _______,      _______, _______, _______, _______
-),
-
-
-/* Raise
- *
- *           ,------------------------------------------------.       ,------------------------------------------------.
- *           |      |      |      |      |      |      |      |       |      |      |      |      |      |      |      |
- *           |------+------+------+------+------+------+------|       |------+------+------+------+------+------+------|
- *           |      |   !  |   @  |   #  |   $  |   %  |      |       |      |   ^  |   &  |   *  |   (  |   )  |      |
- *           |------+------+------+------+------+------+------|       |------+------+------+------+------+------+------|
- *           |      |      |   _  |   +  |  |   |  ~   |      |       |      |   :  |   "  |   >  |   {  |   }  |      |
- *           |------+------+------+------+------+------+------|       |------+------+------+------+------+------+------+------.
- *           |      |      |   -  |   =  |  \   |  `   |      |       |      |   ;  |   '  |   <  |   [  |   ]  |      |      |
- *           `--------------------+------+------+------+------|       |------+------+------+------+------+------+------+------'
- *                                |      |      |      |      |       |      |      |      |      |
- *                                `---------------------------'       `---------------------------'
- */
-[_RAISE] = LAYOUT(
-  _______, _______, _______, _______, _______, _______, _______,      _______, _______, _______, _______, _______, _______, _______,
-  _______, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, _______,      _______, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
-  _______, _______, KC_UNDS, KC_PLUS, KC_PIPE, KC_TILD, _______,      _______, KC_COLN, KC_DQUO, KC_GT,   KC_LCBR, KC_RCBR, _______,
-  _______, _______, KC_MINS, KC_EQL,  KC_BSLS, KC_GRV,  _______,      _______, KC_SCLN, KC_QUOT, KC_LT,   KC_LBRC, KC_RBRC, _______, _______,
-                             _______, _______, _______, _______,      _______, _______, _______, _______
-),
-
-
-/* Lower
- *
- *           ,------------------------------------------------.       ,------------------------------------------------.
- *           |      |      |      |      |      |      |      |       |      |      |      |      |      |      |      |
- *           |------+------+------+------+------+------+------|       |------+------+------+------+------+------+------|
- *           |      |   1  |   2  |   3  |   4  |   5  |      |       |      |   6  |   7  |   8  |   9  |   0  |      |
- *           |------+------+------+------+------+------+------|       |------+------+------+------+------+------+------|
- *           |      |      |      |      |      |      | Enter|       |      | Left | Down |  Up  | Right|      |      |
- *           |------+------+------+------+------+------+------|       |------+------+------+------+------+------+------+------.
- *           |      |      |      |      |      |      | Del  |       | BkSp |      | PgUp | PgDn |      |      |      |      |
- *           `--------------------+------+------+------+------|       |------+------+------+------+------+------+------+------'
- *                                |      |      |      |      |       |      |      |      |      |
- *                                `---------------------------'       `---------------------------'
- */
-[_LOWER] = LAYOUT(
-  _______, _______, _______, _______, _______, _______, _______,      _______, _______, _______, _______, _______, _______, _______,
-  _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    _______,      _______, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______,
-  _______, _______, _______, _______, _______, _______, KC_ENT,       _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______,
-  _______, _______, _______, _______, _______, _______, KC_DEL,       KC_BSPC, _______, KC_PGUP, KC_PGDN, _______, _______, _______, _______,
-                             _______, _______, _______, _______,      _______, _______, _______, _______
-),
-
-
-/* Adjust
- *
- *           ,------------------------------------------------.       ,------------------------------------------------.
- *           |      |  F1  |  F2  |  F3  |  F4  |  F5  |      |       |      |  F6  |  F7  |  F8  |  F9  |  F0  |  Del |
- *           |------+------+------+------+------+------+------|       |------+------+------+------+------+------+------|
- *           |      | F11  | F12  |BLTOGG|      |BL INC|BL DEC|       |      |      |      |      |      |      |      |
- *           |------+------+------+------+------+------+------|       |------+------+------+------+------+------+------|
- *           |      |      |      |RGBMOD|RGBHUI|RGBSAI|RGBVAI|       |      |      |      |      |      |      |      |
- *           |------+------+------+------+------+------+------|       |------+------+------+------+------+------+------+------.
- *           |      | Reset|      |RGBTOG|RGBHUD|RGBSAD|RGBVAD|       |      | Prev | Next | Vol- | Vol+ | Play |      |      |
- *           `--------------------+------+------+------+------|       |------+------+------+------+------+------+------+------'
- *                                |      |      |      |      |       |      |      |      |      |
- *                                `---------------------------'       `---------------------------'
- */
-[_ADJUST] = LAYOUT(
-  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   _______,      _______, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______,
-  _______, KC_F10,  KC_F12,  BL_TOGG, _______, BL_UP  , BL_DOWN,      _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI,      _______, _______, _______, _______, _______, _______, _______,
-  _______, QK_BOOT, _______, RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD,      _______, KC_MPRV, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, _______, _______,
-                             _______, _______, _______, _______,      _______, _______, _______, _______
-)
-
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        // persistant_default_layer_set(1UL<<_QWERTY);
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-    case HAPPY:
-      if (record->event.pressed) {
-        layer_on(_HAPPY);
-      } else {
-        layer_off(_HAPPY);
-      }
-      return false;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-    case ADJUST:
-      if (record->event.pressed) {
-        layer_on(_ADJUST);
-      } else {
-        layer_off(_ADJUST);
-      }
-      return false;
-  }
-  return true;
-}
diff --git a/keyboards/kagizaraya/scythe/keymaps/forties/readme.md b/keyboards/kagizaraya/scythe/keymaps/forties/readme.md
deleted file mode 100644
index 162792dc375..00000000000
--- a/keyboards/kagizaraya/scythe/keymaps/forties/readme.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# The forty percent compatible keymap for scythe
-
diff --git a/keyboards/kapcave/gskt00/keymaps/nachie/keymap.c b/keyboards/kapcave/gskt00/keymaps/nachie/keymap.c
deleted file mode 100755
index 9b17187d05c..00000000000
--- a/keyboards/kapcave/gskt00/keymaps/nachie/keymap.c
+++ /dev/null
@@ -1,37 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    /* QWERTY */
-	LAYOUT_all(
-		KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_GRV, KC_BSLS,
-		KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC,
-		MO(3), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
-		KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, MO(3),
-		KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, KC_RALT, KC_LCTL), 
-
-    /* DVORAK */
-	LAYOUT_all(
-		KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_LBRC, KC_RBRC, KC_GRV, KC_BSLS, 
-		KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, KC_EQL, KC_BSPC,  
-		MO(3), KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, KC_ENT,
-		KC_LSFT, KC_NUBS, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_LSFT, MO(3),
-		KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, KC_RALT, KC_RCTL), 
-
-    /* COLEMAK */
-	LAYOUT_all(
-		KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_GRV, KC_BSLS,
-		KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_LBRC, KC_RBRC, KC_BSPC,
-		MO(3), KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, KC_ENT, 
-		KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, MO(3),
-		KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, KC_RALT, KC_RCTL), 
-
-    /* FUNCTION */
-	LAYOUT_all(
-		KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_PGUP, KC_UP, KC_PGDN, KC_PSCR, KC_SCRL, KC_PAUS, KC_BSPC,
-		KC_TRNS, KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_CAPS, KC_TRNS, KC_TRNS, KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS, KC_END, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MOD, KC_TRNS, RGB_TOG)
-
-};
diff --git a/keyboards/kapcave/paladinpad/keymaps/aek/keymap.c b/keyboards/kapcave/paladinpad/keymaps/aek/keymap.c
deleted file mode 100644
index 26168f7d2b9..00000000000
--- a/keyboards/kapcave/paladinpad/keymaps/aek/keymap.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-Copyright 2021 KapCave
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include QMK_KEYBOARD_H
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    /* DEFAULT */
-	LAYOUT_numpad_aek(
-		MO(1), KC_PEQL, KC_PSLS, KC_PAST,
-		KC_P7, KC_P8, KC_P9, KC_PMNS, 
-		KC_P4, KC_P5, KC_P6, KC_PPLS,
-		KC_P1, KC_P2, KC_P3,
-		       KC_P0, KC_PDOT, KC_PENT), 
-
-    /* FUNCTION */
-	LAYOUT_numpad_aek(
-		KC_TRNS, RGB_TOG, RGB_MOD, KC_TRNS,
-        RGB_HUI, RGB_SAI, RGB_VAI, KC_TRNS,
-        RGB_HUD, RGB_SAD, RGB_VAD, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS,
-		         KC_TRNS, QK_BOOT, KC_NUM)
-};
-
diff --git a/keyboards/kapcave/paladinpad/keymaps/aek/readme.md b/keyboards/kapcave/paladinpad/keymaps/aek/readme.md
deleted file mode 100644
index 44b106fa6bc..00000000000
--- a/keyboards/kapcave/paladinpad/keymaps/aek/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-The keymap for PaladinPad which resembles the AEK Numpad
\ No newline at end of file
diff --git a/keyboards/kbdcraft/adam64/adam64.c b/keyboards/kbdcraft/adam64/adam64.c
index 3f1565c2f30..db32d2856e1 100644
--- a/keyboards/kbdcraft/adam64/adam64.c
+++ b/keyboards/kbdcraft/adam64/adam64.c
@@ -26,73 +26,73 @@ const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
  *   |  |     G location
  *   |  |     |     B location
  *   |  |     |     | */
-    {0, CS14_SW1, CS13_SW1, CS15_SW1},
-    {0, CS14_SW2, CS13_SW2, CS15_SW2},
-    {0, CS14_SW3, CS13_SW3, CS15_SW3},
-    {0, CS14_SW4, CS13_SW4, CS15_SW4},
-    {0, CS14_SW5, CS13_SW5, CS15_SW5},
-    {0, CS14_SW6, CS13_SW6, CS15_SW6},
-    {0, CS14_SW7, CS13_SW7, CS15_SW7},
-    {0, CS32_SW1, CS31_SW1, CS33_SW1},
-    {0, CS32_SW2, CS31_SW2, CS33_SW2},
-    {0, CS32_SW3, CS31_SW3, CS33_SW3},
-    {0, CS32_SW4, CS31_SW4, CS33_SW4},
-    {0, CS32_SW5, CS31_SW5, CS33_SW5},
-    {0, CS32_SW6, CS31_SW6, CS33_SW6},
-    {0, CS32_SW7, CS31_SW7, CS33_SW7},
+    {0, SW1_CS14, SW1_CS13, SW1_CS15},
+    {0, SW2_CS14, SW2_CS13, SW2_CS15},
+    {0, SW3_CS14, SW3_CS13, SW3_CS15},
+    {0, SW4_CS14, SW4_CS13, SW4_CS15},
+    {0, SW5_CS14, SW5_CS13, SW5_CS15},
+    {0, SW6_CS14, SW6_CS13, SW6_CS15},
+    {0, SW7_CS14, SW7_CS13, SW7_CS15},
+    {0, SW1_CS32, SW1_CS31, SW1_CS33},
+    {0, SW2_CS32, SW2_CS31, SW2_CS33},
+    {0, SW3_CS32, SW3_CS31, SW3_CS33},
+    {0, SW4_CS32, SW4_CS31, SW4_CS33},
+    {0, SW5_CS32, SW5_CS31, SW5_CS33},
+    {0, SW6_CS32, SW6_CS31, SW6_CS33},
+    {0, SW7_CS32, SW7_CS31, SW7_CS33},
 
-    {0, CS23_SW1, CS24_SW1, CS22_SW1},
-    {0, CS23_SW2, CS24_SW2, CS22_SW2},
-    {0, CS23_SW3, CS24_SW3, CS22_SW3},
-    {0, CS23_SW4, CS24_SW4, CS22_SW4},
-    {0, CS23_SW5, CS24_SW5, CS22_SW5},
-    {0, CS23_SW6, CS24_SW6, CS22_SW6},
-    {0, CS23_SW7, CS24_SW7, CS22_SW7},
-    {0, CS35_SW1, CS34_SW1, CS36_SW1},
-    {0, CS35_SW2, CS34_SW2, CS36_SW2},
-    {0, CS35_SW3, CS34_SW3, CS36_SW3},
-    {0, CS35_SW4, CS34_SW4, CS36_SW4},
-    {0, CS35_SW5, CS34_SW5, CS36_SW5},
-    {0, CS35_SW6, CS34_SW6, CS36_SW6},
-    {0, CS35_SW7, CS34_SW7, CS36_SW7},
+    {0, SW1_CS23, SW1_CS24, SW1_CS22},
+    {0, SW2_CS23, SW2_CS24, SW2_CS22},
+    {0, SW3_CS23, SW3_CS24, SW3_CS22},
+    {0, SW4_CS23, SW4_CS24, SW4_CS22},
+    {0, SW5_CS23, SW5_CS24, SW5_CS22},
+    {0, SW6_CS23, SW6_CS24, SW6_CS22},
+    {0, SW7_CS23, SW7_CS24, SW7_CS22},
+    {0, SW1_CS35, SW1_CS34, SW1_CS36},
+    {0, SW2_CS35, SW2_CS34, SW2_CS36},
+    {0, SW3_CS35, SW3_CS34, SW3_CS36},
+    {0, SW4_CS35, SW4_CS34, SW4_CS36},
+    {0, SW5_CS35, SW5_CS34, SW5_CS36},
+    {0, SW6_CS35, SW6_CS34, SW6_CS36},
+    {0, SW7_CS35, SW7_CS34, SW7_CS36},
 
-    {0, CS17_SW1, CS16_SW1, CS18_SW1},
-    {0, CS17_SW2, CS16_SW2, CS18_SW2},
-    {0, CS17_SW3, CS16_SW3, CS18_SW3},
-    {0, CS17_SW4, CS16_SW4, CS18_SW4},
-    {0, CS17_SW5, CS16_SW5, CS18_SW5},
-    {0, CS17_SW6, CS16_SW6, CS18_SW6},
-    {0, CS17_SW7, CS16_SW7, CS18_SW7},
-    {0, CS26_SW1, CS25_SW1, CS27_SW1},
-    {0, CS26_SW2, CS25_SW2, CS27_SW2},
-    {0, CS26_SW3, CS25_SW3, CS27_SW3},
-    {0, CS26_SW4, CS25_SW4, CS27_SW4},
-    {0, CS26_SW5, CS25_SW5, CS27_SW5},
-    {0, CS26_SW7, CS25_SW7, CS27_SW7},
+    {0, SW1_CS17, SW1_CS16, SW1_CS18},
+    {0, SW2_CS17, SW2_CS16, SW2_CS18},
+    {0, SW3_CS17, SW3_CS16, SW3_CS18},
+    {0, SW4_CS17, SW4_CS16, SW4_CS18},
+    {0, SW5_CS17, SW5_CS16, SW5_CS18},
+    {0, SW6_CS17, SW6_CS16, SW6_CS18},
+    {0, SW7_CS17, SW7_CS16, SW7_CS18},
+    {0, SW1_CS26, SW1_CS25, SW1_CS27},
+    {0, SW2_CS26, SW2_CS25, SW2_CS27},
+    {0, SW3_CS26, SW3_CS25, SW3_CS27},
+    {0, SW4_CS26, SW4_CS25, SW4_CS27},
+    {0, SW5_CS26, SW5_CS25, SW5_CS27},
+    {0, SW7_CS26, SW7_CS25, SW7_CS27},
 
-    {0, CS20_SW1, CS19_SW1, CS21_SW1},
-    {0, CS20_SW2, CS19_SW2, CS21_SW2},
-    {0, CS20_SW3, CS19_SW3, CS21_SW3},
-    {0, CS20_SW4, CS19_SW4, CS21_SW4},
-    {0, CS20_SW5, CS19_SW5, CS21_SW5},
-    {0, CS20_SW6, CS19_SW6, CS21_SW6},
-    {0, CS20_SW7, CS19_SW7, CS21_SW7},
-    {0, CS29_SW1, CS28_SW1, CS30_SW1},
-    {0, CS29_SW2, CS28_SW2, CS30_SW2},
-    {0, CS29_SW3, CS28_SW3, CS30_SW3},
-    {0, CS29_SW4, CS28_SW4, CS30_SW4},
-    {0, CS29_SW5, CS28_SW5, CS30_SW5},
-    {0, CS29_SW6, CS28_SW6, CS30_SW6},
-    {0, CS29_SW7, CS28_SW7, CS30_SW7},
+    {0, SW1_CS20, SW1_CS19, SW1_CS21},
+    {0, SW2_CS20, SW2_CS19, SW2_CS21},
+    {0, SW3_CS20, SW3_CS19, SW3_CS21},
+    {0, SW4_CS20, SW4_CS19, SW4_CS21},
+    {0, SW5_CS20, SW5_CS19, SW5_CS21},
+    {0, SW6_CS20, SW6_CS19, SW6_CS21},
+    {0, SW7_CS20, SW7_CS19, SW7_CS21},
+    {0, SW1_CS29, SW1_CS28, SW1_CS30},
+    {0, SW2_CS29, SW2_CS28, SW2_CS30},
+    {0, SW3_CS29, SW3_CS28, SW3_CS30},
+    {0, SW4_CS29, SW4_CS28, SW4_CS30},
+    {0, SW5_CS29, SW5_CS28, SW5_CS30},
+    {0, SW6_CS29, SW6_CS28, SW6_CS30},
+    {0, SW7_CS29, SW7_CS28, SW7_CS30},
 
-    {0, CS9_SW1, CS10_SW1, CS8_SW1},
-    {0, CS9_SW2, CS10_SW2, CS8_SW2},
-    {0, CS9_SW3, CS10_SW3, CS8_SW3},
-    {0, CS9_SW6, CS10_SW6, CS8_SW6},
-    {0, CS2_SW3, CS1_SW3, CS3_SW3},
-    {0, CS2_SW4, CS1_SW4, CS3_SW4},
-    {0, CS2_SW5, CS1_SW5, CS3_SW5},
-    {0, CS2_SW6, CS1_SW6, CS3_SW6},
-    {0, CS2_SW7, CS1_SW7, CS3_SW7}
+    {0, SW1_CS9, SW1_CS10, SW1_CS8},
+    {0, SW2_CS9, SW2_CS10, SW2_CS8},
+    {0, SW3_CS9, SW3_CS10, SW3_CS8},
+    {0, SW6_CS9, SW6_CS10, SW6_CS8},
+    {0, SW3_CS2, SW3_CS1, SW3_CS3},
+    {0, SW4_CS2, SW4_CS1, SW4_CS3},
+    {0, SW5_CS2, SW5_CS1, SW5_CS3},
+    {0, SW6_CS2, SW6_CS1, SW6_CS3},
+    {0, SW7_CS2, SW7_CS1, SW7_CS3}
 };
 #endif
diff --git a/keyboards/kbdfans/bella/rgb/rgb.c b/keyboards/kbdfans/bella/rgb/rgb.c
index c666f9198f4..4818c990053 100644
--- a/keyboards/kbdfans/bella/rgb/rgb.c
+++ b/keyboards/kbdfans/bella/rgb/rgb.c
@@ -16,106 +16,106 @@
 #include "quantum.h"
 #ifdef RGB_MATRIX_ENABLE
 const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
-    {0, CS18_SW1, CS17_SW1, CS16_SW1},    /* RGB6 */
-    {0, CS18_SW3, CS17_SW3, CS16_SW3},    /* RGB32 */
-    {0, CS18_SW4, CS17_SW4, CS16_SW4},    /* RGB45 */
-    {0, CS18_SW5, CS17_SW5, CS16_SW5},    /* RGB58 */
-    {0, CS18_SW6, CS17_SW6, CS16_SW6},    /* RGB71 */
-    {0, CS18_SW7, CS17_SW7, CS16_SW7},    /* RGB84 */
-    {0, CS18_SW8, CS17_SW8, CS16_SW8},    /* RGB97 */
-    {0, CS21_SW1, CS20_SW1, CS19_SW1},    /* RGB7 */
-    {0, CS21_SW2, CS20_SW2, CS19_SW2},    /* RGB20 */
-    {0, CS21_SW3, CS20_SW3, CS19_SW3},    /* RGB33 */
-    {0, CS21_SW4, CS20_SW4, CS19_SW4},    /* RGB46 */
-    {0, CS21_SW5, CS20_SW5, CS19_SW5},    /* RGB59 */
-    {0, CS21_SW6, CS20_SW6, CS19_SW6},    /* RGB72 */
-    {0, CS21_SW7, CS20_SW7, CS19_SW7},    /* RGB85 */
+    {0, SW1_CS18, SW1_CS17, SW1_CS16},    /* RGB6 */
+    {0, SW3_CS18, SW3_CS17, SW3_CS16},    /* RGB32 */
+    {0, SW4_CS18, SW4_CS17, SW4_CS16},    /* RGB45 */
+    {0, SW5_CS18, SW5_CS17, SW5_CS16},    /* RGB58 */
+    {0, SW6_CS18, SW6_CS17, SW6_CS16},    /* RGB71 */
+    {0, SW7_CS18, SW7_CS17, SW7_CS16},    /* RGB84 */
+    {0, SW8_CS18, SW8_CS17, SW8_CS16},    /* RGB97 */
+    {0, SW1_CS21, SW1_CS20, SW1_CS19},    /* RGB7 */
+    {0, SW2_CS21, SW2_CS20, SW2_CS19},    /* RGB20 */
+    {0, SW3_CS21, SW3_CS20, SW3_CS19},    /* RGB33 */
+    {0, SW4_CS21, SW4_CS20, SW4_CS19},    /* RGB46 */
+    {0, SW5_CS21, SW5_CS20, SW5_CS19},    /* RGB59 */
+    {0, SW6_CS21, SW6_CS20, SW6_CS19},    /* RGB72 */
+    {0, SW7_CS21, SW7_CS20, SW7_CS19},    /* RGB85 */
 
-    {0, CS15_SW1, CS14_SW1, CS13_SW1},    /* RGB5 */
-    {0, CS15_SW2, CS14_SW2, CS13_SW2},    /* RGB18 */
-    {0, CS15_SW3, CS14_SW3, CS13_SW3},    /* RGB31 */
-    {0, CS15_SW4, CS14_SW4, CS13_SW4},    /* RGB44 */
-    {0, CS15_SW5, CS14_SW5, CS13_SW5},    /* RGB57 */
-    {0, CS15_SW6, CS14_SW6, CS13_SW6},    /* RGB70 */
-    {0, CS15_SW7, CS14_SW7, CS13_SW7},    /* RGB83 */
-    {0, CS15_SW8, CS14_SW8, CS13_SW8},    /* RGB96 */
-    {0, CS24_SW1, CS23_SW1, CS22_SW1},    /* RGB8 */
-    {0, CS24_SW2, CS23_SW2, CS22_SW2},    /* RGB21 */
-    {0, CS24_SW3, CS23_SW3, CS22_SW3},    /* RGB34 */
-    {0, CS24_SW4, CS23_SW4, CS22_SW4},    /* RGB47 */
-    {0, CS24_SW5, CS23_SW5, CS22_SW5},    /* RGB60 */
-    {0, CS24_SW6, CS23_SW6, CS22_SW6},    /* RGB73 */
-    {0, CS24_SW7, CS23_SW7, CS22_SW7},    /* RGB86 */
+    {0, SW1_CS15, SW1_CS14, SW1_CS13},    /* RGB5 */
+    {0, SW2_CS15, SW2_CS14, SW2_CS13},    /* RGB18 */
+    {0, SW3_CS15, SW3_CS14, SW3_CS13},    /* RGB31 */
+    {0, SW4_CS15, SW4_CS14, SW4_CS13},    /* RGB44 */
+    {0, SW5_CS15, SW5_CS14, SW5_CS13},    /* RGB57 */
+    {0, SW6_CS15, SW6_CS14, SW6_CS13},    /* RGB70 */
+    {0, SW7_CS15, SW7_CS14, SW7_CS13},    /* RGB83 */
+    {0, SW8_CS15, SW8_CS14, SW8_CS13},    /* RGB96 */
+    {0, SW1_CS24, SW1_CS23, SW1_CS22},    /* RGB8 */
+    {0, SW2_CS24, SW2_CS23, SW2_CS22},    /* RGB21 */
+    {0, SW3_CS24, SW3_CS23, SW3_CS22},    /* RGB34 */
+    {0, SW4_CS24, SW4_CS23, SW4_CS22},    /* RGB47 */
+    {0, SW5_CS24, SW5_CS23, SW5_CS22},    /* RGB60 */
+    {0, SW6_CS24, SW6_CS23, SW6_CS22},    /* RGB73 */
+    {0, SW7_CS24, SW7_CS23, SW7_CS22},    /* RGB86 */
 
-    {0, CS12_SW1, CS11_SW1, CS10_SW1},    /* RGB4 */
-    {0, CS12_SW2, CS11_SW2, CS10_SW2},    /* RGB17 */
-    {0, CS12_SW3, CS11_SW3, CS10_SW3},    /* RGB30 */
-    {0, CS12_SW4, CS11_SW4, CS10_SW4},    /* RGB43 */
-    {0, CS12_SW5, CS11_SW5, CS10_SW5},    /* RGB56 */
-    {0, CS12_SW6, CS11_SW6, CS10_SW6},    /* RGB69 */
-    {0, CS12_SW7, CS11_SW7, CS10_SW7},    /* RGB82 */
-    {0, CS12_SW8, CS11_SW8, CS10_SW8},    /* RGB95 */
-    {0, CS27_SW1, CS26_SW1, CS25_SW1},    /* RGB9 */
-    {0, CS27_SW2, CS26_SW2, CS25_SW2},    /* RGB22 */
-    {0, CS27_SW3, CS26_SW3, CS25_SW3},    /* RGB35 */
-    {0, CS27_SW4, CS26_SW4, CS25_SW4},    /* RGB48 */
-    {0, CS27_SW5, CS26_SW5, CS25_SW5},    /* RGB61 */
-    {0, CS27_SW6, CS26_SW6, CS25_SW6},    /* RGB74 */
-    {0, CS27_SW7, CS26_SW7, CS25_SW7},    /* RGB87 */
+    {0, SW1_CS12, SW1_CS11, SW1_CS10},    /* RGB4 */
+    {0, SW2_CS12, SW2_CS11, SW2_CS10},    /* RGB17 */
+    {0, SW3_CS12, SW3_CS11, SW3_CS10},    /* RGB30 */
+    {0, SW4_CS12, SW4_CS11, SW4_CS10},    /* RGB43 */
+    {0, SW5_CS12, SW5_CS11, SW5_CS10},    /* RGB56 */
+    {0, SW6_CS12, SW6_CS11, SW6_CS10},    /* RGB69 */
+    {0, SW7_CS12, SW7_CS11, SW7_CS10},    /* RGB82 */
+    {0, SW8_CS12, SW8_CS11, SW8_CS10},    /* RGB95 */
+    {0, SW1_CS27, SW1_CS26, SW1_CS25},    /* RGB9 */
+    {0, SW2_CS27, SW2_CS26, SW2_CS25},    /* RGB22 */
+    {0, SW3_CS27, SW3_CS26, SW3_CS25},    /* RGB35 */
+    {0, SW4_CS27, SW4_CS26, SW4_CS25},    /* RGB48 */
+    {0, SW5_CS27, SW5_CS26, SW5_CS25},    /* RGB61 */
+    {0, SW6_CS27, SW6_CS26, SW6_CS25},    /* RGB74 */
+    {0, SW7_CS27, SW7_CS26, SW7_CS25},    /* RGB87 */
 
-    {0, CS9_SW1, CS8_SW1, CS7_SW1},    /* RGB3 */
-    {0, CS9_SW2, CS8_SW2, CS7_SW2},    /* RGB16 */
-    {0, CS9_SW3, CS8_SW3, CS7_SW3},    /* RGB29*/
-    {0, CS9_SW4, CS8_SW4, CS7_SW4},    /* RGB42 */
-    {0, CS9_SW5, CS8_SW5, CS7_SW5},    /* RGB55 */
-    {0, CS9_SW6, CS8_SW6, CS7_SW6},    /* RGB68 */
-    {0, CS9_SW7, CS8_SW7, CS7_SW7},    /* RGB81 */
-    {0, CS9_SW8, CS8_SW8, CS7_SW8},    /* RGB94 */
-    {0, CS30_SW1, CS29_SW1, CS28_SW1},    /* RGB10 */
-    {0, CS30_SW2, CS29_SW2, CS28_SW2},    /* RGB23 */
-    {0, CS30_SW3, CS29_SW3, CS28_SW3},    /* RGB36 */
-    {0, CS30_SW4, CS29_SW4, CS28_SW4},    /* RGB49 */
-    {0, CS30_SW5, CS29_SW5, CS28_SW5},    /* RGB62 */
-    {0, CS30_SW7, CS29_SW7, CS28_SW7},    /* RGB88 */
+    {0, SW1_CS9, SW1_CS8, SW1_CS7},    /* RGB3 */
+    {0, SW2_CS9, SW2_CS8, SW2_CS7},    /* RGB16 */
+    {0, SW3_CS9, SW3_CS8, SW3_CS7},    /* RGB29*/
+    {0, SW4_CS9, SW4_CS8, SW4_CS7},    /* RGB42 */
+    {0, SW5_CS9, SW5_CS8, SW5_CS7},    /* RGB55 */
+    {0, SW6_CS9, SW6_CS8, SW6_CS7},    /* RGB68 */
+    {0, SW7_CS9, SW7_CS8, SW7_CS7},    /* RGB81 */
+    {0, SW8_CS9, SW8_CS8, SW8_CS7},    /* RGB94 */
+    {0, SW1_CS30, SW1_CS29, SW1_CS28},    /* RGB10 */
+    {0, SW2_CS30, SW2_CS29, SW2_CS28},    /* RGB23 */
+    {0, SW3_CS30, SW3_CS29, SW3_CS28},    /* RGB36 */
+    {0, SW4_CS30, SW4_CS29, SW4_CS28},    /* RGB49 */
+    {0, SW5_CS30, SW5_CS29, SW5_CS28},    /* RGB62 */
+    {0, SW7_CS30, SW7_CS29, SW7_CS28},    /* RGB88 */
 
-    {0, CS6_SW1, CS5_SW1, CS4_SW1},    /* RGB2 */
-    {0, CS6_SW3, CS5_SW3, CS4_SW3},    /* RGB28 */
-    {0, CS6_SW4, CS5_SW4, CS4_SW4},    /* RGB41 */
-    {0, CS6_SW5, CS5_SW5, CS4_SW5},    /* RGB54 */
-    {0, CS6_SW6, CS5_SW6, CS4_SW6},    /* RGB67 */
-    {0, CS6_SW7, CS5_SW7, CS4_SW7},    /* RGB80 */
-    {0, CS6_SW8, CS5_SW8, CS4_SW8},    /* RGB93 */
-    {0, CS33_SW1, CS32_SW1, CS31_SW1},    /* RGB11 */
-    {0, CS33_SW2, CS32_SW2, CS31_SW2},    /* RGB24 */
-    {0, CS33_SW3, CS32_SW3, CS31_SW3},    /* RGB37 */
-    {0, CS33_SW4, CS32_SW4, CS31_SW4},    /* RGB50 */
-    {0, CS33_SW5, CS32_SW5, CS31_SW5},    /* RGB63 */
-    {0, CS33_SW6, CS32_SW6, CS31_SW6},    /* RGB76 */
+    {0, SW1_CS6, SW1_CS5, SW1_CS4},    /* RGB2 */
+    {0, SW3_CS6, SW3_CS5, SW3_CS4},    /* RGB28 */
+    {0, SW4_CS6, SW4_CS5, SW4_CS4},    /* RGB41 */
+    {0, SW5_CS6, SW5_CS5, SW5_CS4},    /* RGB54 */
+    {0, SW6_CS6, SW6_CS5, SW6_CS4},    /* RGB67 */
+    {0, SW7_CS6, SW7_CS5, SW7_CS4},    /* RGB80 */
+    {0, SW8_CS6, SW8_CS5, SW8_CS4},    /* RGB93 */
+    {0, SW1_CS33, SW1_CS32, SW1_CS31},    /* RGB11 */
+    {0, SW2_CS33, SW2_CS32, SW2_CS31},    /* RGB24 */
+    {0, SW3_CS33, SW3_CS32, SW3_CS31},    /* RGB37 */
+    {0, SW4_CS33, SW4_CS32, SW4_CS31},    /* RGB50 */
+    {0, SW5_CS33, SW5_CS32, SW5_CS31},    /* RGB63 */
+    {0, SW6_CS33, SW6_CS32, SW6_CS31},    /* RGB76 */
 
-    {0, CS3_SW1, CS2_SW1, CS1_SW1},    /* RGB1 */
-    {0, CS3_SW2, CS2_SW2, CS1_SW2},    /* RGB14 */
-    {0, CS3_SW3, CS2_SW3, CS1_SW3},    /* RGB27 */
-    {0, CS36_SW8, CS35_SW8, CS34_SW8},    /* RGB103 */
-    {0, CS36_SW3, CS35_SW3, CS34_SW3},    /* RGB38 */
-    {0, CS36_SW4, CS35_SW4, CS34_SW4},    /* RGB51 */
-    {0, CS36_SW5, CS35_SW5, CS34_SW5},    /* RGB64 */
-    {0, CS36_SW6, CS35_SW6, CS34_SW6},    /* RGB77 */
-    {0, CS36_SW7, CS35_SW7, CS34_SW7},    /* RGB90 */
+    {0, SW1_CS3, SW1_CS2, SW1_CS1},    /* RGB1 */
+    {0, SW2_CS3, SW2_CS2, SW2_CS1},    /* RGB14 */
+    {0, SW3_CS3, SW3_CS2, SW3_CS1},    /* RGB27 */
+    {0, SW8_CS36, SW8_CS35, SW8_CS34},    /* RGB103 */
+    {0, SW3_CS36, SW3_CS35, SW3_CS34},    /* RGB38 */
+    {0, SW4_CS36, SW4_CS35, SW4_CS34},    /* RGB51 */
+    {0, SW5_CS36, SW5_CS35, SW5_CS34},    /* RGB64 */
+    {0, SW6_CS36, SW6_CS35, SW6_CS34},    /* RGB77 */
+    {0, SW7_CS36, SW7_CS35, SW7_CS34},    /* RGB90 */
 
-    {0, CS18_SW9, CS17_SW9, CS16_SW9},    /* RGB110 */
-    {0, CS18_SW2, CS17_SW2, CS16_SW2},    /* RGB19 */
-    {0, CS12_SW9, CS11_SW9, CS10_SW9},    /* RGB108 */
-    {0, CS21_SW8, CS20_SW8, CS19_SW8},    /* RGB98 */
-    {0, CS24_SW9, CS23_SW9, CS22_SW9},    /* RGB112 */
-    {0, CS24_SW8, CS23_SW8, CS22_SW8},    /* RGB99 */
-    {0, CS9_SW9, CS8_SW9, CS7_SW9},    /* RGB107 */
-    {0, CS27_SW8, CS26_SW8, CS25_SW8},    /* RGB100 */
-    {0, CS33_SW7, CS32_SW7, CS31_SW7},    /* RGB89 */
-    {0, CS33_SW9, CS32_SW9, CS31_SW9},    /* RGB115 */
-    {0, CS36_SW9, CS35_SW9, CS34_SW9},    /* RGB116 */
-    {0, CS36_SW2, CS35_SW2, CS34_SW2},    /* RGB25 */
-    {0, CS3_SW9, CS2_SW9, CS1_SW9},    /* RGB105 */
-    {0, CS3_SW4, CS2_SW4, CS1_SW4},    /* RGB40 */
+    {0, SW9_CS18, SW9_CS17, SW9_CS16},    /* RGB110 */
+    {0, SW2_CS18, SW2_CS17, SW2_CS16},    /* RGB19 */
+    {0, SW9_CS12, SW9_CS11, SW9_CS10},    /* RGB108 */
+    {0, SW8_CS21, SW8_CS20, SW8_CS19},    /* RGB98 */
+    {0, SW9_CS24, SW9_CS23, SW9_CS22},    /* RGB112 */
+    {0, SW8_CS24, SW8_CS23, SW8_CS22},    /* RGB99 */
+    {0, SW9_CS9, SW9_CS8, SW9_CS7},    /* RGB107 */
+    {0, SW8_CS27, SW8_CS26, SW8_CS25},    /* RGB100 */
+    {0, SW7_CS33, SW7_CS32, SW7_CS31},    /* RGB89 */
+    {0, SW9_CS33, SW9_CS32, SW9_CS31},    /* RGB115 */
+    {0, SW9_CS36, SW9_CS35, SW9_CS34},    /* RGB116 */
+    {0, SW2_CS36, SW2_CS35, SW2_CS34},    /* RGB25 */
+    {0, SW9_CS3, SW9_CS2, SW9_CS1},    /* RGB105 */
+    {0, SW4_CS3, SW4_CS2, SW4_CS1},    /* RGB40 */
 };
 
 led_config_t g_led_config = {
diff --git a/keyboards/kbdfans/bella/rgb_iso/rgb_iso.c b/keyboards/kbdfans/bella/rgb_iso/rgb_iso.c
index b4fc00765f5..8d9349e295f 100644
--- a/keyboards/kbdfans/bella/rgb_iso/rgb_iso.c
+++ b/keyboards/kbdfans/bella/rgb_iso/rgb_iso.c
@@ -16,107 +16,107 @@
 #include "quantum.h"
 #ifdef RGB_MATRIX_ENABLE
 const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
-    {0, CS18_SW1, CS17_SW1, CS16_SW1},    /* RGB6 */
-    {0, CS18_SW3, CS17_SW3, CS16_SW3},    /* RGB32 */
-    {0, CS18_SW4, CS17_SW4, CS16_SW4},    /* RGB45 */
-    {0, CS18_SW5, CS17_SW5, CS16_SW5},    /* RGB58 */
-    {0, CS18_SW6, CS17_SW6, CS16_SW6},    /* RGB71 */
-    {0, CS18_SW7, CS17_SW7, CS16_SW7},    /* RGB84 */
-    {0, CS18_SW8, CS17_SW8, CS16_SW8},    /* RGB97 */
-    {0, CS21_SW1, CS20_SW1, CS19_SW1},    /* RGB7 */
-    {0, CS21_SW2, CS20_SW2, CS19_SW2},    /* RGB20 */
-    {0, CS21_SW3, CS20_SW3, CS19_SW3},    /* RGB33 */
-    {0, CS21_SW4, CS20_SW4, CS19_SW4},    /* RGB46 */
-    {0, CS21_SW5, CS20_SW5, CS19_SW5},    /* RGB59 */
-    {0, CS21_SW6, CS20_SW6, CS19_SW6},    /* RGB72 */
-    {0, CS21_SW7, CS20_SW7, CS19_SW7},    /* RGB85 */
+    {0, SW1_CS18, SW1_CS17, SW1_CS16},    /* RGB6 */
+    {0, SW3_CS18, SW3_CS17, SW3_CS16},    /* RGB32 */
+    {0, SW4_CS18, SW4_CS17, SW4_CS16},    /* RGB45 */
+    {0, SW5_CS18, SW5_CS17, SW5_CS16},    /* RGB58 */
+    {0, SW6_CS18, SW6_CS17, SW6_CS16},    /* RGB71 */
+    {0, SW7_CS18, SW7_CS17, SW7_CS16},    /* RGB84 */
+    {0, SW8_CS18, SW8_CS17, SW8_CS16},    /* RGB97 */
+    {0, SW1_CS21, SW1_CS20, SW1_CS19},    /* RGB7 */
+    {0, SW2_CS21, SW2_CS20, SW2_CS19},    /* RGB20 */
+    {0, SW3_CS21, SW3_CS20, SW3_CS19},    /* RGB33 */
+    {0, SW4_CS21, SW4_CS20, SW4_CS19},    /* RGB46 */
+    {0, SW5_CS21, SW5_CS20, SW5_CS19},    /* RGB59 */
+    {0, SW6_CS21, SW6_CS20, SW6_CS19},    /* RGB72 */
+    {0, SW7_CS21, SW7_CS20, SW7_CS19},    /* RGB85 */
 
-    {0, CS15_SW1, CS14_SW1, CS13_SW1},    /* RGB5 */
-    {0, CS15_SW2, CS14_SW2, CS13_SW2},    /* RGB18 */
-    {0, CS15_SW3, CS14_SW3, CS13_SW3},    /* RGB31 */
-    {0, CS15_SW4, CS14_SW4, CS13_SW4},    /* RGB44 */
-    {0, CS15_SW5, CS14_SW5, CS13_SW5},    /* RGB57 */
-    {0, CS15_SW6, CS14_SW6, CS13_SW6},    /* RGB70 */
-    {0, CS15_SW7, CS14_SW7, CS13_SW7},    /* RGB83 */
-    {0, CS15_SW8, CS14_SW8, CS13_SW8},    /* RGB96 */
-    {0, CS24_SW1, CS23_SW1, CS22_SW1},    /* RGB8 */
-    {0, CS24_SW2, CS23_SW2, CS22_SW2},    /* RGB21 */
-    {0, CS24_SW3, CS23_SW3, CS22_SW3},    /* RGB34 */
-    {0, CS24_SW4, CS23_SW4, CS22_SW4},    /* RGB47 */
-    {0, CS24_SW5, CS23_SW5, CS22_SW5},    /* RGB60 */
-    {0, CS24_SW6, CS23_SW6, CS22_SW6},    /* RGB73 */
-    {0, CS24_SW7, CS23_SW7, CS22_SW7},    /* RGB86 */
+    {0, SW1_CS15, SW1_CS14, SW1_CS13},    /* RGB5 */
+    {0, SW2_CS15, SW2_CS14, SW2_CS13},    /* RGB18 */
+    {0, SW3_CS15, SW3_CS14, SW3_CS13},    /* RGB31 */
+    {0, SW4_CS15, SW4_CS14, SW4_CS13},    /* RGB44 */
+    {0, SW5_CS15, SW5_CS14, SW5_CS13},    /* RGB57 */
+    {0, SW6_CS15, SW6_CS14, SW6_CS13},    /* RGB70 */
+    {0, SW7_CS15, SW7_CS14, SW7_CS13},    /* RGB83 */
+    {0, SW8_CS15, SW8_CS14, SW8_CS13},    /* RGB96 */
+    {0, SW1_CS24, SW1_CS23, SW1_CS22},    /* RGB8 */
+    {0, SW2_CS24, SW2_CS23, SW2_CS22},    /* RGB21 */
+    {0, SW3_CS24, SW3_CS23, SW3_CS22},    /* RGB34 */
+    {0, SW4_CS24, SW4_CS23, SW4_CS22},    /* RGB47 */
+    {0, SW5_CS24, SW5_CS23, SW5_CS22},    /* RGB60 */
+    {0, SW6_CS24, SW6_CS23, SW6_CS22},    /* RGB73 */
+    {0, SW7_CS24, SW7_CS23, SW7_CS22},    /* RGB86 */
 
-    {0, CS12_SW1, CS11_SW1, CS10_SW1},    /* RGB4 */
-    {0, CS12_SW2, CS11_SW2, CS10_SW2},    /* RGB17 */
-    {0, CS12_SW3, CS11_SW3, CS10_SW3},    /* RGB30 */
-    {0, CS12_SW4, CS11_SW4, CS10_SW4},    /* RGB43 */
-    {0, CS12_SW5, CS11_SW5, CS10_SW5},    /* RGB56 */
-    {0, CS12_SW6, CS11_SW6, CS10_SW6},    /* RGB69 */
-    {0, CS12_SW7, CS11_SW7, CS10_SW7},    /* RGB82 */
-    {0, CS12_SW8, CS11_SW8, CS10_SW8},    /* RGB95 */
-    {0, CS27_SW1, CS26_SW1, CS25_SW1},    /* RGB9 */
-    {0, CS27_SW2, CS26_SW2, CS25_SW2},    /* RGB22 */
-    {0, CS27_SW3, CS26_SW3, CS25_SW3},    /* RGB35 */
-    {0, CS27_SW4, CS26_SW4, CS25_SW4},    /* RGB48 */
-    {0, CS27_SW5, CS26_SW5, CS25_SW5},    /* RGB61 */
-    {0, CS27_SW6, CS26_SW6, CS25_SW6},    /* RGB74 */
-    {0, CS27_SW7, CS26_SW7, CS25_SW7},    /* RGB87 */
+    {0, SW1_CS12, SW1_CS11, SW1_CS10},    /* RGB4 */
+    {0, SW2_CS12, SW2_CS11, SW2_CS10},    /* RGB17 */
+    {0, SW3_CS12, SW3_CS11, SW3_CS10},    /* RGB30 */
+    {0, SW4_CS12, SW4_CS11, SW4_CS10},    /* RGB43 */
+    {0, SW5_CS12, SW5_CS11, SW5_CS10},    /* RGB56 */
+    {0, SW6_CS12, SW6_CS11, SW6_CS10},    /* RGB69 */
+    {0, SW7_CS12, SW7_CS11, SW7_CS10},    /* RGB82 */
+    {0, SW8_CS12, SW8_CS11, SW8_CS10},    /* RGB95 */
+    {0, SW1_CS27, SW1_CS26, SW1_CS25},    /* RGB9 */
+    {0, SW2_CS27, SW2_CS26, SW2_CS25},    /* RGB22 */
+    {0, SW3_CS27, SW3_CS26, SW3_CS25},    /* RGB35 */
+    {0, SW4_CS27, SW4_CS26, SW4_CS25},    /* RGB48 */
+    {0, SW5_CS27, SW5_CS26, SW5_CS25},    /* RGB61 */
+    {0, SW6_CS27, SW6_CS26, SW6_CS25},    /* RGB74 */
+    {0, SW7_CS27, SW7_CS26, SW7_CS25},    /* RGB87 */
 
-    {0, CS9_SW1, CS8_SW1, CS7_SW1},    /* RGB3 */
-    {0, CS9_SW2, CS8_SW2, CS7_SW2},    /* RGB16 */
-    {0, CS9_SW3, CS8_SW3, CS7_SW3},    /* RGB29*/
-    {0, CS9_SW4, CS8_SW4, CS7_SW4},    /* RGB42 */
-    {0, CS9_SW5, CS8_SW5, CS7_SW5},    /* RGB55 */
-    {0, CS9_SW6, CS8_SW6, CS7_SW6},    /* RGB68 */
-    {0, CS9_SW7, CS8_SW7, CS7_SW7},    /* RGB81 */
-    {0, CS9_SW8, CS8_SW8, CS7_SW8},    /* RGB94 */
-    {0, CS30_SW1, CS29_SW1, CS28_SW1},    /* RGB10 */
-    {0, CS30_SW2, CS29_SW2, CS28_SW2},    /* RGB23 */
-    {0, CS30_SW3, CS29_SW3, CS28_SW3},    /* RGB36 */
-    {0, CS30_SW4, CS29_SW4, CS28_SW4},    /* RGB49 */
-    {0, CS30_SW5, CS29_SW5, CS28_SW5},    /* RGB62 */
-    {0, CS30_SW7, CS29_SW7, CS28_SW7},    /* RGB88 */
+    {0, SW1_CS9, SW1_CS8, SW1_CS7},    /* RGB3 */
+    {0, SW2_CS9, SW2_CS8, SW2_CS7},    /* RGB16 */
+    {0, SW3_CS9, SW3_CS8, SW3_CS7},    /* RGB29*/
+    {0, SW4_CS9, SW4_CS8, SW4_CS7},    /* RGB42 */
+    {0, SW5_CS9, SW5_CS8, SW5_CS7},    /* RGB55 */
+    {0, SW6_CS9, SW6_CS8, SW6_CS7},    /* RGB68 */
+    {0, SW7_CS9, SW7_CS8, SW7_CS7},    /* RGB81 */
+    {0, SW8_CS9, SW8_CS8, SW8_CS7},    /* RGB94 */
+    {0, SW1_CS30, SW1_CS29, SW1_CS28},    /* RGB10 */
+    {0, SW2_CS30, SW2_CS29, SW2_CS28},    /* RGB23 */
+    {0, SW3_CS30, SW3_CS29, SW3_CS28},    /* RGB36 */
+    {0, SW4_CS30, SW4_CS29, SW4_CS28},    /* RGB49 */
+    {0, SW5_CS30, SW5_CS29, SW5_CS28},    /* RGB62 */
+    {0, SW7_CS30, SW7_CS29, SW7_CS28},    /* RGB88 */
 
-    {0, CS6_SW1, CS5_SW1, CS4_SW1},    /* RGB2 */
-    {0, CS6_SW2, CS5_SW2, CS4_SW2},    /* RGB15 */
-    {0, CS6_SW3, CS5_SW3, CS4_SW3},    /* RGB28 */
-    {0, CS6_SW4, CS5_SW4, CS4_SW4},    /* RGB41 */
-    {0, CS6_SW5, CS5_SW5, CS4_SW5},    /* RGB54 */
-    {0, CS6_SW6, CS5_SW6, CS4_SW6},    /* RGB67 */
-    {0, CS6_SW7, CS5_SW7, CS4_SW7},    /* RGB80 */
-    {0, CS6_SW8, CS5_SW8, CS4_SW8},    /* RGB93 */
-    {0, CS33_SW1, CS32_SW1, CS31_SW1},    /* RGB11 */
-    {0, CS33_SW2, CS32_SW2, CS31_SW2},    /* RGB24 */
-    {0, CS33_SW3, CS32_SW3, CS31_SW3},    /* RGB37 */
-    {0, CS33_SW4, CS32_SW4, CS31_SW4},    /* RGB50 */
-    {0, CS33_SW5, CS32_SW5, CS31_SW5},    /* RGB63 */
-    {0, CS33_SW6, CS32_SW6, CS31_SW6},    /* RGB76 */
+    {0, SW1_CS6, SW1_CS5, SW1_CS4},    /* RGB2 */
+    {0, SW2_CS6, SW2_CS5, SW2_CS4},    /* RGB15 */
+    {0, SW3_CS6, SW3_CS5, SW3_CS4},    /* RGB28 */
+    {0, SW4_CS6, SW4_CS5, SW4_CS4},    /* RGB41 */
+    {0, SW5_CS6, SW5_CS5, SW5_CS4},    /* RGB54 */
+    {0, SW6_CS6, SW6_CS5, SW6_CS4},    /* RGB67 */
+    {0, SW7_CS6, SW7_CS5, SW7_CS4},    /* RGB80 */
+    {0, SW8_CS6, SW8_CS5, SW8_CS4},    /* RGB93 */
+    {0, SW1_CS33, SW1_CS32, SW1_CS31},    /* RGB11 */
+    {0, SW2_CS33, SW2_CS32, SW2_CS31},    /* RGB24 */
+    {0, SW3_CS33, SW3_CS32, SW3_CS31},    /* RGB37 */
+    {0, SW4_CS33, SW4_CS32, SW4_CS31},    /* RGB50 */
+    {0, SW5_CS33, SW5_CS32, SW5_CS31},    /* RGB63 */
+    {0, SW6_CS33, SW6_CS32, SW6_CS31},    /* RGB76 */
 
-    {0, CS3_SW1, CS2_SW1, CS1_SW1},    /* RGB1 */
-    {0, CS3_SW2, CS2_SW2, CS1_SW2},    /* RGB14 */
-    {0, CS3_SW3, CS2_SW3, CS1_SW3},    /* RGB27 */
-    {0, CS36_SW8, CS35_SW8, CS34_SW8},    /* RGB103 */
-    {0, CS36_SW3, CS35_SW3, CS34_SW3},    /* RGB38 */
-    {0, CS36_SW4, CS35_SW4, CS34_SW4},    /* RGB51 */
-    {0, CS36_SW5, CS35_SW5, CS34_SW5},    /* RGB64 */
-    {0, CS36_SW6, CS35_SW6, CS34_SW6},    /* RGB77 */
-    {0, CS36_SW7, CS35_SW7, CS34_SW7},    /* RGB90 */
+    {0, SW1_CS3, SW1_CS2, SW1_CS1},    /* RGB1 */
+    {0, SW2_CS3, SW2_CS2, SW2_CS1},    /* RGB14 */
+    {0, SW3_CS3, SW3_CS2, SW3_CS1},    /* RGB27 */
+    {0, SW8_CS36, SW8_CS35, SW8_CS34},    /* RGB103 */
+    {0, SW3_CS36, SW3_CS35, SW3_CS34},    /* RGB38 */
+    {0, SW4_CS36, SW4_CS35, SW4_CS34},    /* RGB51 */
+    {0, SW5_CS36, SW5_CS35, SW5_CS34},    /* RGB64 */
+    {0, SW6_CS36, SW6_CS35, SW6_CS34},    /* RGB77 */
+    {0, SW7_CS36, SW7_CS35, SW7_CS34},    /* RGB90 */
 
-    {0, CS18_SW9, CS17_SW9, CS16_SW9},    /* RGB110 */
-    {0, CS18_SW2, CS17_SW2, CS16_SW2},    /* RGB19 */
-    {0, CS12_SW9, CS11_SW9, CS10_SW9},    /* RGB108 */
-    {0, CS21_SW8, CS20_SW8, CS19_SW8},    /* RGB98 */
-    {0, CS24_SW9, CS23_SW9, CS22_SW9},    /* RGB112 */
-    {0, CS24_SW8, CS23_SW8, CS22_SW8},    /* RGB99 */
-    {0, CS9_SW9, CS8_SW9, CS7_SW9},    /* RGB107 */
-    {0, CS27_SW8, CS26_SW8, CS25_SW8},    /* RGB100 */
-    {0, CS33_SW7, CS32_SW7, CS31_SW7},    /* RGB89 */
-    {0, CS33_SW9, CS32_SW9, CS31_SW9},    /* RGB115 */
-    {0, CS36_SW9, CS35_SW9, CS34_SW9},    /* RGB116 */
-    {0, CS36_SW2, CS35_SW2, CS34_SW2},    /* RGB25 */
-    {0, CS3_SW9, CS2_SW9, CS1_SW9},    /* RGB105 */
-    {0, CS3_SW4, CS2_SW4, CS1_SW4},    /* RGB40 */
+    {0, SW9_CS18, SW9_CS17, SW9_CS16},    /* RGB110 */
+    {0, SW2_CS18, SW2_CS17, SW2_CS16},    /* RGB19 */
+    {0, SW9_CS12, SW9_CS11, SW9_CS10},    /* RGB108 */
+    {0, SW8_CS21, SW8_CS20, SW8_CS19},    /* RGB98 */
+    {0, SW9_CS24, SW9_CS23, SW9_CS22},    /* RGB112 */
+    {0, SW8_CS24, SW8_CS23, SW8_CS22},    /* RGB99 */
+    {0, SW9_CS9, SW9_CS8, SW9_CS7},    /* RGB107 */
+    {0, SW8_CS27, SW8_CS26, SW8_CS25},    /* RGB100 */
+    {0, SW7_CS33, SW7_CS32, SW7_CS31},    /* RGB89 */
+    {0, SW9_CS33, SW9_CS32, SW9_CS31},    /* RGB115 */
+    {0, SW9_CS36, SW9_CS35, SW9_CS34},    /* RGB116 */
+    {0, SW2_CS36, SW2_CS35, SW2_CS34},    /* RGB25 */
+    {0, SW9_CS3, SW9_CS2, SW9_CS1},    /* RGB105 */
+    {0, SW4_CS3, SW4_CS2, SW4_CS1},    /* RGB40 */
 };
 
 led_config_t g_led_config = {
diff --git a/keyboards/kbdfans/boop65/rgb/rgb.c b/keyboards/kbdfans/boop65/rgb/rgb.c
index b8145382c7a..f70c92812f9 100644
--- a/keyboards/kbdfans/boop65/rgb/rgb.c
+++ b/keyboards/kbdfans/boop65/rgb/rgb.c
@@ -19,97 +19,97 @@
 #ifdef RGB_MATRIX_ENABLE
 
 const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
-    {0, CS21_SW1, CS20_SW1, CS19_SW1},
-    {0, CS21_SW2, CS20_SW2, CS19_SW2},
-    {0, CS21_SW3, CS20_SW3, CS19_SW3},
-    {0, CS21_SW4, CS20_SW4, CS19_SW4},
-    {0, CS21_SW5, CS20_SW5, CS19_SW5},
-    {0, CS21_SW6, CS20_SW6, CS19_SW6},
-    {0, CS21_SW7, CS20_SW7, CS19_SW7},
-    {0, CS21_SW8, CS20_SW8, CS19_SW8},
-    {0, CS24_SW1, CS23_SW1, CS22_SW1},
-    {0, CS24_SW2, CS23_SW2, CS22_SW2},
-    {0, CS24_SW3, CS23_SW3, CS22_SW3},
-    {0, CS24_SW4, CS23_SW4, CS22_SW4},
-    {0, CS24_SW5, CS23_SW5, CS22_SW5},
-    {0, CS24_SW6, CS23_SW6, CS22_SW6},
-    {0, CS24_SW7, CS23_SW7, CS22_SW7},
+    {0, SW1_CS21, SW1_CS20, SW1_CS19},
+    {0, SW2_CS21, SW2_CS20, SW2_CS19},
+    {0, SW3_CS21, SW3_CS20, SW3_CS19},
+    {0, SW4_CS21, SW4_CS20, SW4_CS19},
+    {0, SW5_CS21, SW5_CS20, SW5_CS19},
+    {0, SW6_CS21, SW6_CS20, SW6_CS19},
+    {0, SW7_CS21, SW7_CS20, SW7_CS19},
+    {0, SW8_CS21, SW8_CS20, SW8_CS19},
+    {0, SW1_CS24, SW1_CS23, SW1_CS22},
+    {0, SW2_CS24, SW2_CS23, SW2_CS22},
+    {0, SW3_CS24, SW3_CS23, SW3_CS22},
+    {0, SW4_CS24, SW4_CS23, SW4_CS22},
+    {0, SW5_CS24, SW5_CS23, SW5_CS22},
+    {0, SW6_CS24, SW6_CS23, SW6_CS22},
+    {0, SW7_CS24, SW7_CS23, SW7_CS22},
 
-    {0, CS15_SW1, CS14_SW1, CS13_SW1},
-    {0, CS15_SW2, CS14_SW2, CS13_SW2},
-    {0, CS15_SW3, CS14_SW3, CS13_SW3},
-    {0, CS15_SW4, CS14_SW4, CS13_SW4},
-    {0, CS15_SW5, CS14_SW5, CS13_SW5},
-    {0, CS15_SW6, CS14_SW6, CS13_SW6},
-    {0, CS15_SW7, CS14_SW7, CS13_SW7},
-    {0, CS15_SW8, CS14_SW8, CS13_SW8},
-    {0, CS30_SW1, CS29_SW1, CS28_SW1},
-    {0, CS30_SW2, CS29_SW2, CS28_SW2},
-    {0, CS30_SW3, CS29_SW3, CS28_SW3},
-    {0, CS30_SW4, CS29_SW4, CS28_SW4},
-    {0, CS30_SW5, CS29_SW5, CS28_SW5},
-    {0, CS30_SW6, CS29_SW6, CS28_SW6},
-    {0, CS30_SW7, CS29_SW7, CS28_SW7},
+    {0, SW1_CS15, SW1_CS14, SW1_CS13},
+    {0, SW2_CS15, SW2_CS14, SW2_CS13},
+    {0, SW3_CS15, SW3_CS14, SW3_CS13},
+    {0, SW4_CS15, SW4_CS14, SW4_CS13},
+    {0, SW5_CS15, SW5_CS14, SW5_CS13},
+    {0, SW6_CS15, SW6_CS14, SW6_CS13},
+    {0, SW7_CS15, SW7_CS14, SW7_CS13},
+    {0, SW8_CS15, SW8_CS14, SW8_CS13},
+    {0, SW1_CS30, SW1_CS29, SW1_CS28},
+    {0, SW2_CS30, SW2_CS29, SW2_CS28},
+    {0, SW3_CS30, SW3_CS29, SW3_CS28},
+    {0, SW4_CS30, SW4_CS29, SW4_CS28},
+    {0, SW5_CS30, SW5_CS29, SW5_CS28},
+    {0, SW6_CS30, SW6_CS29, SW6_CS28},
+    {0, SW7_CS30, SW7_CS29, SW7_CS28},
 
-    {0, CS12_SW1, CS11_SW1, CS10_SW1},
-    {0, CS12_SW2, CS11_SW2, CS10_SW2},
-    {0, CS12_SW3, CS11_SW3, CS10_SW3},
-    {0, CS12_SW4, CS11_SW4, CS10_SW4},
-    {0, CS12_SW5, CS11_SW5, CS10_SW5},
-    {0, CS12_SW6, CS11_SW6, CS10_SW6},
-    {0, CS12_SW7, CS11_SW7, CS10_SW7},
-    {0, CS12_SW8, CS11_SW8, CS10_SW8},
-    {0, CS33_SW1, CS32_SW1, CS31_SW1},
-    {0, CS33_SW2, CS32_SW2, CS31_SW2},
-    {0, CS33_SW3, CS32_SW3, CS31_SW3},
-    {0, CS33_SW4, CS32_SW4, CS31_SW4},
-    {0, CS33_SW5, CS32_SW5, CS31_SW5},
-    {0, CS33_SW7, CS32_SW7, CS31_SW7},
+    {0, SW1_CS12, SW1_CS11, SW1_CS10},
+    {0, SW2_CS12, SW2_CS11, SW2_CS10},
+    {0, SW3_CS12, SW3_CS11, SW3_CS10},
+    {0, SW4_CS12, SW4_CS11, SW4_CS10},
+    {0, SW5_CS12, SW5_CS11, SW5_CS10},
+    {0, SW6_CS12, SW6_CS11, SW6_CS10},
+    {0, SW7_CS12, SW7_CS11, SW7_CS10},
+    {0, SW8_CS12, SW8_CS11, SW8_CS10},
+    {0, SW1_CS33, SW1_CS32, SW1_CS31},
+    {0, SW2_CS33, SW2_CS32, SW2_CS31},
+    {0, SW3_CS33, SW3_CS32, SW3_CS31},
+    {0, SW4_CS33, SW4_CS32, SW4_CS31},
+    {0, SW5_CS33, SW5_CS32, SW5_CS31},
+    {0, SW7_CS33, SW7_CS32, SW7_CS31},
 
-    {0, CS9_SW1, CS8_SW1, CS7_SW1},
-    {0, CS9_SW2, CS8_SW2, CS7_SW2},
-    {0, CS9_SW3, CS8_SW3, CS7_SW3},
-    {0, CS9_SW4, CS8_SW4, CS7_SW4},
-    {0, CS9_SW5, CS8_SW5, CS7_SW5},
-    {0, CS9_SW6, CS8_SW6, CS7_SW6},
-    {0, CS9_SW7, CS8_SW7, CS7_SW7},
-    {0, CS9_SW8, CS8_SW8, CS7_SW8},
-    {0, CS36_SW1, CS35_SW1, CS34_SW1},
-    {0, CS36_SW2, CS35_SW2, CS34_SW2},
-    {0, CS36_SW3, CS35_SW3, CS34_SW3},
-    {0, CS36_SW4, CS35_SW4, CS34_SW4},
-    {0, CS36_SW5, CS35_SW5, CS34_SW5},
-    {0, CS36_SW7, CS35_SW7, CS34_SW7},
+    {0, SW1_CS9, SW1_CS8, SW1_CS7},
+    {0, SW2_CS9, SW2_CS8, SW2_CS7},
+    {0, SW3_CS9, SW3_CS8, SW3_CS7},
+    {0, SW4_CS9, SW4_CS8, SW4_CS7},
+    {0, SW5_CS9, SW5_CS8, SW5_CS7},
+    {0, SW6_CS9, SW6_CS8, SW6_CS7},
+    {0, SW7_CS9, SW7_CS8, SW7_CS7},
+    {0, SW8_CS9, SW8_CS8, SW8_CS7},
+    {0, SW1_CS36, SW1_CS35, SW1_CS34},
+    {0, SW2_CS36, SW2_CS35, SW2_CS34},
+    {0, SW3_CS36, SW3_CS35, SW3_CS34},
+    {0, SW4_CS36, SW4_CS35, SW4_CS34},
+    {0, SW5_CS36, SW5_CS35, SW5_CS34},
+    {0, SW7_CS36, SW7_CS35, SW7_CS34},
 
-    {0, CS3_SW1, CS2_SW1, CS1_SW1},
-    {0, CS3_SW2, CS2_SW2, CS1_SW2},
-    {0, CS3_SW3, CS2_SW3, CS1_SW3},
-    {0, CS3_SW6, CS2_SW6, CS1_SW6},
-    {0, CS39_SW2, CS38_SW2, CS37_SW2},
-    {0, CS39_SW3, CS38_SW3, CS37_SW3},
-    {0, CS39_SW4, CS38_SW4, CS37_SW4},
-    {0, CS39_SW5, CS38_SW5, CS37_SW5},
-    {0, CS39_SW7, CS38_SW7, CS37_SW7},
+    {0, SW1_CS3, SW1_CS2, SW1_CS1},
+    {0, SW2_CS3, SW2_CS2, SW2_CS1},
+    {0, SW3_CS3, SW3_CS2, SW3_CS1},
+    {0, SW6_CS3, SW6_CS2, SW6_CS1},
+    {0, SW2_CS39, SW2_CS38, SW2_CS37},
+    {0, SW3_CS39, SW3_CS38, SW3_CS37},
+    {0, SW4_CS39, SW4_CS38, SW4_CS37},
+    {0, SW5_CS39, SW5_CS38, SW5_CS37},
+    {0, SW7_CS39, SW7_CS38, SW7_CS37},
 
 /* underglow */
 
-    {0, CS18_SW1, CS17_SW1, CS16_SW1},
-    {0, CS18_SW3, CS17_SW3, CS16_SW3},
-    {0, CS18_SW5, CS17_SW5, CS16_SW5},
-    {0, CS18_SW7, CS17_SW7, CS16_SW7},
-    {0, CS27_SW2, CS26_SW2, CS25_SW2},
-    {0, CS27_SW4, CS26_SW4, CS25_SW4},
-    {0, CS27_SW6, CS26_SW6, CS25_SW6},
-    {0, CS27_SW7, CS26_SW7, CS25_SW7},
+    {0, SW1_CS18, SW1_CS17, SW1_CS16},
+    {0, SW3_CS18, SW3_CS17, SW3_CS16},
+    {0, SW5_CS18, SW5_CS17, SW5_CS16},
+    {0, SW7_CS18, SW7_CS17, SW7_CS16},
+    {0, SW2_CS27, SW2_CS26, SW2_CS25},
+    {0, SW4_CS27, SW4_CS26, SW4_CS25},
+    {0, SW6_CS27, SW6_CS26, SW6_CS25},
+    {0, SW7_CS27, SW7_CS26, SW7_CS25},
 
-    {0, CS6_SW1, CS5_SW1, CS4_SW1},
-    {0, CS6_SW3, CS5_SW3, CS4_SW3},
-    {0, CS6_SW4, CS5_SW4, CS4_SW4},
-    {0, CS6_SW7, CS5_SW7, CS4_SW7},
-    {0, CS39_SW1, CS38_SW1, CS37_SW1},
-    {0, CS33_SW6, CS32_SW6, CS31_SW6},
-    {0, CS36_SW6, CS35_SW6, CS34_SW6},
-    {0, CS39_SW6, CS38_SW6, CS37_SW6}
+    {0, SW1_CS6, SW1_CS5, SW1_CS4},
+    {0, SW3_CS6, SW3_CS5, SW3_CS4},
+    {0, SW4_CS6, SW4_CS5, SW4_CS4},
+    {0, SW7_CS6, SW7_CS5, SW7_CS4},
+    {0, SW1_CS39, SW1_CS38, SW1_CS37},
+    {0, SW6_CS33, SW6_CS32, SW6_CS31},
+    {0, SW6_CS36, SW6_CS35, SW6_CS34},
+    {0, SW6_CS39, SW6_CS38, SW6_CS37}
 
 };
 led_config_t g_led_config = { {
diff --git a/keyboards/epoch80/info.json b/keyboards/kbdfans/epoch80/info.json
similarity index 100%
rename from keyboards/epoch80/info.json
rename to keyboards/kbdfans/epoch80/info.json
diff --git a/keyboards/epoch80/keymaps/default/keymap.c b/keyboards/kbdfans/epoch80/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/epoch80/keymaps/default/keymap.c
rename to keyboards/kbdfans/epoch80/keymaps/default/keymap.c
diff --git a/keyboards/epoch80/keymaps/iso/keymap.c b/keyboards/kbdfans/epoch80/keymaps/iso/keymap.c
similarity index 100%
rename from keyboards/epoch80/keymaps/iso/keymap.c
rename to keyboards/kbdfans/epoch80/keymaps/iso/keymap.c
diff --git a/keyboards/epoch80/keymaps/tsangan/keymap.c b/keyboards/kbdfans/epoch80/keymaps/tsangan/keymap.c
similarity index 100%
rename from keyboards/epoch80/keymaps/tsangan/keymap.c
rename to keyboards/kbdfans/epoch80/keymaps/tsangan/keymap.c
diff --git a/keyboards/epoch80/keymaps/via/keymap.c b/keyboards/kbdfans/epoch80/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/epoch80/keymaps/via/keymap.c
rename to keyboards/kbdfans/epoch80/keymaps/via/keymap.c
diff --git a/keyboards/kbdfans/epoch80/keymaps/via/rules.mk b/keyboards/kbdfans/epoch80/keymaps/via/rules.mk
new file mode 100644
index 00000000000..1e5b99807cb
--- /dev/null
+++ b/keyboards/kbdfans/epoch80/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/epoch80/keymaps/wkl/keymap.c b/keyboards/kbdfans/epoch80/keymaps/wkl/keymap.c
similarity index 100%
rename from keyboards/epoch80/keymaps/wkl/keymap.c
rename to keyboards/kbdfans/epoch80/keymaps/wkl/keymap.c
diff --git a/keyboards/epoch80/readme.md b/keyboards/kbdfans/epoch80/readme.md
similarity index 92%
rename from keyboards/epoch80/readme.md
rename to keyboards/kbdfans/epoch80/readme.md
index a78f9ce87ba..b029b5bd994 100644
--- a/keyboards/epoch80/readme.md
+++ b/keyboards/kbdfans/epoch80/readme.md
@@ -11,10 +11,10 @@ The board was also sold in a zFrontier groupbuy under the name Dolch.CR 80.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make epoch80:default
+    make kbdfans/epoch80:default
 
 Flashing example for this keyboard:
 
-    make epoch80:default:flash
+    make kbdfans/epoch80:default:flash
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/epoch80/rules.mk b/keyboards/kbdfans/epoch80/rules.mk
similarity index 100%
rename from keyboards/epoch80/rules.mk
rename to keyboards/kbdfans/epoch80/rules.mk
diff --git a/keyboards/jm60/board.h b/keyboards/kbdfans/jm60/board.h
similarity index 100%
rename from keyboards/jm60/board.h
rename to keyboards/kbdfans/jm60/board.h
diff --git a/keyboards/jm60/chconf.h b/keyboards/kbdfans/jm60/chconf.h
similarity index 100%
rename from keyboards/jm60/chconf.h
rename to keyboards/kbdfans/jm60/chconf.h
diff --git a/keyboards/jm60/config.h b/keyboards/kbdfans/jm60/config.h
similarity index 100%
rename from keyboards/jm60/config.h
rename to keyboards/kbdfans/jm60/config.h
diff --git a/keyboards/jm60/info.json b/keyboards/kbdfans/jm60/info.json
similarity index 100%
rename from keyboards/jm60/info.json
rename to keyboards/kbdfans/jm60/info.json
diff --git a/keyboards/jm60/jm60.c b/keyboards/kbdfans/jm60/jm60.c
similarity index 100%
rename from keyboards/jm60/jm60.c
rename to keyboards/kbdfans/jm60/jm60.c
diff --git a/keyboards/jm60/keymaps/default/keymap.c b/keyboards/kbdfans/jm60/keymaps/default/keymap.c
similarity index 97%
rename from keyboards/jm60/keymaps/default/keymap.c
rename to keyboards/kbdfans/jm60/keymaps/default/keymap.c
index 2bb26fccf6d..d063afa0fd3 100644
--- a/keyboards/jm60/keymaps/default/keymap.c
+++ b/keyboards/kbdfans/jm60/keymaps/default/keymap.c
@@ -1,3 +1,6 @@
+// Copyright QMK
+// SPDX-License-Identifier: GPL-2.0+
+
 #include QMK_KEYBOARD_H
 
 enum layer_names {
diff --git a/keyboards/jm60/keymaps/poker3/keymap.c b/keyboards/kbdfans/jm60/keymaps/poker3/keymap.c
similarity index 100%
rename from keyboards/jm60/keymaps/poker3/keymap.c
rename to keyboards/kbdfans/jm60/keymaps/poker3/keymap.c
diff --git a/keyboards/jm60/ld/jm60_bootloader.ld b/keyboards/kbdfans/jm60/ld/jm60_bootloader.ld
similarity index 100%
rename from keyboards/jm60/ld/jm60_bootloader.ld
rename to keyboards/kbdfans/jm60/ld/jm60_bootloader.ld
diff --git a/keyboards/jm60/mcuconf.h b/keyboards/kbdfans/jm60/mcuconf.h
similarity index 100%
rename from keyboards/jm60/mcuconf.h
rename to keyboards/kbdfans/jm60/mcuconf.h
diff --git a/keyboards/jm60/readme.md b/keyboards/kbdfans/jm60/readme.md
similarity index 96%
rename from keyboards/jm60/readme.md
rename to keyboards/kbdfans/jm60/readme.md
index bb790d6d07f..545124f3aaa 100644
--- a/keyboards/jm60/readme.md
+++ b/keyboards/kbdfans/jm60/readme.md
@@ -8,7 +8,7 @@ A compact 60% keyboard with full RGB led support.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make jm60:default
+    make kbdfans/jm60:default
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
 
diff --git a/keyboards/jm60/rules.mk b/keyboards/kbdfans/jm60/rules.mk
similarity index 100%
rename from keyboards/jm60/rules.mk
rename to keyboards/kbdfans/jm60/rules.mk
diff --git a/keyboards/kbdfans/kbd19x/info.json b/keyboards/kbdfans/kbd19x/info.json
index c37e3587e25..f2b28e4a086 100644
--- a/keyboards/kbdfans/kbd19x/info.json
+++ b/keyboards/kbdfans/kbd19x/info.json
@@ -46,6 +46,130 @@
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [6, 0], "x": 5.5, "y": 0},
+                {"matrix": [6, 1], "x": 6.5, "y": 0},
+                {"matrix": [6, 2], "x": 7.5, "y": 0},
+                {"matrix": [6, 3], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 5], "x": 9.75, "y": 0},
+                {"matrix": [0, 6], "x": 10.75, "y": 0},
+                {"matrix": [0, 7], "x": 11.75, "y": 0},
+                {"matrix": [0, 8], "x": 12.75, "y": 0},
+
+                {"matrix": [7, 2], "x": 14, "y": 0},
+
+                {"matrix": [0, 9], "x": 15.5, "y": 0},
+                {"matrix": [0, 10], "x": 16.5, "y": 0},
+                {"matrix": [0, 11], "x": 17.5, "y": 0},
+                {"matrix": [0, 12], "x": 18.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [6, 4], "x": 5, "y": 1.5},
+                {"matrix": [6, 5], "x": 6, "y": 1.5},
+                {"matrix": [6, 6], "x": 7, "y": 1.5},
+                {"matrix": [6, 7], "x": 8, "y": 1.5},
+                {"matrix": [1, 5], "x": 9, "y": 1.5},
+                {"matrix": [1, 6], "x": 10, "y": 1.5},
+                {"matrix": [1, 7], "x": 11, "y": 1.5},
+                {"matrix": [1, 8], "x": 12, "y": 1.5},
+                {"matrix": [7, 0], "x": 13, "y": 1.5},
+                {"matrix": [7, 1], "x": 14, "y": 1.5},
+
+                {"matrix": [1, 9], "x": 15.5, "y": 1.5},
+                {"matrix": [1, 10], "x": 16.5, "y": 1.5},
+                {"matrix": [1, 11], "x": 17.5, "y": 1.5},
+                {"matrix": [1, 12], "x": 18.5, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [6, 8], "x": 5.5, "y": 2.5},
+                {"matrix": [6, 9], "x": 6.5, "y": 2.5},
+                {"matrix": [6, 10], "x": 7.5, "y": 2.5},
+                {"matrix": [6, 11], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 12.5, "y": 2.5},
+                {"matrix": [7, 3], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 9], "x": 15.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 16.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 17.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 18.5, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [6, 12], "x": 5.75, "y": 3.5},
+                {"matrix": [7, 5], "x": 6.75, "y": 3.5},
+                {"matrix": [7, 6], "x": 7.75, "y": 3.5},
+                {"matrix": [7, 7], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [3, 9], "x": 15.5, "y": 3.5},
+                {"matrix": [3, 10], "x": 16.5, "y": 3.5},
+                {"matrix": [3, 11], "x": 17.5, "y": 3.5},
+                {"matrix": [3, 12], "x": 18.5, "y": 3.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [7, 8], "x": 5.25, "y": 4.5},
+                {"matrix": [7, 9], "x": 6.25, "y": 4.5},
+                {"matrix": [7, 10], "x": 7.25, "y": 4.5},
+                {"matrix": [7, 11], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 12.25, "y": 4.5, "w": 1.75},
+
+                {"matrix": [7, 4], "x": 14.25, "y": 4.75},
+
+                {"matrix": [4, 9], "x": 15.5, "y": 4.5},
+                {"matrix": [4, 10], "x": 16.5, "y": 4.5},
+                {"matrix": [4, 11], "x": 17.5, "y": 4.5},
+                {"matrix": [4, 12], "x": 18.5, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5},
+                {"matrix": [5, 2], "x": 2.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 9], "x": 3.5, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 5], "x": 9.75, "y": 5.5},
+                {"matrix": [5, 6], "x": 10.75, "y": 5.5},
+                {"matrix": [5, 7], "x": 11.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 8], "x": 13.25, "y": 5.75},
+                {"matrix": [5, 3], "x": 14.25, "y": 5.75},
+                {"matrix": [5, 4], "x": 15.25, "y": 5.75},
+
+                {"matrix": [5, 10], "x": 16.5, "y": 5.5},
+                {"matrix": [5, 11], "x": 17.5, "y": 5.5},
+                {"matrix": [5, 12], "x": 18.5, "y": 5.5}
+            ]
+        },
         "LAYOUT_ansi": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
@@ -166,6 +290,364 @@
                 {"matrix": [5, 11], "x": 17.5, "y": 5.5}
             ]
         },
+        "LAYOUT_ansi_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [6, 0], "x": 5.5, "y": 0},
+                {"matrix": [6, 1], "x": 6.5, "y": 0},
+                {"matrix": [6, 2], "x": 7.5, "y": 0},
+                {"matrix": [6, 3], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 5], "x": 9.75, "y": 0},
+                {"matrix": [0, 6], "x": 10.75, "y": 0},
+                {"matrix": [0, 7], "x": 11.75, "y": 0},
+                {"matrix": [0, 8], "x": 12.75, "y": 0},
+
+                {"matrix": [7, 2], "x": 14, "y": 0},
+
+                {"matrix": [0, 9], "x": 15.5, "y": 0},
+                {"matrix": [0, 10], "x": 16.5, "y": 0},
+                {"matrix": [0, 11], "x": 17.5, "y": 0},
+                {"matrix": [0, 12], "x": 18.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [6, 4], "x": 5, "y": 1.5},
+                {"matrix": [6, 5], "x": 6, "y": 1.5},
+                {"matrix": [6, 6], "x": 7, "y": 1.5},
+                {"matrix": [6, 7], "x": 8, "y": 1.5},
+                {"matrix": [1, 5], "x": 9, "y": 1.5},
+                {"matrix": [1, 6], "x": 10, "y": 1.5},
+                {"matrix": [1, 7], "x": 11, "y": 1.5},
+                {"matrix": [1, 8], "x": 12, "y": 1.5},
+                {"matrix": [7, 0], "x": 13, "y": 1.5},
+                {"matrix": [7, 1], "x": 14, "y": 1.5},
+
+                {"matrix": [1, 9], "x": 15.5, "y": 1.5},
+                {"matrix": [1, 10], "x": 16.5, "y": 1.5},
+                {"matrix": [1, 11], "x": 17.5, "y": 1.5},
+                {"matrix": [1, 12], "x": 18.5, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [6, 8], "x": 5.5, "y": 2.5},
+                {"matrix": [6, 9], "x": 6.5, "y": 2.5},
+                {"matrix": [6, 10], "x": 7.5, "y": 2.5},
+                {"matrix": [6, 11], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 12.5, "y": 2.5},
+                {"matrix": [7, 3], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 9], "x": 15.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 16.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 17.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 18.5, "y": 2.5, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [6, 12], "x": 5.75, "y": 3.5},
+                {"matrix": [7, 5], "x": 6.75, "y": 3.5},
+                {"matrix": [7, 6], "x": 7.75, "y": 3.5},
+                {"matrix": [7, 7], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [3, 9], "x": 15.5, "y": 3.5},
+                {"matrix": [3, 10], "x": 16.5, "y": 3.5},
+                {"matrix": [3, 11], "x": 17.5, "y": 3.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [7, 8], "x": 5.25, "y": 4.5},
+                {"matrix": [7, 9], "x": 6.25, "y": 4.5},
+                {"matrix": [7, 10], "x": 7.25, "y": 4.5},
+                {"matrix": [7, 11], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 12.25, "y": 4.5, "w": 1.75},
+
+                {"matrix": [7, 4], "x": 14.25, "y": 4.75},
+
+                {"matrix": [4, 9], "x": 15.5, "y": 4.5},
+                {"matrix": [4, 10], "x": 16.5, "y": 4.5},
+                {"matrix": [4, 11], "x": 17.5, "y": 4.5},
+                {"matrix": [4, 12], "x": 18.5, "y": 4.5, "h": 2},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5},
+                {"matrix": [5, 2], "x": 2.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 9], "x": 3.5, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 5], "x": 9.75, "y": 5.5},
+                {"matrix": [5, 6], "x": 10.75, "y": 5.5},
+                {"matrix": [5, 7], "x": 11.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 8], "x": 13.25, "y": 5.75},
+                {"matrix": [5, 3], "x": 14.25, "y": 5.75},
+                {"matrix": [5, 4], "x": 15.25, "y": 5.75},
+
+                {"matrix": [5, 10], "x": 16.5, "y": 5.5},
+                {"matrix": [5, 11], "x": 17.5, "y": 5.5}
+            ]
+        },
+        "LAYOUT_ansi_wkl": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [6, 0], "x": 5.5, "y": 0},
+                {"matrix": [6, 1], "x": 6.5, "y": 0},
+                {"matrix": [6, 2], "x": 7.5, "y": 0},
+                {"matrix": [6, 3], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 5], "x": 9.75, "y": 0},
+                {"matrix": [0, 6], "x": 10.75, "y": 0},
+                {"matrix": [0, 7], "x": 11.75, "y": 0},
+                {"matrix": [0, 8], "x": 12.75, "y": 0},
+
+                {"matrix": [7, 2], "x": 14, "y": 0},
+
+                {"matrix": [0, 9], "x": 15.5, "y": 0},
+                {"matrix": [0, 10], "x": 16.5, "y": 0},
+                {"matrix": [0, 11], "x": 17.5, "y": 0},
+                {"matrix": [0, 12], "x": 18.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [6, 4], "x": 5, "y": 1.5},
+                {"matrix": [6, 5], "x": 6, "y": 1.5},
+                {"matrix": [6, 6], "x": 7, "y": 1.5},
+                {"matrix": [6, 7], "x": 8, "y": 1.5},
+                {"matrix": [1, 5], "x": 9, "y": 1.5},
+                {"matrix": [1, 6], "x": 10, "y": 1.5},
+                {"matrix": [1, 7], "x": 11, "y": 1.5},
+                {"matrix": [1, 8], "x": 12, "y": 1.5},
+                {"matrix": [7, 1], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 9], "x": 15.5, "y": 1.5},
+                {"matrix": [1, 10], "x": 16.5, "y": 1.5},
+                {"matrix": [1, 11], "x": 17.5, "y": 1.5},
+                {"matrix": [1, 12], "x": 18.5, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [6, 8], "x": 5.5, "y": 2.5},
+                {"matrix": [6, 9], "x": 6.5, "y": 2.5},
+                {"matrix": [6, 10], "x": 7.5, "y": 2.5},
+                {"matrix": [6, 11], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 12.5, "y": 2.5},
+                {"matrix": [7, 3], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 9], "x": 15.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 16.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 17.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 18.5, "y": 2.5, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [6, 12], "x": 5.75, "y": 3.5},
+                {"matrix": [7, 5], "x": 6.75, "y": 3.5},
+                {"matrix": [7, 6], "x": 7.75, "y": 3.5},
+                {"matrix": [7, 7], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [3, 9], "x": 15.5, "y": 3.5},
+                {"matrix": [3, 10], "x": 16.5, "y": 3.5},
+                {"matrix": [3, 11], "x": 17.5, "y": 3.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [7, 8], "x": 5.25, "y": 4.5},
+                {"matrix": [7, 9], "x": 6.25, "y": 4.5},
+                {"matrix": [7, 10], "x": 7.25, "y": 4.5},
+                {"matrix": [7, 11], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 12.25, "y": 4.5, "w": 1.75},
+
+                {"matrix": [7, 4], "x": 14.25, "y": 4.75},
+
+                {"matrix": [4, 9], "x": 15.5, "y": 4.5},
+                {"matrix": [4, 10], "x": 16.5, "y": 4.5},
+                {"matrix": [4, 11], "x": 17.5, "y": 4.5},
+                {"matrix": [4, 12], "x": 18.5, "y": 4.5, "h": 2},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 2], "x": 1.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 9], "x": 3, "y": 5.5, "w": 7},
+                {"matrix": [5, 5], "x": 10, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 7], "x": 11.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [5, 8], "x": 13.25, "y": 5.75},
+                {"matrix": [5, 3], "x": 14.25, "y": 5.75},
+                {"matrix": [5, 4], "x": 15.25, "y": 5.75},
+
+                {"matrix": [5, 10], "x": 16.5, "y": 5.5},
+                {"matrix": [5, 11], "x": 17.5, "y": 5.5}
+            ]
+        },
+        "LAYOUT_ansi_wkl_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [6, 0], "x": 5.5, "y": 0},
+                {"matrix": [6, 1], "x": 6.5, "y": 0},
+                {"matrix": [6, 2], "x": 7.5, "y": 0},
+                {"matrix": [6, 3], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 5], "x": 9.75, "y": 0},
+                {"matrix": [0, 6], "x": 10.75, "y": 0},
+                {"matrix": [0, 7], "x": 11.75, "y": 0},
+                {"matrix": [0, 8], "x": 12.75, "y": 0},
+
+                {"matrix": [7, 2], "x": 14, "y": 0},
+
+                {"matrix": [0, 9], "x": 15.5, "y": 0},
+                {"matrix": [0, 10], "x": 16.5, "y": 0},
+                {"matrix": [0, 11], "x": 17.5, "y": 0},
+                {"matrix": [0, 12], "x": 18.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [6, 4], "x": 5, "y": 1.5},
+                {"matrix": [6, 5], "x": 6, "y": 1.5},
+                {"matrix": [6, 6], "x": 7, "y": 1.5},
+                {"matrix": [6, 7], "x": 8, "y": 1.5},
+                {"matrix": [1, 5], "x": 9, "y": 1.5},
+                {"matrix": [1, 6], "x": 10, "y": 1.5},
+                {"matrix": [1, 7], "x": 11, "y": 1.5},
+                {"matrix": [1, 8], "x": 12, "y": 1.5},
+                {"matrix": [7, 0], "x": 13, "y": 1.5},
+                {"matrix": [7, 1], "x": 14, "y": 1.5},
+
+                {"matrix": [1, 9], "x": 15.5, "y": 1.5},
+                {"matrix": [1, 10], "x": 16.5, "y": 1.5},
+                {"matrix": [1, 11], "x": 17.5, "y": 1.5},
+                {"matrix": [1, 12], "x": 18.5, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [6, 8], "x": 5.5, "y": 2.5},
+                {"matrix": [6, 9], "x": 6.5, "y": 2.5},
+                {"matrix": [6, 10], "x": 7.5, "y": 2.5},
+                {"matrix": [6, 11], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 12.5, "y": 2.5},
+                {"matrix": [7, 3], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 9], "x": 15.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 16.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 17.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 18.5, "y": 2.5, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [6, 12], "x": 5.75, "y": 3.5},
+                {"matrix": [7, 5], "x": 6.75, "y": 3.5},
+                {"matrix": [7, 6], "x": 7.75, "y": 3.5},
+                {"matrix": [7, 7], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [3, 9], "x": 15.5, "y": 3.5},
+                {"matrix": [3, 10], "x": 16.5, "y": 3.5},
+                {"matrix": [3, 11], "x": 17.5, "y": 3.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [7, 8], "x": 5.25, "y": 4.5},
+                {"matrix": [7, 9], "x": 6.25, "y": 4.5},
+                {"matrix": [7, 10], "x": 7.25, "y": 4.5},
+                {"matrix": [7, 11], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 12.25, "y": 4.5, "w": 1.75},
+
+                {"matrix": [7, 4], "x": 14.25, "y": 4.75},
+
+                {"matrix": [4, 9], "x": 15.5, "y": 4.5},
+                {"matrix": [4, 10], "x": 16.5, "y": 4.5},
+                {"matrix": [4, 11], "x": 17.5, "y": 4.5},
+                {"matrix": [4, 12], "x": 18.5, "y": 4.5, "h": 2},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 2], "x": 1.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 9], "x": 3, "y": 5.5, "w": 7},
+                {"matrix": [5, 5], "x": 10, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 7], "x": 11.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [5, 8], "x": 13.25, "y": 5.75},
+                {"matrix": [5, 3], "x": 14.25, "y": 5.75},
+                {"matrix": [5, 4], "x": 15.25, "y": 5.75},
+
+                {"matrix": [5, 10], "x": 16.5, "y": 5.5},
+                {"matrix": [5, 11], "x": 17.5, "y": 5.5}
+            ]
+        },
         "LAYOUT_iso": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
@@ -286,7 +768,7 @@
                 {"matrix": [5, 11], "x": 17.5, "y": 5.5}
             ]
         },
-        "LAYOUT_all": {
+        "LAYOUT_iso_split_bs": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
 
@@ -346,12 +828,10 @@
                 {"matrix": [2, 6], "x": 10.5, "y": 2.5},
                 {"matrix": [2, 7], "x": 11.5, "y": 2.5},
                 {"matrix": [2, 8], "x": 12.5, "y": 2.5},
-                {"matrix": [7, 3], "x": 13.5, "y": 2.5, "w": 1.5},
-
                 {"matrix": [2, 9], "x": 15.5, "y": 2.5},
                 {"matrix": [2, 10], "x": 16.5, "y": 2.5},
                 {"matrix": [2, 11], "x": 17.5, "y": 2.5},
-                {"matrix": [2, 12], "x": 18.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 18.5, "y": 2.5, "h": 2},
 
                 {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
                 {"matrix": [3, 1], "x": 1.75, "y": 3.5},
@@ -365,12 +845,12 @@
                 {"matrix": [3, 5], "x": 9.75, "y": 3.5},
                 {"matrix": [3, 6], "x": 10.75, "y": 3.5},
                 {"matrix": [3, 7], "x": 11.75, "y": 3.5},
-                {"matrix": [3, 8], "x": 12.75, "y": 3.5, "w": 2.25},
+                {"matrix": [7, 3], "x": 12.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
 
                 {"matrix": [3, 9], "x": 15.5, "y": 3.5},
                 {"matrix": [3, 10], "x": 16.5, "y": 3.5},
                 {"matrix": [3, 11], "x": 17.5, "y": 3.5},
-                {"matrix": [3, 12], "x": 18.5, "y": 3.5},
 
                 {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
                 {"matrix": [4, 1], "x": 1.25, "y": 4.5},
@@ -391,7 +871,7 @@
                 {"matrix": [4, 9], "x": 15.5, "y": 4.5},
                 {"matrix": [4, 10], "x": 16.5, "y": 4.5},
                 {"matrix": [4, 11], "x": 17.5, "y": 4.5},
-                {"matrix": [4, 12], "x": 18.5, "y": 4.5},
+                {"matrix": [4, 12], "x": 18.5, "y": 4.5, "h": 2},
 
                 {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
                 {"matrix": [5, 1], "x": 1.25, "y": 5.5},
@@ -406,8 +886,244 @@
                 {"matrix": [5, 4], "x": 15.25, "y": 5.75},
 
                 {"matrix": [5, 10], "x": 16.5, "y": 5.5},
-                {"matrix": [5, 11], "x": 17.5, "y": 5.5},
-                {"matrix": [5, 12], "x": 18.5, "y": 5.5}
+                {"matrix": [5, 11], "x": 17.5, "y": 5.5}
+            ]
+        },
+        "LAYOUT_iso_wkl": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [6, 0], "x": 5.5, "y": 0},
+                {"matrix": [6, 1], "x": 6.5, "y": 0},
+                {"matrix": [6, 2], "x": 7.5, "y": 0},
+                {"matrix": [6, 3], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 5], "x": 9.75, "y": 0},
+                {"matrix": [0, 6], "x": 10.75, "y": 0},
+                {"matrix": [0, 7], "x": 11.75, "y": 0},
+                {"matrix": [0, 8], "x": 12.75, "y": 0},
+
+                {"matrix": [7, 2], "x": 14, "y": 0},
+
+                {"matrix": [0, 9], "x": 15.5, "y": 0},
+                {"matrix": [0, 10], "x": 16.5, "y": 0},
+                {"matrix": [0, 11], "x": 17.5, "y": 0},
+                {"matrix": [0, 12], "x": 18.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [6, 4], "x": 5, "y": 1.5},
+                {"matrix": [6, 5], "x": 6, "y": 1.5},
+                {"matrix": [6, 6], "x": 7, "y": 1.5},
+                {"matrix": [6, 7], "x": 8, "y": 1.5},
+                {"matrix": [1, 5], "x": 9, "y": 1.5},
+                {"matrix": [1, 6], "x": 10, "y": 1.5},
+                {"matrix": [1, 7], "x": 11, "y": 1.5},
+                {"matrix": [1, 8], "x": 12, "y": 1.5},
+                {"matrix": [7, 1], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 9], "x": 15.5, "y": 1.5},
+                {"matrix": [1, 10], "x": 16.5, "y": 1.5},
+                {"matrix": [1, 11], "x": 17.5, "y": 1.5},
+                {"matrix": [1, 12], "x": 18.5, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [6, 8], "x": 5.5, "y": 2.5},
+                {"matrix": [6, 9], "x": 6.5, "y": 2.5},
+                {"matrix": [6, 10], "x": 7.5, "y": 2.5},
+                {"matrix": [6, 11], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 15.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 16.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 17.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 18.5, "y": 2.5, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [6, 12], "x": 5.75, "y": 3.5},
+                {"matrix": [7, 5], "x": 6.75, "y": 3.5},
+                {"matrix": [7, 6], "x": 7.75, "y": 3.5},
+                {"matrix": [7, 7], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 11.75, "y": 3.5},
+                {"matrix": [7, 3], "x": 12.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+                {"matrix": [3, 9], "x": 15.5, "y": 3.5},
+                {"matrix": [3, 10], "x": 16.5, "y": 3.5},
+                {"matrix": [3, 11], "x": 17.5, "y": 3.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [7, 8], "x": 5.25, "y": 4.5},
+                {"matrix": [7, 9], "x": 6.25, "y": 4.5},
+                {"matrix": [7, 10], "x": 7.25, "y": 4.5},
+                {"matrix": [7, 11], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 12.25, "y": 4.5, "w": 1.75},
+
+                {"matrix": [7, 4], "x": 14.25, "y": 4.75},
+
+                {"matrix": [4, 9], "x": 15.5, "y": 4.5},
+                {"matrix": [4, 10], "x": 16.5, "y": 4.5},
+                {"matrix": [4, 11], "x": 17.5, "y": 4.5},
+                {"matrix": [4, 12], "x": 18.5, "y": 4.5, "h": 2},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 2], "x": 1.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 9], "x": 3, "y": 5.5, "w": 7},
+                {"matrix": [5, 5], "x": 10, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 7], "x": 11.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [5, 8], "x": 13.25, "y": 5.75},
+                {"matrix": [5, 3], "x": 14.25, "y": 5.75},
+                {"matrix": [5, 4], "x": 15.25, "y": 5.75},
+
+                {"matrix": [5, 10], "x": 16.5, "y": 5.5},
+                {"matrix": [5, 11], "x": 17.5, "y": 5.5}
+            ]
+        },
+        "LAYOUT_iso_wkl_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [6, 0], "x": 5.5, "y": 0},
+                {"matrix": [6, 1], "x": 6.5, "y": 0},
+                {"matrix": [6, 2], "x": 7.5, "y": 0},
+                {"matrix": [6, 3], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 5], "x": 9.75, "y": 0},
+                {"matrix": [0, 6], "x": 10.75, "y": 0},
+                {"matrix": [0, 7], "x": 11.75, "y": 0},
+                {"matrix": [0, 8], "x": 12.75, "y": 0},
+
+                {"matrix": [7, 2], "x": 14, "y": 0},
+
+                {"matrix": [0, 9], "x": 15.5, "y": 0},
+                {"matrix": [0, 10], "x": 16.5, "y": 0},
+                {"matrix": [0, 11], "x": 17.5, "y": 0},
+                {"matrix": [0, 12], "x": 18.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [6, 4], "x": 5, "y": 1.5},
+                {"matrix": [6, 5], "x": 6, "y": 1.5},
+                {"matrix": [6, 6], "x": 7, "y": 1.5},
+                {"matrix": [6, 7], "x": 8, "y": 1.5},
+                {"matrix": [1, 5], "x": 9, "y": 1.5},
+                {"matrix": [1, 6], "x": 10, "y": 1.5},
+                {"matrix": [1, 7], "x": 11, "y": 1.5},
+                {"matrix": [1, 8], "x": 12, "y": 1.5},
+                {"matrix": [7, 0], "x": 13, "y": 1.5},
+                {"matrix": [7, 1], "x": 14, "y": 1.5},
+
+                {"matrix": [1, 9], "x": 15.5, "y": 1.5},
+                {"matrix": [1, 10], "x": 16.5, "y": 1.5},
+                {"matrix": [1, 11], "x": 17.5, "y": 1.5},
+                {"matrix": [1, 12], "x": 18.5, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [6, 8], "x": 5.5, "y": 2.5},
+                {"matrix": [6, 9], "x": 6.5, "y": 2.5},
+                {"matrix": [6, 10], "x": 7.5, "y": 2.5},
+                {"matrix": [6, 11], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 15.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 16.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 17.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 18.5, "y": 2.5, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [6, 12], "x": 5.75, "y": 3.5},
+                {"matrix": [7, 5], "x": 6.75, "y": 3.5},
+                {"matrix": [7, 6], "x": 7.75, "y": 3.5},
+                {"matrix": [7, 7], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 11.75, "y": 3.5},
+                {"matrix": [7, 3], "x": 12.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+                {"matrix": [3, 9], "x": 15.5, "y": 3.5},
+                {"matrix": [3, 10], "x": 16.5, "y": 3.5},
+                {"matrix": [3, 11], "x": 17.5, "y": 3.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [7, 8], "x": 5.25, "y": 4.5},
+                {"matrix": [7, 9], "x": 6.25, "y": 4.5},
+                {"matrix": [7, 10], "x": 7.25, "y": 4.5},
+                {"matrix": [7, 11], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 12.25, "y": 4.5, "w": 1.75},
+
+                {"matrix": [7, 4], "x": 14.25, "y": 4.75},
+
+                {"matrix": [4, 9], "x": 15.5, "y": 4.5},
+                {"matrix": [4, 10], "x": 16.5, "y": 4.5},
+                {"matrix": [4, 11], "x": 17.5, "y": 4.5},
+                {"matrix": [4, 12], "x": 18.5, "y": 4.5, "h": 2},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 2], "x": 1.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 9], "x": 3, "y": 5.5, "w": 7},
+                {"matrix": [5, 5], "x": 10, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 7], "x": 11.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [5, 8], "x": 13.25, "y": 5.75},
+                {"matrix": [5, 3], "x": 14.25, "y": 5.75},
+                {"matrix": [5, 4], "x": 15.25, "y": 5.75},
+
+                {"matrix": [5, 10], "x": 16.5, "y": 5.5},
+                {"matrix": [5, 11], "x": 17.5, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/kbdfans/kbd19x/matrix_diagram.md b/keyboards/kbdfans/kbd19x/matrix_diagram.md
new file mode 100644
index 00000000000..5c7aa98557b
--- /dev/null
+++ b/keyboards/kbdfans/kbd19x/matrix_diagram.md
@@ -0,0 +1,28 @@
+# Matrix Diagram for KBDfans KBD19x
+
+```
+┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐ ┌───┬───┬───┬───┐
+│00 ││01 │02 │03 │04 ││60 │61 │62 │63 ││05 │06 │07 │08 ││72 │ │09 │0A │0B │0C │
+└───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘ └───┴───┴───┴───┘
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┐    ┌───────┐
+│10 │11 │12 │13 │14 │64 │65 │66 │67 │15 │16 │17 │18 │70 │71 │ │19 │1A │1B │1C │    │71     │ 2u Backspace
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┼───┼───┤    └─┬─────┤                ┌───┐
+│20   │21 │22 │23 │24 │68 │69 │6A │6B │25 │26 │27 │28 │73   │ │29 │2A │2B │2C │      │     │                │   │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ ├───┼───┼───┼───┤   ┌──┴┐38  │ ISO Enter      │2C │ 2u Numpad Plus
+│30    │31 │32 │33 │34 │6C │75 │76 │77 │35 │36 │37 │38      │ │39 │3A │3B │3C │   │73 │    │                │   │
+├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┘ ├───┼───┼───┼───┤   └───┴────┘                ├───┤
+│40  │41 │42 │43 │44 │78 │79 │7A │7B │45 │46 │47 │48    │┌───┐│49 │4A │4B │4C │                             │   │
+├────┼───┼───┴┬──┴───┴───┴───┴───┴───┴─┬─┴─┬─┴─┬─┴──┬───┘│74 │└───┼───┼───┼───┤                             │4C │ 2u Numpad Enter
+│50  │51 │52  │59                      │55 │56 │57  │┌───┼───┼───┐│5A │5B │5C │                             │   │
+└────┴───┴────┴────────────────────────┴───┴───┴────┘│58 │53 │54 │└───┴───┴───┘                             └───┘
+                                                     └───┴───┴───┘
+┌────────┐
+│40      │ 2.25u LShift
+└────────┘
+┌────┬───┬────┬───────────────────────┬────┬───┬────┐
+│50  │51 │52  │59                     │55  │56 │57  │ 6u Space
+└────┴───┴────┴───────────────────────┴────┴───┴────┘
+┌─────┬─────┬───────────────────────────┬─────┬─────┐
+│50   │52   │59                         │55   │57   │ WKL (7u Space)
+└─────┴─────┴───────────────────────────┴─────┴─────┘
+```
diff --git a/keyboards/kbdfans/kbd67/hotswap/keymaps/stevanmilic/config.h b/keyboards/kbdfans/kbd67/hotswap/keymaps/stevanmilic/config.h
deleted file mode 100644
index 16497ddf0f8..00000000000
--- a/keyboards/kbdfans/kbd67/hotswap/keymaps/stevanmilic/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-
-#define FORCE_NKRO
-
-#define MOUSEKEY_DELAY             50
-#define MOUSEKEY_INTERVAL          15
-#define MOUSEKEY_MAX_SPEED         4
-#define MOUSEKEY_TIME_TO_MAX       50
-#define MOUSEKEY_WHEEL_MAX_SPEED   1
-#define MOUSEKEY_WHEEL_TIME_TO_MAX 50
-
-#define NO_ACTION_FUNCTION
-#define NO_ACTION_MACRO
-#define NO_ACTION_ONESHOT
-
-#define PERMISSIVE_HOLD
-#define TAPPING_TERM        200
-#define TAPPING_TOGGLE      2
-#define TAP_HOLD_CAPS_DELAY 50
diff --git a/keyboards/kbdfans/kbd67/hotswap/keymaps/stevanmilic/keymap.c b/keyboards/kbdfans/kbd67/hotswap/keymaps/stevanmilic/keymap.c
deleted file mode 100644
index 4b00cc63ff6..00000000000
--- a/keyboards/kbdfans/kbd67/hotswap/keymaps/stevanmilic/keymap.c
+++ /dev/null
@@ -1,79 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define FN      MO(L_FN)
-#define FN_CAPS LT(L_FN, KC_CAPS)
-#define FN_ESC  LT(L_FN, KC_ESC)
-#define FN_FNLK TT(L_FN)
-
-#define MV_UP   LCTL(KC_UP)
-#define MV_DOWN LCTL(KC_DOWN)
-#define MV_LEFT LCTL(KC_LEFT)
-#define MV_RGHT LCTL(KC_RGHT)
-#define TOP     LCTL(KC_HOME)
-#define BOTTOM  LCTL(KC_END)
-
-enum keycodes {
-    CLEAR = SAFE_RANGE,
-};
-
-enum layers {
-    L_BASE,
-    L_FN,
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-    case CLEAR:
-        if (record->event.pressed) {
-            SEND_STRING(SS_LCTL("a") SS_TAP(X_DELETE));
-        }
-        return false;
-
-    default:
-        return true;
-    }
-}
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Base layer
-     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
-     * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ \ │ ` │PSc│
-     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
-     * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │Bspc │Del│
-     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
-     * │FnEsc │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ Enter  │PgU│
-     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
-     * │ LShift │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │RShift│ ↑ │PgD│
-     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
-     * │LCtl│LGui│LAlt│         Space          │RAlt│FnLk│ │ ← │ ↓ │ → │
-     * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
-     */
-    [L_BASE] = LAYOUT(
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_GRV,  KC_PSCR,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC, KC_DEL,
-        FN_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGUP,
-        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   KC_PGDN,
-        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, FN_FNLK,          KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-
-    /* Function layer
-     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
-     * │   │F1 │F2 │F3 │F4 │F5 │F6 │F7 │F8 │F9 │F10│F11│F12│NLk│SLk│Pau│
-     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
-     * │     │M2 │M↑ │M1 │M3 │   │   │   │   │Stp│Ply│Prv│Nxt│Clear│Ins│
-     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
-     * │      │M← │M↓ │M→ │MW↑│   │   │Mv←│ ↓ │ ↑ │Mv→│   │        │Top│
-     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
-     * │        │MA0│MA2│MW←│MW→│   │   │App│Vo-│Vo+│Mut│      │PgU│Btm│
-     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
-     * │    │DtPR│DtNA│          MW↓           │    │    │ │Hom│PgD│End│
-     * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
-     */
-    [L_FN] = LAYOUT(
-        _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NUM,  KC_SCRL, KC_PAUS,
-        _______, KC_BTN2, KC_MS_U, KC_BTN1, KC_BTN3, _______, _______, _______, _______, KC_MSTP, KC_MPLY, KC_MPRV, KC_MNXT, CLEAR,   KC_INS,
-        _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_U, _______, MV_LEFT, KC_DOWN, KC_UP,   MV_RGHT, _______, _______,          _______, TOP,
-        _______, KC_ACL0, KC_ACL2, KC_WH_L, KC_WH_R, _______, _______, KC_APP,  KC_VOLD, KC_VOLU, KC_MUTE,          _______, KC_PGUP, BOTTOM,
-        _______, _______, _______,                   KC_WH_D,                            _______, _______,          KC_HOME, KC_PGDN, KC_END
-    ),
-};
diff --git a/keyboards/kbdfans/kbd67/hotswap/keymaps/stevanmilic/rules.mk b/keyboards/kbdfans/kbd67/hotswap/keymaps/stevanmilic/rules.mk
deleted file mode 100644
index 0bef91295ed..00000000000
--- a/keyboards/kbdfans/kbd67/hotswap/keymaps/stevanmilic/rules.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-COMMAND_ENABLE    = yes
-CONSOLE_ENABLE    = yes
-EXTRAKEY_ENABLE   = yes
-MOUSEKEY_ENABLE   = yes
-NKRO_ENABLE       = yes
diff --git a/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/adamdehaven/config.h b/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/adamdehaven/config.h
deleted file mode 100644
index 4fcd7735526..00000000000
--- a/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/adamdehaven/config.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-#define TAPPING_TERM 200
diff --git a/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/adamdehaven/keymap.c b/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/adamdehaven/keymap.c
deleted file mode 100644
index 637ea3e2c8a..00000000000
--- a/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/adamdehaven/keymap.c
+++ /dev/null
@@ -1,71 +0,0 @@
-#include QMK_KEYBOARD_H
-
-// Compile from qmk_firmware folder with the following command:
-// $ make kbdfans/kbd67/mkii-soldered:adamdehaven
-
-// Each layer gets a name for readability. The underscores don't mean anything - you can have a layer called STUFF or any other name.
-// Layer names don't all need to be of the same length, and you can also skip them entirely and just use numbers.
-#define _QWERTY 0
-#define _FN1 1
-
-// Tap Dance Definitions
-enum tapdance {
-    TD_HOME = 0,
-    TD_END
-};
-
-tap_dance_action_t tap_dance_actions[] = {
-    // Tap once for Home, twice for PageUp
-    [TD_HOME] = ACTION_TAP_DANCE_DOUBLE(KC_HOME, KC_PGUP),
-    // Tap once for End, twice for PageDown
-    [TD_END] = ACTION_TAP_DANCE_DOUBLE(KC_END, KC_PGDN)
-};
-
-/*
- *  You can use _______ in place for KC_TRNS (transparent)
- *  Or you can use XXXXXXX for KC_NO (NOOP)
- */
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    /* 0: _QWERTY
-     * ┌─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┐
-     * │ QK_GESC │ KC_1    │ KC_2    │ KC_3    │ KC_4    │ KC_5    │ KC_6    │ KC_7    │ KC_8    │ KC_9    │ KC_0    │ KC_MINS │ KC_EQL  │    KC_BSPC (2)    │ KC_DEL  │
-     * ├─────────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬──────────────┼─────────┤
-     * │   KC_TAB     │ KC_Q    │ KC_W    │ KC_E    │ KC_R    │ KC_T    │ KC_Y    │ KC_U    │ KC_I    │ KC_O    │ KC_P    │ KC_LBRC │ KC_RBRC │   KC_BSLS    │ TD_HOME │
-     * ├──────────────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴──────────────┼─────────┤
-     * │    KC_CAPS     │ KC_A    │ KC_S    │ KC_D    │ KC_F    │ KC_G    │ KC_H    │ KC_J    │ KC_K    │ KC_L    │ KC_SCLN │ KC_QUOT │       KC_ENT         │ TD_END  │
-     * ├────────────────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────────────┬─────────┼─────────┤
-     * │     KC_LSFT (2)     │ KC_Z    │ KC_X    │ KC_C    │ KC_V    │ KC_B    │ KC_N    │ KC_M    │ KC_COMM │ KC_DOT  │ KC_SLSH │     KC_RSFT     │ KC_UP   │ MO(_FN1)│
-     * ├───────────┬─────────┴─┬───────┴───┬─────┴─────────┴─────────┴─────────┴─────────┴─────────┴───────┬─┴───────┬┴────────┬─┴───────┬─────────┼─────────┼─────────┤
-     * │  KC_LCTL  │  KC_LGUI  │  KC_LALT  │                            KC_SPC                             │ KC_RALT │ KC_RCTL │         │ KC_LEFT │ KC_DOWN │ KC_RGHT │
-     * └───────────┴───────────┴───────────┴───────────────────────────────────────────────────────────────┴─────────┴─────────┴─────────┴─────────┴─────────┴─────────┘
-     */
-    [_QWERTY] = LAYOUT_all(
-        QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_DEL,
-        KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, TD(TD_HOME),
-        KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, TD(TD_END),
-        KC_LSFT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, MO(_FN1),
-        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-
-    /* 1: _FN1
-     * ┌─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬───────────────────┬─────────┐
-     * │ QK_BOOT   │ KC_F1   │ KC_F2   │ KC_F3   │ KC_F4   │ KC_F5   │ KC_F6   │ KC_F7   │ KC_F8   │ KC_F9   │ KC_F10  │ KC_F11  │ KC_F12  │    _______ (2)    │ KC_MUTE │
-     * ├─────────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬──────────────┼─────────┤
-     * │   _______    │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │ KC_PSCR │ _______ │ _______ │   _______    │ KC_VOLU │
-     * ├──────────────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴─┬───────┴──────────────┼─────────┤
-     * │    _______     │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │       _______        │ KC_VOLD │
-     * ├────────────────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────────────┬─────────┼─────────┤
-     * │     _______ (2)     │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │ _______ │     _______     │ KC_MPLY │ _______ │
-     * ├───────────┬─────────┴─┬───────┴───┬─────┴─────────┴─────────┴─────────┴─────────┴─────────┴───────┬─┴───────┬─┴───────┬─┴───────┬─────────┼─────────┼─────────┤
-     * │  _______  │  _______  │  _______  │                            _______                            │ _______ │ _______ │         │ KC_MPRV │ KC_MPLY │ KC_MNXT │
-     * └───────────┴───────────┴───────────┴───────────────────────────────────────────────────────────────┴─────────┴─────────┴─────────┴─────────┴─────────┴─────────┘
-     */
-    [_FN1] = LAYOUT_all(
-        QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, KC_MUTE,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______,          _______, KC_VOLU,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          KC_VOLD,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_MPLY, _______,
-        _______, _______, _______,          _______,          _______,          _______,          _______, _______,          KC_MPRV, KC_MPLY, KC_MNXT
-    )
-};
diff --git a/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/adamdehaven/rules.mk b/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/adamdehaven/rules.mk
deleted file mode 100644
index e5ddcae8d92..00000000000
--- a/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/adamdehaven/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-TAP_DANCE_ENABLE = yes
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/dnsnrk/config.h b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/dnsnrk/config.h
deleted file mode 100644
index bb3409256c1..00000000000
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/dnsnrk/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2019 dnsnrk 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* place overrides here */
-#undef DEBOUNCE
-#define DEBOUNCE 8
-#undef TAPPING_TOGGLE
-#define TAPPING_TOGGLE 2
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/dnsnrk/keymap.c b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/dnsnrk/keymap.c
deleted file mode 100644
index 826977fbf50..00000000000
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/dnsnrk/keymap.c
+++ /dev/null
@@ -1,96 +0,0 @@
-/* Copyright 2019 dnsnrk
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-#define RC_ENT RCTL_T(KC_ENT)
-#define LC_CPS LCTL_T(KC_CAPS)
-
-enum {
-      _LAYER0 = 0,
-      _LAYER1,
-      _LAYER2
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_LAYER0] = LAYOUT_65_ansi_blocker( /* Base Layer */
-                                       KC_ESC,  KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,    KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC,   KC_GRV,
-                                       KC_TAB,  KC_Q,     KC_W,     KC_E,  KC_R,  KC_T,  KC_Y,    KC_U,  KC_I,    KC_O,     KC_P,     KC_LBRC,  KC_RBRC, KC_BSLS,   KC_PGUP,
-                                       LC_CPS,  KC_A,     KC_S,     KC_D,  KC_F,  KC_G,  KC_H,    KC_J,  KC_K,    KC_L,     KC_SCLN,  KC_QUOT,           RC_ENT,    KC_PGDN,
-                                       KC_LSFT, KC_Z,     KC_X,     KC_C,  KC_V,  KC_B,  KC_N,    KC_M,  KC_COMM, KC_DOT,   KC_SLSH,  KC_RSFT,           KC_UP,     TT(2),
-                                       KC_LCTL, KC_LGUI,  KC_LALT,                KC_SPC,                KC_RALT,           TT(1),    KC_LEFT,           KC_DOWN,   KC_RIGHT),
-    [_LAYER1] = LAYOUT_65_ansi_blocker( /* FN, RGB Controls */
-                                       KC_GRV,   KC_F1,    KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_PWR,
-                                       _______,  RGB_TOG,  RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,  KC_HOME,
-                                       _______,  RGB_RMOD, RGB_SPD, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_END,
-                                       _______,  _______,  _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_SAI, _______,          _______, RGB_VAI, _______,
-                                       _______,  _______,  _______,                   _______,                   _______,          _______,          RGB_HUD, RGB_VAD, RGB_HUI),
-    [_LAYER2] = LAYOUT_65_ansi_blocker( /* Media, Programming */
-                                       _______,  KC_BRMD, KC_BRMU, _______, _______, _______, _______, KC_MRWD, KC_MPLY, KC_MFFD, KC_MUTE,  KC_VOLD, KC_VOLU, KC_EJCT, _______,
-                                       _______,  _______, _______, EE_CLR,  QK_BOOT, _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______,
-                                       _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______,          _______, _______,
-                                       _______,  _______, _______, _______, _______, _______, AG_NORM, AG_SWAP, _______, _______,  _______,          _______, _______, _______,
-                                       _______,  _______, _______,                   _______,                   _______,           _______,          _______, _______, _______)
-};
-
-void set_hsv_at(HSV hsv, uint8_t index);
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    return true;
-}
-
-bool rgb_matrix_indicators_user(void) {
-    if (rgb_matrix_config.enable) {
-        HSV hsv = rgb_matrix_config.hsv;
-        if (host_keyboard_led_state().caps_lock) {
-            HSV hsv_inv_hue = {hsv.h + 128, hsv.s, hsv.v};
-            set_hsv_at(hsv_inv_hue, 30);
-        }
-        // indicate which higher layer is currently active on which key
-        HSV hsv1 = {hsv.h - 64, hsv.s, hsv.v};
-        HSV hsv2 = {hsv.h + 64, hsv.s, hsv.v};
-        // except when we are in any animated LED mode
-        if (rgb_matrix_config.mode < RGB_MATRIX_BREATHING || rgb_matrix_config.mode > RGB_MATRIX_JELLYBEAN_RAINDROPS) {
-            for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-                for (uint8_t col = 0; col < MATRIX_COLS; col++) {
-                    keypos_t pos = {col, row};
-                    uint8_t key_layer = layer_switch_get_layer(pos);
-                    uint8_t key_led = g_led_config.matrix_co[row][col];
-                    if (key_led != NO_LED) {
-                        switch(key_layer) {
-                        case _LAYER2:
-                            set_hsv_at(hsv2, key_led);
-                            break;
-                        case _LAYER1:
-                            set_hsv_at(hsv1, key_led);
-                            break;
-                        default:
-                            break;
-                        }
-                    }
-                }
-            }
-        }
-        // sticky layer indicators regardless of RGB mode. Hardcoded for lack of better idea.
-        set_hsv_at(hsv1, 63);
-        set_hsv_at(hsv2, 57);
-    }
-    return false;
-}
-
-void set_hsv_at(HSV hsv, uint8_t index) {
-    RGB rgb = hsv_to_rgb(hsv);
-    rgb_matrix_set_color(index, rgb.r, rgb.g, rgb.b);
-}
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/dnsnrk/readme.md b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/dnsnrk/readme.md
deleted file mode 100644
index 5554b03e5de..00000000000
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/dnsnrk/readme.md
+++ /dev/null
@@ -1,41 +0,0 @@
-# dnsnrk's KDB67 MKII Layout
-
-* This is a three layer layout wih some consolidated functionality in the second and third layer.
-* The keyboard is mostly used on macOS, but also on Linux and therefore it can swap ALT/CMD.
-* There are additional CTRL keys for left and right when caps lock or enter key is held.
-* Layers can be toggled (tap twice) or actived momentarily (hold).
-* There are 2 seperate FN keys to activate layer 1 and 2 separately, indicated by different RGB colors.
-* The main custom feature is using RGB to indicate the current active layer for each key. This is best achieved in solid color RGB modes.
-
-## Layer 0
-
-This is the base QUERTY layer.
-
-* Grave is provided in the top right corner.
-* Caps lock is tapped once on and off and indicated by hue inverted LED when on.
-* Caps lock and enter become CTRL when held.
-* Primary Fn in the last row activates layer 1, indicated by hue shifted LED color.
-* Secondary Fn right to the up arrow key activates layer 2, indicated by 2nd hue shifted LED color.
-* Toggle layers by tapping Fn twice or switch on by holding Fn.
-
-## Layer 1
-
-This layer activates function keys and provides RGB controls. Keys acting on this layer are indicated by an LED color matching the current Fn key's LED color.
-
-* Number keys become equivalent function keys.
-* ESC becomes Grave.
-* Grave becomes POWER (very useful on macOS only).
-* Q toggles RGB.
-* WASD for navigating through RGB modes and adjusting speed.
-* <> control RGB saturation.
-* Arrow keys shift hue and adjust brightness.
-* PgUp, PgDown become HOME and END respectively.
-* Backspace acts as delete, pipe as insert.
-
-## Layer 2
-
-This layer comprises most macOS media keys at the top row and some additional programming options. Keys acting on this layer are indicated by an LED color matching the current Fn key's LED color.
-
-* N, M swap ALT/CMD for (N)ormal or (M)acOS.
-* E resets (E)EPROM.
-* R (R)esets keyboard.
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/kemmeldev/import-for-qmk-configurator/kemmeldev-4-layered-layout.json b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/kemmeldev/import-for-qmk-configurator/kemmeldev-4-layered-layout.json
deleted file mode 100644
index c15ab8c85a0..00000000000
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/kemmeldev/import-for-qmk-configurator/kemmeldev-4-layered-layout.json
+++ /dev/null
@@ -1 +0,0 @@
-{"keyboard":"kbdfans/kbd67/mkiirgb","keymap":"default_37b6a2a","layout":"LAYOUT_65_ansi_blocker","layers":[["QK_GESC","KC_1","KC_2","KC_3","KC_4","KC_5","KC_6","KC_7","KC_8","KC_9","KC_0","KC_MINS","KC_EQL","KC_BSPC","KC_CALC","KC_TAB","KC_Q","KC_W","KC_E","KC_R","KC_T","KC_Y","KC_U","KC_I","KC_O","KC_P","KC_LBRC","KC_RBRC","KC_BSLS","KC_PGUP","MO(1)","KC_A","KC_S","KC_D","KC_F","KC_G","KC_H","KC_J","KC_K","KC_L","KC_SCLN","KC_QUOT","KC_ENT","KC_PGDN","KC_LSFT","KC_Z","KC_X","KC_C","KC_V","KC_B","KC_N","KC_M","KC_COMM","KC_DOT","KC_SLSH","KC_RSFT","KC_UP","KC_END","KC_LCTL","KC_LGUI","KC_LALT","KC_SPC","KC_RALT","KC_RCTL","KC_LEFT","KC_DOWN","KC_RGHT"],["KC_GRV","KC_F1","KC_F2","KC_F3","KC_F4","KC_F5","KC_F6","KC_F7","KC_F8","KC_F9","KC_F10","KC_F11","KC_F12","KC_DEL","KC_CALC","KC_CAPS","KC_BTN1","KC_MS_U","KC_BTN2","KC_WH_U","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_UP","KC_PSCR","KC_SCRL","KC_PAUS","QK_BOOT","KC_MYCM","KC_TRNS","KC_MS_L","KC_MS_D","KC_MS_R","KC_WH_D","KC_TRNS","RGB_SAI","RGB_SAD","KC_LEFT","KC_DOWN","KC_RGHT","KC_TRNS","EE_CLR","KC_HOME","KC_LSFT","RGB_TOG","RGB_MOD","RGB_VAI","RGB_VAD","RGB_SPI","RGB_SPD","RGB_HUI","RGB_HUD","KC_TRNS","KC_TRNS","KC_TRNS","KC_VOLU","KC_MUTE","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","TO(2)","KC_MPRV","KC_VOLD","KC_MNXT"],["QK_GESC","KC_F1","KC_F2","KC_F3","KC_F4","KC_F5","KC_F6","KC_F7","KC_F8","KC_F9","KC_F10","KC_F11","KC_F12","KC_BSPC","KC_CALC","KC_TAB","KC_Q","KC_W","KC_E","KC_R","KC_T","KC_Y","KC_U","KC_I","KC_O","KC_P","KC_LBRC","KC_RBRC","KC_BSLS","KC_PGUP","MO(3)","KC_A","KC_S","KC_D","KC_F","KC_G","KC_H","KC_J","KC_K","KC_L","KC_SCLN","KC_QUOT","KC_ENT","KC_PGDN","KC_LSFT","KC_Z","KC_X","KC_C","KC_V","KC_B","KC_N","KC_M","KC_COMM","KC_DOT","KC_SLSH","KC_RSFT","KC_UP","KC_END","KC_LCTL","KC_LGUI","KC_LALT","KC_SPC","KC_RALT","KC_TRNS","KC_LEFT","KC_DOWN","KC_RGHT"],["KC_GRV","KC_1","KC_2","KC_3","KC_4","KC_5","KC_6","KC_7","KC_8","KC_9","KC_0","KC_MINS","KC_EQL","KC_DEL","KC_CALC","KC_CAPS","KC_BTN1","KC_MS_U","KC_BTN2","KC_WH_U","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_UP","KC_PSCR","KC_SCRL","KC_PAUS","QK_BOOT","KC_MYCM","KC_TRNS","KC_MS_L","KC_MS_D","KC_MS_R","KC_WH_D","KC_TRNS","RGB_SAI","RGB_SAD","KC_LEFT","KC_DOWN","KC_RGHT","KC_TRNS","EE_CLR","KC_HOME","KC_LSFT","RGB_TOG","RGB_MOD","RGB_VAI","RGB_VAD","RGB_SPI","RGB_SPD","RGB_HUI","RGB_HUD","KC_TRNS","KC_TRNS","KC_TRNS","KC_VOLU","KC_MUTE","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","TO(0)","KC_MPRV","KC_VOLD","KC_MNXT"]],"author":"","notes":""}
\ No newline at end of file
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/kemmeldev/keymap.c b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/kemmeldev/keymap.c
deleted file mode 100644
index 10ccb4ca469..00000000000
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/kemmeldev/keymap.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[0] = LAYOUT_65_ansi_blocker(QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_CALC, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, MO(1), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
-	[1] = LAYOUT_65_ansi_blocker(KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_CALC, KC_CAPS, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, KC_MYCM, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, KC_TRNS, RGB_SAI, RGB_SAD, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, EE_CLR, KC_HOME, KC_LSFT, RGB_TOG, RGB_MOD, RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD, RGB_HUI, RGB_HUD, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, TO(2), KC_MPRV, KC_VOLD, KC_MNXT),
-	[2] = LAYOUT_65_ansi_blocker(QK_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_BSPC, KC_CALC, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, MO(3), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT),
-	[3] = LAYOUT_65_ansi_blocker(KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_DEL, KC_CALC, KC_CAPS, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, KC_MYCM, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, KC_TRNS, RGB_SAI, RGB_SAD, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, EE_CLR, KC_HOME, KC_LSFT, RGB_TOG, RGB_MOD, RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD, RGB_HUI, RGB_HUD, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, TO(0), KC_MPRV, KC_VOLD, KC_MNXT)
-};
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/kemmeldev/layers.json b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/kemmeldev/layers.json
deleted file mode 100644
index 4fe0b20d9bb..00000000000
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/kemmeldev/layers.json
+++ /dev/null
@@ -1 +0,0 @@
-[["QK_GESC", "KC_1", "KC_2", "KC_3", "KC_4", "KC_5", "KC_6", "KC_7", "KC_8", "KC_9", "KC_0", "KC_MINS", "KC_EQL", "KC_BSPC", "KC_CALC", "KC_TAB", "KC_Q", "KC_W", "KC_E", "KC_R", "KC_T", "KC_Y", "KC_U", "KC_I", "KC_O", "KC_P", "KC_LBRC", "KC_RBRC", "KC_BSLS", "KC_PGUP", "MO(1)", "KC_A", "KC_S", "KC_D", "KC_F", "KC_G", "KC_H", "KC_J", "KC_K", "KC_L", "KC_SCLN", "KC_QUOT", "KC_ENT", "KC_PGDN", "KC_LSFT", "KC_Z", "KC_X", "KC_C", "KC_V", "KC_B", "KC_N", "KC_M", "KC_COMM", "KC_DOT", "KC_SLSH", "KC_RSFT", "KC_UP", "KC_END", "KC_LCTL", "KC_LGUI", "KC_LALT", "KC_SPC", "KC_RALT", "KC_RCTL", "KC_LEFT", "KC_DOWN", "KC_RGHT"], ["KC_GRV", "KC_F1", "KC_F2", "KC_F3", "KC_F4", "KC_F5", "KC_F6", "KC_F7", "KC_F8", "KC_F9", "KC_F10", "KC_F11", "KC_F12", "KC_DEL", "KC_CALC", "KC_CAPS", "KC_BTN1", "KC_MS_U", "KC_BTN2", "KC_WH_U", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_UP", "KC_PSCR", "KC_SCRL", "KC_PAUS", "QK_BOOT", "KC_MYCM", "KC_TRNS", "KC_MS_L", "KC_MS_D", "KC_MS_R", "KC_WH_D", "KC_TRNS", "RGB_SAI", "RGB_SAD", "KC_LEFT", "KC_DOWN", "KC_RGHT", "KC_TRNS", "EE_CLR", "KC_HOME", "KC_LSFT", "RGB_TOG", "RGB_MOD", "RGB_VAI", "RGB_VAD", "RGB_SPI", "RGB_SPD", "RGB_HUI", "RGB_HUD", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_VOLU", "KC_MUTE", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "TO(2)", "KC_MPRV", "KC_VOLD", "KC_MNXT"], ["QK_GESC", "KC_F1", "KC_F2", "KC_F3", "KC_F4", "KC_F5", "KC_F6", "KC_F7", "KC_F8", "KC_F9", "KC_F10", "KC_F11", "KC_F12", "KC_BSPC", "KC_CALC", "KC_TAB", "KC_Q", "KC_W", "KC_E", "KC_R", "KC_T", "KC_Y", "KC_U", "KC_I", "KC_O", "KC_P", "KC_LBRC", "KC_RBRC", "KC_BSLS", "KC_PGUP", "MO(3)", "KC_A", "KC_S", "KC_D", "KC_F", "KC_G", "KC_H", "KC_J", "KC_K", "KC_L", "KC_SCLN", "KC_QUOT", "KC_ENT", "KC_PGDN", "KC_LSFT", "KC_Z", "KC_X", "KC_C", "KC_V", "KC_B", "KC_N", "KC_M", "KC_COMM", "KC_DOT", "KC_SLSH", "KC_RSFT", "KC_UP", "KC_END", "KC_LCTL", "KC_LGUI", "KC_LALT", "KC_SPC", "KC_RALT", "KC_TRNS", "KC_LEFT", "KC_DOWN", "KC_RGHT"], ["KC_GRV", "KC_1", "KC_2", "KC_3", "KC_4", "KC_5", "KC_6", "KC_7", "KC_8", "KC_9", "KC_0", "KC_MINS", "KC_EQL", "KC_DEL", "KC_CALC", "KC_CAPS", "KC_BTN1", "KC_MS_U", "KC_BTN2", "KC_WH_U", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_UP", "KC_PSCR", "KC_SCRL", "KC_PAUS", "QK_BOOT", "KC_MYCM", "KC_TRNS", "KC_MS_L", "KC_MS_D", "KC_MS_R", "KC_WH_D", "KC_TRNS", "RGB_SAI", "RGB_SAD", "KC_LEFT", "KC_DOWN", "KC_RGHT", "KC_TRNS", "EE_CLR", "KC_HOME", "KC_LSFT", "RGB_TOG", "RGB_MOD", "RGB_VAI", "RGB_VAD", "RGB_SPI", "RGB_SPD", "RGB_HUI", "RGB_HUD", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_VOLU", "KC_MUTE", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "TO(0)", "KC_MPRV", "KC_VOLD", "KC_MNXT"]]
\ No newline at end of file
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/kemmeldev/readme.md b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/kemmeldev/readme.md
deleted file mode 100644
index 8a7b230dbf4..00000000000
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/kemmeldev/readme.md
+++ /dev/null
@@ -1,54 +0,0 @@
-# Layout description
-
-* This layout features 4 layers. The caps lock key has been replaced by the FN key.
-* The first layer features ESC/~ and numbers and symbols on the top row of the keyboard.
-* The top right key launches calculator.
-* Pressing the FN key activates a temporary second layer. This layer contains:
-	* ESC/~ is now `/~
-	* WASD to move your mouse up, left, down, right respectively.
-		* Q and E click left and right mouse respectively.
-		* R and F scroll mousewheel up and down respectively.
-	* IJKL act as up, left, down, right arrows respectively.
-	* UP/DOWN keys act as volume UP/DOWN
-	* LEFT/RIGHT keys act as previous/next track.
-	* The key below the calculator key launches 'This PC'
-	* RGB Controls
-		* Z toggles ON/OFF
-		* X toggles RGB_MODE
-		* C and V increase/decrease brightness
-		* B and N increase/decrease effect
-		* M and , increase/decrease hue
-		* H and J increase/decrease saturation
-* Pressing RIGHT CTRL whilst holding the FN key allows you to swap to the third layer.
-	* This layer can switch to the fourth layer by holding the FN key.
-* The third and fourth layer are essentially copies of the first and second layer and offer the same functionalities, however the third and fourth layer have the F-keys and Num/Symbol keys swapped.
-
-## Layer 0
-
-![](https://i.imgur.com/9U9PaTw.png)
-
-## Layer 1
-
-![](https://i.imgur.com/rqqjiyn.png)
-
-## Layer 2
-
-![](https://i.imgur.com/A7YkrTF.png)
-
-## Layer 3
-
-![](https://i.imgur.com/sxJ1ocF.png)
-
-# Generated Keymap Layout
-
-This layout was generated by the QMK API. You can find the JSON data used to
-generate this keymap in the file layers.json.
-
-To make use of this file you will need follow the following steps:
-
-* Download or Clone QMK Firmware: <https://github.com/qmk/qmk_firmware/>
-* Extract QMK Firmware to a location on your hard drive
-* Copy this folder into %s
-* You are now ready to compile or use your keymap with the source
-
-More information can be found in the QMK docs: <https://docs.qmk.fm>
\ No newline at end of file
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/pascalpfeil/config.h b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/pascalpfeil/config.h
deleted file mode 100644
index a1ba1fd43e0..00000000000
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/pascalpfeil/config.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright 2021 Pascal Pfeil
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* 1000Hz USB polling */
-#define USB_POLLING_INTERVAL_MS 1
-
-/* Force NKRO on boot up */
-#define FORCE_NKRO
-
-#ifdef RGB_MATRIX_ENABLE
-#    define RGB_MATRIX_SLEEP
-#    undef RGB_MATRIX_TIMEOUT
-#    define RGB_MATRIX_TIMEOUT 900000
-#endif
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/pascalpfeil/keymap.c b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/pascalpfeil/keymap.c
deleted file mode 100644
index df4bceed3f8..00000000000
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/pascalpfeil/keymap.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Copyright 2021 Pascal Pfeil
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[0] = LAYOUT_65_ansi_blocker( 
-		QK_GESC, KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,    KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC,   KC_PSCR,
-		KC_TAB,  KC_Q,     KC_W,     KC_E,  KC_R,  KC_T,  KC_Y,    KC_U,  KC_I,    KC_O,     KC_P,     KC_LBRC,  KC_RBRC, KC_BSLS,   KC_DEL,
-		KC_CAPS, KC_A,     KC_S,     KC_D,  KC_F,  KC_G,  KC_H,    KC_J,  KC_K,    KC_L,     KC_SCLN,  KC_QUOT,           KC_ENT,    KC_HOME,
-		KC_LSFT, KC_Z,     KC_X,     KC_C,  KC_V,  KC_B,  KC_N,    KC_M,  KC_COMM, KC_DOT,   KC_SLSH,  KC_RSFT,           KC_UP,     KC_END,
-		KC_LCTL, KC_LGUI,  KC_LALT,                LT(1, KC_SPC),         KC_RALT,           MO(1),    KC_LEFT,           KC_DOWN,   KC_RIGHT
-	),
-	[1] = LAYOUT_65_ansi_blocker( 
-		QK_GESC,       KC_F1,    KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12,  BS_NORM,  RGB_VAI,
-		KC_TRNS,       KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, BS_SWAP,  RGB_HUI,
-		KC_TRNS,       KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          RGB_TOG,  RGB_SPI,
-		KC_TRNS,       KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          KC_TRNS,  RGB_MOD,
-		KC_TRNS,       AG_NORM,  AG_SWAP,                   KC_TRNS,                   KC_TRNS,          KC_TRNS,  KC_TRNS,          KC_TRNS,  KC_TRNS
-	),
-	[2] = LAYOUT_65_ansi_blocker( 
-		KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,
-		KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,
-		KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,  KC_TRNS,
-		KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,  KC_TRNS,
-		KC_TRNS,  KC_TRNS,  KC_TRNS,                     KC_TRNS,                   KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS,  KC_TRNS
-	),
-	[3] = LAYOUT_65_ansi_blocker( 
-		KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,
-		KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,
-		KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,  KC_TRNS,
-		KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,  KC_TRNS,
-		KC_TRNS,  KC_TRNS,  KC_TRNS,                     KC_TRNS,                   KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS,  KC_TRNS
-	),
-};
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/spx01/config.h b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/spx01/config.h
deleted file mode 100644
index c66f49213a1..00000000000
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/spx01/config.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Copyright 2022 spx01 (@spx01)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* --- custom defines only used in my own code --- */
-
-/* easily switch on debugging features */
-#define CUSTOM_DEBUG false
-
-/* hexrgb mode special keys, these shouldn't be KC_A to KC_F or KC_0 to KC_9 */
-/* keycode that triggers saving the current rgb_static color into eeprom */
-#define HEXRGB_SAVE_KC KC_S
-/* keycode that triggers resetting rgb_static to the color saved in the eeprom */
-#define HEXRGB_RESET_KC KC_R
-
-/* --- keyboard configuration macros --- */
-
-#if CUSTOM_DEBUG
-#    define NO_DEBUG
-#    define NO_PRINT
-#endif
-
-#define RETRO_TAPPING
-#define PERMISSIVE_HOLD
-
-#undef RGB_MATRIX_DEFAULT_MODE
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CUSTOM_RGB_STATIC
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/spx01/keymap.c b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/spx01/keymap.c
deleted file mode 100644
index 8c814b86bbd..00000000000
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/spx01/keymap.c
+++ /dev/null
@@ -1,158 +0,0 @@
-/* Copyright 2022 spx01 (@spx01)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-#include "print.h"
-
-enum CustomKeycodes {
-    CK_HEXRGB = SAFE_RANGE,
-    /* esc when shift is held, grave otherwise; particularly useful for windows' task manager shortcut */
-    CK_ESCG,
-};
-
-enum Layers {
-    _LAYER1,
-    _LAYER2,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    // clang-format off
-    [_LAYER1] = LAYOUT_65_ansi_blocker( 
-        QK_GESC,              KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,    KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC,   KC_HOME,
-        KC_TAB,               KC_Q,     KC_W,     KC_E,  KC_R,  KC_T,  KC_Y,    KC_U,  KC_I,    KC_O,     KC_P,     KC_LBRC,  KC_RBRC, KC_BSLS,   KC_PGUP,
-        LT(_LAYER2, KC_CAPS), KC_A,     KC_S,     KC_D,  KC_F,  KC_G,  KC_H,    KC_J,  KC_K,    KC_L,     KC_SCLN,  KC_QUOT,           KC_ENT,    KC_PGDN,
-        KC_LSFT,              KC_Z,     KC_X,     KC_C,  KC_V,  KC_B,  KC_N,    KC_M,  KC_COMM, KC_DOT,   KC_SLSH,  KC_RSFT,           KC_UP,     KC_END,
-        KC_LCTL,              KC_LGUI,  KC_LALT,                KC_SPC,                KC_RALT,           MO(1),    KC_LEFT,           KC_DOWN,   KC_RIGHT),
-    [_LAYER2] = LAYOUT_65_ansi_blocker( 
-        CK_ESCG,  KC_F1,    KC_F2,   KC_F3,   KC_F4,    KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,    KC_F11,  KC_F12,  KC_DEL,   KC_INS,
-        KC_TRNS,  KC_TRNS,  KC_TRNS, EE_CLR,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR,   KC_TRNS, KC_TRNS, QK_BOOT,  KC_TRNS,
-        KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,          KC_TRNS,  KC_TRNS,
-        KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_MUTE, KC_TRNS, KC_TRNS, CK_HEXRGB, KC_MPLY,          KC_VOLU,  KC_TRNS,
-        KC_TRNS,  KC_TRNS,  KC_TRNS,                    RGB_TOG,                   KC_TRNS,          KC_TRNS,   KC_MPRV,          KC_VOLD,  KC_MNXT),
-    /* [] = LAYOUT_65_ansi_blocker(
-        KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,
-        KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,
-        KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,  KC_TRNS,
-        KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,  KC_TRNS,
-        KC_TRNS,  KC_TRNS,  KC_TRNS,                     KC_TRNS,                   KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS,  KC_TRNS), */
-    // clang-format on
-};
-
-/* exported by the rgb_static effect */
-void           RGB_STATIC_save_eeprom(void);
-void           RGB_STATIC_reset(void);
-extern uint8_t g_rgb_static_color[3];
-
-/* returns number corresponding to hex digit represented by keycode or -1 if keycode isn't a valid hex digit */
-static int8_t key_hexdigit(uint16_t keycode) {
-    if (keycode >= KC_A && keycode <= KC_F) {
-        return keycode - KC_A + 10;
-    }
-    if (keycode >= KC_1 && keycode <= KC_0) {
-        int8_t res = keycode - KC_1 + 1;
-        /* mod 10 considering res is between 1 and 10 */
-        res *= res != 10;
-        return res;
-    }
-    return -1;
-}
-
-typedef struct {
-    bool    active;
-    uint8_t color[3];
-    uint8_t count;
-} RGBHexState;
-static RGBHexState hexrgb;
-
-/* handles input mode for an rgb value */
-static void hexrgb_input(uint16_t keycode) {
-    /* only check for special keys when input mode has just been triggered */
-    if (hexrgb.count == 0) {
-        switch (keycode) {
-            case HEXRGB_SAVE_KC:
-                RGB_STATIC_save_eeprom();
-                hexrgb.active = false;
-                return;
-            case HEXRGB_RESET_KC:
-                RGB_STATIC_reset();
-                hexrgb.active = false;
-                return;
-            default:
-        }
-    }
-
-    int8_t digit = key_hexdigit(keycode);
-    /* exit input mode if an invalid key has been pressed */
-    if (digit == -1) {
-        hexrgb.count = 0;
-        hexrgb.active = false;
-        return;
-    }
-
-    /* append digit to current color */
-    uint8_t idx = hexrgb.count / 2;
-    hexrgb.color[idx] <<= 4;
-    hexrgb.color[idx] |= digit;
-
-    ++hexrgb.count;
-    /* done with input */
-    if (hexrgb.count == 6) {
-        hexrgb.active = false;
-        hexrgb.count  = 0;
-        /* copy color to rgb_static's buffer */
-        for (int8_t i = 0; i < 3; ++i) {
-            g_rgb_static_color[i] = hexrgb.color[i];
-            hexrgb.color[i]       = 0;
-        }
-    }
-}
-
-void keyboard_post_init_user(void) {
-#if CUSTOM_DEBUG
-    debug_enable = true;
-    debug_matrix = true;
-#endif
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    /* shift status last time ck_escg was pressed so that the correct key can be released */
-    static bool ck_escg_last_shifted;
-
-    if (hexrgb.active && record->event.pressed) {
-        hexrgb_input(keycode);
-        /* while in input mode nothing passes through */
-        return false;
-    }
-
-    switch (keycode) {
-        case CK_HEXRGB:
-            hexrgb.active = record->event.pressed;
-            return false;
-        case CK_ESCG:
-            /* if pressed, inject key, otherwise delete it */
-            if (record->event.pressed) {
-                bool shifted = get_mods() & MOD_BIT(KC_LSFT);
-                add_key(shifted ? KC_ESC : KC_GRV);
-                ck_escg_last_shifted = shifted;
-            } else {
-                del_key(ck_escg_last_shifted ? KC_ESC : KC_GRV);
-            }
-            send_keyboard_report();
-            return false;
-        default:
-    }
-    return true;
-}
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/spx01/readme.md b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/spx01/readme.md
deleted file mode 100644
index 86b90772b02..00000000000
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/spx01/readme.md
+++ /dev/null
@@ -1,23 +0,0 @@
-# spx01's KBD67 MKIIRGB Layout
-
-This is a fairly simple QWERTY 2 layer layout, full list of particularities below:
-
-* Besides Fn acting like a standard layer switch, CapsLock is set to switch to layer 2 while held and activate CapsLock when tapped.
-* The Esc key/grave key (top left) is set to QMK's "Grave Escape" (sends Esc when tapped alone, Grave when tapped together with Shift/Ctrl/GUI), but on the 2nd layer it's set to the CK_ESCG custom keycode, acting like grave when tapped alone and as Esc when Shift is also held down. This means that there is easy access to both the characters (grave and tilde) and the Esc key while also allowing for shortcuts such as Ctrl+Shift+Esc with Ctrl+Shift+Caps+Esc (the Windows Task Manager shortcut).
-* The default RGB Matrix effect is set to a custom one, RGB_STATIC, which sets a solid RGB color based on a global variable, featuring EEPROM saving and automatic loading independent on the HSV EEPROM memory that the standard effects use. This was done in order to accomodate the next feature.
-* The HexRGB mode is triggered by pressing the '/' key in the second layer (CK_HEXRGB) and enables the user to type a 6 digit hexadecimal color code that is then stored as the color for the RGB_STATIC effect. If any invalid key is pressed during color input, the keymap will go back to its normal behavior without any changes to RGB.
-* Besides keys representing hexadecimal digits (0-9 and a-f), there are also 2 more keys that provide functionality in the HexRGB input mode (only as a first keypress). HEXRGB_SAVE_KC (set by default to S) triggers the RGB_STATIC effect to save the currently set RGB color to EEPROM and the HEXRGB_RESET_KC (set by default to R) resets the RGB color to the one currently saved in EEPROM. These 2 keys can be reassigned in config.h.
-
-Various 2nd layer keys:
-* 1 to '+' for F1-12
-* P for PrtSc/Print
-* Backspace for Delete
-* Home (top right key) for Insert
-* E for resetting EEPROM
-* '\\' for bootloader mode
-* Space for toggling RGB on or off
-* Right Shift for pausing media
-* Left/Right for previous track/next track
-* Up/Down for volume up/down
-
-**Note: I disabled VIA in rules.mk because I don't use it, but there is enough memory space for it to be enabled.**
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/spx01/rgb_matrix_user.inc b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/spx01/rgb_matrix_user.inc
deleted file mode 100644
index 85c4dc2cad5..00000000000
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/spx01/rgb_matrix_user.inc
+++ /dev/null
@@ -1,68 +0,0 @@
-/* Copyright 2022 spx01 (@spx01)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-RGB_MATRIX_EFFECT(RGB_STATIC)
-
-#define UNWRAP_RGB_PARAMS(x) x[0], x[1], x[2]
-#ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-
-/* eeprom saved data structure */
-typedef struct {
-    union {
-        uint32_t whole;
-        uint8_t  rgb[3];
-    };
-} UserData;
-
-uint8_t g_rgb_static_color[3];
-
-/* save current colors to eeprom */
-void RGB_STATIC_save_eeprom(void) {
-    UserData data = {0};
-    for (int8_t i = 0; i < 3; ++i) {
-        data.rgb[i] = g_rgb_static_color[i];
-    }
-    eeconfig_update_user(data.whole);
-}
-
-/* initialize by loading the eeprom colors */
-static void RGB_STATIC_init(void) {
-    UserData data;
-    data.whole = eeconfig_read_user();
-    for (int8_t i = 0; i < 3; ++i) {
-        g_rgb_static_color[i] = data.rgb[i];
-    }
-}
-
-/* reset colors to eeprom values */
-void RGB_STATIC_reset(void) {
-    RGB_STATIC_init();
-}
-
-static bool RGB_STATIC(effect_params_t *params) {
-    if (params->init) {
-        RGB_STATIC_init();
-    }
-    RGB_MATRIX_USE_LIMITS(led_min, led_max);
-    for (uint8_t i = led_min; i < led_max; i++) {
-        RGB_MATRIX_TEST_LED_FLAGS();
-        rgb_matrix_set_color(i, UNWRAP_RGB_PARAMS(g_rgb_static_color));
-    }
-    return rgb_matrix_check_finished_leds(led_max);
-}
-
-#endif
-#undef UNWRAP_RGB_PARAMS
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/spx01/rules.mk b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/spx01/rules.mk
deleted file mode 100644
index 2700c035cc0..00000000000
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/spx01/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-VIA_ENABLE = no
-LTO_ENABLE = yes
-CONSOLE_ENABLE = no
-RGB_MATRIX_CUSTOM_USER = yes
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v3/v3.c b/keyboards/kbdfans/kbd67/mkiirgb/v3/v3.c
index 5910d0cf7b0..0b40afadf9b 100755
--- a/keyboards/kbdfans/kbd67/mkiirgb/v3/v3.c
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v3/v3.c
@@ -19,78 +19,78 @@
 #ifdef RGB_MATRIX_ENABLE
 
 const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
-    {0, CS21_SW1, CS20_SW1, CS19_SW1},
-    {0, CS21_SW2, CS20_SW2, CS19_SW2},
-    {0, CS21_SW3, CS20_SW3, CS19_SW3},
-    {0, CS21_SW4, CS20_SW4, CS19_SW4},
-    {0, CS21_SW5, CS20_SW5, CS19_SW5},
-    {0, CS21_SW6, CS20_SW6, CS19_SW6},
-    {0, CS21_SW7, CS20_SW7, CS19_SW7},
-    {0, CS21_SW8, CS20_SW8, CS19_SW8},
-    {0, CS24_SW1, CS23_SW1, CS22_SW1},
-    {0, CS24_SW2, CS23_SW2, CS22_SW2},
-    {0, CS24_SW3, CS23_SW3, CS22_SW3},
-    {0, CS24_SW4, CS23_SW4, CS22_SW4},
-    {0, CS24_SW5, CS23_SW5, CS22_SW5},
-    {0, CS24_SW6, CS23_SW6, CS22_SW6},
-    {0, CS24_SW7, CS23_SW7, CS22_SW7},
+    {0, SW1_CS21, SW1_CS20, SW1_CS19},
+    {0, SW2_CS21, SW2_CS20, SW2_CS19},
+    {0, SW3_CS21, SW3_CS20, SW3_CS19},
+    {0, SW4_CS21, SW4_CS20, SW4_CS19},
+    {0, SW5_CS21, SW5_CS20, SW5_CS19},
+    {0, SW6_CS21, SW6_CS20, SW6_CS19},
+    {0, SW7_CS21, SW7_CS20, SW7_CS19},
+    {0, SW8_CS21, SW8_CS20, SW8_CS19},
+    {0, SW1_CS24, SW1_CS23, SW1_CS22},
+    {0, SW2_CS24, SW2_CS23, SW2_CS22},
+    {0, SW3_CS24, SW3_CS23, SW3_CS22},
+    {0, SW4_CS24, SW4_CS23, SW4_CS22},
+    {0, SW5_CS24, SW5_CS23, SW5_CS22},
+    {0, SW6_CS24, SW6_CS23, SW6_CS22},
+    {0, SW7_CS24, SW7_CS23, SW7_CS22},
 
-    {0, CS15_SW1, CS14_SW1, CS13_SW1},
-    {0, CS15_SW2, CS14_SW2, CS13_SW2},
-    {0, CS15_SW3, CS14_SW3, CS13_SW3},
-    {0, CS15_SW4, CS14_SW4, CS13_SW4},
-    {0, CS15_SW5, CS14_SW5, CS13_SW5},
-    {0, CS15_SW6, CS14_SW6, CS13_SW6},
-    {0, CS15_SW7, CS14_SW7, CS13_SW7},
-    {0, CS15_SW8, CS14_SW8, CS13_SW8},
-    {0, CS30_SW1, CS29_SW1, CS28_SW1},
-    {0, CS30_SW2, CS29_SW2, CS28_SW2},
-    {0, CS30_SW3, CS29_SW3, CS28_SW3},
-    {0, CS30_SW4, CS29_SW4, CS28_SW4},
-    {0, CS30_SW5, CS29_SW5, CS28_SW5},
-    {0, CS30_SW6, CS29_SW6, CS28_SW6},
-    {0, CS30_SW7, CS29_SW7, CS28_SW7},
+    {0, SW1_CS15, SW1_CS14, SW1_CS13},
+    {0, SW2_CS15, SW2_CS14, SW2_CS13},
+    {0, SW3_CS15, SW3_CS14, SW3_CS13},
+    {0, SW4_CS15, SW4_CS14, SW4_CS13},
+    {0, SW5_CS15, SW5_CS14, SW5_CS13},
+    {0, SW6_CS15, SW6_CS14, SW6_CS13},
+    {0, SW7_CS15, SW7_CS14, SW7_CS13},
+    {0, SW8_CS15, SW8_CS14, SW8_CS13},
+    {0, SW1_CS30, SW1_CS29, SW1_CS28},
+    {0, SW2_CS30, SW2_CS29, SW2_CS28},
+    {0, SW3_CS30, SW3_CS29, SW3_CS28},
+    {0, SW4_CS30, SW4_CS29, SW4_CS28},
+    {0, SW5_CS30, SW5_CS29, SW5_CS28},
+    {0, SW6_CS30, SW6_CS29, SW6_CS28},
+    {0, SW7_CS30, SW7_CS29, SW7_CS28},
 
-    {0, CS12_SW1, CS11_SW1, CS10_SW1},
-    {0, CS12_SW2, CS11_SW2, CS10_SW2},
-    {0, CS12_SW3, CS11_SW3, CS10_SW3},
-    {0, CS12_SW4, CS11_SW4, CS10_SW4},
-    {0, CS12_SW5, CS11_SW5, CS10_SW5},
-    {0, CS12_SW6, CS11_SW6, CS10_SW6},
-    {0, CS12_SW7, CS11_SW7, CS10_SW7},
-    {0, CS12_SW8, CS11_SW8, CS10_SW8},
-    {0, CS33_SW1, CS32_SW1, CS31_SW1},
-    {0, CS33_SW2, CS32_SW2, CS31_SW2},
-    {0, CS33_SW3, CS32_SW3, CS31_SW3},
-    {0, CS33_SW4, CS32_SW4, CS31_SW4},
-    {0, CS33_SW5, CS32_SW5, CS31_SW5},
-    {0, CS33_SW7, CS32_SW7, CS31_SW7},
+    {0, SW1_CS12, SW1_CS11, SW1_CS10},
+    {0, SW2_CS12, SW2_CS11, SW2_CS10},
+    {0, SW3_CS12, SW3_CS11, SW3_CS10},
+    {0, SW4_CS12, SW4_CS11, SW4_CS10},
+    {0, SW5_CS12, SW5_CS11, SW5_CS10},
+    {0, SW6_CS12, SW6_CS11, SW6_CS10},
+    {0, SW7_CS12, SW7_CS11, SW7_CS10},
+    {0, SW8_CS12, SW8_CS11, SW8_CS10},
+    {0, SW1_CS33, SW1_CS32, SW1_CS31},
+    {0, SW2_CS33, SW2_CS32, SW2_CS31},
+    {0, SW3_CS33, SW3_CS32, SW3_CS31},
+    {0, SW4_CS33, SW4_CS32, SW4_CS31},
+    {0, SW5_CS33, SW5_CS32, SW5_CS31},
+    {0, SW7_CS33, SW7_CS32, SW7_CS31},
 
-    {0, CS9_SW1, CS8_SW1, CS7_SW1},
-    {0, CS9_SW2, CS8_SW2, CS7_SW2},
-    {0, CS9_SW3, CS8_SW3, CS7_SW3},
-    {0, CS9_SW4, CS8_SW4, CS7_SW4},
-    {0, CS9_SW5, CS8_SW5, CS7_SW5},
-    {0, CS9_SW6, CS8_SW6, CS7_SW6},
-    {0, CS9_SW7, CS8_SW7, CS7_SW7},
-    {0, CS9_SW8, CS8_SW8, CS7_SW8},
-    {0, CS36_SW1, CS35_SW1, CS34_SW1},
-    {0, CS36_SW2, CS35_SW2, CS34_SW2},
-    {0, CS36_SW3, CS35_SW3, CS34_SW3},
-    {0, CS36_SW4, CS35_SW4, CS34_SW4},
-    {0, CS36_SW5, CS35_SW5, CS34_SW5},
-    {0, CS36_SW7, CS35_SW7, CS34_SW7},
+    {0, SW1_CS9, SW1_CS8, SW1_CS7},
+    {0, SW2_CS9, SW2_CS8, SW2_CS7},
+    {0, SW3_CS9, SW3_CS8, SW3_CS7},
+    {0, SW4_CS9, SW4_CS8, SW4_CS7},
+    {0, SW5_CS9, SW5_CS8, SW5_CS7},
+    {0, SW6_CS9, SW6_CS8, SW6_CS7},
+    {0, SW7_CS9, SW7_CS8, SW7_CS7},
+    {0, SW8_CS9, SW8_CS8, SW8_CS7},
+    {0, SW1_CS36, SW1_CS35, SW1_CS34},
+    {0, SW2_CS36, SW2_CS35, SW2_CS34},
+    {0, SW3_CS36, SW3_CS35, SW3_CS34},
+    {0, SW4_CS36, SW4_CS35, SW4_CS34},
+    {0, SW5_CS36, SW5_CS35, SW5_CS34},
+    {0, SW7_CS36, SW7_CS35, SW7_CS34},
 
-    {0, CS3_SW1, CS2_SW1, CS1_SW1},
-    {0, CS3_SW2, CS2_SW2, CS1_SW2},
-    {0, CS3_SW3, CS2_SW3, CS1_SW3},
-    {0, CS3_SW6, CS2_SW6, CS1_SW6},
-//    {0, CS39_SW1, CS38_SW1, CS37_SW1},
-    {0, CS39_SW2, CS38_SW2, CS37_SW2},
-    {0, CS39_SW3, CS38_SW3, CS37_SW3},
-    {0, CS39_SW4, CS38_SW4, CS37_SW4},
-    {0, CS39_SW5, CS38_SW5, CS37_SW5},
-    {0, CS39_SW7, CS38_SW7, CS37_SW7}
+    {0, SW1_CS3, SW1_CS2, SW1_CS1},
+    {0, SW2_CS3, SW2_CS2, SW2_CS1},
+    {0, SW3_CS3, SW3_CS2, SW3_CS1},
+    {0, SW6_CS3, SW6_CS2, SW6_CS1},
+//    {0, SW1_CS39, SW1_CS38, SW1_CS37},
+    {0, SW2_CS39, SW2_CS38, SW2_CS37},
+    {0, SW3_CS39, SW3_CS38, SW3_CS37},
+    {0, SW4_CS39, SW4_CS38, SW4_CS37},
+    {0, SW5_CS39, SW5_CS38, SW5_CS37},
+    {0, SW7_CS39, SW7_CS38, SW7_CS37}
 
 };
 
diff --git a/keyboards/kbdfans/kbd67/rev1/config.h b/keyboards/kbdfans/kbd67/rev1/config.h
deleted file mode 100644
index d876570c808..00000000000
--- a/keyboards/kbdfans/kbd67/rev1/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2018 MechMerlin
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/kbdfans/kbd67/rev1/info.json b/keyboards/kbdfans/kbd67/rev1/info.json
index f279c5a2c95..ba91317906b 100644
--- a/keyboards/kbdfans/kbd67/rev1/info.json
+++ b/keyboards/kbdfans/kbd67/rev1/info.json
@@ -8,10 +8,24 @@
     "pid": "0x6066",
     "device_version": "0.0.1"
   },
+  "features": {
+    "bootmagic": true,
+    "extrakey": true,
+    "mousekey": true,
+    "nkro": true,
+    "backlight": true,
+    "rgblight": true
+  },
   "matrix_pins": {
     "cols": ["F0", "F1", "E6", "C7", "C6", "B7", "D4", "B1", "B0", "B5", "B4", "D7", "D6", "B3", "F4", "F5"],
     "rows": ["D0", "D1", "D2", "D3", "D5"]
   },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  },
   "diode_direction": "COL2ROW",
   "backlight": {
     "pin": "B6",
@@ -38,7 +52,6 @@
       "knight": true,
       "christmas": true,
       "static_gradient": true,
-      "alternating": true,
       "twinkle": true
     }
   },
diff --git a/keyboards/kbdfans/kbd67/rev1/keymaps/default/config.h b/keyboards/kbdfans/kbd67/rev1/keymaps/default/config.h
deleted file mode 100644
index 90fb10ebbee..00000000000
--- a/keyboards/kbdfans/kbd67/rev1/keymaps/default/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2018 MechMerlin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#define LAYER_STATE_8BIT
diff --git a/keyboards/kbdfans/kbd67/rev1/keymaps/default/keymap.c b/keyboards/kbdfans/kbd67/rev1/keymaps/default/keymap.c
index 21ff6843b3d..50a8bdfee08 100644
--- a/keyboards/kbdfans/kbd67/rev1/keymaps/default/keymap.c
+++ b/keyboards/kbdfans/kbd67/rev1/keymaps/default/keymap.c
@@ -15,12 +15,6 @@
  */
 #include QMK_KEYBOARD_H
 
-// Defines the keycodes used by our macros in process_record_user
-enum custom_keycodes {
-  QMKBEST = SAFE_RANGE,
-  QMKURL
-};
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /* Keymap (Base Layer) Default Layer
    * ,----------------------------------------------------------------.
@@ -63,25 +57,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______,  _______,  _______,                     _______,                     _______,_______,_______,KC_HOME,KC_PGDN, KC_END),
 
 };
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QMKBEST:
-      if (record->event.pressed) {
-        // when keycode QMKBEST is pressed
-        SEND_STRING("QMK is the best thing ever!");
-      } else {
-        // when keycode QMKBEST is released
-      }
-      break;
-    case QMKURL:
-      if (record->event.pressed) {
-        // when keycode QMKURL is pressed
-        SEND_STRING("https://qmk.fm/" SS_TAP(X_ENTER));
-      } else {
-        // when keycode QMKURL is released
-      }
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/kbdfans/kbd67/rev1/keymaps/martinffx/keymap.c b/keyboards/kbdfans/kbd67/rev1/keymaps/martinffx/keymap.c
deleted file mode 100644
index 228f6483197..00000000000
--- a/keyboards/kbdfans/kbd67/rev1/keymaps/martinffx/keymap.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/* Copyright 2018 'mechmerlin'
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-
-// Defines the keycodes used by our macros in process_record_user
-enum custom_keycodes {
-  QMKBEST = SAFE_RANGE,
-  QMKURL
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Keymap (Base Layer) Default Layer
-   * ,----------------------------------------------------------------.
-   * |Esc|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp |   ~|
-   * |----------------------------------------------------------------|
-   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \  | Del|
-   * |----------------------------------------------------------------|
-   * |Ctrl   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |PgUp|
-   * |----------------------------------------------------------------|
-   * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift | Up|PgDn|
-   * |----------------------------------------------------------------|
-   * |Ctrl|Win |Alt |        Space          |Alt| FN|Ctrl|Lef|Dow|Rig |
-   * `----------------------------------------------------------------'
-   */
-[0] = LAYOUT_65_ansi(
-  KC_ESC,  KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_GRAVE,
-  KC_TAB,  KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DELETE,
-  KC_LCTL, KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGUP,
-  KC_LSFT, KC_Z,    KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   KC_PGDN,
-  KC_LCTL, KC_LGUI, KC_LALT,                KC_SPC,                          KC_RALT, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
-
-  /* Keymap Fn Layer
-   * ,----------------------------------------------------------------.
-   * |~ `|F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|Del    |Ins |
-   * |----------------------------------------------------------------|
-   * |Caps |   |Up |   |   |   |   |   |PSc|SLk|Pau|Up |   |     |    |
-   * |----------------------------------------------------------------|
-   * |      |Lef|Dow|Rig|   |   |   |   |Hom|PUp|Lef|Rig|        |    |
-   * |----------------------------------------------------------------|
-   * |        |   |   |   |   |   |   |   |End|PDn|Dow|      |PUp|    |
-   * |----------------------------------------------------------------|
-   * |    |    |    |                       |   |   |    |Hom|PDn|End |
-   * `----------------------------------------------------------------'
-   */
-[1] = LAYOUT_65_ansi(
-   KC_GRV,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9, KC_F10, KC_F11, KC_F12,          KC_DEL,KC_INS,
-   KC_CAPS,_______,  KC_UP,_______,_______,_______,_______,_______,KC_PSCR,KC_SCRL,KC_PAUS,  KC_UP,_______,     _______,_______,
-      _______,KC_LEFT,KC_DOWN,KC_RGHT,_______,_______,_______,_______,KC_HOME,KC_PGUP,KC_LEFT,KC_RGHT,            _______,_______,
-           _______,_______,_______,_______,_______,_______,_______,_______, KC_END,KC_PGDN,KC_DOWN,       _______,KC_PGUP,_______,
-    _______,  _______,  _______,                     _______,                     _______,_______,_______,KC_HOME,KC_PGDN, KC_END),
-
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QMKBEST:
-      if (record->event.pressed) {
-        // when keycode QMKBEST is pressed
-        SEND_STRING("QMK is the best thing ever!");
-      } else {
-        // when keycode QMKBEST is released
-      }
-      break;
-    case QMKURL:
-      if (record->event.pressed) {
-        // when keycode QMKURL is pressed
-        SEND_STRING("https://qmk.fm/" SS_TAP(X_ENTER));
-      } else {
-        // when keycode QMKURL is released
-      }
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/kbdfans/kbd67/rev1/keymaps/martinffx/readme.md b/keyboards/kbdfans/kbd67/rev1/keymaps/martinffx/readme.md
deleted file mode 100644
index dfa800d17c2..00000000000
--- a/keyboards/kbdfans/kbd67/rev1/keymaps/martinffx/readme.md
+++ /dev/null
@@ -1,33 +0,0 @@
-# The default keymap for kbd67
-
-```
-/* Keymap (Base Layer) Default Layer
- * ,----------------------------------------------------------------.
- * |Esc|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp |   ~|
- * |----------------------------------------------------------------|
- * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \  | Del|
- * |----------------------------------------------------------------|
- * |Ctrl   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |PgUp|
- * |----------------------------------------------------------------|
- * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift | Up|PgDn|
- * |----------------------------------------------------------------|
- * |Ctrl|Win |Alt |        Space          |Alt| FN|Ctrl|Lef|Dow|Rig |
- * `----------------------------------------------------------------'
- */
-```
-
-```
-  /* Keymap Fn Layer
-   * ,----------------------------------------------------------------.
-   * |~ `|F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|Del    |Ins |
-   * |----------------------------------------------------------------|
-   * |Caps |   |Up |   |   |   |   |   |PSc|SLk|Pau|Up |   |     |    |
-   * |----------------------------------------------------------------|
-   * |      |Lef|Dow|Rig|   |   |   |   |Hom|PUp|Lef|Rig|        |    |
-   * |----------------------------------------------------------------|
-   * |        |   |   |   |   |   |   |   |End|PDn|Dow|      |PUp|    |
-   * |----------------------------------------------------------------|
-   * |    |    |    |                       |   |   |    |Hom|PDn|End |
-   * `----------------------------------------------------------------'
-   */
-```
diff --git a/keyboards/kbdfans/kbd67/rev1/keymaps/via/keymap.c b/keyboards/kbdfans/kbd67/rev1/keymaps/via/keymap.c
index 755da6e5cf6..a25c5247320 100644
--- a/keyboards/kbdfans/kbd67/rev1/keymaps/via/keymap.c
+++ b/keyboards/kbdfans/kbd67/rev1/keymaps/via/keymap.c
@@ -29,12 +29,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * |Ctrl|Win |Alt |        Space          |Alt| FN|Ctrl|Lef|Dow|Rig |
    * `----------------------------------------------------------------'
    */
-[0] = LAYOUT_65_ansi(
-  KC_ESC,  KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_HOME,
-  KC_TAB,  KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
-  KC_LCTL, KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT, KC_PGDN,
-  KC_LSFT, KC_Z,    KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_END,
-  KC_LCTL, KC_LGUI, KC_LALT,                KC_SPC,                          KC_RALT, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+    [0] = LAYOUT_65_ansi(
+      KC_ESC,  KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_HOME,
+      KC_TAB,  KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
+      KC_LCTL, KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT, KC_PGDN,
+      KC_LSFT, KC_Z,    KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_END,
+      KC_LCTL, KC_LGUI, KC_LALT,                KC_SPC,                          KC_RALT, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
 
   /* Keymap Fn Layer
    * ,----------------------------------------------------------------.
@@ -49,27 +50,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * |    |    |    |                       |   |   |    |Hom|PDn|End |
    * `----------------------------------------------------------------'
    */
-[1] = LAYOUT_65_ansi(
-   KC_GRV,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9, KC_F10, KC_F11, KC_F12,          KC_DEL,KC_INS,
-   KC_CAPS,_______,  KC_UP,_______,_______,_______,_______,_______,KC_PSCR,KC_SCRL,KC_PAUS,  KC_UP,_______,     _______,_______,
-      _______,KC_LEFT,KC_DOWN,KC_RGHT,_______,_______,_______,_______,KC_HOME,KC_PGUP,KC_LEFT,KC_RGHT,            _______,_______,
-           _______,_______,_______,_______,_______,_______,_______,_______, KC_END,KC_PGDN,KC_DOWN,       _______,KC_PGUP,_______,
-    _______,  _______,  _______,                     _______,                     _______,_______,_______,KC_HOME,KC_PGDN, KC_END),
-
-
-[2] = LAYOUT_65_ansi(
-  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,        _______,_______,
-   _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,     _______,_______,
-      _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,            _______,_______,
-           _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,       _______,_______,_______,
-    _______,  _______,  _______,                     _______,                     _______,_______,_______,_______,_______,_______),
-
-
-[3] = LAYOUT_65_ansi(
-  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,        _______,_______,
-   _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,     _______,_______,
-      _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,            _______,_______,
-           _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,       _______,_______,_______,
-    _______,  _______,  _______,                     _______,                     _______,_______,_______,_______,_______,_______),
-
+    [1] = LAYOUT_65_ansi(
+       KC_GRV,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9, KC_F10, KC_F11, KC_F12,          KC_DEL,KC_INS,
+       KC_CAPS,_______,  KC_UP,_______,_______,_______,_______,_______,KC_PSCR,KC_SCRL,KC_PAUS,  KC_UP,_______,     _______,_______,
+          _______,KC_LEFT,KC_DOWN,KC_RGHT,_______,_______,_______,_______,KC_HOME,KC_PGUP,KC_LEFT,KC_RGHT,            _______,_______,
+               _______,_______,_______,_______,_______,_______,_______,_______, KC_END,KC_PGDN,KC_DOWN,       _______,KC_PGUP,_______,
+        _______,  _______,  _______,                     _______,                     _______,_______,_______,KC_HOME,KC_PGDN, KC_END
+    )
 };
diff --git a/keyboards/kbdfans/kbd67/rev1/keymaps/via/readme.md b/keyboards/kbdfans/kbd67/rev1/keymaps/via/readme.md
deleted file mode 100644
index f32cf23932c..00000000000
--- a/keyboards/kbdfans/kbd67/rev1/keymaps/via/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The via keymap for kbd67
diff --git a/keyboards/kbdfans/kbd67/rev1/keymaps/via/rules.mk b/keyboards/kbdfans/kbd67/rev1/keymaps/via/rules.mk
index 36b7ba9cbc9..1e5b99807cb 100644
--- a/keyboards/kbdfans/kbd67/rev1/keymaps/via/rules.mk
+++ b/keyboards/kbdfans/kbd67/rev1/keymaps/via/rules.mk
@@ -1,2 +1 @@
 VIA_ENABLE = yes
-LTO_ENABLE = yes
diff --git a/keyboards/kbdfans/kbd67/rev1/readme.md b/keyboards/kbdfans/kbd67/rev1/readme.md
index 0e9c66b2445..9c9e35202c8 100644
--- a/keyboards/kbdfans/kbd67/rev1/readme.md
+++ b/keyboards/kbdfans/kbd67/rev1/readme.md
@@ -10,4 +10,16 @@ Make example for this keyboard (after setting up your build environment):
 
     make kbdfans/kbd67/rev1:default
 
+Flashing example for this keyboard:
+
+    make kbdfans/kbd67/rev1:default:flash
+
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/kbdfans/kbd67/rev1/rules.mk b/keyboards/kbdfans/kbd67/rev1/rules.mk
index 99067f7d6a3..6e7633bfe01 100644
--- a/keyboards/kbdfans/kbd67/rev1/rules.mk
+++ b/keyboards/kbdfans/kbd67/rev1/rules.mk
@@ -1,12 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = no        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
+# This file intentionally left blank
diff --git a/keyboards/kbdfans/kbd6x/keymaps/devinceble_hhkb_tofu/keymap.c b/keyboards/kbdfans/kbd6x/keymaps/devinceble_hhkb_tofu/keymap.c
deleted file mode 100644
index 4aa8b940b2b..00000000000
--- a/keyboards/kbdfans/kbd6x/keymaps/devinceble_hhkb_tofu/keymap.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/* Copyright 2019 Devinceble AKA Vimwarrior
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[0] = LAYOUT(
-        KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_GRV,
-        KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC,
-        KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
-        KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1),
-        KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RCTL, MO(2), KC_RGUI
-    ),
-	[1] = LAYOUT(
-        KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL,
-        KC_TRNS, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_RGHT, KC_TRNS,
-        KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DOWN, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-    ),
-	[2] = LAYOUT(
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD, KC_TRNS, KC_TRNS,
-        KC_CAPS, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, BL_TOGG, BL_STEP, BL_ON, BL_OFF, BL_UP,  BL_DOWN,BL_BRTG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
-};
-
-void matrix_init_user(void) {
-
-}
-
-void matrix_scan_user(void) {
-
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
diff --git a/keyboards/kbdfans/kbd6x/keymaps/devinceble_hhkb_tofu/readme.md b/keyboards/kbdfans/kbd6x/keymaps/devinceble_hhkb_tofu/readme.md
deleted file mode 100644
index ebd416aea57..00000000000
--- a/keyboards/kbdfans/kbd6x/keymaps/devinceble_hhkb_tofu/readme.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Devinceble AKA Vimwarrior HHKB Tofu Keymap
-
-Build Hex File:
-
-    make kbdfans/kbd6x:devinceble_hhkb_tofu
-
-Flash Keyboard
-
-    make kbdfans/kbd6x:devinceble_hhkb_tofu:flash
diff --git a/keyboards/kbdfans/kbd6x/keymaps/devinceble_hhkb_tofu/rules.mk b/keyboards/kbdfans/kbd6x/keymaps/devinceble_hhkb_tofu/rules.mk
deleted file mode 100644
index 23f4c567445..00000000000
--- a/keyboards/kbdfans/kbd6x/keymaps/devinceble_hhkb_tofu/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-BOOTLOADER = atmel-dfu
-MOUSEKEY_ENABLE    = yes
diff --git a/keyboards/kbdfans/kbd6x/keymaps/othi/config.h b/keyboards/kbdfans/kbd6x/keymaps/othi/config.h
deleted file mode 100644
index d5bc8ab7ec7..00000000000
--- a/keyboards/kbdfans/kbd6x/keymaps/othi/config.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#pragma once
-#define ONESHOT_TAP_TOOGLE 2
-#define ONESHOT_TIMEOUT 2000
-// tap dance configurations
-#define TAPPING_TERM 200
-#define TAPPING_TOGGLE 2
-#define PERMISSIVE_HOLD
-// Fix QK_GESC conflict with Cmd+Alt+Esc on macros
-#define GRAVE_ESC_GUI_OVERRIDE
-
diff --git a/keyboards/kbdfans/kbd6x/keymaps/othi/keymap.c b/keyboards/kbdfans/kbd6x/keymaps/othi/keymap.c
deleted file mode 100644
index d748a2f7361..00000000000
--- a/keyboards/kbdfans/kbd6x/keymaps/othi/keymap.c
+++ /dev/null
@@ -1,189 +0,0 @@
-/* Copyright 2018 Othi
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-
-// read README.md for rundown of what does what
-
-// #define BL 0
-#define CL 0
-#define NM_MODE 2
-#define VI_MODE 3
-#define FN3 4
-#define ACCENT 5
-#define ACCENT_CAP 6
-
-//Unicode keymaps
-void eeconfig_init_user(void) {
-  set_unicode_input_mode(UNICODE_MODE_LINUX);
-}
-#define DE_ADIA     UC(0x00E4)
-#define DE_SS       UC(0x00DF)
-#define DE_ODIA     UC(0x00F6)
-#define DE_UDIA     UC(0x00FC)
-#define DE_ADIA_CAP UC(0x00C4)
-#define DE_ODIA_CAP UC(0x00D6)
-#define DE_UDIA_CAP UC(0x00DC)
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    switch (get_highest_layer(state)) {
-    case NM_MODE:
-        rgblight_setrgb (0x00,  0x66, 0x00);
-        break;
-    case VI_MODE:
-        rgblight_setrgb (0x66,  0x66, 0x00);
-        break;
-    case ACCENT:
-        rgblight_setrgb (0x7A,  0x00, 0xFF);
-        break;
-    case ACCENT_CAP:
-        rgblight_setrgb (0x7A,  0xFF, 0xFF);
-        break;
-    default: //  for any other layers, or the default layer
-        rgblight_setrgb (0xFF,  0x00, 0x00);
-        break;
-    }
-  return state;
-}
-
-//Tap Dance Declarations
-enum {
-  CTL_NM = 0,
-  ALT_NM = 1,
-  SFT_NM = 2,
-  GUI_NM = 3
-};
-
-void dance_CTL_NM_finished (tap_dance_state_t *state, void *user_data) {
-  if (state->count == 1) {
-	set_oneshot_mods(MOD_LCTL);
-  } else {
-    register_code (KC_LCTL);
-	layer_on(NM_MODE);
-  }
-}
-
-void dance_CTL_NM_reset (tap_dance_state_t *state, void *user_data) {
-  if (state->count == 1) {
-    unregister_code (KC_LCTL);
-  } else {
-    unregister_code (KC_LCTL);
-	layer_off(NM_MODE);
-  }
-}
-
-void dance_GUI_NM_finished (tap_dance_state_t *state, void *user_data) {
-  if (state->count == 1) {
-	register_code (KC_LGUI);
-  } else {
-    register_code (KC_LGUI);
-	layer_on(NM_MODE);
-  }
-}
-
-void dance_GUI_NM_reset (tap_dance_state_t *state, void *user_data) {
-  if (state->count == 1) {
-    unregister_code (KC_LGUI);
-  } else {
-    unregister_code (KC_LGUI);
-	layer_off(NM_MODE);
-  }
-}
-
-void dance_ALT_NM_finished (tap_dance_state_t *state, void *user_data) {
-  if (state->count == 1) {
-	register_code (KC_LALT);
-  } else {
-    register_code (KC_LALT);
-	layer_on(NM_MODE);
-  }
-}
-
-void dance_ALT_NM_reset (tap_dance_state_t *state, void *user_data) {
-  if (state->count == 1) {
-    unregister_code (KC_LALT);
-  } else {
-    unregister_code (KC_LALT);
-	layer_off(NM_MODE);
-  }
-}
-
-void dance_SFT_NM_finished (tap_dance_state_t *state, void *user_data) {
-  if (state->count == 1) {
-	register_code (KC_LSFT);
-	set_oneshot_mods(MOD_LSFT);
-  } else {
-    register_code (KC_LSFT);
-	layer_on(NM_MODE);
-  }
-}
-
-void dance_SFT_NM_reset (tap_dance_state_t *state, void *user_data) {
-  if (state->count == 1) {
-    unregister_code (KC_LSFT);
-  } else {
-    unregister_code (KC_LSFT);
-	layer_off(NM_MODE);
-  }
-}
-
-
-tap_dance_action_t tap_dance_actions[] = {
- [CTL_NM] = ACTION_TAP_DANCE_FN_ADVANCED (NULL, dance_CTL_NM_finished, dance_CTL_NM_reset),
- [GUI_NM] = ACTION_TAP_DANCE_FN_ADVANCED (NULL, dance_GUI_NM_finished, dance_GUI_NM_reset),
- [ALT_NM] = ACTION_TAP_DANCE_FN_ADVANCED (NULL, dance_ALT_NM_finished, dance_ALT_NM_reset),
- [SFT_NM] = ACTION_TAP_DANCE_FN_ADVANCED (NULL, dance_SFT_NM_finished, dance_SFT_NM_reset)
-};
-
-// backup
-// old R3 capslock, LT(NM_MODE,KC_BSPC),
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [CL] = LAYOUT(
-      QK_GESC, 					 KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,        KC_EQL,     KC_BSLS,    KC_DEL,
-      MT(MOD_LGUI,KC_TAB),       LT(NM_MODE,KC_Q),    KC_W,    LT(ACCENT,KC_F),    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN,     KC_LBRC, KC_RBRC, KC_BSPC,
-      MT(MOD_LCTL,KC_BSPC),      KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,           KC_QUOT, KC_ENT,
-      TD(SFT_NM),                KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    MT(MOD_LCTL,KC_COMM), MT(MOD_LSFT,KC_DOT),  MT(MOD_LALT,KC_SLSH),        LM(CL,MOD_LGUI|MOD_LSFT), TT(NM_MODE),
-      _______, TD(CTL_NM),                     TD(ALT_NM),              		KC_SPC,    LM(CL,MOD_LGUI|MOD_LALT), OSL(ACCENT)    , _______
-      ),
-  [NM_MODE] = LAYOUT(
-      KC_GRV,            KC_MPRV,    KC_MNXT,    KC_MPLY,    KC_END,      _______,     _______,     _______,     _______,     _______,     KC_HOME,    _______,  _______,  QK_BOOT, KC_INS,
-      LGUI(KC_TAB),       _______,    LCTL(KC_RGHT),  _______,    _______,    _______,    _______,    KC_UP,    KC_PGUP,    _______,    _______,     _______, TG(CL), KC_DEL,
-      _______,            KC_LEFT,    _______,    KC_RGHT,      _______,    KC_PGDN,    KC_LEFT,   KC_DOWN,   KC_RGHT,     _______,    KC_ENT,  KC_QUOT, KC_LGUI,
-      KC_LSFT,     			_______,    _______,    _______,      _______,    LCTL(KC_LEFT),    _______,    _______,    _______,    _______,    _______,    TG(VI_MODE), TO(CL),
-      _______, TD(CTL_NM),                     TD(ALT_NM),              		KC_SPC,    LM(CL,MOD_LGUI|MOD_LALT), OSL(ACCENT), _______
-      ),
-
-  [VI_MODE] = LAYOUT(
-      KC_GRV,         KC_MPRV,  KC_MNXT, KC_MPLY,    LSFT(KC_END),          KC_F5,     KC_F6,     KC_F7,     KC_F8,     KC_F9,     LSFT(KC_HOME),    KC_F11,  KC_F12,  QK_BOOT, KC_INS,
-      LGUI(KC_TAB),     _______,    LSFT(LCTL(KC_RGHT)),  _______,    _______,    _______,    _______,    LSFT(KC_UP),    _______,    _______,    _______,     _______, TG(CL), KC_BSPC,
-      _______,            _______,    _______,    _______,      _______,    _______,    LSFT(LCTL(KC_LEFT)),   LSFT(KC_DOWN),   LSFT(KC_RGHT),     _______,    KC_SCLN,  KC_QUOT, KC_LGUI,
-      KC_LSFT,      	    _______,  _______, _______,      _______,    LSFT(LCTL(KC_LEFT)),    _______,    _______,    _______,    _______,    KC_SLSH,    OSM(MOD_LSFT), TO(CL),
-      _______, TD(CTL_NM),                     TD(ALT_NM),              		KC_SPC,    LM(CL,MOD_LGUI|MOD_LALT), OSL(ACCENT), _______
-      ),
-  [ACCENT] = LAYOUT(
-      _______,       KC_F1,  KC_F2, KC_F3,    KC_F4,     KC_F5,     KC_F6,     KC_F7,     KC_F8,     KC_F9,     KC_F10,    KC_F11,  KC_F12,  _______, _______,
-      _______,         RGB_TOG,    RGB_MODE_PLAIN,  _______,    _______,    _______,    _______,    _______,    DE_UDIA,    _______,    _______,     _______, _______, _______,
-      _______,            DE_ADIA,    UC_Z,    DE_SS,      _______,    _______,    _______,   _______,   _______,     _______,    DE_ODIA,  _______, _______,
-      OSL(ACCENT_CAP),     _______,  _______, _______,      _______,    _______,    _______,    _______,    _______,    _______,        _______, _______, TO(CL),
-      _______,             _______,         _______,            _______,         _______, _______,  _______
-      ),
-  [ACCENT_CAP] = LAYOUT(
-      _______,   _______,  _______, _______,    _______,          _______,     _______,     _______,     _______,     _______,     _______,    _______,  _______,  _______, _______,
-      _______,      _______,    _______,  _______,    _______,    _______,    _______,    _______,    DE_UDIA_CAP,    _______,    _______,     _______, _______, _______,
-      _______,        DE_ADIA_CAP,    _______,    DE_SS,      _______,    _______,    _______,   _______,   _______,     _______,    DE_ODIA_CAP,  _______, TO(CL),
-      _______, 	       _______, _______,      _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______, _______, _______,
-      _______,   _______,         _______,         _______,         _______,   _______,      _______
-      ),
-};
diff --git a/keyboards/kbdfans/kbd6x/keymaps/othi/readme.md b/keyboards/kbdfans/kbd6x/keymaps/othi/readme.md
deleted file mode 100644
index 95be36d057d..00000000000
--- a/keyboards/kbdfans/kbd6x/keymaps/othi/readme.md
+++ /dev/null
@@ -1,56 +0,0 @@
-## Othi's Universal HHKB keymap
-
-### Goals
-- Colemak layout. If you don't use Colemak then you'll need to also change the arrow key bindigns in other layers
-
-- Vim-like navigation layer so you can use vim binding arrowkeys in non-vim environment
-
-- Good modifier support so you don't have to hold 14 modifier keys at the same time
-
-- RGB indicating layer change(only work with plain colors so far, don't put your rgb to pulsing or any non static animation)
-
-### Layers
-- **CL:**
-
-	The base layer, default is Colemak
-
-- **NM_MODE:**
-
-	Vim-like arrowkeys in the home row, it's `LHNE` for *JENK Colemak* and `HJKL` for *QWERTY*
-
-	Also `HOME`, `END` and next/prev word (`Ctrl + Left/Right`) in `0, 4, w, b` like in vim
-
-- **VI_MODE:**
-
-	The same as `NM_MODE` but with `KC_LSFT` held down for mostly highlighting
-
-- **ACCENT + ACCENT_CAP:**
-
-	Function row and Unicode characters
-
-### Modifiers and Tap Dance keys
-**LHS:**
-
-- Any Tap Dance key with the format of `TD(XXX_NM)` act as normal XXX modifier upon hold, but will hold **and** put you to `NM_MODE` when double click hold(a tap before the hold)(eg you can produce `Alt + PgUp` by pressing `Alt + Alt + U`)
-
-- `KC_TAB` acts as both `KC_TAB` on tap and `KC_LGUI` on hold
-
-- R3 CapsLock acts as both `KC_BSPC` on tap and `KC_LCTL` on hold
-
-- Holding `KC_Q` also puts you into `NM_MODE`
-
-- Holding `KC_F` puts you into `VI_MODE` for fast function keys
-
-**RHS:**
-
-- 3 keys `KC_SCLN`, `KC_DOT` and `KC_SLSH` in `CL` layer can also be held down for respectively `KC_LCTL`, `KC_LSFT`, `KC_LALT` for easier 2-hand modifier holding
-
-- Right modifiers hold the selected modifier with `KC_LGUI` at the same time, mainly for i3wm, you can change this to whatever combination you want
-
-### Misc. functionalities
-
-**Unicode:**
-
-- In case the keyboard output the 4-digit codepoint instead of the actual unicode, you need to change the rewrite input mode of the keyboard into the EEPROM(you only have to do this if the EEPROM was cleared or your current machine use another unicode compose method other than IBus/Linux's `Ctrl + Shift + U`). Change the corresponding Input `void eeconfig_init_user(void)`. See [this](https://docs.qmk.fm/#/feature_unicode) for availble input modes.
-
-- **NOTE:** make sure to keep your qmk env up to date with upstream
diff --git a/keyboards/kbdfans/kbd6x/keymaps/othi/rules.mk b/keyboards/kbdfans/kbd6x/keymaps/othi/rules.mk
deleted file mode 100644
index 9a4459c2891..00000000000
--- a/keyboards/kbdfans/kbd6x/keymaps/othi/rules.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no        # Console for debug(+400)
-COMMAND_ENABLE = no        # Commands for debug and configuration
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-NKRO_ENABLE = yes            # USB Nkey Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality on B7 by default
-MIDI_ENABLE = no            # MIDI support (+2400 to 4200, depending on config)
-UNICODE_ENABLE = yes         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = yes
-AUDIO_ENABLE = no           # Audio output on port C6
-TAP_DANCE_ENABLE=yes
diff --git a/keyboards/kbdfans/kbdmini/kbdmini.c b/keyboards/kbdfans/kbdmini/kbdmini.c
index 31b2e1a2563..7aec00cbdc2 100644
--- a/keyboards/kbdfans/kbdmini/kbdmini.c
+++ b/keyboards/kbdfans/kbdmini/kbdmini.c
@@ -1,61 +1,61 @@
 #include "quantum.h"
 
 const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
-    { 0, B_9,  A_9,  C_9  }, //LA33
-    { 0, B_10, A_10, C_10 }, //LA37
-    { 0, B_11, A_11, C_11 }, //LA41
-    { 0, B_12, A_12, C_12 }, //LA45
-    { 0, B_13, A_13, C_13 }, //LA49
-    { 0, B_14, A_14, C_14 }, //LA53
-    { 0, B_15, A_15, C_15 }, //LA57
-    { 0, B_6,  A_6,  C_6  }, //LA21
-    { 0, B_5,  A_5,  C_5  }, //LA17
-    { 0, B_4,  A_4,  C_4  }, //LA13
-    { 0, B_3,  A_3,  C_3  }, //LA9
-    { 0, B_2,  A_2,  C_2  }, //LA5
-    { 0, B_1,  A_1,  C_1  }, //LA1
+    { 0, SW2_CS9,  SW1_CS9,  SW3_CS9  }, //LA33
+    { 0, SW2_CS10, SW1_CS10, SW3_CS10 }, //LA37
+    { 0, SW2_CS11, SW1_CS11, SW3_CS11 }, //LA41
+    { 0, SW2_CS12, SW1_CS12, SW3_CS12 }, //LA45
+    { 0, SW2_CS13, SW1_CS13, SW3_CS13 }, //LA49
+    { 0, SW2_CS14, SW1_CS14, SW3_CS14 }, //LA53
+    { 0, SW2_CS15, SW1_CS15, SW3_CS15 }, //LA57
+    { 0, SW2_CS6,  SW1_CS6,  SW3_CS6  }, //LA21
+    { 0, SW2_CS5,  SW1_CS5,  SW3_CS5  }, //LA17
+    { 0, SW2_CS4,  SW1_CS4,  SW3_CS4  }, //LA13
+    { 0, SW2_CS3,  SW1_CS3,  SW3_CS3  }, //LA9
+    { 0, SW2_CS2,  SW1_CS2,  SW3_CS2  }, //LA5
+    { 0, SW2_CS1,  SW1_CS1,  SW3_CS1  }, //LA1
 
-    { 0, E_9,  D_9,  F_9  }, //LA34
-    { 0, E_10, D_10, F_10 }, //LA38
-    { 0, E_11, D_11, F_11 }, //LA42
-    { 0, E_12, D_12, F_12 }, //LA46
-    { 0, E_13, D_13, F_13 }, //LA50
-    { 0, E_14, D_14, F_14 }, //LA54
-    { 0, E_15, D_15, F_15 }, //LA58
-    { 0, E_6,  D_6,  F_6  }, //LA22
-    { 0, E_5,  D_5,  F_5  }, //LA18
-    { 0, E_4,  D_4,  F_4  }, //LA14
-    { 0, E_3,  D_3,  F_3  }, //LA10
-    { 0, E_2,  D_2,  F_2  }, //LA6
-    { 0, E_1,  D_1,  F_1  }, //LA2
+    { 0, SW5_CS9,  SW4_CS9,  SW6_CS9  }, //LA34
+    { 0, SW5_CS10, SW4_CS10, SW6_CS10 }, //LA38
+    { 0, SW5_CS11, SW4_CS11, SW6_CS11 }, //LA42
+    { 0, SW5_CS12, SW4_CS12, SW6_CS12 }, //LA46
+    { 0, SW5_CS13, SW4_CS13, SW6_CS13 }, //LA50
+    { 0, SW5_CS14, SW4_CS14, SW6_CS14 }, //LA54
+    { 0, SW5_CS15, SW4_CS15, SW6_CS15 }, //LA58
+    { 0, SW5_CS6,  SW4_CS6,  SW6_CS6  }, //LA22
+    { 0, SW5_CS5,  SW4_CS5,  SW6_CS5  }, //LA18
+    { 0, SW5_CS4,  SW4_CS4,  SW6_CS4  }, //LA14
+    { 0, SW5_CS3,  SW4_CS3,  SW6_CS3  }, //LA10
+    { 0, SW5_CS2,  SW4_CS2,  SW6_CS2  }, //LA6
+    { 0, SW5_CS1,  SW4_CS1,  SW6_CS1  }, //LA2
 
-    { 0, H_9,  G_9,  I_9  }, //LA35
-    { 0, H_10, G_10, I_10 }, //LA39
-    { 0, H_11, G_11, I_11 }, //LA43
-    { 0, H_12, G_12, I_12 }, //LA47
-    { 0, H_13, G_13, I_13 }, //LA51
-    { 0, H_14, G_14, I_14 }, //LA55
-    { 0, H_15, G_15, I_15 }, //LA59
-    { 0, H_6,  G_6,  I_6  }, //LA23
-    { 0, H_5,  G_5,  I_5  }, //LA19
-    { 0, H_4,  G_4,  I_4  }, //LA15
-    { 0, H_3,  G_3,  I_3  }, //LA11
-    { 0, H_2,  G_2,  I_2  }, //LA7
-    { 0, H_1,  G_1,  I_1  }, //LA3
+    { 0, SW8_CS9,  SW7_CS9,  SW9_CS9  }, //LA35
+    { 0, SW8_CS10, SW7_CS10, SW9_CS10 }, //LA39
+    { 0, SW8_CS11, SW7_CS11, SW9_CS11 }, //LA43
+    { 0, SW8_CS12, SW7_CS12, SW9_CS12 }, //LA47
+    { 0, SW8_CS13, SW7_CS13, SW9_CS13 }, //LA51
+    { 0, SW8_CS14, SW7_CS14, SW9_CS14 }, //LA55
+    { 0, SW8_CS15, SW7_CS15, SW9_CS15 }, //LA59
+    { 0, SW8_CS6,  SW7_CS6,  SW9_CS6  }, //LA23
+    { 0, SW8_CS5,  SW7_CS5,  SW9_CS5  }, //LA19
+    { 0, SW8_CS4,  SW7_CS4,  SW9_CS4  }, //LA15
+    { 0, SW8_CS3,  SW7_CS3,  SW9_CS3  }, //LA11
+    { 0, SW8_CS2,  SW7_CS2,  SW9_CS2  }, //LA7
+    { 0, SW8_CS1,  SW7_CS1,  SW9_CS1  }, //LA3
 
-    { 0, K_9,  J_9,  L_9  }, //LA36
-    { 0, K_10, J_10, L_10 }, //LA40
-    { 0, K_11, J_11, L_11 }, //LA44
-    { 0, K_12, J_12, L_12 }, //LA48
-    { 0, K_13, J_13, L_13 }, //LA52
-    { 0, K_14, J_14, L_14 }, //LA56
-    { 0, K_15, J_15, L_15 }, //LA60
-    { 0, K_6,  J_6,  L_6  }, //LA24
-    { 0, K_5,  J_5,  L_5  }, //LA20
-    { 0, K_4,  J_4,  L_4  }, //LA16
-    { 0, K_3,  J_3,  L_3  }, //LA12
-    { 0, K_2,  J_2,  L_2  }, //LA8
-    { 0, K_1,  J_1,  L_1  }  //LA4
+    { 0, SW11_CS9,  SW10_CS9,  SW12_CS9  }, //LA36
+    { 0, SW11_CS10, SW10_CS10, SW12_CS10 }, //LA40
+    { 0, SW11_CS11, SW10_CS11, SW12_CS11 }, //LA44
+    { 0, SW11_CS12, SW10_CS12, SW12_CS12 }, //LA48
+    { 0, SW11_CS13, SW10_CS13, SW12_CS13 }, //LA52
+    { 0, SW11_CS14, SW10_CS14, SW12_CS14 }, //LA56
+    { 0, SW11_CS15, SW10_CS15, SW12_CS15 }, //LA60
+    { 0, SW11_CS6,  SW10_CS6,  SW12_CS6  }, //LA24
+    { 0, SW11_CS5,  SW10_CS5,  SW12_CS5  }, //LA20
+    { 0, SW11_CS4,  SW10_CS4,  SW12_CS4  }, //LA16
+    { 0, SW11_CS3,  SW10_CS3,  SW12_CS3  }, //LA12
+    { 0, SW11_CS2,  SW10_CS2,  SW12_CS2  }, //LA8
+    { 0, SW11_CS1,  SW10_CS1,  SW12_CS1  }  //LA4
 };
 
 led_config_t g_led_config = {
diff --git a/keyboards/kbdfans/kbdpad/mk2/keymaps/iracing_replay/keymap.c b/keyboards/kbdfans/kbdpad/mk2/keymaps/iracing_replay/keymap.c
deleted file mode 100644
index 5bbd8666ae9..00000000000
--- a/keyboards/kbdfans/kbdpad/mk2/keymaps/iracing_replay/keymap.c
+++ /dev/null
@@ -1,156 +0,0 @@
-/* Copyright 2021 Aaron VerDow
- * 
- * This program is free software: you can redistribute it and/or modify 
- * it under the terms of the GNU General Public License as published by 
- * the Free Software Foundation, either version 2 of the License, or 
- * (at your option) any later version. 
- * 
- * This program is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
- * GNU General Public License for more details. 
- * 
- * You should have received a copy of the GNU General Public License 
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
- */ 
-
-#include QMK_KEYBOARD_H
-
-// Layer declarations
-enum {
-    DEF_LAYER,
-    MOD_LAYER,
-};
-
-// Tap Dance declarations
-enum {
-    TD_CAR,
-    TD_PRINT,
-    TD_CAM_UP,
-    TD_CAM_DN
-};
-
-void camera_number(uint16_t tens, uint16_t ones) {
-/* Switch to a specific camera number
- *
- * I haven't been able to find official docs for this.
- *
- * To determine the number click the dropdown in UI and 
- * count from the top.  The list can change with updates.
- *
- * Shift must be held between both * presses or the combo
- * won't be recognized.
- */
-
-    register_code16(KC_LSFT);
-    tap_code(KC_8);
-    tap_code(KC_8);
-    unregister_code16(KC_LSFT);
-    tap_code(tens);
-    tap_code(ones);
-    tap_code(KC_ENT);
-}
-
-void cam_up(tap_dance_state_t *state, void *user_data) {
-    switch (state->count) {
-        case 1:                     
-            tap_code(KC_C);             // tap once for next cam
-            break;
-        case 2:                     
-            camera_number(KC_2,KC_0); // tap twice for reverse chase cam
-            break;
-    }
-}
-
-void cam_down(tap_dance_state_t *state, void *user_data) {
-    switch (state->count) {
-        case 1:                     
-            tap_code16(LSFT(KC_C));     // tap once for prev cam
-            break;
-        case 2:                     
-            camera_number(KC_1,KC_8); // tap twice for chase cam
-            break;
-    }
-}
-
-// Tap Dance definitions
-tap_dance_action_t tap_dance_actions[] = {
-    [TD_CAR] = ACTION_TAP_DANCE_DOUBLE(
-        LSFT(KC_V),                 // tap once for prev car
-        LCTL(KC_V)                  // tap twice for my car
-    ),
-    [TD_PRINT] = ACTION_TAP_DANCE_DOUBLE(
-        LCTL(LALT(LSFT(KC_S))),     // tap once for iRacing screenshot (must be enabled in options)
-        LGUI(KC_PSCR)               // tap twice for Windows print screen and save to file
-    ),
-    [TD_CAM_UP] = ACTION_TAP_DANCE_FN(cam_up),
-    [TD_CAM_DN] = ACTION_TAP_DANCE_FN(cam_down)
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [DEF_LAYER] = LAYOUT_ortho_6x4( /* Base */
-
-    TD(TD_CAM_UP),  // next cam, double tap for reverse chase cam
-    KC_V,           // next car
-    LSFT(KC_P3),    // next lap
-    LCTL(KC_P3),    // next inc
-
-    TD(TD_CAM_DN),  // prev cam, double tap for chase cam
-    TD(TD_CAR),     // prev car, double tap for my car
-    LSFT(KC_P1),    // prev lap
-    LCTL(KC_P1),    // prev inc
-
-    LSFT(KC_P4),    // rewind
-    KC_P5,          // play/pause
-    LSFT(KC_P6),    // fast forward
-    KC_P8,          // slow mo
-
-    KC_P4,          // prev frame
-    KC_W,           // up
-    KC_P6,          // next frame
-    TD(TD_PRINT),   // print screen
-
-    KC_A,           // left
-    KC_S,           // down
-    KC_D,           // right
-    LALT(KC_K),     // toggle click and drag ui elements (in car)
-
-    KC_LCTL,        // ctrl 
-    KC_LALT,        // alt
-    LCTL(KC_F12),   // camera tool
-    LT(MOD_LAYER, KC_SPACE)        // press once for UI, hold for MOD layer
-  ),
-
-  [MOD_LAYER] = LAYOUT_ortho_6x4( /* Base */
-
-    KC_B,           // next sub cam
-    KC_PGUP,        // next driver cam
-    LCTL(KC_P6),    // next session
-    KC_P7,          // start
-
-    LSFT(KC_B),     // prev sub cam
-    KC_PGDN,        // prev driver cam
-    LCTL(KC_P4),    // prev session
-    KC_P1,          // end
-
-    KC_RBRC,        // FOV up
-    KC_EQL,         // step factor up 
-    _______,
-    _______,
-
-    KC_LBRC,        // FOV down
-    KC_MINS,        // step factor down
-    _______,
-    _______,
-
-    _______,
-    _______,
-    _______,
-    _______,
-
-    _______,
-    LALT(KC_M),     // cycle aim
-    RALT(KC_ENTER), // fullscreen (unreliable)
-    _______
-  ),
-};
diff --git a/keyboards/kbdfans/kbdpad/mk2/keymaps/iracing_replay/readme.md b/keyboards/kbdfans/kbdpad/mk2/keymaps/iracing_replay/readme.md
deleted file mode 100644
index a574499c6b3..00000000000
--- a/keyboards/kbdfans/kbdpad/mk2/keymaps/iracing_replay/readme.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# iRacing Replay Tool
-
-![](https://imgur.com/0948eBGh.jpg)
-
-Replay/camera tool for iRacing.  This uses the default keybindings for the game so nothing should need to be mapped.  This makes replays much easier to view in VR and makes waiting through heats a lot more enjoyable.
-
-To make full use of the arrow keys open the camera tool (you can close the UI after) and optionally switch the AIM to static.
-
-The code to generate stl files for the keycap set are ![available here.](https://github.com/AaronVerDow/KeyV2/blob/numpad/src/layouts/numpad/iracing.scad)
-
-Other notes:
-* Hold MOD (UI key) to access features on the front of 
-* Double tap car down is a shortcut for your car
-* Double tap cam down is a shortcut for chase cam
-* Double tap cam up is a shortcut for reverse chase cam
-* The record button takes a screenshot using iRacing.  Double tap record button to auto save a screenshot using Windows.
-* The key above UI is unassigned  
diff --git a/keyboards/kbdfans/kbdpad/mk2/keymaps/iracing_replay/rules.mk b/keyboards/kbdfans/kbdpad/mk2/keymaps/iracing_replay/rules.mk
deleted file mode 100644
index e5ddcae8d92..00000000000
--- a/keyboards/kbdfans/kbdpad/mk2/keymaps/iracing_replay/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-TAP_DANCE_ENABLE = yes
diff --git a/keyboards/kbdfans/niu_mini/keymaps/planck/config.h b/keyboards/kbdfans/niu_mini/keymaps/planck/config.h
deleted file mode 100644
index 0c42bb50602..00000000000
--- a/keyboards/kbdfans/niu_mini/keymaps/planck/config.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-#define MUSIC_MASK (keycode != KC_NO)
-
-/*
- * MIDI options
- */
-
-/* enable basic MIDI features:
-   - MIDI notes can be sent when in Music mode is on
-*/
-
-#define MIDI_BASIC
-
-/* enable advanced MIDI features:
-   - MIDI notes can be added to the keymap
-   - Octave shift and transpose
-   - Virtual sustain, portamento, and modulation wheel
-   - etc.
-*/
-//#define MIDI_ADVANCED
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
-#endif
diff --git a/keyboards/kbdfans/niu_mini/keymaps/planck/keymap.c b/keyboards/kbdfans/niu_mini/keymaps/planck/keymap.c
deleted file mode 100644
index fb82d320a4f..00000000000
--- a/keyboards/kbdfans/niu_mini/keymaps/planck/keymap.c
+++ /dev/null
@@ -1,261 +0,0 @@
-/* Copyright 2015-2017 Jack Humbert
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-enum layers {
-  _QWERTY,
-  _COLEMAK,
-  _DVORAK,
-  _LOWER,
-  _RAISE,
-  _PLOVER,
-  _ADJUST
-};
-
-enum keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  DVORAK,
-  PLOVER,
-  LOWER,
-  RAISE,
-  BACKLIT,
-  EXT_PLV
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT_planck_mit(
-  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-  KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT ,
-  BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,       KC_SPC,       RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Colemak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_COLEMAK] = LAYOUT_planck_mit(
-  KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-  KC_ESC,  KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
-  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT ,
-  BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,       KC_SPC,       RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Dvorak
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_DVORAK] = LAYOUT_planck_mit(
-  KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC,
-  KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
-  KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_ENT ,
-  BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,       KC_SPC,       RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | | Home | End  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT_planck_mit(
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR,    KC_ASTR,    KC_LPRN, KC_RPRN, KC_BSPC,
-  KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS,    KC_PLUS,    KC_LCBR, KC_RCBR, KC_PIPE,
-  _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  S(KC_NUHS), S(KC_NUBS), KC_HOME, KC_END,  _______,
-  _______, _______, _______, _______, _______,     _______,      _______,    KC_MNXT,    KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |Pg Up |Pg Dn |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT_planck_mit(
-  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
-  KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
-  _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, _______,
-  _______, _______, _______, _______, _______,     _______,      _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-),
-
-/* Plover layer (http://opensteno.org)
- * ,-----------------------------------------------------------------------------------.
- * |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |   S  |   T  |   P  |   H  |   *  |   *  |   F  |   P  |   L  |   T  |   D  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |   S  |   K  |   W  |   R  |   *  |   *  |   R  |   B  |   G  |   S  |   Z  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Exit |      |      |   A  |   O  |             |   E  |   U  |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-
-[_PLOVER] = LAYOUT_planck_mit(
-  KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,
-  XXXXXXX, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,
-  XXXXXXX, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-  EXT_PLV, XXXXXXX, XXXXXXX, KC_C,    KC_V,        XXXXXXX,      KC_N,    KC_M,    XXXXXXX, XXXXXXX, XXXXXXX
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|Plover|      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT_planck_mit(
-  _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
-  _______, _______, MU_NEXT, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
-  _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______,     _______,      _______, _______, _______, _______, _______
-)
-
-
-};
-
-#ifdef AUDIO_ENABLE
-  float plover_song[][2]     = SONG(PLOVER_SOUND);
-  float plover_gb_song[][2]  = SONG(PLOVER_GOODBYE_SOUND);
-#endif
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        print("mode just switched to qwerty and this is a huge string\n");
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_COLEMAK);
-      }
-      return false;
-      break;
-    case DVORAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_DVORAK);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case BACKLIT:
-      if (record->event.pressed) {
-        register_code(KC_RSFT);
-        #ifdef BACKLIGHT_ENABLE
-          backlight_step();
-        #endif
-      } else {
-        unregister_code(KC_RSFT);
-      }
-      return false;
-      break;
-    case PLOVER:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          stop_all_notes();
-          PLAY_SONG(plover_song);
-        #endif
-        layer_off(_RAISE);
-        layer_off(_LOWER);
-        layer_off(_ADJUST);
-        layer_on(_PLOVER);
-        if (!eeconfig_is_enabled()) {
-            eeconfig_init();
-        }
-        keymap_config.raw = eeconfig_read_keymap();
-        keymap_config.nkro = 1;
-        eeconfig_update_keymap(keymap_config.raw);
-      }
-      return false;
-      break;
-    case EXT_PLV:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(plover_gb_song);
-        #endif
-        layer_off(_PLOVER);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/kbdfans/niu_mini/keymaps/planck/readme.md b/keyboards/kbdfans/niu_mini/keymaps/planck/readme.md
deleted file mode 100644
index de9680b4985..00000000000
--- a/keyboards/kbdfans/niu_mini/keymaps/planck/readme.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# The Default Planck Layout
-
diff --git a/keyboards/kbdfans/odinmini/info.json b/keyboards/kbdfans/odinmini/info.json
index 19a854c4ce4..a9cb1a798fc 100644
--- a/keyboards/kbdfans/odinmini/info.json
+++ b/keyboards/kbdfans/odinmini/info.json
@@ -5,8 +5,6 @@
     "bootloader": "rp2040",
     "diode_direction": "COL2ROW",
     "features": {
-        "audio": false,
-        "backlight": false,
         "bootmagic": true,
         "command": false,
         "extrakey": true,
diff --git a/keyboards/kbdfans/tiger80/info.json b/keyboards/kbdfans/tiger80/info.json
index 1a2258deea8..9761cb892d0 100644
--- a/keyboards/kbdfans/tiger80/info.json
+++ b/keyboards/kbdfans/tiger80/info.json
@@ -4,8 +4,6 @@
     "maintainer": "kbdfans",
     "bootloader": "atmel-dfu",
     "features": {
-        "audio": false,
-        "backlight": false,
         "bootmagic": true,
         "command": false,
         "console": false,
diff --git a/keyboards/kbdfans/tiger80/keymaps/micros24/keymap.c b/keyboards/kbdfans/tiger80/keymaps/micros24/keymap.c
deleted file mode 100644
index 6b9b70a8a4c..00000000000
--- a/keyboards/kbdfans/tiger80/keymaps/micros24/keymap.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/* Copyright 2022 micros24 <jasperjano.ph@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-
-enum layers {
-    _LAYER0
-};
-
-enum custom_keycodes {
-	M_CHARSELECT = SAFE_RANGE,
-	TAPHOLD_RALT,
-	TAPHOLD_RCTRL
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    [_LAYER0] = LAYOUT_tkl_f13_ansi_tsangan(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_MPLY,    KC_PSCR, KC_VOLD, KC_VOLU,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,    KC_DEL,  KC_END,  KC_PGDN,
-        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
-        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,             KC_UP,
-        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                      TAPHOLD_RALT, M_CHARSELECT, TAPHOLD_RCTRL,    KC_LEFT, KC_DOWN, KC_RGHT
-    )
-
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-	static uint16_t my_hash_timer;
-    switch (keycode) {
-		/* RWIN key */
-		case M_CHARSELECT:
-			tap_code(KC_F9);
-			wait_ms(100);
-			tap_code(KC_ENT);
-			break;
-		/* RALT key */
-		case TAPHOLD_RALT:
-			if(record->event.pressed) {
-				my_hash_timer = timer_read();
-				register_code(KC_RALT); // Change the key to be held here
-			} 
-			else {
-				unregister_code(KC_RALT); // Change this key to be the same as above
-				if (timer_elapsed(my_hash_timer) < TAPPING_TERM) {
-					tap_code(KC_MPRV); // The key to be pressed on tap
-				}
-			}
-			return false; // We handled this keypress
-			break;
-		/* RCTRL key */
-		case TAPHOLD_RCTRL:
-					if(record->event.pressed) {
-				my_hash_timer = timer_read();
-				register_code(KC_RCTL); // Change the key to be held here
-			} 
-			else {
-				unregister_code(KC_RCTL); // Change this key to be the same as above
-				if (timer_elapsed(my_hash_timer) < TAPPING_TERM) {
-					tap_code(KC_MNXT); // The key to be pressed on tap
-				}
-			}
-			break;
-			return false; // We handled this keypress
-    }
-    return true;
-};
\ No newline at end of file
diff --git a/keyboards/kbdfans/tiger80/keymaps/micros24/readme.md b/keyboards/kbdfans/tiger80/keymaps/micros24/readme.md
deleted file mode 100644
index 30e28e5f070..00000000000
--- a/keyboards/kbdfans/tiger80/keymaps/micros24/readme.md
+++ /dev/null
@@ -1,15 +0,0 @@
-## KEYMAP BY MICROS24
-Keymap by Micros24 for optimized gaming performance and media controls. RGB underglow is disabled as I don't use it.
-* SCROLL LOCK and PAUSE BREAK keys have been replaced with VOL- and VOL+ respectively.
-* F13 have been replaced with PLAY/PAUSE MEDIA.
-* RWIN is configured as F9 + ENTER macro.
-
-RALT and RCTRL have tap and hold configured as follows:
-
-RALT:
-* TAP is configured as PREVIOUS MEDIA
-* HOLD is configured as normal RALT
-
-RCTRL:
-* TAP is configured as NEXT MEDIA
-* HOLD is configured as normal RCTRL
\ No newline at end of file
diff --git a/keyboards/kbdfans/tiger80/keymaps/micros24/rules.mk b/keyboards/kbdfans/tiger80/keymaps/micros24/rules.mk
deleted file mode 100644
index 670e7c89075..00000000000
--- a/keyboards/kbdfans/tiger80/keymaps/micros24/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-RGBLIGHT_ENABLE = no
-MOUSEKEY_ENABLE = no
-DEBOUNCE_TYPE = sym_eager_pk
-VIA_ENABLE = yes
-LTO_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/kc60/keymaps/dbroqua_hhkb/keymap.c b/keyboards/kc60/keymaps/dbroqua_hhkb/keymap.c
deleted file mode 100644
index 2189e5bc5c3..00000000000
--- a/keyboards/kc60/keymaps/dbroqua_hhkb/keymap.c
+++ /dev/null
@@ -1,51 +0,0 @@
-
-#include QMK_KEYBOARD_H
-
-enum layer_names {
-    _QWERTY,
-    _FN
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Qwerty
-     * ,-----------------------------------------------------------------------------------------.
-     * | Esc |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |  \  |  `  |
-     * |-----------------------------------------------------------------------------------------+
-     * | Tab    |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |  Bksp  |
-     * |-----------------------------------------------------------------------------------------+
-     * | Ctrl    |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |    Enter    |
-     * |-----------------------------------------------------------------------------------------+
-     * | Shift     |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  | RShift    | FN  |
-     * |-----------------------------------------------------------------------------------------+
-     *         | LGUI  | LAlt  |               Space             | RAlt  | RGUI  |
-     *         `-----------------------------------------------------------------'
-     */
-    [0] = LAYOUT_all( /* Basic QWERTY */
-        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_GRV,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,
-        KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NO,   KC_ENT,
-        KC_LSFT, KC_NO,   KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(_FN),
-        _______, KC_LGUI, KC_LALT,                   KC_SPC,                                      KC_RALT, KC_RGUI, _______, _______
-    ),
-
-    /* Layer 1
-     * ,-----------------------------------------------------------------------------------------.
-     * |     | F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9  | F10 | F11 | F12 | Ins | Del |
-     * |-----------------------------------------------------------------------------------------+
-     * |  CAPS  | Led | Led-| Led+|     |     |     |     | Psc | Slck| Paus| Up  |     |        |
-     * |-----------------------------------------------------------------------------------------+
-     * |         | Vol-| Vol+| Mute|     |     | *   | /   | Home| PgUp| Left|Right|             |
-     * |-----------------------------------------------------------------------------------------+
-     * |           | Prev| Play| Next|     |     | +   | -   | End  |PgDn| Down|           |     |
-     * |-----------------------------------------------------------------------------------------+
-     *         |       |       |                                 | Stop  |       |
-     *         `-----------------------------------------------------------------'
-     */
-    [_FN] = LAYOUT_all( /* Layer 1 */
-        _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL,
-        KC_CAPS, BL_TOGG, BL_UP,   BL_DOWN, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   _______, _______,
-        _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, _______,
-        _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN, _______, _______,
-        _______, _______, _______,                   _______,                                     KC_MSTP, _______, _______, _______
-    )
-};
diff --git a/keyboards/kc60/keymaps/dbroqua_hhkb/readme.md b/keyboards/kc60/keymaps/dbroqua_hhkb/readme.md
deleted file mode 100644
index be99a3bc7e7..00000000000
--- a/keyboards/kc60/keymaps/dbroqua_hhkb/readme.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Dbroqua HHKB like Layout
-
-Like the HHKB but with a KC60 PCB :D.
-
-# Programming Instructions:
-Enter into programming mode and run the following command.
-```
-$ sudo KEYMAP=dbroqua_hhkb make dfu
-```
\ No newline at end of file
diff --git a/keyboards/kc60/keymaps/wigguno/keymap.c b/keyboards/kc60/keymaps/wigguno/keymap.c
deleted file mode 100644
index ba4571c4e4e..00000000000
--- a/keyboards/kc60/keymaps/wigguno/keymap.c
+++ /dev/null
@@ -1,52 +0,0 @@
-// This keymap was designed to close to the default kc60 layout, with some useful changes, such as adding media keys.
-// It also moves the reset key off the base layer, as in the default kc60 layout for this firmware.
-// I have swapped FN and RGUI as my rainbow keyset has them in the opposite order.
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    /* Basic QWERTY
-     * ,-----------------------------------------------------------.
-     * |Esc | 1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp |
-     * |-----------------------------------------------------------|
-     * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \  |
-     * |-----------------------------------------------------------|
-     * |CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |
-     * |-----------------------------------------------------------|
-     * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift     |
-     * |-----------------------------------------------------------|
-     * |Ctrl|Gui |Alt |      Space            |Alt |FN  |Gui |Ctrl |
-     * `-----------------------------------------------------------'
-     */
-    [0] = LAYOUT_all(
-        KC_ESC,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_NO,
-        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,
-        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_NO,    KC_ENT,
-        KC_LSFT,  KC_NO,    KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,  KC_NO,
-        KC_LCTL,  KC_LGUI,  KC_LALT,                      KC_SPC,                                           KC_RALT,  MO(1),    KC_RGUI,  KC_RCTL
-    ),
-
-    /*
-     * ,-----------------------------------------------------------.
-     * | `  |F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12| Del   |
-     * |-----------------------------------------------------------|
-     * |     |   | Up|   |   |   |   |   |   |   | PS|   |   |     |
-     * |-----------------------------------------------------------|
-     * |       |Lft|Dwn|Rgt|   |BL-|BL+|   |   |   |   |   |       |
-     * |-----------------------------------------------------------|
-     * |        |Prv| PP|Nxt|   |   |   |   |Hom|End|   |          |
-     * |-----------------------------------------------------------|
-     * | Rst|    |    |          BL           |    |    |    |     |
-     * `-----------------------------------------------------------'
-     * PS = Print Screen
-     * PP = Play/Pause
-     */
-    [1] = LAYOUT_all( /* Function Layer */
-        KC_GRV,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_DEL,   KC_NO,
-        KC_TRNS,  KC_TRNS,  KC_UP,    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_PSCR,  KC_TRNS,  KC_TRNS,  KC_TRNS,
-        KC_TRNS,  KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_TRNS,  BL_DOWN,  BL_UP,    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
-        KC_TRNS,  KC_TRNS,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_HOME,  KC_END,   KC_TRNS,  KC_TRNS,  KC_TRNS,
-        QK_BOOT,  KC_TRNS,  KC_TRNS,                      BL_TOGG,                                          KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS
-    ),
-};
diff --git a/keyboards/kc60/keymaps/wigguno/readme.md b/keyboards/kc60/keymaps/wigguno/readme.md
deleted file mode 100644
index 55a9f60c7c7..00000000000
--- a/keyboards/kc60/keymaps/wigguno/readme.md
+++ /dev/null
@@ -1,14 +0,0 @@
-Wigguno's KC60 Layout
-======================
-
-## Quantum MK Firmware
-For the full Quantum feature list, see [the parent readme.md](/readme.md).
-
-## Changes from default QMK layout
-The default QMK layout for KC60 does not have a function layer. It also has the bootloader-mode reset key bound. This keymap fixes both of these by adding a sensible function layer (including moving the reset key onto it, far away from the FN key).
-
-### Changes from the default KC60 layout
-The default KC60 layout is good, but it was missing media keys. I've added previous, play/pause and next. I've also removed some of the keys from the function layer I didn't use.
-
-### Build
-To enable NKRO you must be in the keymaps/wigguno directory when running make.
diff --git a/keyboards/kc60/keymaps/wigguno/rules.mk b/keyboards/kc60/keymaps/wigguno/rules.mk
deleted file mode 100644
index f9b4b86766b..00000000000
--- a/keyboards/kc60/keymaps/wigguno/rules.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = no         # Commands for debug and configuration
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-NKRO_ENABLE = yes           # USB Nkey Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-AUDIO_ENABLE = no           # Audio output on port C6
diff --git a/keyboards/keebio/bamfk1/config.h b/keyboards/keebio/bamfk1/config.h
index 6fd93072f52..46fd4d73169 100644
--- a/keyboards/keebio/bamfk1/config.h
+++ b/keyboards/keebio/bamfk1/config.h
@@ -8,25 +8,3 @@
 #    define STARTUP_SONG SONG(STARTUP_SOUND)
 #endif
 
-#define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2)
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* 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/keebio/bamfk1/info.json b/keyboards/keebio/bamfk1/info.json
index 4fa563f0e88..09e7edbd185 100644
--- a/keyboards/keebio/bamfk1/info.json
+++ b/keyboards/keebio/bamfk1/info.json
@@ -1,52 +1,112 @@
 {
-    "keyboard_name": "BAMFK-1",
     "manufacturer": "Keebio",
-    "url": "https://keeb.io",
+    "keyboard_name": "BAMFK-1",
     "maintainer": "nooges",
-    "usb": {
-        "vid": "0xCB10",
-        "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"
-    },
+    "bootloader": "atmel-dfu",
     "encoder": {
         "rotary": [
             {"pin_a": "C7", "pin_b": "B5"},
             {"pin_a": "D7", "pin_b": "D4"}
         ]
     },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "rgb_matrix": true
+    },
     "matrix_pins": {
         "direct": [
             ["E6", "B6", "D6"]
         ]
     },
+    "processor": "atmega32u4",
+    "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_sat": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "band_val": true,
+            "breathing": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "cycle_up_down": true,
+            "digital_rain": true,
+            "dual_beacon": true,
+            "gradient_left_right": true,
+            "gradient_up_down": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "jellybean_raindrops": true,
+            "multisplash": true,
+            "pixel_flow": true,
+            "pixel_fractal": true,
+            "pixel_rain": true,
+            "rainbow_beacon": true,
+            "rainbow_moving_chevron": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "solid_multisplash": true,
+            "solid_reactive": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_multinexus": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_wide": true,
+            "solid_splash": true,
+            "splash": true,
+            "typing_heatmap": true
+        },
+        "default": {
+            "animation": "cycle_pinwheel",
+            "speed": 48
+        },
+        "driver": "ws2812",
+        "layout": [
+            {"x": 56, "y": 0, "flags": 4},
+            {"x": 168, "y": 0, "flags": 4},
+            {"x": 224, "y": 16, "flags": 4},
+            {"x": 224, "y": 48, "flags": 4},
+            {"matrix": [0, 2], "x": 168, "y": 64, "flags": 4},
+            {"matrix": [0, 1], "x": 56, "y": 64, "flags": 4},
+            {"x": 0, "y": 48, "flags": 4},
+            {"x": 0, "y": 16, "flags": 4},
+            {"x": 0, "y": 0, "flags": 2},
+            {"x": 112, "y": 0, "flags": 2},
+            {"x": 224, "y": 0, "flags": 2},
+            {"x": 224, "y": 32, "flags": 2},
+            {"x": 224, "y": 64, "flags": 2},
+            {"x": 112, "y": 64, "flags": 2},
+            {"x": 224, "y": 64, "flags": 2},
+            {"matrix": [0, 0], "x": 112, "y": 32, "flags": 2}
+        ],
+        "sleep": true
+    },
+    "url": "https://keeb.io",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x1211",
+        "vid": "0xCB10"
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"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]}
+                {"matrix": [0, 0], "x": 1, "y": 0, "w": 2, "h": 2},
+                {"matrix": [0, 1], "x": 0, "y": 2.25},
+                {"matrix": [0, 2], "x": 3, "y": 2.25}
             ]
         }
     }
diff --git a/keyboards/keebio/bamfk1/rules.mk b/keyboards/keebio/bamfk1/rules.mk
index 21df40039e9..6e7633bfe01 100644
--- a/keyboards/keebio/bamfk1/rules.mk
+++ b/keyboards/keebio/bamfk1/rules.mk
@@ -1,14 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = yes          # Audio output
-ENCODER_ENABLE = yes
-LTO_ENABLE = yes
+# This file intentionally left blank
diff --git a/keyboards/keebio/bdn9/keymaps/mousepad/config.h b/keyboards/keebio/bdn9/keymaps/mousepad/config.h
deleted file mode 100644
index a2eb1a95f00..00000000000
--- a/keyboards/keebio/bdn9/keymaps/mousepad/config.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#define MK_3_SPEED
-#define TERMINAL_HELP
-
diff --git a/keyboards/keebio/bdn9/keymaps/mousepad/keymap.c b/keyboards/keebio/bdn9/keymaps/mousepad/keymap.c
deleted file mode 100644
index 268dd8002ab..00000000000
--- a/keyboards/keebio/bdn9/keymaps/mousepad/keymap.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/* Copyright 2019 Danny Nguyen <danny@keeb.io>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-
-
-bool is_alt_tab_active = false;    // ADD this near the begining of keymap.c
-uint16_t alt_tab_timer = 0;        // we will be using them soon.
-
-enum custom_keycodes {             // Make sure have the awesome keycode ready
-  ALT_TAB = SAFE_RANGE,
-};
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT(
-        KC_MS_BTN1, KC_MS_BTN2, KC_MS_BTN3,
-        KC_WH_U, ALT_TAB, KC_WH_L,
-        KC_WH_D, TT(1), KC_WH_R
-    ),
-    [1] = LAYOUT(
-        QK_BOOT, KC_ACL0, KC_ACL1,
-        KC_VOLU, KC_ACL2, KC_BRIU,
-        KC_VOLD, TO(1),  KC_BRID
-    ),
-};
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (index == 0) {
-        if (clockwise) {
-            tap_code(KC_MS_LEFT);
-        } else {
-            tap_code(KC_MS_RIGHT);
-        }
-    }
-    else if (index == 1) {
-        if (clockwise) {
-            tap_code(KC_MS_U);
-        } else {
-            tap_code(KC_MS_D);
-        }
-    }
-    return true;
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {               // This will do most of the grunt work with the keycodes.
-    case ALT_TAB:
-      if (record->event.pressed) {
-        if (!is_alt_tab_active) {
-          is_alt_tab_active = true;
-          register_code(KC_LALT);
-        }
-        alt_tab_timer = timer_read();
-        register_code(KC_TAB);
-      } else {
-        unregister_code(KC_TAB);
-      }
-      break;
-  }
-  return true;
-}
-
-void matrix_scan_user(void) {     // The very important timer.
-  if (is_alt_tab_active) {
-    if (timer_elapsed(alt_tab_timer) > 1000) {
-      unregister_code(KC_LALT);
-      is_alt_tab_active = false;
-    }
-  }
-}
diff --git a/keyboards/keebio/bdn9/keymaps/mousepad/readme.md b/keyboards/keebio/bdn9/keymaps/mousepad/readme.md
deleted file mode 100644
index fc843929dbd..00000000000
--- a/keyboards/keebio/bdn9/keymaps/mousepad/readme.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Mousepad layout for BDN9
-##### 2 encoders required
-Why use a movable mouse when you can "Etech-a-sketch" style mousepad. 
-The left encoder will move the X axis; leaving the right to handle the Y axis
-
-|   |   |   |
-|:-:|:-:|:-:|
-| Left Click | Middle Click | Right Click |
-| Scroll Up | Super ALT↯TAB | Scroll Left |
-| Scroll Down | ADJUSTMENT Layer | Scroll Right|
-
-|   |   |   |
-|:-:|:-:|:-:|
-| RESET | Mouse ACL0 | Mouse ACL1 |
-| VOL UP | Mouse ACL2 | Brightness UP |
-| VOL Down | Adjustment Layer OFF | Brightness Down |
diff --git a/keyboards/keebio/bdn9/keymaps/mousepad/rules.mk b/keyboards/keebio/bdn9/keymaps/mousepad/rules.mk
deleted file mode 100644
index ff752ab42ce..00000000000
--- a/keyboards/keebio/bdn9/keymaps/mousepad/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-MOUSEKEY_ENABLE = yes
-TAPDANCE_ENABLE = yes
diff --git a/keyboards/keebio/convolution/info.json b/keyboards/keebio/convolution/info.json
index 5e05d70ace3..9ea761c1a9f 100644
--- a/keyboards/keebio/convolution/info.json
+++ b/keyboards/keebio/convolution/info.json
@@ -10,9 +10,7 @@
         "console": true,
         "extrakey": true,
         "mousekey": false,
-        "nkro": false,
-        "unicode": false,
-        "backlight": false
+        "nkro": false
     },
     "layout_aliases": {"LAYOUT": "LAYOUT_all"}
 }
diff --git a/keyboards/keebio/convolution/rev1/info.json b/keyboards/keebio/convolution/rev1/info.json
index 5ff7c1f8f02..68ac532620b 100644
--- a/keyboards/keebio/convolution/rev1/info.json
+++ b/keyboards/keebio/convolution/rev1/info.json
@@ -9,8 +9,6 @@
     "diode_direction": "COL2ROW",
     "features": {
         "console": true,
-        "rgblight": false,
-        "backlight": false,
         "rgb_matrix": true
     },
     "matrix_pins": {
diff --git a/keyboards/keebio/dsp40/keymaps/bakingpy/config.h b/keyboards/keebio/dsp40/keymaps/bakingpy/config.h
deleted file mode 100644
index 21bdbf97e3b..00000000000
--- a/keyboards/keebio/dsp40/keymaps/bakingpy/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2021 Danny Nguyen <danny@keeb.io>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#define TAPPING_TERM 150
diff --git a/keyboards/keebio/dsp40/keymaps/bakingpy/keymap.c b/keyboards/keebio/dsp40/keymaps/bakingpy/keymap.c
deleted file mode 100644
index 29414c0976e..00000000000
--- a/keyboards/keebio/dsp40/keymaps/bakingpy/keymap.c
+++ /dev/null
@@ -1,214 +0,0 @@
-/* Copyright 2021 Danny Nguyen <danny@keeb.io>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include QMK_KEYBOARD_H
-
-enum layer_names {
-    _MAC,
-    _WINDOWS,
-    _TESTMODE,
-    _LOWER,
-    _RAISE,
-    _FKEYS,
-    _ADJUST,
-};
-
-enum custom_keycodes {
-  MAC = SAFE_RANGE,
-  WINDOWS,
-  TESTMODE,
-  LOWER,
-  RAISE,
-  ADJUST,
-};
-
-#define KC_ KC_TRNS
-
-#define KC_CAPW LGUI(LSFT(KC_3))        // Capture whole screen
-#define KC_CPYW LGUI(LSFT(LCTL(KC_3)))  // Copy whole screen
-#define KC_CAPP LGUI(LSFT(KC_4))        // Capture portion of screen
-#define KC_CPYP LGUI(LSFT(LCTL(KC_4)))  // Copy portion of screen
-#define KC_ESCC MT(MOD_LCTL, KC_ESC)
-#define KC_LOWR LOWER
-#define KC_RASE RAISE
-#define KC_GRVF LT(_FKEYS, KC_GRV)
-#define KC_ENTS MT(MOD_LSFT, KC_ENT)
-#define KC_BL_S BL_STEP
-#define KC_BL_T BL_TOGG
-#define KC_RMOD RGB_MOD
-
-#ifndef LAYOUT_kc_ortho_4x12
-#define LAYOUT_kc_ortho_4x12( \
-    L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
-    L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
-    L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
-    L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35 \
-    ) \
-    LAYOUT_ortho_4x12( \
-        KC_##L00, KC_##L01, KC_##L02, KC_##L03, KC_##L04, KC_##L05, KC_##R00, KC_##R01, KC_##R02, KC_##R03, KC_##R04, KC_##R05, \
-        KC_##L10, KC_##L11, KC_##L12, KC_##L13, KC_##L14, KC_##L15, KC_##R10, KC_##R11, KC_##R12, KC_##R13, KC_##R14, KC_##R15, \
-        KC_##L20, KC_##L21, KC_##L22, KC_##L23, KC_##L24, KC_##L25, KC_##R20, KC_##R21, KC_##R22, KC_##R23, KC_##R24, KC_##R25, \
-        KC_##L30, KC_##L31, KC_##L32, KC_##L33, KC_##L34, KC_##L35, KC_##R30, KC_##R31, KC_##R32, KC_##R33, KC_##R34, KC_##R35 \
-    )
-
-#endif
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [_MAC] = LAYOUT_kc_ortho_4x12(
-  //┌────┬────┬────┬────┬────┬────┐    ┌────┬────┬────┬────┬────┬────┐
-     TAB , Q  , W  , E  , R  , T  ,      Y  , U  , I  , O  , P  ,MINS,
-  //├────┼────┼────┼────┼────┼────┤    ├────┼────┼────┼────┼────┼────┤
-     ESCC, A  , S  , D  , F  , G  ,      H  , J  , K  , L  ,SCLN,QUOT,
-  //├────┼────┼────┼────┼────┼────┤    ├────┼────┼────┼────┼────┼────┤
-     LSFT, Z  , X  , C  , V  , B  ,      N  , M  ,COMM,DOT ,SLSH,ENTS,
-  //├────┼────┼────┼────┼────┼────┤    ├────┼────┼────┼────┼────┼────┤
-     GRVF,LCTL,LALT,LGUI,LOWR,SPC ,     BSPC,RASE,LEFT,DOWN, UP ,RGHT
-  //└────┴────┴────┴────┴────┴────┘    └────┴────┴────┴────┴────┴────┘
-  ),
-
-  [_WINDOWS] = LAYOUT_kc_ortho_4x12(
-  //┌────┬────┬────┬────┬────┬────┐    ┌────┬────┬────┬────┬────┬────┐
-     TAB , Q  , W  , E  , R  , T  ,      Y  , U  , I  , O  , P  ,MINS,
-  //├────┼────┼────┼────┼────┼────┤    ├────┼────┼────┼────┼────┼────┤
-     ESCC, A  , S  , D  , F  , G  ,      H  , J  , K  , L  ,SCLN,QUOT,
-  //├────┼────┼────┼────┼────┼────┤    ├────┼────┼────┼────┼────┼────┤
-     LSFT, Z  , X  , C  , V  , B  ,      N  , M  ,COMM,DOT ,SLSH,ENTS,
-  //├────┼────┼────┼────┼────┼────┤    ├────┼────┼────┼────┼────┼────┤
-     GRVF,LALT,LGUI,LCTL,LOWR,SPC ,     BSPC,RASE,LEFT,DOWN, UP ,RGHT
-  //└────┴────┴────┴────┴────┴────┘    └────┴────┴────┴────┴────┴────┘
-  ),
-
-  [_TESTMODE] = LAYOUT_kc_ortho_4x12(
-  //┌────┬────┬────┬────┬────┬────┐    ┌────┬────┬────┬────┬────┬────┐
-     TAB , Q  , W  , E  , R  , T  ,      Y  , U  , I  , O  , P  ,MINS,
-  //├────┼────┼────┼────┼────┼────┤    ├────┼────┼────┼────┼────┼────┤
-     RMOD,BL_S, S  , D  , F  , G  ,     RMOD,BL_S, K  , L  ,SCLN,QUOT,
-  //├────┼────┼────┼────┼────┼────┤    ├────┼────┼────┼────┼────┼────┤
-     LSFT, Z  , X  , C  , V  , B  ,      N  , M  ,COMM,DOT ,SLSH,ENTS,
-  //├────┼────┼────┼────┼────┼────┤    ├────┼────┼────┼────┼────┼────┤
-     GRVF,LALT,LGUI,LCTL,LOWR,SPC ,     BSPC,RASE,LEFT,DOWN, UP ,RGHT
-  //└────┴────┴────┴────┴────┴────┘    └────┴────┴────┴────┴────┴────┘
-  ),
-
-  [_LOWER] = LAYOUT_kc_ortho_4x12(
-  //┌────┬────┬────┬────┬────┬────┐    ┌────┬────┬────┬────┬────┬────┐
-         , 1  , 2  , 3  , 4  , 5  ,      6  , 7  , 8  , 9  , 0  ,    ,
-  //├────┼────┼────┼────┼────┼────┤    ├────┼────┼────┼────┼────┼────┤
-     DEL ,CAPP,LEFT,RGHT, UP ,LBRC,     RBRC, P4 , P5 , P6 ,PLUS,PIPE,
-  //├────┼────┼────┼────┼────┼────┤    ├────┼────┼────┼────┼────┼────┤
-         ,CPYP,    ,    ,DOWN,LCBR,     RCBR, P1 , P2 , P3 ,MINS,    ,
-  //├────┼────┼────┼────┼────┼────┤    ├────┼────┼────┼────┼────┼────┤
-     BL_S,BL_T,    ,    ,    ,DEL ,     DEL ,    , P0 ,PDOT,    ,
-  //└────┴────┴────┴────┴────┴────┘    └────┴────┴────┴────┴────┴────┘
-  ),
-
-  [_RAISE] = LAYOUT_kc_ortho_4x12(
-  //┌────┬────┬────┬────┬────┬────┐    ┌────┬────┬────┬────┬────┬────┐
-         ,EXLM, AT ,HASH,DLR ,PERC,     CIRC,AMPR,ASTR,LPRN,RPRN,    ,
-  //├────┼────┼────┼────┼────┼────┤    ├────┼────┼────┼────┼────┼────┤
-     DEL ,MPRV,MNXT,VOLU,PGUP,UNDS,     EQL ,HOME,    ,    ,    ,BSLS,
-  //├────┼────┼────┼────┼────┼────┤    ├────┼────┼────┼────┼────┼────┤
-     MUTE,MSTP,MPLY,VOLD,PGDN,MINS,     PLUS,END ,    ,    ,    ,    ,
-  //├────┼────┼────┼────┼────┼────┤    ├────┼────┼────┼────┼────┼────┤
-         ,    ,    ,    ,    ,    ,         ,    ,    ,    ,    ,
-  //└────┴────┴────┴────┴────┴────┘    └────┴────┴────┴────┴────┴────┘
-  ),
-
-  [_FKEYS] = LAYOUT_kc_ortho_4x12(
-  //┌────┬────┬────┬────┬────┬────┐    ┌────┬────┬────┬────┬────┬────┐
-     F12 , F1 , F2 , F3 , F4 , F5 ,      F6 , F7 , F8 , F9 ,F10 ,F11 ,
-  //├────┼────┼────┼────┼────┼────┤    ├────┼────┼────┼────┼────┼────┤
-         ,    ,    ,    ,    ,    ,         ,    ,    ,    ,    ,    ,
-  //├────┼────┼────┼────┼────┼────┤    ├────┼────┼────┼────┼────┼────┤
-         ,    ,    ,    ,    ,    ,         ,    ,    ,    ,    ,    ,
-  //├────┼────┼────┼────┼────┼────┤    ├────┼────┼────┼────┼────┼────┤
-         ,    ,    ,    ,    ,    ,         ,    ,    ,    ,    ,
-  //└────┴────┴────┴────┴────┴────┘    └────┴────┴────┴────┴────┴────┘
-  ),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |      | Reset|RGB Tg|RGB Md|Hue Up|Hue Dn|Sat Up|Sat Dn|Val Up|Val Dn|      |      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-  [_ADJUST] = LAYOUT_ortho_4x12(
-    _______, QK_BOOT, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI,          RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, _______, _______,
-    _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM,          AG_SWAP, MAC,     WINDOWS, TESTMODE,_______, _______,
-    _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______
-  )
-
-
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case MAC:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_MAC);
-      }
-      return false;
-      break;
-    case WINDOWS:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_WINDOWS);
-      }
-      return false;
-      break;
-    case TESTMODE:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_TESTMODE);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case ADJUST:
-      if (record->event.pressed) {
-        layer_on(_ADJUST);
-      } else {
-        layer_off(_ADJUST);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/keebio/foldkb/keymaps/forrcaho/keymap.c b/keyboards/keebio/foldkb/keymaps/forrcaho/keymap.c
deleted file mode 100644
index 024a9aad2e6..00000000000
--- a/keyboards/keebio/foldkb/keymaps/forrcaho/keymap.c
+++ /dev/null
@@ -1,306 +0,0 @@
-/* Copyright 2022 Forrest Cahoon <forrest.cahoon@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-
-// Milliseconds the backlight is off (or on) when blinking to show
-// caps lock is on. In other words, half the time of a full blink cycle.
-#define CAPS_LOCK_BLINK_MS 350
-
-#include QMK_KEYBOARD_H
-
-enum layer {
-    _QWERTY,
-    _PG, // for "programming"
-    _MS, // for "mouse"
-};
-
-enum custom_keycodes {
-    PG_ARRO = SAFE_RANGE,
-    PG_BANG,
-    PG_ENDC,
-    PG_EQEQ,
-    PG_EQL,
-    PG_LBRK,
-    PG_LPAR,
-    PG_MINS,
-    PG_NEEQ,
-    PG_RBRK,
-    PG_RPAR,
-    PG_SLAS,
-    PG_VBAR,
-    MS_BTN,
-};
-
-// clang-format off
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT(
-// ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐        ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐
-    MS_BTN,  KC_ESC,  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,             KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
-// ├────────┼───┬────┴────────┼────────┼────────┼────────┼────────┼────────┤        ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-    MO(_PG),     KC_TAB,       KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,             KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
-// ├────────┼───┼─────────────┼────────┼────────┼────────┼────────┼────────┤        ├────────┼────────┼────────┼────────┼────────┼────────┼────────┴────────┤
-    MO(_MS),     KC_CAPS,      KC_A,    KC_S,    KC_D,    KC_F,    KC_G,             KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
-// ├────────┼───┴─────────────┼────────┼────────┼────────┼────────┼────────┤        ├────────┼────────┼────────┼────────┼────────┼────────┴────┬────────┬───┘
-    TG(_PG), KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,             KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,      TG(_MS),
-// ├────────┼───┬──────────┬──┴──────┬─┴────────┼────────┼────────┼────────┤        ├────────┴─┬──────┴──────┬─┴────────┼────────┴─┬─────────┬─┴────────┤
-    TG(_MS),     KC_LGUI,   KC_LCTL,  KC_LALT,   MO(_PG), KC_SPC,  KC_SPC,           KC_SPC,    KC_SPC,       MO(_PG),   KC_RALT,   KC_RCTL,  KC_RGUI
-// └────────┴───┴──────────┴─────────┴──────────┴────────┴────────┴────────┘        └──────────┴─────────────┴──────────┴──────────┴─────────┴──────────┘
-  ),
-  [_PG] = LAYOUT(
-// ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐        ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐
-    KC_MUTE, QK_BOOT, _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,            KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
-// ├────────┼───┬────┴────────┼────────┼────────┼────────┼────────┼────────┤        ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-    _______,     _______,      _______, PG_SLAS, PG_LPAR, PG_RPAR, PG_NEEQ,          _______, KC_HOME, KC_UP,   KC_PGUP, KC_INS,  _______, _______, _______,
-// ├────────┼───┼─────────────┼────────┼────────┼────────┼────────┼────────┤        ├────────┼────────┼────────┼────────┼────────┼────────┼────────┴────────┤
-    _______,     _______,      PG_ENDC, PG_VBAR, PG_LBRK, PG_RBRK, PG_EQEQ,          _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_BSPC,
-// ├────────┼───┴─────────────┼────────┼────────┼────────┼────────┼────────┤        ├────────┼────────┼────────┼────────┼────────┼────────┴────┬────────┬───┘
-    _______, _______,          _______, PG_MINS, PG_EQL,  PG_BANG, PG_ARRO,          _______, KC_END,  KC_DOWN, KC_PGDN, KC_DEL,  _______,      _______,
-// ├────────┼───┬──────────┬──┴──────┬─┴────────┼────────┼────────┼────────┤        ├────────┴─┬──────┴──────┬─┴────────┼────────┴─┬─────────┬─┴────────┤
-    _______,     _______,   _______,  _______,   _______, _______, _______,          _______,   _______,      _______,   _______,   _______,  _______
-// └────────┴───┴──────────┴─────────┴──────────┴────────┴────────┴────────┘        └──────────┴─────────────┴──────────┴──────────┴─────────┴──────────┘
-  ),
-  [_MS] = LAYOUT(
-// ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐        ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐
-    _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______, _______,
-// ├────────┼───┬────┴────────┼────────┼────────┼────────┼────────┼────────┤        ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-    _______,     _______,      _______, _______, _______, _______, _______,          _______, KC_BTN1, KC_MS_U, KC_BTN2, _______, _______, _______, _______,
-// ├────────┼───┼─────────────┼────────┼────────┼────────┼────────┼────────┤        ├────────┼────────┼────────┼────────┼────────┼────────┼────────┴────────┤
-    _______,     _______,      _______, _______, _______, _______, _______,          _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_BTN3, _______, _______,
-// ├────────┼───┴─────────────┼────────┼────────┼────────┼────────┼────────┤        ├────────┼────────┼────────┼────────┼────────┼────────┴────┬────────┬───┘
-    _______, _______,          _______, _______, _______, _______, _______,          _______, _______, KC_MS_D, _______, _______, _______,      _______,
-// ├────────┼───┬──────────┬──┴──────┬─┴────────┼────────┼────────┼────────┤        ├────────┴─┬──────┴──────┬─┴────────┼────────┴─┬─────────┬─┴────────┤
-    _______,     _______,   _______,  _______,   _______, _______, _______,          _______,   _______,      _______,   _______,   _______,  _______
-// └────────┴───┴──────────┴─────────┴──────────┴────────┴────────┴────────┘        └──────────┴─────────────┴──────────┴──────────┴─────────┴──────────┘
-  ),
-};
-// clang-format on
-
-const key_override_t pg_lbrk_none  = ko_make_with_layers_and_negmods(0, PG_LBRK, KC_LEFT_CURLY_BRACE, ~0, ~0);
-const key_override_t pg_lbrk_shift = ko_make_with_layers_and_negmods(MOD_MASK_SHIFT, PG_LBRK, KC_LEFT_BRACKET, ~0, ~MOD_MASK_SHIFT);
-
-const key_override_t pg_lpar_none  = ko_make_with_layers_and_negmods(0, PG_LPAR, KC_LEFT_PAREN, ~0, ~0);
-const key_override_t pg_lpar_shift = ko_make_with_layers_and_negmods(MOD_MASK_SHIFT, PG_LPAR, KC_LEFT_ANGLE_BRACKET, ~0, ~MOD_MASK_SHIFT);
-
-const key_override_t pg_rbrk_none  = ko_make_with_layers_and_negmods(0, PG_RBRK, KC_RIGHT_CURLY_BRACE, ~0, ~0);
-const key_override_t pg_rbrk_shift = ko_make_with_layers_and_negmods(MOD_MASK_SHIFT, PG_RBRK, KC_RIGHT_BRACKET, ~0, ~MOD_MASK_SHIFT);
-
-const key_override_t pg_rpar_none  = ko_make_with_layers_and_negmods(0, PG_RPAR, KC_RIGHT_PAREN, ~0, ~0);
-const key_override_t pg_rpar_shift = ko_make_with_layers_and_negmods(MOD_MASK_SHIFT, PG_RPAR, KC_RIGHT_ANGLE_BRACKET, ~0, ~MOD_MASK_SHIFT);
-
-const key_override_t pg_slas_none  = ko_make_with_layers_and_negmods(0, PG_SLAS, KC_SLASH, ~0, ~0);
-const key_override_t pg_slas_shift = ko_make_with_layers_and_negmods(MOD_MASK_SHIFT, PG_SLAS, KC_BACKSLASH, ~0, ~MOD_MASK_SHIFT);
-
-const key_override_t ms_btn_none  = ko_make_with_layers_and_negmods(0, MS_BTN, KC_MS_BTN1, ~0, ~0);
-const key_override_t ms_btn_shift = ko_make_with_layers_and_negmods(MOD_MASK_SHIFT, MS_BTN, KC_MS_BTN2, ~0, ~MOD_MASK_SHIFT);
-
-// clang-format off
-const key_override_t **key_overrides = (const key_override_t *[]){
-    &pg_lbrk_none, &pg_lbrk_shift,
-    &pg_lpar_none, &pg_lpar_shift,
-    &pg_rbrk_none, &pg_rbrk_shift,
-    &pg_rpar_none, &pg_rpar_shift,
-    &pg_slas_none, &pg_slas_shift,
-    &ms_btn_none, &ms_btn_shift,
-    NULL};
-// clang-format on
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    uint8_t std_mods     = get_mods();
-    uint8_t oneshot_mods = get_oneshot_mods();
-    uint8_t all_mods     = std_mods | oneshot_mods;
-    bool    shift_on     = all_mods & MOD_MASK_SHIFT;
-    bool    ctrl_on      = all_mods & MOD_MASK_CTRL;
-
-    // None of our special keycodes use ALT or GUI mods (so far), so we
-    // check once here at the top and let other code handle it if any of
-    // these are set.
-    if (all_mods & (MOD_MASK_ALT | MOD_MASK_GUI)) return true;
-
-    switch (keycode) {
-        case KC_CAPS:
-            // On caps lock release, if caps lock just got turned off, ensure that
-            // backlight is enabled when it stops blinking.
-            if (!record->event.pressed) {
-                if (!host_keyboard_led_state().caps_lock) {
-                    backlight_enable();
-                    // In this case, we want to continue processing
-                    return true;
-                }
-            }
-            break;
-        case PG_ARRO:
-            if (record->event.pressed) {
-                clear_mods();
-                clear_oneshot_mods();
-                if (shift_on) {
-                    if (!ctrl_on) SEND_STRING(" ");
-                    SEND_STRING("=>");
-                    if (!ctrl_on) SEND_STRING(" ");
-                } else {
-                    if (ctrl_on) SEND_STRING(" ");
-                    SEND_STRING("->");
-                    if (ctrl_on) SEND_STRING(" ");
-                }
-                set_mods(std_mods);
-                set_oneshot_mods(oneshot_mods);
-                return false;
-            }
-            break;
-        case PG_BANG:
-            if (record->event.pressed) {
-                clear_mods();
-                clear_oneshot_mods();
-                if (shift_on) {
-                    if (!ctrl_on) SEND_STRING(" ");
-                    SEND_STRING("*");
-                    if (!ctrl_on) SEND_STRING(" ");
-                } else {
-                    if (ctrl_on) SEND_STRING(" ");
-                    SEND_STRING("!");
-                    if (!ctrl_on) SEND_STRING(" ");
-                }
-                set_mods(std_mods);
-                set_oneshot_mods(oneshot_mods);
-                return false;
-            }
-            break;
-        case PG_ENDC:
-            if (record->event.pressed) {
-                clear_mods();
-                clear_oneshot_mods();
-                SEND_STRING(SS_TAP(X_END));
-                if (!shift_on) SEND_STRING(";");
-                if (!ctrl_on) SEND_STRING(SS_TAP(X_ENTER));
-                set_mods(std_mods);
-                set_oneshot_mods(oneshot_mods);
-                return false;
-            }
-            break;
-        case PG_EQEQ:
-            if (record->event.pressed) {
-                clear_mods();
-                clear_oneshot_mods();
-                if (!ctrl_on) SEND_STRING(" ");
-                shift_on ? SEND_STRING("==") : SEND_STRING("===");
-                if (!ctrl_on) SEND_STRING(" ");
-                set_mods(std_mods);
-                set_oneshot_mods(oneshot_mods);
-                return false;
-            }
-            break;
-        case PG_EQL:
-            if (record->event.pressed) {
-                clear_mods();
-                clear_oneshot_mods();
-                if (!ctrl_on) SEND_STRING(" ");
-                shift_on ? SEND_STRING("+") : SEND_STRING("=");
-                if (!ctrl_on) SEND_STRING(" ");
-                set_mods(std_mods);
-                set_oneshot_mods(oneshot_mods);
-                return false;
-            }
-            break;
-        case PG_MINS:
-            if (record->event.pressed) {
-                clear_mods();
-                clear_oneshot_mods();
-                if (shift_on) {
-                    if (ctrl_on) SEND_STRING(" ");
-                    SEND_STRING("_");
-                    if (ctrl_on) SEND_STRING(" ");
-                } else {
-                    if (!ctrl_on) SEND_STRING(" ");
-                    SEND_STRING("-");
-                    if (!ctrl_on) SEND_STRING(" ");
-                }
-                set_mods(std_mods);
-                set_oneshot_mods(oneshot_mods);
-                return false;
-            }
-            break;
-        case PG_NEEQ:
-            if (record->event.pressed) {
-                clear_mods();
-                clear_oneshot_mods();
-                if (!ctrl_on) SEND_STRING(" ");
-                shift_on ? SEND_STRING("!=") : SEND_STRING("!==");
-                if (!ctrl_on) SEND_STRING(" ");
-                set_mods(std_mods);
-                set_oneshot_mods(oneshot_mods);
-                return false;
-            }
-            break;
-        case PG_VBAR:
-            if (record->event.pressed) {
-                clear_mods();
-                clear_oneshot_mods();
-                if (!ctrl_on) SEND_STRING(" ");
-                shift_on ? SEND_STRING("&") : SEND_STRING("|");
-                if (!ctrl_on) SEND_STRING(" ");
-                set_mods(std_mods);
-                set_oneshot_mods(oneshot_mods);
-                return false;
-            }
-            break;
-    }
-    return true;
-}
-
-// I have only one encoder on my FoldKB and I want it to always be a scroll wheel.
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (clockwise) {
-        tap_code(KC_MS_WH_DOWN);
-    } else {
-        tap_code(KC_MS_WH_UP);
-    }
-    return false;
-}
-
-static uint16_t caps_lock_blink_timer = 0;
-
-// This is called after every matrix scan. We make the backlight blink
-// when caps lock is on here. To ensure the backlight is in the on state
-// when caps lock is turned off, we also watch for the relase of the caps
-// lock key in process_record_user().
-void housekeeping_task_user(void) {
-    if (host_keyboard_led_state().caps_lock) {
-        if (timer_elapsed(caps_lock_blink_timer) >= CAPS_LOCK_BLINK_MS) {
-             backlight_toggle();
-            caps_lock_blink_timer = timer_read();
-        }
-    }
-}
-
-// The backlight level shows which layer we are in:
-// Mouse layer: dim | QWERTY layer: medium | Programming layer: bright
-layer_state_t layer_state_set_user(layer_state_t state) {
-    switch (get_highest_layer(state)) {
-        case _MS:
-            backlight_level(1);
-            break;
-        case _PG:
-            backlight_level(3);
-            break;
-        default:
-            backlight_level(2);
-            break;
-    }
-    return state;
-}
-
-void keyboard_post_init(void) {
-    backlight_level(2);
-}
diff --git a/keyboards/keebio/foldkb/keymaps/forrcaho/readme.md b/keyboards/keebio/foldkb/keymaps/forrcaho/readme.md
deleted file mode 100644
index 74ac4507b86..00000000000
--- a/keyboards/keebio/foldkb/keymaps/forrcaho/readme.md
+++ /dev/null
@@ -1,23 +0,0 @@
-# Keebio FoldKB rev1
-
-My layout for the FoldKB has three layers:
-
-* A default standard QWERTY layer, 
-
-* a second "programming" layer with
-    * function keys for the corresponding numbers
-    * arrow and other navigation keys (such as home) on the right half, and
-    * various alternate keymappings and macros useful for programming on the
-    left half.
-
-* a third "mouse" layer with mouse keys on the right half. No special functions
-have been added to the left half for this layer (yet).
-
-This was written for a FoldKB with one encoder, and that is made to function as
-a mouse scroll wheel on all layers. Pressing it is a mouse left click and
-shift-pressing it is a mouse right click. (Presumably both encoders would do the
-same thing on a FoldKB with two.)
-
-The backgound lighting levels indicate the layer: dimmest for the default
-QWERTY layer, middle brightness for the mouse layer, and brightest for the
-programming layer.
diff --git a/keyboards/keebio/foldkb/keymaps/forrcaho/rules.mk b/keyboards/keebio/foldkb/keymaps/forrcaho/rules.mk
deleted file mode 100644
index 959e4286615..00000000000
--- a/keyboards/keebio/foldkb/keymaps/forrcaho/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-KEY_OVERRIDE_ENABLE = yes
-MOUSEKEY_ENABLE = yes
-ENCODER_ENABLE = yes
diff --git a/keyboards/keebio/fourier/keymaps/maxim/keymap.c b/keyboards/keebio/fourier/keymaps/maxim/keymap.c
deleted file mode 100644
index 23e65be4770..00000000000
--- a/keyboards/keebio/fourier/keymaps/maxim/keymap.c
+++ /dev/null
@@ -1,45 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-// The underscores don't mean anything - you can have a layer called STUFF or any other name.
-// Layer names don't all need to be of the same length, obviously, and you can also skip them
-// entirely and just use numbers.
-#define _BASE 0
-#define _FN1 1
-#define _FN2 2
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-};
-
-
-#define FN1 MO(_FN1)
-#define FN2 MO(_FN2)
-#define SPFN1 LT(_FN1, KC_SPACE)
-#define BSFN2 LT(_FN2, KC_BSPC)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_BASE] = LAYOUT(
-    KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_DEL,  KC_BSPC,
-    KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_QUOT,          KC_ENT,
-    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,             KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-    XXXXXXX, KC_LCTL, KC_LALT, XXXXXXX, KC_SPC,           FN1,                       KC_RCTL, KC_RGUI, FN2,  XXXXXXX
-  ),
-
-  [_FN1] = LAYOUT(
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,
-    QK_BOOT, RGB_HUI, RGB_SAI, RGB_VAI, KC_VOLU, KC_LBRC, KC_RBRC, KC_4,    KC_5,    KC_6,    KC_SCLN,          _______,
-    RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, KC_VOLD, KC_LCBR, KC_RCBR,          KC_1,    KC_2,    KC_3,    KC_UP,   _______,
-    RGB_TOG, _______, _______, _______, _______,          KC_DEL,                    KC_0,    KC_LEFT, KC_DOWN, KC_RGHT
-  ),
-
-  [_FN2] = LAYOUT(
-    KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_UNDS, KC_PLUS,
-    _______, _______, _______, KC_INS,  KC_PGUP, KC_HOME, _______, _______, _______, _______, KC_COLN,          _______,
-    _______, _______, _______, KC_DEL,  KC_PGDN, KC_END,  _______,          _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, KC_DEL,           _______,                   _______, _______, _______, _______
-  )
-
-};
diff --git a/keyboards/keebio/iris/keymaps/dvorak/config.h b/keyboards/keebio/iris/keymaps/dvorak/config.h
index 1fe07656475..0776d7e1798 100644
--- a/keyboards/keebio/iris/keymaps/dvorak/config.h
+++ b/keyboards/keebio/iris/keymaps/dvorak/config.h
@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MASTER_LEFT
 
-#undef RGBLED_NUM
+#undef RGBLIGHT_LED_COUNT
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -32,7 +32,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 12
+#define RGBLIGHT_LED_COUNT 12
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/keebio/quefrency/rev2/keymaps/xeal/config.h b/keyboards/keebio/quefrency/rev2/keymaps/xeal/config.h
deleted file mode 100644
index c87e45d053d..00000000000
--- a/keyboards/keebio/quefrency/rev2/keymaps/xeal/config.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-Copyright 2018 Danny Nguyen <danny@keeb.io>
-Copyright 2021 Roger Billerey-Mosier
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Use I2C or Serial, not both */
-
-//#define DEBUG_MATRIX_SCAN_RATE
-
-#define FORCE_NKRO
-
-#undef RGBLIGHT_EFFECT_SNAKE
-#undef RGBLIGHT_EFFECT_KNIGHT
-#undef RGBLIGHT_EFFECT_CHRISTMAS
-#undef RGBLIGHT_EFFECT_STATIC_GRADIENT
-#undef RGBLIGHT_EFFECT_RGB_TEST
-#undef RGBLIGHT_EFFECT_ALTERNATING
-#undef RGBLIGHT_EFFECT_TWINKLE
-
-#define LAYER_STATE_8BIT
-#define MAX_LAYER 3
diff --git a/keyboards/keebio/quefrency/rev2/keymaps/xeal/keymap.c b/keyboards/keebio/quefrency/rev2/keymaps/xeal/keymap.c
deleted file mode 100644
index 530ea8527f5..00000000000
--- a/keyboards/keebio/quefrency/rev2/keymaps/xeal/keymap.c
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright 2022 Danny Nguyen (@nooges)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-// The underscores don't mean anything - you can have a layer called STUFF or any other name.
-// Layer names don't all need to be of the same length, obviously, and you can also skip them
-// entirely and just use numbers.
-enum custom_layer {
-    _BASE,
-    _FN1,
-    _FN2,
-};
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_BASE] = LAYOUT_60(
-    KC_ESC,   KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,     KC_0,    KC_MINS, KC_EQL,  _______,  KC_BSPC,
-    KC_TAB,   KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,     KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
-    MO(_FN1), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,     KC_SCLN, KC_QUOT, KC_ENT,
-    KC_LSFT,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,   KC_SLSH, KC_RSFT, _______,
-    KC_LCTL,  KC_LGUI, KC_LALT, MO(_FN2),KC_SPC,           _______, KC_SPC,  KC_RALT, MO(_FN1), _______, KC_MENU, KC_RCTL
-  ),
-
-  [_FN1] = LAYOUT_60(
-    KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,  KC_DEL,
-    KC_CAPS, KC_PGUP, KC_UP,   KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_UP,   KC_PGDN, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS,
-    KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_HOME, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_INS,  KC_DEL,  KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END,  KC_END,  KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, _______,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-  ),
-
-  [_FN2] = LAYOUT_60(
-    KC_GRV,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  _______,  KC_TRNS,
-    _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______
-  )
-};
diff --git a/keyboards/keebio/quefrency/rev2/keymaps/xeal/rules.mk b/keyboards/keebio/quefrency/rev2/keymaps/xeal/rules.mk
deleted file mode 100644
index 3d5257b7b45..00000000000
--- a/keyboards/keebio/quefrency/rev2/keymaps/xeal/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-NKRO_ENABLE = yes            # Enable N-Key Rollover
-DEBOUNCE_TYPE = sym_eager_pk # Eager; per key
-CONSOLE_ENABLE = no          # debug console
-ENCODER_ENABLE = no
\ No newline at end of file
diff --git a/keyboards/keebio/rorschach/keymaps/insertsnideremarks/config.h b/keyboards/keebio/rorschach/keymaps/insertsnideremarks/config.h
deleted file mode 100644
index c02549e4779..00000000000
--- a/keyboards/keebio/rorschach/keymaps/insertsnideremarks/config.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#pragma once
-
-#define USE_I2C
-
-/* Select hand configuration */
-
-// #define MASTER_LEFT
-// #define MASTER_RIGHT
-#define EE_HANDS
-
-#define TAPPING_TERM 150
-#define TAPPING_TOGGLE 2
-
-// #undef RGBLED_NUM
-// #define RGBLED_NUM 12
-// #define RGBLIGHT_HUE_STEP 8
-// #define RGBLIGHT_SAT_STEP 8
-// #define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/keebio/rorschach/keymaps/insertsnideremarks/keymap.c b/keyboards/keebio/rorschach/keymaps/insertsnideremarks/keymap.c
deleted file mode 100644
index c2aa0c60fad..00000000000
--- a/keyboards/keebio/rorschach/keymaps/insertsnideremarks/keymap.c
+++ /dev/null
@@ -1,281 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-enum rorschach_layers {
-  _COLEMAK,   // Colemak (default layer)
-  _QWERTY,    // Qwerty
-  _NUMBERS,   // Numbers & Symbols
-  _NUMBERS2,  // Numbers & Function Keys (similar to _NUMBERS; used with _NUMBERS for tri-layer access to _ADJUST)
-  _FUNCTION,  // Function
-  _FUNCTION2, // Function 2 (identical as _FUNCTION; used to allow for easier use of space and backspace while using function layer arrows)
-  _NUMPAD,    // Numpad
-  _ADJUST,    // Adjust layer, accessed via tri-layer feature)
-  _ADJUST2    // Second Adjust layer, accessed outside of tri-layer feature)
-};
-
-enum rorschach_keycodes {
-  COLEMAK = SAFE_RANGE,
-  QWERTY,
-  NUMPAD = TG(_NUMPAD),
-  ADJUST = MO(_ADJUST2),
-  SPCFN  = LT(_FUNCTION, KC_SPC),
-  BSPCFN = LT(_FUNCTION2, KC_BSPC),
-  ENTNS  = LT(_NUMBERS, KC_ENT),
-  DELNS  = LT(_NUMBERS2, KC_DEL),
-  CTLESC = CTL_T(KC_ESC),
-  ALTAPP = ALT_T(KC_APP),
-  NKROTG = MAGIC_TOGGLE_NKRO,
-};
-
-//Tap Dance Declarations
-enum {
-  ADJ = 0,
-  LBCB,
-  RBCB,
-  EQPL,
-  PLEQ,
-  MNUN,
-  SLAS,
-  GVTL,
-  PPLEQ,
-  PMNUN,
-  PSLPAS
-};
-
-void dance_LAYER_finished(tap_dance_state_t *state, void *user_data) {
-  if (state->count == 2) {
-     layer_on(_ADJUST2);
-     set_oneshot_layer(_ADJUST2, ONESHOT_START);
-  }
-}
-void dance_LAYER_reset(tap_dance_state_t *state, void *user_data) {
-  if (state->count == 2) {
-     layer_off(_ADJUST2);
-     clear_oneshot_layer_state(ONESHOT_PRESSED);
-  }
-}
-
-tap_dance_action_t tap_dance_actions[] = {
-[ADJ]    = ACTION_TAP_DANCE_FN_ADVANCED(NULL, dance_LAYER_finished, dance_LAYER_reset),  //  Double-tap to activate Adjust layer via oneshot layer
-[LBCB]   = ACTION_TAP_DANCE_DOUBLE(KC_LBRC, KC_LCBR),  // Left bracket on a single-tap, left brace on a double-tap
-[RBCB]   = ACTION_TAP_DANCE_DOUBLE(KC_RBRC, KC_RCBR),  // Right bracket on a single-tap, right brace on a double-tap
-[EQPL]   = ACTION_TAP_DANCE_DOUBLE(KC_EQL, KC_PLUS),   // Plus sign on a single-tap, equal sign on a double-tap
-[PLEQ]   = ACTION_TAP_DANCE_DOUBLE(KC_PLUS, KC_EQL),   // Equal sign on a single-tap, plus sign on a double-tap
-[MNUN]   = ACTION_TAP_DANCE_DOUBLE(KC_MINS, KC_UNDS),  // Minus sign on a single-tap, underscore on a double-tap
-[SLAS]   = ACTION_TAP_DANCE_DOUBLE(KC_SLSH, KC_ASTR),  // Slash in a single-tap, asterisk in a double-tap
-[GVTL]   = ACTION_TAP_DANCE_DOUBLE(KC_GRV, KC_TILD),   // Grave on a single-tap, tilde on a double-tap
-[PPLEQ]  = ACTION_TAP_DANCE_DOUBLE(KC_PPLS, KC_EQL),   // Numpad plus sign on a single-tap, equal sign on a double-tap
-[PMNUN]  = ACTION_TAP_DANCE_DOUBLE(KC_PMNS, KC_UNDS),  // Numpad minus sign on a single-tap, underscore on a double-tap
-[PSLPAS] = ACTION_TAP_DANCE_DOUBLE(KC_PSLS, KC_PAST)   // Numpad slash on a single-tap, numpad asterisk on a double-tap
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Colemak
-*  (Defauit layer; keys separated by /: tap for first, hold for second; uses Space Cadet Shifts)
-*  ,-----------------------------------------------.                  ,-----------------------------------------------.
-*  |  Tab  |   Q   |   W   |   F   |   P   |   G   |                  |   J   |   L   |   U   |   Y   |   ;   |   \   |
-*  |-------+-------+-------+-------+-------+-------|                  |-------+-------+-------+-------+-------+-------|
-*  |Esc/Ctl|   A   |   R   |   S   |   T   |   D   |                  |   H   |   N   |   E   |   I   |   O   |   '   |
-*  |-------+-------+-------+-------+-------+-------|                  |-------+-------+-------+-------+-------+-------|
-*  | SC Sft|   Z   |   X   |   C   |   V   |   B   |                  |   K   |   M   |   ,   |   .   |   /   | SC Sft|
-*  |-------+-------+-------+-------+-------+-------|                  |-------+-------+-------+-------+-------+-------'
-*  |  Ins  |   `   |   [   |   ]   |App/Alt| Spc/FN|                  |Bsp/Fn2|  RGUI |  Left |  Down |   Up  | Right |
-*  `---------------------------------------+-------+-------.  ,-------+-------+---------------------------------------'
-*                                          | Ent/NS|  Bspc |  | Enter |Del/NS2|
-*                                          `---------------'  `---------------'
-*/
-[_COLEMAK] = LAYOUT(
-  KC_TAB,  KC_Q,   KC_W,    KC_F,    KC_P,   KC_G,                    KC_J,   KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSLS,
-  CTLESC,  KC_A,   KC_R,    KC_S,    KC_T,   KC_D,                    KC_H,   KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
-  SC_LSPO, KC_Z,   KC_X,    KC_C,    KC_V,   KC_B,                    KC_K,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SC_RSPC,
-  KC_INS,  KC_GRV, KC_LBRC, KC_RBRC, ALTAPP, SPCFN,                   BSPCFN, KC_RGUI, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT,
-                                             ENTNS, KC_BSPC,  KC_ENT, DELNS
-),
-
-/* QWERTY
-*  (Keys separated by /: tap for first, hold for second; uses Space Cadet Shifts)
-*  ,-----------------------------------------------.                  ,-----------------------------------------------.
-*  |  Tab  |   Q   |   W   |   E   |   R   |   T   |                  |   Y   |   U   |   I   |   O   |   P   |   \   |
-*  |-------+-------+-------+-------+-------+-------|                  |-------+-------+-------+-------+-------+-------|
-*  |Esc/Ctl|   A   |   S   |   D   |   F   |   G   |                  |   H   |   J   |   K   |   L   |   ;   |   '   |
-*  |-------+-------+-------+-------+-------+-------|                  |-------+-------+-------+-------+-------+-------|
-*  | SC Sft|   Z   |   X   |   C   |   V   |   B   |                  |   N   |   M   |   ,   |   .   |   /   | SC Sft|
-*  |-------+-------+-------+-------+-------+-------|                  |-------+-------+-------+-------+-------+-------'
-*  |  Ins  |   `   |   [   |   ]   |App/Alt| Spc/FN|                  |Bsp/Fn2|  RGUI |  Left |  Down |   Up  | Right |
-*  `---------------------------------------+-------+-------.  ,-------+-------+---------------------------------------'
-*                                          | Ent/NS|  Bspc |  | Enter |Del/NS2|
-*                                          `---------------'  `---------------'
-*/
-[_QWERTY] = LAYOUT(
-  KC_TAB,  KC_Q,   KC_W,    KC_E,    KC_R,   KC_T,                    KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
-  CTLESC,  KC_A,   KC_S,    KC_D,    KC_F,   KC_G,                    KC_H,   KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-  SC_LSPO, KC_Z,   KC_X,    KC_C,    KC_V,   KC_B,                    KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SC_RSPC,
-  KC_INS,  KC_GRV, KC_LBRC, KC_RBRC, ALTAPP, SPCFN,                   BSPCFN, KC_RGUI, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT,
-                                             ENTNS, KC_BSPC,  KC_ENT, DELNS
-),
-
-/* Number/symbol layer
-*  (Multiple characters: single-tap for first, double-tap for second)
-*  ,-----------------------------------------------.                  ,-----------------------------------------------.
-*  |       |   6   |   7   |   8   |   9   |   0   |                  |   ^   |   &   |   *   |   (   |   )   |       |
-*  |-------+-------+-------+-------+-------+-------|                  |-------+-------+-------+-------+-------+-------|
-*  |       |   1   |   2   |   3   |   4   |   5   |                  |   !   |   @   |   #   |   $   |   %   |       |
-*  |-------+-------+-------+-------+-------+-------|                  |-------+-------+-------+-------+-------+-------|
-*  |       |       |   .   |  / *  |  - _  |  + =  |                  |  ` ~  |  [ {  |  ] }  |       |       |       |
-*  |-------+-------+-------+-------+-------+-------|                  |-------+-------+-------+-------+-------+-------'
-*  |   (   |   )   |  [ {  |  ] }  |       |       |                  |       |       |       |       |       |       |
-*  `---------------------------------------+-------+-------.  ,-------+-------+---------------------------------------'
-*                                          |       |       |  |       |       |
-*                                          `---------------'  `---------------'
-*/
-[_NUMBERS] = LAYOUT(
-  _______, KC_6,    KC_7,     KC_8,     KC_9,     KC_0,                       KC_CIRC,  KC_AMPR,  KC_ASTR,  KC_LPRN, KC_RPRN, _______,
-  _______, KC_1,    KC_2,     KC_3,     KC_4,     KC_5,                       KC_EXLM,  KC_AT,    KC_HASH,  KC_DLR,  KC_PERC, _______,
-  _______, _______, KC_DOT,   TD(SLAS), TD(MNUN), TD(PLEQ),                   TD(GVTL), TD(LBCB), TD(RBCB), _______, _______, _______,
-  KC_LPRN, KC_RPRN, TD(LBCB), TD(RBCB), _______,  _______,                    _______,  _______,  _______,  _______, _______, _______,
-                                                  _______, _______,  _______, _______
-),
-
-/* Number/Function Key layer
-*  (Multiple characters: single-tap for first, double-tap for second)
-*  ,-----------------------------------------------.                  ,-----------------------------------------------.
-*  |       |   6   |   7   |   8   |   9   |   0   |                  |   F7  |   F8  |   F9  |   F10 |   F11 |   F12 |
-*  |-------+-------+-------+-------+-------+-------|                  |-------+-------+-------+-------+-------+-------|
-*  |       |   1   |   2   |   3   |   4   |   5   |                  |   F1  |   F2  |   F3  |   F4  |   F5  |   F6  |
-*  |-------+-------+-------+-------+-------+-------|                  |-------+-------+-------+-------+-------+-------|
-*  |       |       |   .   |  / *  |  - _  |  + =  |                  |  ` ~  |  [ {  |  ] }  |       |       |       |
-*  |-------+-------+-------+-------+-------+-------|                  |-------+-------+-------+-------+-------+-------'
-*  |   (   |   )   |  [ {  |  ] }  |       |       |                  |       |       |       |       |       |       |
-*  `---------------------------------------+-------+-------.  ,-------+-------+---------------------------------------'
-*                                          |       |       |  |       |       |
-*                                          `---------------'  `---------------'
-*/
-[_NUMBERS2] = LAYOUT(
-  _______, KC_6,    KC_7,     KC_8,     KC_9,     KC_0,                       KC_F7,    KC_F8,    KC_F9,    KC_F10,  KC_F11,  KC_F12,
-  _______, KC_1,    KC_2,     KC_3,     KC_4,     KC_5,                       KC_F1,    KC_F2,    KC_F3,    KC_F4,   KC_F5,   KC_F6,
-  _______, _______, KC_DOT,   TD(SLAS), TD(MNUN), TD(PLEQ),                   TD(GVTL), TD(LBCB), TD(RBCB), _______, _______, _______,
-  KC_LPRN, KC_RPRN, TD(LBCB), TD(RBCB), _______,  _______,                    _______,  _______,  _______,  _______, _______, _______,
-                                                  _______, _______,  _______, _______
-),
-
-/* Function layer
-*  ,-----------------------------------------------.                  ,-----------------------------------------------.
-*  |       |       |       |   Up  |       |       |                  |       |       |   Up  | Ctrl+Y|       |       |
-*  |-------+-------+-------+-------+-------+-------|                  |-------+-------+-------+-------+-------+-------|
-*  |       | Ctrl+A|  Left |  Down | Right |C+A+Tab|                  |  PgUp | Right |  Down |  Left |  Home |       |
-*  |-------+-------+-------+-------+-------+-------|                  |-------+-------+-------+-------+-------+-------|
-*  |       | Ctrl+Z| Ctrl+X| Ctrl+C| Ctrl+V|  Bspc |                  |  PgDn |  Mute |  Vol- |  Vol+ |  End  |       |
-*  |-------+-------+-------+-------+-------+-------|                  |-------+-------+-------+-------+-------+-------'
-*  |       |       |       |       |       |       |                  |       |       |  Prev |  Play |  Next |  Stop |
-*  `---------------------------------------+-------+-------.  ,-------+-------+---------------------------------------'
-*                                          |       |       |  |       |       |
-*                                          `---------------'  `---------------'
-*/
-[_FUNCTION] = LAYOUT(
-  _______, _______,    _______,    KC_UP,      _______,    _______,                    _______, _______, KC_UP,   LCTL(KC_Y), _______, _______,
-  _______, LCTL(KC_A), KC_LEFT,    KC_DOWN,    KC_RGHT,    LCA(KC_TAB),                KC_PGUP, KC_LEFT, KC_DOWN, KC_RGHT,    KC_HOME, _______,
-  _______, LCTL(KC_Z), LCTL(KC_X), LCTL(KC_C), LCTL(KC_V), KC_BSPC,                    KC_PGDN, KC_MUTE, KC_VOLD, KC_VOLU,    KC_END,  _______,
-  _______, _______,    _______,    _______,    _______,    _______,                    _______, _______, KC_MPRV, KC_MPLY,    KC_MNXT, KC_MSTP,
-                                                           _______, _______,  _______, _______
-),
-
-[_FUNCTION2] = LAYOUT(
-  _______, _______,    _______,    KC_UP,      _______,    _______,                    _______, _______, KC_UP,   LCTL(KC_Y), _______, _______,
-  _______, LCTL(KC_A), KC_LEFT,    KC_DOWN,    KC_RGHT,    LCA(KC_TAB),                KC_PGUP, KC_LEFT, KC_DOWN, KC_RGHT,    KC_HOME, _______,
-  _______, LCTL(KC_Z), LCTL(KC_X), LCTL(KC_C), LCTL(KC_V), KC_BSPC,                    KC_PGDN, KC_MUTE, KC_VOLD, KC_VOLU,    KC_END,  _______,
-  _______, _______,    _______,    _______,    _______,    _______,                    _______, _______, KC_MPRV, KC_MPLY,    KC_MNXT, KC_MSTP,
-                                                           _______, _______,  _______, _______
-),
-
-/* Numpad layer
-*  (Left side duplicates layout from the Numbers layer, just with numpad output; right side layout close to PC numpad layout)
-*  ,-----------------------------------------------.                  ,-----------------------------------------------.
-*  |       |  KP 6 |  KP 7 |  KP 8 |  KP 9 |  KP 0 |                  | NumLk |  KP 7 |  KP 8 |  KP 9 |  KP / |       |
-*  |-------+-------+-------+-------+-------+-------|                  |-------+-------+-------+-------+-------+-------|
-*  |       |  KP 1 |  KP 2 |  KP 3 |  KP 4 |  KP 5 |                  |  Tab  |  KP 4 |  KP 5 |  KP 6 |  KP * |       |
-*  |-------+-------+-------+-------+-------+-------|                  |-------+-------+-------+-------+-------+-------|
-*  |       | NumLk |  KP . |KP/ KP*| KP- _ | KP+ = |                  |       |  KP 1 |  KP 2 |  KP 3 |  KP - |       |
-*  |-------+-------+-------+-------+-------+-------|                  |-------+-------+-------+-------+-------+-------'
-*  |   (   |   )   |  [ {  |  ] }  |       |       |                  |       |  KP 0 |   =   |  KP . |  KP + |       |
-*  `---------------------------------------+-------+-------.  ,-------+-------+---------------------------------------'
-*                                          |       |       |  | KP Ent|       |
-*                                          `---------------'  `---------------'
-*/
-[_NUMPAD] = LAYOUT(
-  _______, KC_P6,   KC_P7,    KC_P8,      KC_P9,     KC_P0,                      KC_NUM,  KC_P7, KC_P8,  KC_P9,   KC_PSLS, _______,
-  _______, KC_P1,   KC_P2,    KC_P3,      KC_P4,     KC_P5,                      KC_TAB,  KC_P4, KC_P5,  KC_P6,   KC_PAST, _______,
-  _______, KC_NUM,  KC_PDOT,  TD(PSLPAS), TD(PMNUN), TD(PPLEQ),                  _______, KC_P1, KC_P2,  KC_P3,   KC_PMNS, _______,
-  KC_LPRN, KC_RPRN, TD(LBCB), TD(RBCB),   _______,   _______,                    _______, KC_P0, KC_EQL, KC_PDOT, KC_PPLS, _______,
-                                                     _______, _______,  KC_PENT, _______
-),
-
-/* Adjust layer
-*  (Enter/Number + Delete/Number2 to access; Numpad is a toggle)
-*  ,-----------------------------------------------.                  ,-----------------------------------------------.
-*  |       |Colemak| Qwerty|       |       |       |                  | Numpad|       |       | Ctrl+Y|       | QK_BOOT |
-*  |-------+-------+-------+-------+-------+-------|                  |-------+-------+-------+-------+-------+-------|
-*  |       |       |       |       |       |       |                  |       |NKROTog|       |       |       |       |
-*  |-------+-------+-------+-------+-------+-------|                  |-------+-------+-------+-------+-------+-------|
-*  |       |       |       |       |       |       |                  |       |       |       |       |       |       |
-*  |-------+-------+-------+-------+-------+-------|                  |-------+-------+-------+-------+-------+-------'
-*  |       |       |       |       |       |       |                  |       |       |       |       |       |       |
-*  `---------------------------------------+-------+-------.  ,-------+-------+---------------------------------------'
-*                                          |       |       |  |       |       |
-*                                          `---------------'  `---------------'
-*/
-[_ADJUST] = LAYOUT(
-  _______, COLEMAK,  QWERTY, _______, _______, _______,                    NUMPAD,  _______, _______, _______, _______, QK_BOOT,
-  _______, _______, _______, _______, _______, _______,                    _______, NKROTG,  _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______,                    _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______,                    _______, _______, _______, _______, _______, _______,
-                                               _______, _______,  _______, _______
-),
-
-[_ADJUST2] = LAYOUT(
-  _______, COLEMAK,  QWERTY, _______, _______, _______,                    NUMPAD,  _______, _______, _______, _______, QK_BOOT,
-  _______, _______, _______, _______, _______, _______,                    _______, NKROTG,  _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______,                    _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______,                    _______, _______, _______, _______, _______, _______,
-                                               _______, _______,  _______, _______
-)
-
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _NUMBERS, _NUMBERS2, _ADJUST);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case COLEMAK:
-      if (record->event.pressed) {
-        default_layer_set(1UL << _COLEMAK);
-        layer_off ( _QWERTY);
-        layer_off ( _NUMBERS);
-        layer_off ( _NUMBERS2);
-        layer_off ( _FUNCTION);
-        layer_off ( _FUNCTION2);
-        layer_off ( _NUMPAD);
-        layer_off ( _ADJUST);
-		layer_off ( _ADJUST2);
-      }
-      return false;
-      break;
-    case QWERTY:
-      if (record->event.pressed) {
-        default_layer_set(1UL << _QWERTY);
-        layer_off ( _COLEMAK);
-        layer_off ( _NUMBERS);
-        layer_off ( _NUMBERS2);
-        layer_off ( _FUNCTION);
-        layer_off ( _FUNCTION2);
-        layer_off ( _NUMPAD);
-        layer_off ( _ADJUST);
-		layer_off ( _ADJUST2);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/keebio/rorschach/keymaps/insertsnideremarks/readme.md b/keyboards/keebio/rorschach/keymaps/insertsnideremarks/readme.md
deleted file mode 100644
index 152c8ba01af..00000000000
--- a/keyboards/keebio/rorschach/keymaps/insertsnideremarks/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-## I've changed my folder name to match my GitHub username.  Please see https://github.com/qmk/qmk_firmware/tree/master/keyboards/keebio/rorschach/keymaps/tuesdayjohn for my current keymap files.
diff --git a/keyboards/keebio/rorschach/keymaps/insertsnideremarks/rules.mk b/keyboards/keebio/rorschach/keymaps/insertsnideremarks/rules.mk
deleted file mode 100644
index 390cb3fd60a..00000000000
--- a/keyboards/keebio/rorschach/keymaps/insertsnideremarks/rules.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = yes        # Console for debug(+400)
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = yes        # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-TAP_DANCE_ENABLE = yes      # Enable Tap Dancing function
diff --git a/keyboards/keebio/rorschach/keymaps/tuesdayjohn/config.h b/keyboards/keebio/rorschach/keymaps/tuesdayjohn/config.h
deleted file mode 100644
index 9d65e8da70c..00000000000
--- a/keyboards/keebio/rorschach/keymaps/tuesdayjohn/config.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#pragma once
-
-#define USE_I2C
-
-/* Select hand configuration */
-
-// #define MASTER_LEFT
-// #define MASTER_RIGHT
-#define EE_HANDS
-
-#define TAPPING_TERM 175
-#define TAPPING_TOGGLE 2
-
-// #undef RGBLED_NUM
-// #define RGBLED_NUM 12
-// #define RGBLIGHT_HUE_STEP 8
-// #define RGBLIGHT_SAT_STEP 8
-// #define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/keebio/rorschach/keymaps/tuesdayjohn/keymap.c b/keyboards/keebio/rorschach/keymaps/tuesdayjohn/keymap.c
deleted file mode 100644
index db5677e3b6d..00000000000
--- a/keyboards/keebio/rorschach/keymaps/tuesdayjohn/keymap.c
+++ /dev/null
@@ -1,296 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-enum rorschach_layers {
-  _COLEMAK,   // Colemak (default layer)
-  _QWERTY,    // Qwerty
-  _NUMBERS,   // Numbers & Symbols
-  _NUMBERS2,  // Numbers & Function Keys (similar to _NUMBERS; used with _NUMBERS for tri-layer access to _ADJUST)
-  _FUNCTION,  // Function
-  _FUNCTION2, // Function 2 (identical as _FUNCTION; used to allow for easier use of space and backspace while using function layer arrows)
-  _NUMPAD,    // Numpad
-  _ADJUST,    // Adjust layer, accessed via tri-layer feature)
-  _ADJUST2    // Second Adjust layer, accessed outside of tri-layer feature)
-};
-
-enum rorschach_keycodes {
-  COLEMAK = SAFE_RANGE,
-  QWERTY
-};
-
-//Tap Dance Declarations
-enum {
-  ADJ = 0,
-  LBCB,
-  RBCB,
-  EQPL,
-  PLEQ,
-  MNUN,
-  SLAS,
-  GVTL,
-  PPEQ,
-  PMUN,
-  PSPA
-};
-
-void dance_LAYER_finished(tap_dance_state_t *state, void *user_data) {
-  if (state->count == 2) {
-     layer_on(_ADJUST2);
-     set_oneshot_layer(_ADJUST2, ONESHOT_START);
-  }
-}
-void dance_LAYER_reset(tap_dance_state_t *state, void *user_data) {
-  if (state->count == 2) {
-     layer_off(_ADJUST2);
-     clear_oneshot_layer_state(ONESHOT_PRESSED);
-  }
-}
-
-tap_dance_action_t tap_dance_actions[] = {
-[ADJ]  = ACTION_TAP_DANCE_FN_ADVANCED(NULL, dance_LAYER_finished, dance_LAYER_reset),  //  Double-tap to activate Adjust layer via oneshot layer
-[LBCB] = ACTION_TAP_DANCE_DOUBLE(KC_LBRC, KC_LCBR),  // Left bracket on a single-tap, left brace on a double-tap
-[RBCB] = ACTION_TAP_DANCE_DOUBLE(KC_RBRC, KC_RCBR),  // Right bracket on a single-tap, right brace on a double-tap
-[EQPL] = ACTION_TAP_DANCE_DOUBLE(KC_EQL, KC_PLUS),   // Plus sign on a single-tap, equal sign on a double-tap
-[PLEQ] = ACTION_TAP_DANCE_DOUBLE(KC_PLUS, KC_EQL),   // Equal sign on a single-tap, plus sign on a double-tap
-[MNUN] = ACTION_TAP_DANCE_DOUBLE(KC_MINS, KC_UNDS),  // Minus sign on a single-tap, underscore on a double-tap
-[SLAS] = ACTION_TAP_DANCE_DOUBLE(KC_SLSH, KC_ASTR),  // Slash in a single-tap, asterisk in a double-tap
-[GVTL] = ACTION_TAP_DANCE_DOUBLE(KC_GRV, KC_TILD),   // Grave on a single-tap, tilde on a double-tap
-[PPEQ] = ACTION_TAP_DANCE_DOUBLE(KC_PPLS, KC_EQL),   // Numpad plus sign on a single-tap, equal sign on a double-tap
-[PMUN] = ACTION_TAP_DANCE_DOUBLE(KC_PMNS, KC_UNDS),  // Numpad minus sign on a single-tap, underscore on a double-tap
-[PSPA] = ACTION_TAP_DANCE_DOUBLE(KC_PSLS, KC_PAST)   // Numpad slash on a single-tap, numpad asterisk on a double-tap
-};
-
-//Aliases for longer keycodes
-#define NUMPAD  TG(_NUMPAD)
-#define ADJUST  MO(_ADJUST2)
-#define SPCFN   LT(_FUNCTION, KC_SPC)
-#define BSPCFN  LT(_FUNCTION2, KC_BSPC)
-#define ENTNS   LT(_NUMBERS, KC_ENT)
-#define DELNS   LT(_NUMBERS2, KC_DEL)
-#define CTLESC  CTL_T(KC_ESC)
-#define ALTAPP  ALT_T(KC_APP)
-#define CTL_A   LCTL(KC_A)
-#define CTL_C   LCTL(KC_C)
-#define CTL_V   LCTL(KC_V)
-#define CTL_X   LCTL(KC_X)
-#define CTL_Z   LCTL(KC_Z)
-#define CTL_Y   LCTL(KC_Y)
-#define CA_TAB  LCA(KC_TAB)
-#define HYPER   ALL_T(KC_NO)
-#define TD_ADJ  TD(ADJ)
-#define TD_LBCB TD(LBCB)
-#define TD_RBCB TD(RBCB)
-#define TD_EQPL TD(EQPL)
-#define TD_PLEQ TD(PLEQ)
-#define TD_MNUN TD(MNUN)
-#define TD_SLAS TD(SLAS)
-#define TD_GVTL TD(GVTL)
-#define TD_PPEQ TD(PPEQ)
-#define TD_PMUN TD(PMUN)
-#define TD_PSPA TD(PSPA)
-#define NKROTG  MAGIC_TOGGLE_NKRO
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/*
-Colemak
-(Defauit layer; keys separated by /: tap for first, hold for second; uses Space Cadet Shifts)
- ,-----------------------------------------------------.                    ,-----------------------------------------------------.
- |  Tab   |    Q   |    W   |    F   |    P   |    G   |                    |    J   |    L   |    U   |    Y   |    ;   |    \   |
- |--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
- | Esc/Ctl|    A   |    R   |    S   |    T   |    D   |                    |    H   |    N   |    E   |    I   |    O   |    '   |
- |--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
- |SC Shift|    Z   |    X   |    C   |    V   |    B   |                    |    K   |    M   |    ,   |    .   |    /   |SC Shift|
- |--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------'
- |   Ins  |    `   |    [   |    ]   | App/Alt| Spc/FN |                    | Bsp/Fn2|  RGUI  |  Left  |  Down  |   Up   |  Right |
- `--------------------------------------------+--------+--------.  ,--------+--------+--------------------------------------------'
-                                              | Ent/NS |  Bspc  |  |  Enter | Del/NS2|
-                                              `-----------------'  `-----------------'
-*/
-[_COLEMAK] = LAYOUT(
-  KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,                         KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSLS,
-  CTLESC,  KC_A,    KC_R,    KC_S,    KC_T,    KC_D,                         KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
-  SC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                         KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SC_RSPC,
-  KC_INS,  KC_GRV,  KC_LBRC, KC_RBRC, ALTAPP,  SPCFN,                        BSPCFN,  KC_RGUI, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT,
-                                               ENTNS,   KC_BSPC,    KC_ENT,  DELNS
-),
-
-/*
-QWERTY
-(Keys separated by /: tap for first, hold for second; uses Space Cadet Shifts)
- ,-----------------------------------------------------.                    ,-----------------------------------------------------.
- |  Tab   |    Q   |    W   |    E   |    R   |    T   |                    |    Y   |    U   |    I   |    O   |    P   |    \   |
- |--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
- | Esc/Ctl|    A   |    S   |    D   |    F   |    G   |                    |    H   |    J   |    K   |    L   |    ;   |    '   |
- |--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
- |SC Shift|    Z   |    X   |    C   |    V   |    B   |                    |    N   |    M   |    ,   |    .   |    /   |SC Shift|
- |--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------'
- |   Ins  |    `   |    [   |    ]   | App/Alt| Spc/FN |                    | Bsp/Fn2|  RGUI  |  Left  |  Down  |   Up   |  Right |
- `--------------------------------------------+--------+--------.  ,--------+--------+--------------------------------------------'
-                                              | Ent/NS |  Bspc  |  |  Enter | Del/NS2|
-                                              `-----------------'  `-----------------'
-*/
-[_QWERTY] = LAYOUT(
-  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                         KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
-  CTLESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                         KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-  SC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                         KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SC_RSPC,
-  KC_INS,  KC_GRV,  KC_LBRC, KC_RBRC, ALTAPP,  SPCFN,                        BSPCFN,  KC_RGUI, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT,
-                                               ENTNS,   KC_BSPC,    KC_ENT,  DELNS
-),
-
-/*
-Number/symbol layer
-(Multiple characters: single-tap for first, double-tap for second)
- ,-----------------------------------------------------.                    ,-----------------------------------------------------.
- |        |    6   |    7   |    8   |    9   |    0   |                    |    ^   |    &   |    *   |    (   |    )   |        |
- |--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
- |        |    1   |    2   |    3   |    4   |    5   |                    |    !   |    @   |    #   |    $   |    %   |        |
- |--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
- |        |        |    .   |   / *  |   - _  |   + =  |                    |   ` ~  |   [ {  |   ] }  |        |        |        |
- |--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
- |    (   |    )   |   [ {  |   ] }  |        |        |                    |        |        |        |        |        |        |
- `--------------------------------------------+--------+--------.  ,--------+--------+--------------------------------------------'
-                                              |        |        |  |        |        |
-                                              `-----------------'  `-----------------'
-*/
-[_NUMBERS] = LAYOUT(
-  _______, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,                         KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
-  _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                         KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, _______,
-  _______, _______, KC_DOT,  TD_SLAS, TD_MNUN, TD_PLEQ,                      TD_GVTL, TD_LBCB, TD_RBCB, _______, _______, _______,
-  KC_LPRN, KC_RPRN, TD_LBCB, TD_RBCB, _______, _______,                      _______, _______, _______, _______, _______, _______,
-                                               _______, _______,    _______, _______
-),
-
-/*
-Number/Function Key layer
-(Multiple characters: single-tap for first, double-tap for second)
- ,-----------------------------------------------------.                    ,-----------------------------------------------------.
- |        |    6   |    7   |    8   |    9   |    0   |                    |   F7   |   F8   |   F9   |   F10  |   F11  |   F12  |
- |--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
- |        |    1   |    2   |    3   |    4   |    5   |                    |   F1   |   F2   |   F3   |   F4   |   F5   |   F6   |
- |--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
- |        |        |    .   |   / *  |   - _  |   + =  |                    |   ` ~  |   [ {  |   ] }  |        |        |        |
- |--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
- |    (   |    )   |   [ {  |   ] }  |        |        |                    |        |        |        |        |        |        |
- `--------------------------------------------+--------+--------.  ,--------+--------+--------------------------------------------'
-                                              |        |        |  |        |        |
-                                              `-----------------'  `-----------------'
-*/
-[_NUMBERS2] = LAYOUT(
-  _______, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,                         KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-  _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                         KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,
-  _______, _______, KC_DOT,  TD_SLAS, TD_MNUN, TD_PLEQ,                      TD_GVTL, TD_LBCB, TD_RBCB, _______, _______, _______,
-  KC_LPRN, KC_RPRN, TD_LBCB, TD_RBCB, _______, _______,                      _______, _______, _______, _______, _______, _______,
-                                               _______, _______,    _______, _______
-),
-
-/*
-Function layer
- ,-----------------------------------------------------.                    ,-----------------------------------------------------.
- |        |        |        |   Up   |        |        |                    |        |        |   Up   | Ctrl+Y |        |        |
- |--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
- |        | Ctrl+A |  Left  |  Down  |  Right | C+A+Tab|                    |  PgUp  |  Right |  Down  |  Left  |  Home  |        |
- |--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
- |        | Ctrl+Z | Ctrl+X | Ctrl+C | Ctrl+V |  Bspc  |                    |  PgDn  |  Mute  |  Vol-  |  Vol+  |   End  |        |
- |--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
- |        |        |        |        |        |        |                    |        |        |  Prev  |  Play  |  Next  |  Stop  |
- `--------------------------------------------+--------+--------.  ,--------+--------+--------------------------------------------'
-                                              |        |        |  |        |        |
-                                              `-----------------'  `-----------------'
-*/
-[_FUNCTION] = LAYOUT(
-  _______, _______, _______, KC_UP,   _______, _______,                      _______, _______, KC_UP,   CTL_Y,   _______, _______,
-  _______, CTL_A,   KC_LEFT, KC_DOWN, KC_RGHT, CA_TAB,                       KC_PGUP, KC_LEFT, KC_DOWN, KC_RGHT, KC_HOME, _______,
-  _______, CTL_Z,   CTL_X,   CTL_C,   CTL_V,   KC_BSPC,                      KC_PGDN, KC_MUTE, KC_VOLD, KC_VOLU, KC_END,  _______,
-  _______, _______, _______, _______, _______, _______,                      _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP,
-                                               _______, _______,    _______, _______
-),
-
-[_FUNCTION2] = LAYOUT(
-  _______, _______, _______, KC_UP,   _______, _______,                      _______, _______, KC_UP,   CTL_Y,   _______, _______,
-  _______, CTL_A,   KC_LEFT, KC_DOWN, KC_RGHT, CA_TAB,                       KC_PGUP, KC_LEFT, KC_DOWN, KC_RGHT, KC_HOME, _______,
-  _______, CTL_Z,   CTL_X,   CTL_C,   CTL_V,   KC_BSPC,                      KC_PGDN, KC_MUTE, KC_VOLD, KC_VOLU, KC_END,  _______,
-  _______, _______, _______, _______, _______, _______,                      _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP,
-                                               _______, _______,    _______, _______
-),
-
-/*
-Numpad layer
-(Left side duplicates layout from the Numbers layer, just with numpad output; right side layout close to PC numpad layout)
- ,-----------------------------------------------------.                    ,-----------------------------------------------------.
- |        |  KP 6  |  KP 7  |  KP 8  |  KP 9  |  KP 0  |                    |  NumLk |  KP 7  |  KP 8  |  KP 9  |  KP /  |        |
- |--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
- |        |  KP 1  |  KP 2  |  KP 3  |  KP 4  |  KP 5  |                    |   Tab  |  KP 4  |  KP 5  |  KP 6  |  KP *  |        |
- |--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
- |        |  NumLk |  KP .  | KP/ KP*|  KP- _ |  KP+ = |                    |        |  KP 1  |  KP 2  |  KP 3  |  KP -  |        |
- |--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
- |    (   |    )   |   [ {  |   ] }  |        |        |                    |        |  KP 0  |    =   |  KP .  |  KP +  |        |
- `--------------------------------------------+--------+--------.  ,--------+--------+--------------------------------------------'
-                                              |        |        |  | KP Ent |        |
-                                              `-----------------'  `-----------------'
-*/
-[_NUMPAD] = LAYOUT(
-  _______, KC_P6,   KC_P7,   KC_P8,   KC_P9,   KC_P0,                        KC_NUM,  KC_P7,   KC_P8,   KC_P9,   KC_PSLS, _______,
-  _______, KC_P1,   KC_P2,   KC_P3,   KC_P4,   KC_P5,                        KC_TAB,  KC_P4,   KC_P5,   KC_P6,   KC_PAST, _______,
-  _______, KC_NUM,  KC_PDOT, TD_PSPA, TD_PMUN, TD_PPEQ,                      _______, KC_P1,   KC_P2,   KC_P3,   KC_PMNS, _______,
-  KC_LPRN, KC_RPRN, TD_LBCB, TD_RBCB, _______, _______,                      _______, KC_P0,   KC_EQL,  KC_PDOT, KC_PPLS, _______,
-                                               _______, _______,    KC_PENT, _______
-),
-
-/*
-Adjust layer
-(Enter/Number + Delete/Number2 to access; Numpad is a toggle)
- ,-----------------------------------------------------.                    ,-----------------------------------------------------.
- |        | Colemak| Qwerty |        |        |        |                    | Numpad |        |        |        |        |  QK_BOOT |
- |--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
- |        |        |        |        |        |        |                    |        |NKRO Tog|        |        |        |        |
- |--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
- |        |        |        |        |        |        |                    |        |        |        |        |        |        |
- |--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
- |        |        |        |        |        |        |                    |        |        |        |        |        |        |
- `--------------------------------------------+--------+--------.  ,--------+--------+--------------------------------------------'
-                                              |        |        |  |        |        |
-                                              `-----------------'  `-----------------'
-*/
-[_ADJUST] = LAYOUT(
-  _______, COLEMAK,  QWERTY, _______, _______, _______,                      NUMPAD,  _______, _______, _______, _______, QK_BOOT,
-  _______, _______, _______, _______, _______, _______,                      _______, NKROTG,  _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______,                      _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______,                      _______, _______, _______, _______, _______, _______,
-                                               _______, _______,    _______, _______
-),
-
-[_ADJUST2] = LAYOUT(
-  _______, COLEMAK,  QWERTY, _______, _______, _______,                      NUMPAD,  _______, _______, _______, _______, QK_BOOT,
-  _______, _______, _______, _______, _______, _______,                      _______, NKROTG,  _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______,                      _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______,                      _______, _______, _______, _______, _______, _______,
-                                               _______, _______,    _______, _______
-)
-
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _NUMBERS, _NUMBERS2, _ADJUST);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case COLEMAK:
-      if (record->event.pressed) {
-        default_layer_set(1UL << _COLEMAK);
-        layer_move (_COLEMAK);
-
-      }
-      return false;
-      break;
-    case QWERTY:
-      if (record->event.pressed) {
-        default_layer_set(1UL << _QWERTY);
-        layer_move (_QWERTY);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/keebio/rorschach/keymaps/tuesdayjohn/rules.mk b/keyboards/keebio/rorschach/keymaps/tuesdayjohn/rules.mk
deleted file mode 100644
index 390cb3fd60a..00000000000
--- a/keyboards/keebio/rorschach/keymaps/tuesdayjohn/rules.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = yes        # Console for debug(+400)
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = yes        # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-TAP_DANCE_ENABLE = yes      # Enable Tap Dancing function
diff --git a/keyboards/keebio/sinc/info.json b/keyboards/keebio/sinc/info.json
index a55f42649e6..aa1e08f39dd 100644
--- a/keyboards/keebio/sinc/info.json
+++ b/keyboards/keebio/sinc/info.json
@@ -6,14 +6,12 @@
         "vid": "0xCB10"
     },
     "features": {
-        "audio": false,
         "bootmagic": true,
         "command": false,
         "console": false,
         "extrakey": true,
         "mousekey": false,
-        "nkro": false,
-        "unicode": false
+        "nkro": false
     },
     "split": {
         "enabled": true
diff --git a/keyboards/keebio/sinc/keymaps/lickel/keymap.c b/keyboards/keebio/sinc/keymaps/lickel/keymap.c
deleted file mode 100644
index 97111e9dda9..00000000000
--- a/keyboards/keebio/sinc/keymaps/lickel/keymap.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/* Copyright 2021 @ Adam Lickel
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-// clang-format off
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT_80_with_macro(
-    KC_MUTE,          KC_ESC,  KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, BL_DOWN, BL_UP,   KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_DEL,  KC_MPLY,
-    KC_F1,   KC_F2,   KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, KC_HOME,
-    KC_F3,   KC_F4,   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
-    KC_F5,   KC_F6,   KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGDN,
-    KC_F7,   KC_F8,   KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_END,
-    KC_F9,   KC_F10,  KC_LCTL, KC_LALT, KC_LGUI, MO(1),   KC_SPC,  KC_SPC,           MO(1),   KC_SPC,  KC_RGUI, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
-  ),
-  [1] = LAYOUT_80_with_macro(
-    _______,          _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, RGB_RMOD,RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______,          _______, _______,
-    _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______, _______
-  ),
-  [2] = LAYOUT_80_with_macro(
-    _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
-    _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______, _______
-  ),
-  [3] = LAYOUT_80_with_macro(
-    _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
-    _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______, _______
-  ),
-};
-
-// clang-format on
-
-#ifdef ENCODER_MAP_ENABLE
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
-	[0] = { ENCODER_CCW_CW(KC_PGUP, KC_PGDN), ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
-	[1] = { ENCODER_CCW_CW(RGB_MOD, RGB_RMOD), ENCODER_CCW_CW(KC_MNXT, KC_MPRV) },
-	[2] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) },
-	[3] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) },
-};
-#endif
diff --git a/keyboards/keebio/sinc/keymaps/lickel/readme.md b/keyboards/keebio/sinc/keymaps/lickel/readme.md
deleted file mode 100644
index faf130dec5e..00000000000
--- a/keyboards/keebio/sinc/keymaps/lickel/readme.md
+++ /dev/null
@@ -1,26 +0,0 @@
-# lickel's Sinc keymap
-
-- Via support is enabled by default
-- Function Row is optimized for macOS
-- RGB controls mimic the stock Keychron Q1 layout
-- F3 opens Mission Control and F4 opens Launchpad
-- Left macros are: F1->F10
-- Right macros are: Play, Home, Pg Up, Pg Dn, End, Right
-
-![Layout](https://i.imgur.com/0uXXrJY.png)
-
-([KLE](http://www.keyboard-layout-editor.com/#/gists/e0350d8914cac3166abcca6abfd093b7))
-
-## Changelog
-
-### 2022-12-09 - 1.2
-
-- Add ENCODER_MAP_ENABLE from default VIA definition
-
-### 2022-03-04 - 1.1
-
-- Correct function row to change LED backlights, not underglow
-
-### 2021-11-27 - 1.0
-
-- Initial release
diff --git a/keyboards/keebio/sinc/rev3/info.json b/keyboards/keebio/sinc/rev3/info.json
index e20cd24f192..da828dbb35f 100644
--- a/keyboards/keebio/sinc/rev3/info.json
+++ b/keyboards/keebio/sinc/rev3/info.json
@@ -9,8 +9,6 @@
     "diode_direction": "COL2ROW",
     "features": {
         "console": true,
-        "rgblight": false,
-        "backlight": false,
         "rgb_matrix": true
     },
     "split": {
diff --git a/keyboards/keebio/tragicforce68/keymaps/buswerks/keymap.c b/keyboards/keebio/tragicforce68/keymaps/buswerks/keymap.c
deleted file mode 100644
index 6e5afacff86..00000000000
--- a/keyboards/keebio/tragicforce68/keymaps/buswerks/keymap.c
+++ /dev/null
@@ -1,60 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define _QWERTY 0
-#define _COLEMAK 1
-#define _FN1 2
-
-#define WORD_L LALT(KC_LEFT)
-#define WORD_R LALT(KC_RGHT)
-#define LINE_L LGUI(KC_LEFT)
-#define LINE_R LGUI(KC_RGHT)
-
-#define DESK_L LCTL(KC_LEFT)
-#define DESK_R LCTL(KC_RGHT)
-#define MSN_CTL LCTL(KC_UP)
-
-#define LT_FN LT(_FN1, KC_ESC)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────────────┐ ┌────────┬────────┐
-     KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,       KC_BSPC,      KC_INS,  KC_PGUP,
-  //├────────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────────────┤ ├────────┼────────┤
-     KC_TAB,      KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,    KC_BSLS,    KC_DEL,  KC_PGDN,
-  //├────────────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴────────────┤ └────────┴────────┘
-     LT_FN,         KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,       KC_ENTER,
-  //├──────────────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───────────────────┤ ┌────────┐
-     SC_LSPO,           KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          SC_RSPC,          KC_UP,
-  //├──────────┬───────┴──┬─────┴────┬───┴────────┴────────┴────────┴────────┴────────┴──────┬─┴────────┼────────┴─┬──────────┬────┬──────┴─┬────────┼────────┐
-     KC_LCTL,   KC_LGUI,   KC_LALT,                        KC_SPACE,                          KC_RALT,   KC_CAPS,   KC_RCTL,        KC_LEFT, KC_DOWN, KC_RGHT
-  //└──────────┴──────────┴──────────┴───────────────────────────────────────────────────────┴──────────┴──────────┴──────────┘    └────────┴────────┴────────┘
-  ),
-
-    [_COLEMAK] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────────────┐ ┌────────┬────────┐
-     KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,       KC_BSPC,      KC_INS,  KC_PGUP,
-  //├────────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────────────┤ ├────────┼────────┤
-     KC_TAB,      KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_LBRC, KC_RBRC,    KC_BSLS,    KC_DEL,  KC_PGDN,
-  //├────────────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴────────────┤ └────────┴────────┘
-     LT_FN,         KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,       KC_ENTER,
-  //├──────────────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───────────────────┤ ┌────────┐
-     SC_LSPO,           KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          SC_RSPC,          KC_UP,
-  //├──────────┬───────┴──┬─────┴────┬───┴────────┴────────┴────────┴────────┴────────┴──────┬─┴────────┼────────┴─┬──────────┬────┬──────┴─┬────────┼────────┐
-     KC_LCTL,   KC_LGUI,   KC_LALT,                        KC_SPACE,                          KC_RALT,   KC_CAPS,   KC_RCTL,        KC_LEFT, KC_DOWN, KC_RGHT
-  //└──────────┴──────────┴──────────┴───────────────────────────────────────────────────────┴──────────┴──────────┴──────────┘    └────────┴────────┴────────┘
-  ),
-
-  [_FN1] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────────────┐ ┌────────┬────────┐
-     KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,       _______,      QK_BOOT, KC_HOME,
-  //├────────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────────────┤ ├────────┼────────┤
-     _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______,    _______, KC_END,
-  //├────────────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴────────────┤ └────────┴────────┘
-     _______,       DESK_L,  MSN_CTL, DESK_R,  _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______,       _______,
-  //├──────────────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───────────────────┤ ┌────────┐
-     _______,           _______, _______, _______, _______, _______, LINE_L,  WORD_L,  WORD_R,  LINE_R,  _______,          _______,          BL_UP, 
-  //├──────────┬───────┴──┬─────┴────┬───┴────────┴────────┴────────┴────────┴────────┴──────┬─┴────────┼────────┴─┬──────────┬────┬──────┴─┬────────┼────────┐
-     _______,   _______,   _______,                        KC_BSPC,                           _______,   _______,   KC_MENU,        BL_BRTG, BL_DOWN, BL_TOGG
-  //└──────────┴──────────┴──────────┴───────────────────────────────────────────────────────┴──────────┴──────────┴──────────┘    └────────┴────────┴────────┘
-  )
-};
\ No newline at end of file
diff --git a/keyboards/keebio/viterbi/keymaps/met/keymap.c b/keyboards/keebio/viterbi/keymaps/met/keymap.c
deleted file mode 100644
index 4848038befc..00000000000
--- a/keyboards/keebio/viterbi/keymaps/met/keymap.c
+++ /dev/null
@@ -1,321 +0,0 @@
-#include QMK_KEYBOARD_H
-
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-// The underscores don't mean anything - you can have a layer called STUFF or any other name.
-// Layer names don't all need to be of the same length, obviously, and you can also skip them
-// entirely and just use numbers.
-
-#define CANCEL LCTL(KC_C)
-#define TERM LCTL(LALT(KC_T))
-#define ALPHAMOD LT(_ALPHA, KC_VOLD)
-#define CTLBSP MT(MOD_LCTL, KC_BSPC)
-#define GUIDEL MT(MOD_LGUI, KC_DEL)
-#define ALTSPC MT(MOD_LALT, KC_SPACE)
-#define SPCMOD LT(_MOD, KC_SPACE)
-#define JUMPBACK LSFT(KC_TAB)
-#define NTAB LCTL(KC_T)
-#define CTAB LCTL(KC_W)
-#define TAB1 LCTL(KC_1)
-#define TAB2 LCTL(KC_2)
-#define TAB3 LCTL(KC_3)
-#define TAB4 LCTL(KC_4)
-#define BWORD LCTL(KC_BSPC)
-#define LWORD LCTL(KC_LEFT)
-#define RWORD LCTL(KC_RIGHT)
-#define TABMOD LT(_MOD, KC_TAB)
-#define ENTMOD LT(_ENT, KC_ENTER)
-
-enum layer_names {
-  _BASE,
-  _PLAYING,
-  _PLAYED,
-  _NUMS,
-  _FN,
-  _TEST,
-  _ALPHA,
-  _QWERTY,
-  _REV,
-  _DEL,
-  _MOD,
-  _ENT
-};
-
-enum custom_keycodes {
-  MET = SAFE_RANGE,
-  SET,
-  GO,
-  STOP,
-  RESUME,
-  NEWRESUME,
-  SYNC,
-  SHUTDOWN,
-  REBOOT,
-  SOURCE,
-  PUSH,
-  TEST,
-  TST,
-  ENAME,
-  SNAME,
-  LNAME,
-  BUS,
-  PMERGE,
-  CSPEAK
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-  case SET:
-  if (record->event.pressed) {
-  layer_on(_NUMS);
-  SEND_STRING("met ");
-}
-  break;
-  case GO:
-  if (record->event.pressed) {
-  layer_off(_NUMS);
-  layer_off(_ALPHA);
-  layer_off(_PLAYED);
-  layer_on(_PLAYING);
-  SEND_STRING(SS_TAP(X_ENTER));
-}
-  break;
-  case STOP:
-  if (record->event.pressed) {
-  layer_off(_PLAYING);
-  layer_on(_PLAYED);
-  layer_off(_NUMS);
-  layer_off(_ALPHA);
-  SEND_STRING(SS_TAP(X_N));
-  SEND_STRING(SS_TAP(X_N));
-  SEND_STRING(SS_LCTL(SS_TAP(X_C)));
-}
-  break;
-  case RESUME:
-  if (record->event.pressed) {
-  layer_off(_PLAYED);
-  layer_on(_PLAYING);
-  SEND_STRING(SS_LCTL(SS_TAP(X_C)));
-  SEND_STRING(SS_TAP(X_UP));
-  SEND_STRING(SS_TAP(X_ENTER));
-}
-  break;
-  case NEWRESUME:
-  if (record->event.pressed) {
-  layer_off(_NUMS);
-  layer_off(_ALPHA);
-  layer_off(_PLAYED);
-  layer_on(_PLAYING);
-  SEND_STRING(SS_TAP(X_R));
-  SEND_STRING(SS_TAP(X_ENTER));
-}
-  break;
-  case SYNC:
-  if (record->event.pressed) {
-  SEND_STRING(SS_TAP(X_N));
-}
-  break;
-  case SHUTDOWN:
-  if (record->event.pressed) {
-  SEND_STRING(SS_LCTL(SS_TAP(X_C)));
-  SEND_STRING("shutdown now");
-  SEND_STRING(SS_TAP(X_ENTER));
-}
-  break;
-  case REBOOT:
-  if (record->event.pressed) {
-  SEND_STRING(SS_LCTL(SS_TAP(X_C)));
-  SEND_STRING("reboot");
-  SEND_STRING(SS_TAP(X_ENTER));
-  }
-  break;
-  case SOURCE:
-  if (record->event.pressed) {
-  SEND_STRING("source .bashrc");
-  SEND_STRING(SS_TAP(X_ENTER));
-  }
-  break;
-  case PUSH:
-  if (record->event.pressed) {
-  SEND_STRING("ftp rossmontsinger.net");
-  _delay_ms(250);
-  SEND_STRING(SS_TAP(X_ENTER));
-  _delay_ms(2250);
-  SEND_STRING("met@rossmontsinger.net");
-  _delay_ms(250);
-  SEND_STRING(SS_TAP(X_ENTER));
-  _delay_ms(2500);
-  SEND_STRING("metboard");
-  _delay_ms(250);
-  SEND_STRING(SS_TAP(X_ENTER));
-  }
-  break;
-  case TEST:
-  if (record->event.pressed) {
-  layer_off(_NUMS);
-  layer_off(_ALPHA);
-  layer_off(_PLAYED);
-  layer_on(_PLAYING);
-  SEND_STRING(SS_LCTL(SS_TAP(X_C)));
-  _delay_ms(250);
-  SEND_STRING("play Desktop/met/a_lazoom.mp3");
-  SEND_STRING(SS_TAP(X_ENTER));
-  }
-  case TST:
-  if (record->event.pressed) {
-  SEND_STRING("tst");
-  SEND_STRING(SS_TAP(X_ENTER));
-  }
-  break;
-  case ENAME:
-  if (record->event.pressed) {
-  SEND_STRING("sname ");
-  layer_on(_NUMS);
-  layer_on(_ALPHA);
-  }
-  break;
-  case SNAME:
-  if (record->event.pressed) {
-  SEND_STRING(SS_TAP(X_ENTER));
-  layer_off(_NUMS);
-  layer_off(_ALPHA);
-  }
-  break;
-  case LNAME:
-  if (record->event.pressed) {
-  SEND_STRING("met $");
-  layer_off(_NUMS);
-  layer_on(_ALPHA);
-  }
-  break;
-  case BUS:
-  if (record->event.pressed) {
-  SEND_STRING("met $bus");
-  layer_off(_NUMS);
-  layer_off(_ALPHA);
-  layer_off(_PLAYED);
-  layer_on(_PLAYING);
-  SEND_STRING(SS_TAP(X_ENTER));
-  }
-  break;
-  case PMERGE:
-  if (record->event.pressed) {
-  SEND_STRING(SS_TAP(X_HOME));
-  SEND_STRING(SS_TAP(X_BACKSPACE));
-  SEND_STRING(SS_TAP(X_SPACE));
-  SEND_STRING(SS_LCTL(SS_TAP(X_BACKSPACE)));
-  SEND_STRING(SS_TAP(X_SPACE));
-      }
-break;
-case CSPEAK:
-  if (record->event.pressed) {
-  SEND_STRING(SS_TAP(X_PAGE_DOWN));
-  SEND_STRING(SS_TAP(X_ENTER));
-  SEND_STRING(SS_TAP(X_ENTER));
-  SEND_STRING(SS_TAP(X_PAGE_DOWN));
-}
- break;
-};
-
-  return true;
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_BASE] = LAYOUT_ortho_5x14(
-    KC_NO,   STOP   , TST    , _______, _______, _______, BUS    ,     _______, _______, _______, _______, _______, _______, _______,
-    KC_NO,   _______, SET    , SET    , SET    , _______, _______,     _______, _______, _______, _______, _______, _______, _______,
-    KC_NO,   _______, SET    , SET    , SET    , _______, _______,     _______, _______, _______, _______, _______, _______, _______,
-    KC_NO,   LNAME  , SET    , SET    , SET    , _______, _______,     _______, _______, _______, _______, _______, _______, _______,
-    KC_NO,   MO(_FN), _______, SET    , _______, _______, _______,     TG(_QWERTY),KC_B, _______, _______, _______, _______, _______
-  ),
-
-  [_PLAYING] = LAYOUT_ortho_5x14(
-    KC_NO,   _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______,
-    KC_NO,   _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______,
-    KC_NO,   _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______,
-    KC_NO,   _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______,
-    KC_NO,   _______, _______, _______, _______, _______, STOP   ,     _______, _______, _______, _______, _______, _______, _______
-  ),
-
-  [_PLAYED] = LAYOUT_ortho_5x14(
-    KC_NO,   _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______,
-    KC_NO,   _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______,
-    KC_NO,   _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______,
-    KC_NO,   _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______,
-    KC_NO,   _______,_______, _______, _______, _______,NEWRESUME,    _______, _______, _______, _______, _______, _______, _______
-  ),
-
-  [_NUMS] = LAYOUT_ortho_5x14(
-    KC_NO,   _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______,
-    KC_NO,   _______, KC_7   , KC_8   , KC_9   , _______, _______,     _______, _______, _______, _______, _______, _______, _______,
-    KC_NO,   _______, KC_4   , KC_5   , KC_6   , _______, _______,     _______, _______, _______, _______, _______, _______, _______,
-    KC_NO,   _______, KC_1   , KC_2   , KC_3   , _______, _______,     _______, _______, _______, _______, _______, _______, _______,
-    KC_NO,   _______, _______, KC_0   , _______, _______, GO     ,     _______, _______, _______, _______, _______, _______, _______
-  ),
-
-  [_FN] = LAYOUT_ortho_5x14(
-    KC_NO,   SHUTDOWN,_______, _______, _______, _______, KC_VOLU,    _______, _______, _______, _______, _______, _______, _______,
-    KC_NO,   REBOOT , _______, _______, _______, _______, KC_VOLD,    _______, _______, _______, _______, _______, _______, _______,
-    KC_NO,   _______, _______, _______, _______, _______, _______,    _______, _______, _______, _______, _______, _______, _______,
-    KC_NO,   ENAME  , _______, _______, _______, _______, _______,    _______, _______, _______, _______, _______, _______, _______,
-    KC_NO,   _______, _______, _______, _______, _______, SOURCE ,    _______, _______, _______, _______, _______, _______, _______
-  ),
-
-  [_TEST] = LAYOUT_ortho_5x14(
-    KC_NO,   TST    , TST    , TST    , TST    , TST    , TST     ,    _______, _______, _______, _______, _______, _______, _______,
-    KC_NO,   TST    , TST    , TST    , TST    , TST    , TST     ,    _______, _______, _______, _______, _______, _______, _______,
-    KC_NO,   TST    , TST    , TST    , TST    , TST    , TST     ,    _______, _______, _______, _______, _______, _______, _______,
-    KC_NO,   TST    , TST    , TST    , TST    , TST    , TST     ,    _______, _______, _______, _______, _______, _______, _______,
-    KC_NO,   TST    , TST    , TST    , TST    , TST    , TST     ,    _______, _______, _______, _______, _______, _______, _______
-  ),
-    
-  [_ALPHA] = LAYOUT_ortho_5x14(
-    KC_NO,   _______, KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   ,     _______, _______, _______, _______, _______, _______, _______,
-    KC_NO,   KC_N   , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   ,     _______, _______, _______, _______, _______, _______, _______,
-    KC_NO,   KC_M   , KC_A   , KC_S   , KC_D   , KC_F   , KC_G   ,     _______, _______, _______, _______, _______, _______, _______,
-    KC_NO,   _______, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   ,     _______, _______, _______, _______, _______, _______, _______,
-    KC_NO,   _______, KC_H   , KC_J   , KC_K   , KC_L   , GO     ,     _______, _______, _______, _______, _______, _______, _______
-  ),
-  
- [_QWERTY] = LAYOUT_ortho_5x14(
-    KC_NO,   KC_ESC , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   ,     KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL  ,
-    KC_NO,   KC_CAPS, KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   ,     KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC ,
-    KC_NO,   KC_CAPS, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   ,     KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT, KC_PGUP ,
-    KC_NO,   KC_LSFT, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   ,     KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_UP,   KC_PGDN ,
-    KC_NO,   CTLBSP , GUIDEL , KC_ENTER, ALTSPC, TABMOD , KC_BSPC,     ENTMOD , SPCMOD ,MO(_DEL), KC_BSLS, KC_LEFT, KC_DOWN, KC_RIGHT
-  ),
-
-  
-  [_REV] = LAYOUT_ortho_5x14(
-    KC_NO  , _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______,
-    KC_NO  , _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______,
-    KC_NO  , _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______,
-    KC_NO  , _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______,
-    KC_NO  , _______, _______, _______, _______, KC_TAB , KC_PGDN,     _______, _______, _______, _______, _______, _______, _______
-  ),
-  
-  
- [_DEL] = LAYOUT_ortho_5x14(
-    KC_NO  , _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______,
-    KC_NO  , _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______,
-    KC_NO  , _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______,
-    KC_NO  , _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______,
-    KC_NO  , _______, _______, _______, _______, KC_BSPC, BWORD  ,     _______, _______, _______, _______, _______, _______, _______
-  ),
-  
- [_MOD] = LAYOUT_ortho_5x14(
-    KC_NO  , KC_GRAVE,KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  ,     KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , NTAB ,
-    KC_NO  , _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, CTAB,
-    KC_NO  , _______, _______, _______, _______, _______, _______,     KC_HOME, KC_LEFT, KC_UP  ,KC_RIGHT, KC_END , _______, _______,
-    KC_NO  , _______, _______, _______, _______, _______, _______,     _______, PMERGE , KC_DOWN, _______, _______, _______, _______,
-    KC_NO  , _______, _______, _______, _______, LWORD  , RWORD  ,     TG(_QWERTY),_______,_______,_______,_______, _______, _______
-  ),
-   
- [_ENT] = LAYOUT_ortho_5x14(
-    KC_NO  , _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______,
-    KC_NO  , _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______,
-    KC_NO  , _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______,
-    KC_NO  , _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______,
-    KC_NO  , _______, _______, _______, _______, _______, CSPEAK ,     _______, _______, _______, _______, _______, _______, _______
-  )
-};
-
diff --git a/keyboards/keebio/viterbi/keymaps/met/rules.mk b/keyboards/keebio/viterbi/keymaps/met/rules.mk
deleted file mode 100644
index 1e3cebb1451..00000000000
--- a/keyboards/keebio/viterbi/keymaps/met/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-RGBLIGHT_ENABLE = yes
diff --git a/keyboards/keebwerk/mega/ansi/ansi.c b/keyboards/keebwerk/mega/ansi/ansi.c
index 4b10cdde66e..5218fdd0e19 100755
--- a/keyboards/keebwerk/mega/ansi/ansi.c
+++ b/keyboards/keebwerk/mega/ansi/ansi.c
@@ -28,135 +28,135 @@ const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
  *   |  |      G location
  *   |  |      |      B location
  *   |  |      |      | */
-    {0, B_1,   A_1,   C_1}, //LA1
-    {0, E_1,   D_1,   F_1}, //LA2
-    {0, H_1,   G_1,   I_1}, //LA3
-    {0, K_1,   J_1,   L_1}, //LA4
-    {0, B_2,   A_2,   C_2}, //LA5
-    {0, E_2,   D_2,   F_2}, //LA6
-    {0, H_2,   G_2,   I_2}, //LA7
-    {0, K_2,   J_2,   L_2}, //LA8
-    {0, B_3,   A_3,   C_3}, //LA9
-    {0, E_3,   D_3,   F_3}, //LA10
-    {0, H_3,   G_3,   I_3}, //LA11
-    {0, K_3,   J_3,   L_3}, //LA12
-    {0, B_4,   A_4,   C_4}, //LA13
-    {0, E_4,   D_4,   F_4}, //LA14
-    {0, H_4,   G_4,   I_4}, //LA15
-    {0, K_4,   J_4,   L_4}, //LA16
-    {0, B_5,   A_5,   C_5}, //LA17
-    {0, E_5,   D_5,   F_5}, //LA18
-    {0, H_5,   G_5,   I_5}, //LA19
-    {0, K_5,   J_5,   L_5}, //LA20
-    {0, B_6,   A_6,   C_6}, //LA21
-    {0, E_6,   D_6,   F_6}, //LA22
-    {0, H_6,   G_6,   I_6}, //LA23
-    {0, K_6,   J_6,   L_6}, //LA24
-    {0, B_7,   A_7,   C_7}, //LA25
-    {0, E_7,   D_7,   F_7}, //LA26
-    {0, H_7,   G_7,   I_7}, //LA27
-    {0, K_7,   J_7,   L_7}, //LA28
-    {0, B_8,   A_8,   C_8}, //LA29
-    {0, E_8,   D_8,   F_8}, //LA30
-    {0, H_8,   G_8,   I_8}, //LA31
-    {0, K_8,   J_8,   L_8}, //LA32
-    {0, B_9,   A_9,   C_9}, //LA33
-    {0, E_9,   D_9,   F_9}, //LA34
-    {0, H_9,   G_9,   I_9}, //LA35
-    {0, K_9,   J_9,   L_9}, //LA36
-    {0, B_10,  A_10,  C_10}, //LA37
-    {0, E_10,  D_10,  F_10}, //LA38
-    {0, H_10,  G_10,  I_10}, //LA39
-    {0, K_10,  J_10,  L_10}, //LA40
-    {0, B_11,  A_11,  C_11}, //LA41
-    {0, E_11,  D_11,  F_11}, //LA42
-    {0, H_11,  G_11,  I_11}, //LA43
-    {0, K_11,  J_11,  L_11}, //LA44
-    {0, B_12,  A_12,  C_12}, //LA45
-    {0, E_12,  D_12,  F_12}, //LA46
-    {0, H_12,  G_12,  I_12}, //LA47
-    {0, K_12,  J_12,  L_12}, //LA48
-    {0, B_13,  A_13,  C_13}, //LA49
-    {0, E_13,  D_13,  F_13}, //LA50
-    {0, H_13,  G_13,  I_13}, //LA51
-    {0, K_13,  J_13,  L_13}, //LA52
-    {0, B_14,  A_14,  C_14}, //LA53
-    {0, E_14,  D_14,  F_14}, //LA54
-    {0, H_14,  G_14,  I_14}, //LA55
-    {0, K_14,  J_14,  L_14}, //LA56
-    {0, B_15,  A_15,  C_15}, //LA57
-    {0, E_15,  D_15,  F_15}, //LA58
-    {0, H_15,  G_15,  I_15}, //LA59
-    {0, K_15,  J_15,  L_15}, //LA60
-    {0, B_16,  A_16,  C_16}, //LA61
-    {0, E_16,  D_16,  F_16}, //LA62
-    {0, H_16,  G_16,  I_16}, //LA63
-    {0, K_16,  J_16,  L_16}, //LA64
+    {0, SW2_CS1,   SW1_CS1,   SW3_CS1}, //LA1
+    {0, SW5_CS1,   SW4_CS1,   SW6_CS1}, //LA2
+    {0, SW8_CS1,   SW7_CS1,   SW9_CS1}, //LA3
+    {0, SW11_CS1,   SW10_CS1,   SW12_CS1}, //LA4
+    {0, SW2_CS2,   SW1_CS2,   SW3_CS2}, //LA5
+    {0, SW5_CS2,   SW4_CS2,   SW6_CS2}, //LA6
+    {0, SW8_CS2,   SW7_CS2,   SW9_CS2}, //LA7
+    {0, SW11_CS2,   SW10_CS2,   SW12_CS2}, //LA8
+    {0, SW2_CS3,   SW1_CS3,   SW3_CS3}, //LA9
+    {0, SW5_CS3,   SW4_CS3,   SW6_CS3}, //LA10
+    {0, SW8_CS3,   SW7_CS3,   SW9_CS3}, //LA11
+    {0, SW11_CS3,   SW10_CS3,   SW12_CS3}, //LA12
+    {0, SW2_CS4,   SW1_CS4,   SW3_CS4}, //LA13
+    {0, SW5_CS4,   SW4_CS4,   SW6_CS4}, //LA14
+    {0, SW8_CS4,   SW7_CS4,   SW9_CS4}, //LA15
+    {0, SW11_CS4,   SW10_CS4,   SW12_CS4}, //LA16
+    {0, SW2_CS5,   SW1_CS5,   SW3_CS5}, //LA17
+    {0, SW5_CS5,   SW4_CS5,   SW6_CS5}, //LA18
+    {0, SW8_CS5,   SW7_CS5,   SW9_CS5}, //LA19
+    {0, SW11_CS5,   SW10_CS5,   SW12_CS5}, //LA20
+    {0, SW2_CS6,   SW1_CS6,   SW3_CS6}, //LA21
+    {0, SW5_CS6,   SW4_CS6,   SW6_CS6}, //LA22
+    {0, SW8_CS6,   SW7_CS6,   SW9_CS6}, //LA23
+    {0, SW11_CS6,   SW10_CS6,   SW12_CS6}, //LA24
+    {0, SW2_CS7,   SW1_CS7,   SW3_CS7}, //LA25
+    {0, SW5_CS7,   SW4_CS7,   SW6_CS7}, //LA26
+    {0, SW8_CS7,   SW7_CS7,   SW9_CS7}, //LA27
+    {0, SW11_CS7,   SW10_CS7,   SW12_CS7}, //LA28
+    {0, SW2_CS8,   SW1_CS8,   SW3_CS8}, //LA29
+    {0, SW5_CS8,   SW4_CS8,   SW6_CS8}, //LA30
+    {0, SW8_CS8,   SW7_CS8,   SW9_CS8}, //LA31
+    {0, SW11_CS8,   SW10_CS8,   SW12_CS8}, //LA32
+    {0, SW2_CS9,   SW1_CS9,   SW3_CS9}, //LA33
+    {0, SW5_CS9,   SW4_CS9,   SW6_CS9}, //LA34
+    {0, SW8_CS9,   SW7_CS9,   SW9_CS9}, //LA35
+    {0, SW11_CS9,   SW10_CS9,   SW12_CS9}, //LA36
+    {0, SW2_CS10,  SW1_CS10,  SW3_CS10}, //LA37
+    {0, SW5_CS10,  SW4_CS10,  SW6_CS10}, //LA38
+    {0, SW8_CS10,  SW7_CS10,  SW9_CS10}, //LA39
+    {0, SW11_CS10,  SW10_CS10,  SW12_CS10}, //LA40
+    {0, SW2_CS11,  SW1_CS11,  SW3_CS11}, //LA41
+    {0, SW5_CS11,  SW4_CS11,  SW6_CS11}, //LA42
+    {0, SW8_CS11,  SW7_CS11,  SW9_CS11}, //LA43
+    {0, SW11_CS11,  SW10_CS11,  SW12_CS11}, //LA44
+    {0, SW2_CS12,  SW1_CS12,  SW3_CS12}, //LA45
+    {0, SW5_CS12,  SW4_CS12,  SW6_CS12}, //LA46
+    {0, SW8_CS12,  SW7_CS12,  SW9_CS12}, //LA47
+    {0, SW11_CS12,  SW10_CS12,  SW12_CS12}, //LA48
+    {0, SW2_CS13,  SW1_CS13,  SW3_CS13}, //LA49
+    {0, SW5_CS13,  SW4_CS13,  SW6_CS13}, //LA50
+    {0, SW8_CS13,  SW7_CS13,  SW9_CS13}, //LA51
+    {0, SW11_CS13,  SW10_CS13,  SW12_CS13}, //LA52
+    {0, SW2_CS14,  SW1_CS14,  SW3_CS14}, //LA53
+    {0, SW5_CS14,  SW4_CS14,  SW6_CS14}, //LA54
+    {0, SW8_CS14,  SW7_CS14,  SW9_CS14}, //LA55
+    {0, SW11_CS14,  SW10_CS14,  SW12_CS14}, //LA56
+    {0, SW2_CS15,  SW1_CS15,  SW3_CS15}, //LA57
+    {0, SW5_CS15,  SW4_CS15,  SW6_CS15}, //LA58
+    {0, SW8_CS15,  SW7_CS15,  SW9_CS15}, //LA59
+    {0, SW11_CS15,  SW10_CS15,  SW12_CS15}, //LA60
+    {0, SW2_CS16,  SW1_CS16,  SW3_CS16}, //LA61
+    {0, SW5_CS16,  SW4_CS16,  SW6_CS16}, //LA62
+    {0, SW8_CS16,  SW7_CS16,  SW9_CS16}, //LA63
+    {0, SW11_CS16,  SW10_CS16,  SW12_CS16}, //LA64
 
-    {1, B_1,   A_1,   C_1}, //LB1
-    {1, E_1,   D_1,   F_1}, //LB2
-    {1, H_1,   G_1,   I_1}, //LB3
-    {1, K_1,   J_1,   L_1}, //LB4
-    {1, B_2,   A_2,   C_2}, //LB5
-    {1, E_2,   D_2,   F_2}, //LB6
-    {1, H_2,   G_2,   I_2}, //LB7
-    {1, K_2,   J_2,   L_2}, //LB8
-    {1, B_3,   A_3,   C_3}, //LB9
-    {1, E_3,   D_3,   F_3}, //LB10
-    {1, H_3,   G_3,   I_3}, //LB11
-    {1, K_3,   J_3,   L_3}, //LB12
-    {1, B_4,   A_4,   C_4}, //LB13
-    {1, E_4,   D_4,   F_4}, //LB14
-    {1, H_4,   G_4,   I_4}, //LB15
-    {1, K_4,   J_4,   L_4}, //LB16
-    {1, B_5,   A_5,   C_5}, //LB17
-    {1, E_5,   D_5,   F_5}, //LB18
-    {1, H_5,   G_5,   I_5}, //LB19
-    {1, K_5,   J_5,   L_5}, //LB20
-    {1, B_6,   A_6,   C_6}, //LB21
-    {1, E_6,   D_6,   F_6}, //LB22
-    {1, H_6,   G_6,   I_6}, //LB23
-    {1, K_6,   J_6,   L_6}, //LB24
-    {1, B_7,   A_7,   C_7}, //LB25
-    {1, E_7,   D_7,   F_7}, //LB26
-    {1, H_7,   G_7,   I_7}, //LB27
-    {1, K_7,   J_7,   L_7}, //LB28
-    {1, B_8,   A_8,   C_8}, //LB29
-    {1, E_8,   D_8,   F_8}, //LB30
-    {1, H_8,   G_8,   I_8}, //LB31
-    {1, K_8,   J_8,   L_8}, //LB32
-    {1, B_9,   A_9,   C_9}, //LB33
-    {1, E_9,   D_9,   F_9}, //LB34
-    {1, H_9,   G_9,   I_9}, //LB35
-    {1, K_9,   J_9,   L_9}, //LB36
-    {1, B_10,  A_10,  C_10}, //LB37
-    {1, E_10,  D_10,  F_10}, //LB38
-    {1, H_10,  G_10,  I_10}, //LB39
-    {1, K_10,  J_10,  L_10}, //LB40
-    {1, B_11,  A_11,  C_11}, //LB41
-    {1, E_11,  D_11,  F_11}, //LB42
-    {1, H_11,  G_11,  I_11}, //LB43
-    {1, K_11,  J_11,  L_11}, //LB44
-    {1, B_12,  A_12,  C_12}, //LB45
-    {1, E_12,  D_12,  F_12}, //LB46
-    {1, H_12,  G_12,  I_12}, //LB47
-    {1, K_12,  J_12,  L_12}, //LB48
-    {1, B_13,  A_13,  C_13}, //LB49
-    {1, E_13,  D_13,  F_13}, //LB50
-    {1, H_13,  G_13,  I_13}, //LB51
-    {1, K_13,  J_13,  L_13}, //LB52
-    {1, B_14,  A_14,  C_14}, //LB53
-    {1, E_14,  D_14,  F_14}, //LB54
-    {1, H_14,  G_14,  I_14}, //LB55
-    {1, K_14,  J_14,  L_14}, //LB56
-    {1, B_15,  A_15,  C_15}, //LB57
-    {1, E_15,  D_15,  F_15}, //LB58
-    {1, H_15,  G_15,  I_15}, //LB59
-    {1, K_15,  J_15,  L_15}, //LB60
-    {1, B_16,  A_16,  C_16}, //LB61
-    {1, E_16,  D_16,  F_16}, //LB62
-    {1, H_16,  G_16,  I_16}, //LB63
-    {1, K_16,  J_16,  L_16}, //LB64
+    {1, SW2_CS1,   SW1_CS1,   SW3_CS1}, //LB1
+    {1, SW5_CS1,   SW4_CS1,   SW6_CS1}, //LB2
+    {1, SW8_CS1,   SW7_CS1,   SW9_CS1}, //LB3
+    {1, SW11_CS1,   SW10_CS1,   SW12_CS1}, //LB4
+    {1, SW2_CS2,   SW1_CS2,   SW3_CS2}, //LB5
+    {1, SW5_CS2,   SW4_CS2,   SW6_CS2}, //LB6
+    {1, SW8_CS2,   SW7_CS2,   SW9_CS2}, //LB7
+    {1, SW11_CS2,   SW10_CS2,   SW12_CS2}, //LB8
+    {1, SW2_CS3,   SW1_CS3,   SW3_CS3}, //LB9
+    {1, SW5_CS3,   SW4_CS3,   SW6_CS3}, //LB10
+    {1, SW8_CS3,   SW7_CS3,   SW9_CS3}, //LB11
+    {1, SW11_CS3,   SW10_CS3,   SW12_CS3}, //LB12
+    {1, SW2_CS4,   SW1_CS4,   SW3_CS4}, //LB13
+    {1, SW5_CS4,   SW4_CS4,   SW6_CS4}, //LB14
+    {1, SW8_CS4,   SW7_CS4,   SW9_CS4}, //LB15
+    {1, SW11_CS4,   SW10_CS4,   SW12_CS4}, //LB16
+    {1, SW2_CS5,   SW1_CS5,   SW3_CS5}, //LB17
+    {1, SW5_CS5,   SW4_CS5,   SW6_CS5}, //LB18
+    {1, SW8_CS5,   SW7_CS5,   SW9_CS5}, //LB19
+    {1, SW11_CS5,   SW10_CS5,   SW12_CS5}, //LB20
+    {1, SW2_CS6,   SW1_CS6,   SW3_CS6}, //LB21
+    {1, SW5_CS6,   SW4_CS6,   SW6_CS6}, //LB22
+    {1, SW8_CS6,   SW7_CS6,   SW9_CS6}, //LB23
+    {1, SW11_CS6,   SW10_CS6,   SW12_CS6}, //LB24
+    {1, SW2_CS7,   SW1_CS7,   SW3_CS7}, //LB25
+    {1, SW5_CS7,   SW4_CS7,   SW6_CS7}, //LB26
+    {1, SW8_CS7,   SW7_CS7,   SW9_CS7}, //LB27
+    {1, SW11_CS7,   SW10_CS7,   SW12_CS7}, //LB28
+    {1, SW2_CS8,   SW1_CS8,   SW3_CS8}, //LB29
+    {1, SW5_CS8,   SW4_CS8,   SW6_CS8}, //LB30
+    {1, SW8_CS8,   SW7_CS8,   SW9_CS8}, //LB31
+    {1, SW11_CS8,   SW10_CS8,   SW12_CS8}, //LB32
+    {1, SW2_CS9,   SW1_CS9,   SW3_CS9}, //LB33
+    {1, SW5_CS9,   SW4_CS9,   SW6_CS9}, //LB34
+    {1, SW8_CS9,   SW7_CS9,   SW9_CS9}, //LB35
+    {1, SW11_CS9,   SW10_CS9,   SW12_CS9}, //LB36
+    {1, SW2_CS10,  SW1_CS10,  SW3_CS10}, //LB37
+    {1, SW5_CS10,  SW4_CS10,  SW6_CS10}, //LB38
+    {1, SW8_CS10,  SW7_CS10,  SW9_CS10}, //LB39
+    {1, SW11_CS10,  SW10_CS10,  SW12_CS10}, //LB40
+    {1, SW2_CS11,  SW1_CS11,  SW3_CS11}, //LB41
+    {1, SW5_CS11,  SW4_CS11,  SW6_CS11}, //LB42
+    {1, SW8_CS11,  SW7_CS11,  SW9_CS11}, //LB43
+    {1, SW11_CS11,  SW10_CS11,  SW12_CS11}, //LB44
+    {1, SW2_CS12,  SW1_CS12,  SW3_CS12}, //LB45
+    {1, SW5_CS12,  SW4_CS12,  SW6_CS12}, //LB46
+    {1, SW8_CS12,  SW7_CS12,  SW9_CS12}, //LB47
+    {1, SW11_CS12,  SW10_CS12,  SW12_CS12}, //LB48
+    {1, SW2_CS13,  SW1_CS13,  SW3_CS13}, //LB49
+    {1, SW5_CS13,  SW4_CS13,  SW6_CS13}, //LB50
+    {1, SW8_CS13,  SW7_CS13,  SW9_CS13}, //LB51
+    {1, SW11_CS13,  SW10_CS13,  SW12_CS13}, //LB52
+    {1, SW2_CS14,  SW1_CS14,  SW3_CS14}, //LB53
+    {1, SW5_CS14,  SW4_CS14,  SW6_CS14}, //LB54
+    {1, SW8_CS14,  SW7_CS14,  SW9_CS14}, //LB55
+    {1, SW11_CS14,  SW10_CS14,  SW12_CS14}, //LB56
+    {1, SW2_CS15,  SW1_CS15,  SW3_CS15}, //LB57
+    {1, SW5_CS15,  SW4_CS15,  SW6_CS15}, //LB58
+    {1, SW8_CS15,  SW7_CS15,  SW9_CS15}, //LB59
+    {1, SW11_CS15,  SW10_CS15,  SW12_CS15}, //LB60
+    {1, SW2_CS16,  SW1_CS16,  SW3_CS16}, //LB61
+    {1, SW5_CS16,  SW4_CS16,  SW6_CS16}, //LB62
+    {1, SW8_CS16,  SW7_CS16,  SW9_CS16}, //LB63
+    {1, SW11_CS16,  SW10_CS16,  SW12_CS16}, //LB64
 };
 #endif
 
diff --git a/keyboards/keebwerk/mega/ansi/keymaps/jesusvallejo/keymap.c b/keyboards/keebwerk/mega/ansi/keymaps/jesusvallejo/keymap.c
deleted file mode 100644
index 307eac90e1f..00000000000
--- a/keyboards/keebwerk/mega/ansi/keymaps/jesusvallejo/keymap.c
+++ /dev/null
@@ -1,176 +0,0 @@
-/* Copyright 2020 Yiancar
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-#include "drivers/led/issi/is31fl3733.h"
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[0] = LAYOUT_65_ansi( /* Base */
-    QK_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_HOME,
-    KC_TAB,  KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
-    KC_CAPS, KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGDN,
-    KC_LSFT, KC_Z,    KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   KC_END,
-    KC_LCTL, KC_LGUI, KC_LALT,                KC_SPC,                          KC_RALT, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
-
-[1] = LAYOUT_65_ansi( /* FN */
-    KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, S1_DEC,  S1_INC,  S2_DEC,  S2_INC,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
-    KC_TRNS, EF_DEC,  EF_INC,  H1_DEC,  H1_INC,  H2_DEC,  H2_INC,  BR_DEC,  BR_INC,  ES_DEC,  ES_INC,  KC_TRNS,          KC_TRNS, KC_TRNS,
-    KC_VOLU, KC_VOLD, KC_MUTE,                KC_TRNS,                               KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-
-[2] = LAYOUT_65_ansi( /* Empty for dynamic keymaps */
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS,                KC_TRNS,                               KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-
-[3] = LAYOUT_65_ansi( /* Empty for dynamic keymaps */
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS,                KC_TRNS,                               KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-};
-
-
-static uint16_t ledTimer;
-
-uint8_t r = 0;  /* First led*/
-uint8_t g = 0;  /* Second led*/
-uint8_t b = 0;  /* Third led*/
-
-/* Boot animation parameters */
-
-uint8_t bootFirst=3;    /* Number of increment slides. */
-uint8_t bootSec=3;      /* Number of full blink. */
-
-/* Breathing animation parameters */
-
-const uint16_t travelTime = 1000;   /* Time the leds take to go from off to on or on to off. */
-const uint16_t fadeStep = 5;        /* Steps for the fade in and out, 0-255 by steps of 10. */
-const uint16_t fadeTime = 20;       /* Time between each fade step. */
-const uint8_t maxBrightness=255;    /* keep them multipliers of fade Step between 0 and 255. */
-const uint8_t minBrightness=0;
-
-uint16_t previousTime = 0;
-uint16_t time = 0;
-
-bool bootAnimation(void){
-    if (bootFirst>0 || bootSec>0){    
-        if(bootFirst!=0){
-            if (timer_elapsed(ledTimer) > 150){
-                g = 255;
-                r = 0;
-                b = 0;
-                is31fl3733_set_color( 6+64-1, r, g, b );
-            }
-            if (timer_elapsed(ledTimer) > 300){
-                g = 255;
-                r = 255;
-                b = 0;
-                is31fl3733_set_color( 6+64-1, r, g, b );
-            }
-            if (timer_elapsed(ledTimer) > 400){
-                g = 255;
-                r = 255;
-                b = 255;
-                is31fl3733_set_color( 6+64-1, r, g, b );
-            }
-            if (timer_elapsed(ledTimer) > 500){
-                g = 0;
-                r = 0;
-                b = 0;
-                is31fl3733_set_color( 6+64-1, r, g, b );
-                ledTimer = timer_read();
-                bootFirst--;
-            }
-        }
-        if (bootFirst==0 && bootSec!=0){
-            if (timer_elapsed(ledTimer) > 200) {
-                g = 255;
-                r = 255;
-                b = 255;
-                is31fl3733_set_color( 6+64-1, r, g, b );
-            }
-            if (timer_elapsed(ledTimer) > 400){
-                g = 0;
-                r = 0;
-                b = 0;
-                is31fl3733_set_color( 6+64-1, r, g, b );
-                ledTimer = timer_read();
-                bootSec--;
-            }
-        }
-        return false;
-    }
-    return true;
-}
-
-
-void breathing(void) {
-    if(timer_elapsed(ledTimer)<travelTime){
-        time = timer_elapsed(ledTimer);
-        if((time - previousTime) > fadeTime && r<maxBrightness){
-            g+=fadeStep;
-            r+=fadeStep;
-            b+=fadeStep;
-            is31fl3733_set_color( 6+64-1, r, g, b );
-            previousTime = time;
-        }
-    }
-    else if(timer_elapsed(ledTimer)<(travelTime *  2)){
-        time = timer_elapsed(ledTimer);
-        if((time - previousTime) > fadeTime && r>minBrightness){
-            g-=fadeStep;
-            r-=fadeStep;
-            b-=fadeStep;
-            is31fl3733_set_color( 6+64-1, r, g, b );
-            previousTime = time;
-        } 
-    }
-    else {
-        r=0;
-        g=0;
-        b=0;
-        is31fl3733_set_color( 6+64-1, r, g, b );
-        previousTime = 0;
-        time = 0;
-        ledTimer=timer_read();
-    }
-}
-
-/* this avoids turning off the led each matrix_scan_user() call */
-bool capsState; 
-bool prevCapsState;
-
-void matrix_scan_user(void){
-    if(bootAnimation()){
-        capsState = host_keyboard_led_state().caps_lock; 
-        if (capsState) {
-            breathing();
-            prevCapsState = capsState; 
-        } 
-        else if(!capsState && capsState != prevCapsState){ 
-            g = 0;
-            r = 0;
-            b = 0;
-            is31fl3733_set_color( 6+64-1, r, g, b );
-            prevCapsState = capsState; 
-        }
-    }
-}
diff --git a/keyboards/keebwerk/mega/ansi/keymaps/jesusvallejo/readme.md b/keyboards/keebwerk/mega/ansi/keymaps/jesusvallejo/readme.md
deleted file mode 100644
index 5910222a460..00000000000
--- a/keyboards/keebwerk/mega/ansi/keymaps/jesusvallejo/readme.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# The jesusvallejo keymap for ANSI Keebwerk Mega. VIA support enabled.
-
-![Layer 0](https://i.imgur.com/RcuLofrl.png)
-
-![Layer 1](https://i.imgur.com/NJOORcdl.png)
-
-- Default layer is normal ANSI 65%.
-- Leds slide and blink bootup animation.
-- Leds fade Caps Lock animation.
diff --git a/keyboards/keebwerk/nano_slider/keymaps/midi2vol/keymap.c b/keyboards/keebwerk/nano_slider/keymaps/midi2vol/keymap.c
deleted file mode 100644
index bd1f399086b..00000000000
--- a/keyboards/keebwerk/nano_slider/keymaps/midi2vol/keymap.c
+++ /dev/null
@@ -1,154 +0,0 @@
-/* Copyright 2020 Duckle, 2021 Jesús Vallejo
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-#include QMK_KEYBOARD_H
-#include "analog.h"
-#include "qmk_midi.h"
-
-/*
-This keymap works with midi2vol: linux version  https://github.com/jesusvallejo/Midi2Vol-Linux  
-and windows version https://github.com/jesusvallejo/Midi2Vol
-
-Enables the user to change the volume on the host computer if running midi2vol software.
-
-Example to extend usability is provided check VLC in: enum custom_keycodes {} and bool process_record_user(uint16_t keycode, keyrecord_t *record) {}
-Remember to give allways the new volume control a hex value not used by other volume control, 
-and add it to the midi2vol software.
-Check respective midi2vol readme on how to do so.In linux change config.json,in windows you can use configuration option.
-
-A compiled version of this keymap is provided in here: https://github.com/jesusvallejo/nanokeymaps/
-
-*/
-
-uint8_t midi2vol = 0x3E;
-
-/* Defines names for use in layer keycodes and the keymap */
-
-enum custom_layers {
-    _MEDIA,    /* Controls Pause, Mute , Forward ... */
-    _NAV,      /* Nav arrows, Enter, Space*/
-    _VOLUME,    /* Changes midi2vol int to interface with midi2vol program: Chrome Volume, General Volume */
-    _DISCORD,  /* FXX unsused keys to interface with Discord: Mute , Silence */
-    _LIGHTS,   /* Edits underglow and retroilumination */
-    _EDIT,     /* Cut, Copy ,Paste */
-    _QK_BOOT,  /* Layer to set nano in bootloader mode */
-    _TOOGLE,   /* Momentary layer to switch between layers */
-};
-
-
-
-/* Defines the keycodes used by our macros in process_record_user */
-enum custom_keycodes { /* In order to add more volume controls, add here a custom keycode, ex: VLC */
-    DEFAULT= SAFE_RANGE,SPOTIFY,DISCORD,CHROME/*,VLC*/
-};
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Base */
-    [_MEDIA] = LAYOUT(
-        MO(_TOOGLE),
-        KC_MPLY, KC_MNXT,  KC_COPY,
-        KC_MUTE,  KC_MPRV, KC_PASTE, KC_ENTER
-    ),
-    [_NAV] = LAYOUT(
-        MO(_TOOGLE),
-        KC_SPC, KC_UP, KC_BSPC,
-        KC_LEFT, KC_DOWN, KC_RIGHT, KC_ENTER      
-    ),
-    [_VOLUME] = LAYOUT(
-        MO(_TOOGLE),
-        SPOTIFY, DISCORD, CHROME,
-        KC_NO, KC_NO, KC_NO, DEFAULT
-    ),
-    [_DISCORD] = LAYOUT(
-        MO(_TOOGLE),
-        KC_F18, KC_F19, KC_F20,
-        KC_F21, KC_F22, KC_F23, KC_F24
-    ),
-    [_LIGHTS] = LAYOUT(
-        MO(_TOOGLE),
-        RGB_TOG, RGB_MOD, RGB_VAI,
-        RGB_SAI, BL_BRTG, BL_STEP, KC_LSFT
-    ),
-    [_EDIT] = LAYOUT(
-        MO(_TOOGLE),
-        KC_MENU, KC_CUT, KC_COPY,
-        KC_FIND, KC_UNDO, KC_PASTE, KC_MPLY
-    ),
-    [_RESET] = LAYOUT(
-        MO(_TOOGLE),
-        KC_NO, KC_NO, KC_NO,
-        KC_NO, KC_NO, KC_NO, QK_BOOT 
-    ),
-    [_TOOGLE] = LAYOUT(
-        MO(_TOOGLE),
-        TO(_MEDIA),    TO(_NAV),    TO(_VOLUME),
-        TO(_DISCORD),    TO(_LIGHTS),    TO(_EDIT),    TO(_RESET)
-    )
-};
-/* In order to add more volume controls, add here code to detect custom keycode, ex: VLC */
-bool process_record_user(uint16_t keycode, keyrecord_t *record) { 
-    switch (keycode) {
-        case DEFAULT:
-            if (record->event.pressed) {
-                /* when keycode DEFAULT is pressed */
-                midi2vol= 0x3E;
-            } else {
-                /* when keycode DEFAULT is released */
-            }
-            break;
-        case SPOTIFY:
-            if (record->event.pressed) {                
-                midi2vol= 0x3F;
-            }
-            break;
-        case DISCORD:
-            if (record->event.pressed) {
-                
-                midi2vol= 0x40;
-            } 
-            break;
-        case CHROME:
-            if (record->event.pressed) {
-                
-                midi2vol= 0x41;
-            }
-            break;
-        /*
-        case VLC:
-            if (record->event.pressed) {
-                midi2vol= 0x42;
-            }
-            break;
-        */
-    }
-    return true;
-}
-
-uint8_t divisor = 0;
-
-
-void slider(void) {
-    if (divisor++) { /* only run the slider function 1/256 times it's called */
-        return;
-    }
-    midi_send_cc(&midi_device, 2, midi2vol, 0x7F - (analogReadPin(SLIDER_PIN) >> 3));
-}
-
-void matrix_scan_user(void) {
-    slider();
-}
diff --git a/keyboards/keebwerk/nano_slider/keymaps/midi2vol/readme.md b/keyboards/keebwerk/nano_slider/keymaps/midi2vol/readme.md
deleted file mode 100644
index 869baef07f5..00000000000
--- a/keyboards/keebwerk/nano_slider/keymaps/midi2vol/readme.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# The Midi2Vol keymap for nano_slider
-This keymap has the code for the nano_slider to work with [Midi2Vol](https://github.com/jesusvallejo/Midi2Vol).
diff --git a/keyboards/keyboardio/atreus/keymaps/ardumont/keymap.c b/keyboards/keyboardio/atreus/keymaps/ardumont/keymap.c
deleted file mode 100644
index 92296cbc55e..00000000000
--- a/keyboards/keyboardio/atreus/keymaps/ardumont/keymap.c
+++ /dev/null
@@ -1,137 +0,0 @@
-// Copyright (C) 2019, 2020  Keyboard.io, Inc
-//               2021  Antoine R. Dumont (@ardumont) <antoine.romain.dumont@gmail.com>
-//
-// this is the style you want to emulate.
-// This is the canonical layout file for the Quantum project. If you want to add another keyboard,
-
-#include QMK_KEYBOARD_H
-
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-// The underscores don't mean anything - you can have a layer called STUFF or any other name.
-// Layer names don't all need to be of the same length, obviously, and you can also skip them
-// entirely and just use numbers.
-enum layer_names {
-    _QW,
-    _RS,
-    _LW,
-};
-
-// tap: z    // hold: SHIFT
-#define Z_SFT     SFT_T(KC_Z)
-// tap: /    // hold: SHIFT
-#define SLSH_SFT  SFT_T(KC_SLSH)
-
-// tap: `    // hold: SHIFT
-#define GRAVE_SFT SFT_T(KC_GRAVE)
-// tap: [    // hold: SHIFT
-#define RBRC_SFT  SFT_T(KC_RBRC)
-
-// Layer movment
-#define FN0 MO(_RS)  // move to layer 1 (L1)
-#define FN1 TG(_LW)  // move to layer 2 (L2)
-#define FN2 TO(_QW)  // move to layer 0 (L0)
-
-  /*
-   *  q     w     e     r   t      ||     y   u   i/tab o  p
-   *  a     s     d     f   g      ||     h   j   k     l  ;
-   *  z/sft x     c     v   b  `   || \   n   m   ,     .  //sft
-   *  ctl   esc  super  alt L1 spc || spc L1  alt -     '  ctl
-   */
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QW] = LAYOUT( /* Qwerty */
-    KC_Q,    KC_W,   KC_E,     KC_R,    KC_T,                      KC_Y,   KC_U,    KC_I,    KC_O,    KC_P    ,
-    KC_A,    KC_S,   KC_D,     KC_F,    KC_G,                      KC_H,   KC_J,    KC_K,    KC_L,    KC_SCLN ,
-    Z_SFT,   KC_X,   KC_C,     KC_V,    KC_B,   KC_GRAVE, KC_BSLS, KC_N,   KC_M,    KC_COMM, KC_DOT,  SLSH_SFT,
-    KC_LCTL, KC_ESC, KC_LGUI,  KC_LALT, KC_SPC, FN0,      FN0,     KC_SPC, KC_LALT, KC_MINS, KC_QUOT, KC_LCTL
-  ),
-
-  /*
-   *  1     2      3     4   5       ||    6   7   8    9    0
-   *  !     @      #     $   %       ||    ^   &   *    (    )
-   *  `/sft ~      ?     ?   ?   ~   || |  +   -   /    [    ]/sft
-   *  ctl   esc    super alt spc L2  || L2 spc alt =    esc  ctl
-   */
-  [_RS] = LAYOUT( /* [> RAISE <] */
-    KC_1,      KC_2,    KC_3,    KC_4,    KC_5,                       KC_6,     KC_7,    KC_8,    KC_9,    KC_0    ,
-    KC_EXLM,   KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                    KC_CIRC,  KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN ,
-    GRAVE_SFT, KC_TILD, KC_NO,   KC_NO,   KC_NO,    _______, _______, KC_PLUS,  KC_MINS, KC_SLSH, KC_LBRC, RBRC_SFT,
-    _______,   _______, _______, _______, _______, FN1,      FN1,     _______, _______, KC_EQL,   _______,  _______
-  ),
-
-  /*
-   * F1  F2  F3    F4  F5          ||    F6  F7  F8  F9  F10
-   * __  __  __    __  F11         ||    F12 __  __  __  __
-   * __  __  __    dbg rst eep-rst || __ __  __  __  __  __
-   * ctl esc super alt  __ L0      || L0 __ alt  __  esc ctl
-   */
-  [_LW] = LAYOUT( /* [> LOWER <] */
-    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                     KC_F6,   KC_F7,   KC_F8, KC_F9,  KC_F10,
-    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_F11,                    KC_F12,  KC_NO,   KC_NO, KC_NO,  KC_NO ,
-    KC_NO,   KC_NO,   KC_NO,   DB_TOGG, QK_BOOT, EE_CLR,  _______, KC_NO,   KC_NO,   KC_NO, KC_NO,  KC_NO ,
-    _______, _______, _______, _______, _______, FN2,     FN2,     _______, _______, KC_NO, KC_ESC, _______
-  )
-};
-
-// Initialize variable holding the binary
-// representation of active modifiers.
-uint8_t mod_state;
-
-bool substitute_keycode(uint16_t keycode, keyrecord_t *record, uint8_t mod_state, uint16_t substitute_keycode) {
-    /* Substitute keycode if condition matches */
-    // Initialize a boolean variable that keeps track
-    // of the delete key status: registered or not?
-    static bool key_registered;
-    // ctrl activated?
-    if ((mod_state & MOD_BIT(KC_LCTL)) == MOD_BIT(KC_LCTL)) {
-        if (record->event.pressed) {
-            // No need to register KC_LCTL because it's already active.
-            unregister_code(KC_LCTL);
-            // Send substitute code
-            register_code(substitute_keycode);
-            // Update the boolean variable to reflect the status of the register
-            key_registered = true;
-            // Reapplying modifier state so that the held shift key(s)
-            // still work even after having tapped the Backspace/Delete key.
-            set_mods(mod_state);
-            // Do not let QMK process the keycode further
-            return false;
-        } else {
-            // In case substitude_keycode is still even after release of the key
-            if (key_registered) {
-                unregister_code(substitute_keycode);
-                key_registered = false;
-                // Do not let QMK process the keycode further
-                return false;
-            }
-        }
-    } else { // ctrl got released
-        // In case substitude_keycode is still sent after release of the ctrl key
-        if (key_registered) {
-            unregister_code(substitute_keycode);
-            key_registered = false;
-        }
-    }
-    // Else, let QMK process the keycode as usual
-    return true;
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    // Store the current modifier state in the variable for later reference
-    mod_state = get_mods();
-    switch (keycode) {
-    case KC_I:
-        return substitute_keycode(keycode, record, mod_state, KC_TAB);
-    case KC_M:
-        return substitute_keycode(keycode, record, mod_state, KC_ENTER);
-    case KC_H:
-        return substitute_keycode(keycode, record, mod_state, KC_BSPC);
-    case KC_D:
-        return substitute_keycode(keycode, record, mod_state, KC_DEL);
-    case KC_N:
-        return substitute_keycode(keycode, record, mod_state, KC_DOWN);
-    case KC_P:
-        return substitute_keycode(keycode, record, mod_state, KC_UP);
-    }
-    return true;
-};
diff --git a/keyboards/keyboardio/atreus/keymaps/ardumont/readme.md b/keyboards/keyboardio/atreus/keymaps/ardumont/readme.md
deleted file mode 100644
index d2532d7e973..00000000000
--- a/keyboards/keyboardio/atreus/keymaps/ardumont/readme.md
+++ /dev/null
@@ -1,23 +0,0 @@
-![ardumont layout](https://i.imgur.com/tuk64AI.png)
-
-# ardumont layout
-
-This is a qwerty layout for the keyboardio/atreus. For the most part, it's a
-straightforward layout. Only the modifiers key are not organized like the default
-layout. Those modifier keys are mostly symmetrically configured.
-
-The idea is that when using a modifier key, some users may expect to use both side of
-the keyboard symmetrically (as in emacs, qutebrowser, terminal/tmux).
-
-Exceptions to the rules are the `Escape` and the `Super` which only exists on the left
-Side of the keyboard. Those are mostly unused.
-
-Note that some keys are not present in the keyboard (e.g `Tab`, `Enter`, ...) since they
-are available from the legacy terminal bindings:
-
-- Ctrl-i: Tab
-- Ctrl-m: Enter
-- Ctrl-h: Backspace
-- Ctrl-d: Del
-- Ctrl-n: Down
-- Ctrl-p: Up
diff --git a/keyboards/keyboardio/atreus/keymaps/kkokdae/config.h b/keyboards/keyboardio/atreus/keymaps/kkokdae/config.h
deleted file mode 100644
index c34fa270b40..00000000000
--- a/keyboards/keyboardio/atreus/keymaps/kkokdae/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2022 kkokdae <kkokdae@me.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-//#define PERMISSIVE_HOLD
-#define TAPPING_TERM 200
-#define ONESHOT_TAP_TOGGLE 5
-#define ONESHOT_TIMEOUT 5000
-
-#define AUTO_SHIFT_DISABLED_AT_STARTUP
-#define AUTO_SHIFT_TIMEOUT 0
-#define NO_AUTO_SHIFT_SPECIAL
-#define NO_AUTO_SHIFT_NUMERIC
diff --git a/keyboards/keyboardio/atreus/keymaps/kkokdae/keymap.c b/keyboards/keyboardio/atreus/keymaps/kkokdae/keymap.c
deleted file mode 100644
index de8491d2463..00000000000
--- a/keyboards/keyboardio/atreus/keymaps/kkokdae/keymap.c
+++ /dev/null
@@ -1,110 +0,0 @@
-/* Copyright 2022 kkokdae <kkokdae@me.com>
- *
- *  This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-enum my_layers {
-  _COLEMAK,
-  _QWERTY,
-  _FUNC,
-  _NUMPAD,
-  _SYMBOL
-};
-
-enum my_tds {
-  TdH,
-  TdL
-};
-
-#define FUNC LT(_FUNC, KC_SPC)
-#define NUMPAD  LT(_NUMPAD, KC_BSPC)
-#define DNUMPAD LT(_NUMPAD, KC_DEL)
-#define SYMBOL OSL(_SYMBOL)
-
-#define OSMCMD OSM(MOD_LGUI)
-#define OSMOPT OSM(MOD_LALT)
-#define OSMCTL OSM(MOD_LCTL)
-#define OSMSFT OSM(MOD_LSFT)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_COLEMAK] = LAYOUT(
-      KC_Q,    KC_W,    KC_F,    KC_P,    KC_B,                      KC_J,    KC_L,    KC_U,    KC_Y,    KC_QUOT,
-      KC_A,    KC_R,    KC_S,    KC_T,    KC_G,                      KC_M,    KC_N,    KC_E,    KC_I,    KC_O,
-      KC_Z,    KC_X,    KC_C,    KC_D,    KC_V,    _______, _______, KC_K,    KC_H,    KC_COMM, KC_DOT,  KC_ENT,
-			OSMCMD,  OSMOPT,  OSMCTL,  OSMSFT,  FUNC,    KC_TAB,  KC_ESC,  NUMPAD,  SYMBOL,  OSMCTL,  OSMOPT,  OSMCMD
-      ),
-
-  [_QWERTY] = LAYOUT(
-      KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,
-      KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L,    KC_QUOT,
-      KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    _______, _______, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_ENT,
-			OSMCMD,  OSMOPT,  OSMCTL,  OSMSFT,  FUNC,    KC_TAB,  KC_ESC,  NUMPAD,  SYMBOL,  OSMCTL,  OSMOPT,  OSMCMD
-      ),
-
-  [_FUNC] = LAYOUT(
-      KC_MRWD, KC_VOLU, KC_VOLD, KC_MFFD, KC_MPLY,                   KC_INS,  KC_F7,   KC_F8,   KC_F9,   KC_CAPS,
-      KC_LEFT, KC_UP,   KC_DOWN, KC_RGHT, KC_BRIU,                   KC_F12,  KC_F4,   KC_F5,   KC_F6,   TD(TdL),
-      KC_HOME, KC_PGUP, KC_PGDN, KC_END,  KC_BRID, _______, _______, KC_F10,  KC_F1,   KC_F2,   KC_F3,   KC_F11,
-      _______, _______, _______, CW_TOGG, _______, _______, _______, DNUMPAD, _______, _______, _______, _______
-      ),
-
-  [_NUMPAD] = LAYOUT(
-      _______, _______, _______, _______, _______,                   S(KC_E), KC_7,    KC_8,    KC_9,    S(KC_F),
-      TD(TdL), KC_EQL,  KC_ASTR, KC_PLUS, _______,                   S(KC_C), KC_4,    KC_5,    KC_6,    S(KC_D),
-      TD(TdH), KC_DOT,  KC_SLSH, KC_MINS, _______, _______, _______, S(KC_A), KC_1,    KC_2,    KC_3,    S(KC_B),
-      _______, _______, _______, CW_TOGG, _______, _______, _______, _______, KC_0,    _______, _______, _______
-      ),
-
-  [_SYMBOL] = LAYOUT(
-      KC_LCBR, KC_LBRC, KC_RBRC, KC_RCBR, KC_CIRC,                   KC_DLR,  KC_BSLS, KC_PERC, KC_AT,   KC_DQUO,
-      KC_QUES, KC_EXLM, KC_HASH, KC_ASTR, KC_AMPR,                   KC_PIPE, KC_MINS, KC_PLUS, KC_UNDS, KC_EQL,
-      KC_LT,   KC_LPRN, KC_RPRN, KC_GT,   KC_GRV,  _______, _______, KC_TILD, KC_SLSH, C(KC_B), KC_COLN, KC_SCLN,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-      ),
-};
-
-void dance_hex(tap_dance_state_t *state, void *user_data) {
-  switch(state->count) {
-    case 1:
-			SEND_STRING("0x");
-      break;
-    case 2:
-			SEND_STRING("\\x");
-      break;
-  }
-}
-
-void dance_lang(tap_dance_state_t *state, void *user_data) {
-  uint32_t default_layer;
-  switch(state->count) {
-    case 1:
-			SEND_STRING(SS_LCTL(" ") SS_DELAY(200) SS_TAP(X_ENT));
-    case 2:
-      default_layer = get_highest_layer(default_layer_state);
-      if (default_layer == _COLEMAK) {
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      else if (default_layer == _QWERTY) {
-        set_single_persistent_default_layer(_COLEMAK);
-      }
-      break;
-  }
-}
-
-tap_dance_action_t tap_dance_actions[] = {
-  [TdH] = ACTION_TAP_DANCE_FN(dance_hex),
-  [TdL] = ACTION_TAP_DANCE_FN(dance_lang)
-};
diff --git a/keyboards/keyboardio/atreus/keymaps/kkokdae/readme.md b/keyboards/keyboardio/atreus/keymaps/kkokdae/readme.md
deleted file mode 100644
index f7f85f70a6a..00000000000
--- a/keyboards/keyboardio/atreus/keymaps/kkokdae/readme.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# kkokdae keymap - Keyboardio Atreus
-
-This is the keymap available for keyboardio/atreus keyboards.
-
-The default layout used [Colemak Mod-DH](https://colemakmods.github.io/mod-dh/). The prefix keys for vim/tmux users. The symbol is designed for ease of use by programmers.
diff --git a/keyboards/keyboardio/atreus/keymaps/kkokdae/rules.mk b/keyboards/keyboardio/atreus/keymaps/kkokdae/rules.mk
deleted file mode 100644
index 75ebcd912b7..00000000000
--- a/keyboards/keyboardio/atreus/keymaps/kkokdae/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-MOUSEKEY_ENABLE = no
-COMMAND_ENABLE = no
-TAP_DANCE_ENABLE = yes
-CAPS_WORD_ENABLE = yes
diff --git a/keyboards/keyboardio/atreus/keymaps/poweredbyporridge/config.h b/keyboards/keyboardio/atreus/keymaps/poweredbyporridge/config.h
deleted file mode 100644
index 0fa53c2d678..00000000000
--- a/keyboards/keyboardio/atreus/keymaps/poweredbyporridge/config.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* Copyright 2023 @PoweredByPorridge
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#define AUTO_SHIFT_TIMEOUT 210
-
-#define NO_AUTO_SHIFT_NUMERIC
-// #define NO_AUTO_SHIFT_SPECIAL
-
-// retro shift is auto shift on home row mods
-// I no longer use home row mods, but do find this setting helps
-// avoid 'fat fingered' keypresses.
-
-// If RETRO_SHIFT is defined to a value, hold times greater 
-// than that value will not produce a tap on release. This enables 
-// modifiers to be held for combining with mouse clicks without 
-// generating taps on release.
-#define RETRO_SHIFT 425
-
-// can also be defined without a value
-// #define RETRO_SHIFT
-
-// Configure the global tapping term (default: 200ms)
-// Lower than 210 and I can't tap dance brackets without a run up.
-#define TAPPING_TERM 210
-
-#define TAPPING_TERM_PER_KEY
-
-// Apply the modifier on keys that are tapped during a short hold of a modtap
-// Prevents slurred typing (of home row mods)
-#define PERMISSIVE_HOLD
diff --git a/keyboards/keyboardio/atreus/keymaps/poweredbyporridge/keymap.c b/keyboards/keyboardio/atreus/keymaps/poweredbyporridge/keymap.c
deleted file mode 100644
index 40c8b0b5aad..00000000000
--- a/keyboards/keyboardio/atreus/keymaps/poweredbyporridge/keymap.c
+++ /dev/null
@@ -1,224 +0,0 @@
-/* Copyright 2023 @PoweredByPorridge
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-// Tap Dance keycodes
-enum td_keycodes {
-    L_BRAX, // Used in the keymap, add additional keycodes for each tapdance.
-    R_BRAX,
-    QUOTS,  
-    TACHE   
-};
-
-// Define a type containing as many tapdance states as you need
-typedef enum {
-    SINGLE_TAP,
-    DOUBLE_TAP,           // SINGLE_HOLD,
-    TRIPLE_TAP            // DOUBLE_SINGLE_TAP
-} td_state_t;
-
-// Create a global instance of the tapdance state type
-static td_state_t td_state;
-
-// Declare your tapdance functions:
-
-// Function to determine the current tapdance state
-uint8_t cur_dance(tap_dance_state_t *state);
-
-// `finished` and `reset` functions for each tapdance keycode
-void lbrax_finished(tap_dance_state_t *state, void *user_data);
-void lbrax_reset(tap_dance_state_t *state, void *user_data);
-
-void rbrax_finished(tap_dance_state_t *state, void *user_data);
-void rbrax_reset(tap_dance_state_t *state, void *user_data);
-
-void quots_finished(tap_dance_state_t *state, void *user_data);
-void quots_reset(tap_dance_state_t *state, void *user_data);
-
-void tache_finished(tap_dance_state_t *state, void *user_data);
-void tache_reset(tap_dance_state_t *state, void *user_data);
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[0] = LAYOUT(KC_Q,         KC_W,        KC_E,       KC_R,     KC_T,                              KC_Y,        KC_U,      KC_I,     KC_O,    KC_P,
-		     KC_A,         KC_S,        KC_D,       KC_F,     KC_G,                              KC_H,        KC_J,      KC_K,     KC_L,    KC_SCLN,
-		     KC_Z,         KC_X,        KC_C,       KC_V,     KC_B,      KC_NUBS,     KC_SLSH,   KC_N,        KC_M,      KC_COMM,  KC_DOT,  KC_ENT,
-	   LCTL_T(KC_ESC),         KC_LALT,     KC_LGUI,    KC_LSFT,  MO(1),     KC_SPC,      KC_SPC,    MO(2),       TD(QUOTS), KC_RSFT,  KC_LALT, LCTL_T(KC_TAB)),
-	
-	[1] = LAYOUT(KC_EXLM,      KC_DQUO,     LSFT(KC_3), KC_DLR,   KC_PERC,                           KC_CIRC,     KC_AMPR,   KC_ASTR,  KC_DEL,  KC_BSPC,
-		     KC_F24,       LALT(KC_F3), KC_NO,      KC_NO,    TD(L_BRAX),                        TD(R_BRAX),  KC_LEFT,   KC_DOWN,  KC_UP,   KC_RGHT,
-		     LCTL(KC_F12), LALT(KC_X),  KC_NO,      KC_NO,    KC_NO,      TD(QUOTS),  TD(TACHE), KC_MINS,     KC_EQL,    KC_COMM,  KC_DOT,  KC_ENT,
-		     KC_TRNS,      KC_NO,       KC_NO,      MO(3),    KC_NO,      KC_NO,      KC_NO,     KC_NO,       KC_NO,     KC_NO,    KC_NO,   LSFT(KC_TAB)),
-	
-	[2] = LAYOUT(KC_1,         KC_2,        KC_3,       KC_4,     KC_5,                              KC_6,        KC_7,      KC_8,     KC_9,    KC_0,
-		     KC_NO,        LALT(KC_F3), KC_NO,      KC_NO,    TD(L_BRAX),                        TD(R_BRAX),  KC_HOME,   KC_PGDN,  KC_PGUP, KC_END,
-     		     LCTL(KC_F12), LALT(KC_X),  KC_NO,      KC_NO,    KC_NO,      TD(QUOTS),  TD(TACHE), KC_MINS,     KC_EQL,    KC_COMM,  KC_DOT,  KC_NO,
-		     KC_TRNS,      KC_NO,       KC_NO,      KC_NO,    MO(3),      KC_NO,      KC_NO,     KC_NO,       MO(3),     KC_NO,    KC_NO,   KC_TRNS),
-	
-	[3] = LAYOUT(KC_F1,        KC_F2,       KC_F3,      KC_F4,    KC_F5,                             KC_F6,       KC_F7,     KC_F8,    KC_F9,   KC_F10,
-		     AS_TOGG,      KC_F24,      KC_NO,      KC_NO,    KC_NO,                             KC_NO,       LSA(KC_LEFT), LSA(KC_DOWN), LSA(KC_UP), LSA(KC_RGHT),
-		     KC_LCTL,      LALT(KC_DEL),KC_NO,      KC_NO,    KC_NO,      KC_NO,      KC_VOLU,   KC_NO,       KC_F12,    KC_F13,   KC_F14,  KC_NO,
-		     KC_TRNS,      KC_F23,      KC_LCTL,    KC_NO,    KC_TRNS,    KC_NO,     KC_VOLD,    KC_MPLY,     KC_LSFT,   KC_NO,   KC_NO,  KC_TRNS)
-};
-
-/* 
-Notes on keys
-or, why on earth do I have keymap 
-lower-shift-z is CTRL-F12 - Darkroom mode in emacs
-lower-x is ALT-X - emacs
-layer3-a is toggle autoshift
-layer3-s is F24 - i3 controls popup reminder
-lower-s is ALT-F3 - multi-select in Sublime text
-*/
-
-
-// Determine the tapdance state to return
-uint8_t cur_dance(tap_dance_state_t *state) {
-    if (state->count == 1) {
-        return SINGLE_TAP;
-    } else if (state->count == 2) {
-        return DOUBLE_TAP;
-    } else if (state->count == 3) {
-        return TRIPLE_TAP;
-    } else {
-        reset_tap_dance (state);
-        return 3;
-    }
-}
-
-
-// Handle the possible states for each tapdance keycode you define:
-
-void lbrax_finished(tap_dance_state_t *state, void *user_data) {
-    td_state = cur_dance(state);
-    switch (td_state) {
-        case SINGLE_TAP:
-	    register_code16(LSFT(KC_9));
-            break;
-        case DOUBLE_TAP:
-            register_code16(KC_LBRC);
-            break;
-        case TRIPLE_TAP: 
-  	    register_code16(LSFT(KC_LBRC));
-    }
-}
-
-void lbrax_reset(tap_dance_state_t *state, void *user_data) {
-    switch (td_state) {
-        case SINGLE_TAP:
-	    unregister_code16(LSFT(KC_9));
-	    break; 
-        case DOUBLE_TAP:
-            unregister_code16(KC_LBRC);
-            break;
-        case TRIPLE_TAP:
-            unregister_code16(LSFT(KC_LBRC));
-    }
-}
-
-// Handle the possible states for each tapdance keycode you define:
-
-void rbrax_finished(tap_dance_state_t *state, void *user_data) {
-    td_state = cur_dance(state);
-    switch (td_state) {
-        case SINGLE_TAP:
-            register_code16(LSFT(KC_0));
-            break;
-        case DOUBLE_TAP:
-            register_code16(KC_RBRC);
-            break;
-        case TRIPLE_TAP: 
-            register_code16(LSFT(KC_RBRC));
-    }
-}
-
-
-void rbrax_reset(tap_dance_state_t *state, void *user_data) {
-    switch (td_state) {
-        case SINGLE_TAP:
-	    unregister_code16(LSFT(KC_0));
-            break;
-        case DOUBLE_TAP:
-            unregister_code16(KC_RBRC);
-            break;
-        case TRIPLE_TAP:
-	    unregister_code16(LSFT(KC_RBRC));
-    }
-}
-
-void quots_finished(tap_dance_state_t *state, void *user_data) {
-    td_state = cur_dance(state);
-    switch (td_state) {
-        case SINGLE_TAP:
-            register_code16(KC_QUOT);
-            break;
-        case DOUBLE_TAP:
-            register_code16(KC_AT);
-            break;
-        case TRIPLE_TAP:
-            register_code16(KC_DQUO);
-    }
-}
-
-void quots_reset(tap_dance_state_t *state, void *user_data) {
-    switch (td_state) {
-        case SINGLE_TAP:
-            unregister_code16(KC_QUOT);
-            break;
-        case DOUBLE_TAP:
-            unregister_code16(KC_AT);
-            break;
-        case TRIPLE_TAP:
-            unregister_code16(KC_DQUO);
-    }
-}
-
-void tache_finished(tap_dance_state_t *state, void *user_data) {
-    td_state = cur_dance(state);
-    switch (td_state) {
-        case SINGLE_TAP:
-            register_code16(KC_NUHS);
-            break;
-        case DOUBLE_TAP:
-
-            register_code16(LSFT(KC_NUHS));
-            break;
-        case TRIPLE_TAP:
-            register_code16(KC_GRV);
-    }
-}
-
-void tache_reset(tap_dance_state_t *state, void *user_data) {
-    switch (td_state) {
-        case SINGLE_TAP:
-            unregister_code16(KC_NUHS);
-            break;
-        case DOUBLE_TAP:
-	    unregister_code16(LSFT(KC_NUHS));
-            break;
-        case TRIPLE_TAP:
-            unregister_code16(KC_GRV);
-    }
-}
-
-// Define `ACTION_TAP_DANCE_FN_ADVANCED()` for each tapdance keycode, passing in `finished` and `reset` functions
-
-tap_dance_action_t tap_dance_actions[] = {
-    [L_BRAX] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, lbrax_finished, lbrax_reset),
-    [R_BRAX] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, rbrax_finished, rbrax_reset),
-    [QUOTS] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, quots_finished, quots_reset),
-    [TACHE] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, tache_finished, tache_reset)
-};
diff --git a/keyboards/keyboardio/atreus/keymaps/poweredbyporridge/readme.md b/keyboards/keyboardio/atreus/keymaps/poweredbyporridge/readme.md
deleted file mode 100644
index 619654186de..00000000000
--- a/keyboards/keyboardio/atreus/keymaps/poweredbyporridge/readme.md
+++ /dev/null
@@ -1,35 +0,0 @@
-# Keyboardio Atreus with an SLF layout from PoweredByPorridge
-
-SLF stands for [Stiff Little Fingers](https://en.wikipedia.org/wiki/Stiff_Little_Fingers) who were a great punk band from Belfast, Northern Ireland. Stiff Little Fingers is also a good way of describing my hands, a condition which I ascribe to too many winters cycling without gloves. So, I need a keyboard and layout to cope.
-
-I use a Keyboardio Atreus, in fact, they're so good, I use two. I tried all sorts of layouts, and finally came up with the one that suits my stiff fingers.
-
-It has four layers:
-
-0 - Normal - letters and punctuation.
-
-![layer 0](https://i.imgur.com/3Z8PZtI.png)
-
-1 - Symbols (shifted numbers), arrow keys, assorted function keys, Del and Backspace.
-
-![layer 1](https://i.imgur.com/9rJalxV.png)
-
-2 - Numbers, page up, page down, home, and end. Similar assorted functions.
-
-![layer 2](https://i.imgur.com/TYY11b5.png)
-
-3 - F1 to F14, play/pause, volume up/down, Left-shift-Alt left, right, up, down.
-
-![layer 3](https://i.imgur.com/MuWNPTz.png)
-
-Autoshift is important, I use it all the time.
-
-I use tap dance (one, two, or three key presses) for:
-
-* Braces, brackets, and curly brackets. TD(L_BRAX) and TD(R_BRAX)
-* Hash (pound), tilde, and backtick. TD(TACHE)
-* Single quote, double quote, and @. TD(QUOTS)
-
-There are odd keys that are there for a particular reason:
-* F24 - my [I3](https://i3wm.org/) popup to remind me of stuff I always forget.
-* Alt-shift-left/right/up/down - multi-select in Sublime text.
\ No newline at end of file
diff --git a/keyboards/keyboardio/atreus/keymaps/poweredbyporridge/rules.mk b/keyboards/keyboardio/atreus/keymaps/poweredbyporridge/rules.mk
deleted file mode 100644
index 3285414f97d..00000000000
--- a/keyboards/keyboardio/atreus/keymaps/poweredbyporridge/rules.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-BOOTMAGIC_ENABLE = no
-MOUSEKEY_ENABLE = no
-CONSOLE_ENABLE = no
-COMMAND_ENABLE = no
-UNICODE_ENABLE = no
-AUTO_SHIFT_ENABLE = yes
-TAP_DANCE_ENABLE = yes
diff --git a/keyboards/keyboardio/atreus/keymaps/slotthe/autocorrect_data.h b/keyboards/keyboardio/atreus/keymaps/slotthe/autocorrect_data.h
deleted file mode 100644
index 155b1fbc540..00000000000
--- a/keyboards/keyboardio/atreus/keymaps/slotthe/autocorrect_data.h
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright 2023 QMK
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-/*******************************************************************************
-  88888888888 888      d8b                .d888 d8b 888               d8b
-      888     888      Y8P               d88P"  Y8P 888               Y8P
-      888     888                        888        888
-      888     88888b.  888 .d8888b       888888 888 888  .d88b.       888 .d8888b
-      888     888 "88b 888 88K           888    888 888 d8P  Y8b      888 88K
-      888     888  888 888 "Y8888b.      888    888 888 88888888      888 "Y8888b.
-      888     888  888 888      X88      888    888 888 Y8b.          888      X88
-      888     888  888 888  88888P'      888    888 888  "Y8888       888  88888P'
-                                                        888                 888
-                                                        888                 888
-                                                        888                 888
-     .d88b.   .d88b.  88888b.   .d88b.  888d888 8888b.  888888 .d88b.   .d88888
-    d88P"88b d8P  Y8b 888 "88b d8P  Y8b 888P"      "88b 888   d8P  Y8b d88" 888
-    888  888 88888888 888  888 88888888 888    .d888888 888   88888888 888  888
-    Y88b 888 Y8b.     888  888 Y8b.     888    888  888 Y88b. Y8b.     Y88b 888
-     "Y88888  "Y8888  888  888  "Y8888  888    "Y888888  "Y888 "Y8888   "Y88888
-         888
-    Y8b d88P
-     "Y88P"
-*******************************************************************************/
-
-#pragma once
-
-// Autocorrection dictionary (4 entries):
-//   :alot      -> a lot
-//   accesories -> accessories
-//   accomodate -> accommodate
-//   alledge    -> allege
-
-#define AUTOCORRECT_MIN_LENGTH 5 // ":alot"
-#define AUTOCORRECT_MAX_LENGTH 10 // "accesories"
-#define DICTIONARY_SIZE 73
-
-static const uint8_t autocorrect_data[DICTIONARY_SIZE] PROGMEM = {
-    0x48, 0x0A, 0x00, 0x16, 0x2C, 0x00, 0x17, 0x3E, 0x00, 0x00, 0x4A, 0x11, 0x00, 0x17, 0x1B, 0x00,
-    0x00, 0x07, 0x08, 0x0F, 0x0F, 0x04, 0x00, 0x82, 0x67, 0x65, 0x00, 0x04, 0x07, 0x12, 0x10, 0x12,
-    0x06, 0x06, 0x04, 0x00, 0x84, 0x6D, 0x6F, 0x64, 0x61, 0x74, 0x65, 0x00, 0x08, 0x0C, 0x15, 0x12,
-    0x16, 0x08, 0x06, 0x06, 0x04, 0x00, 0x84, 0x73, 0x6F, 0x72, 0x69, 0x65, 0x73, 0x00, 0x12, 0x0F,
-    0x04, 0x2C, 0x00, 0x82, 0x20, 0x6C, 0x6F, 0x74, 0x00
-};
diff --git a/keyboards/keyboardio/atreus/keymaps/slotthe/config.h b/keyboards/keyboardio/atreus/keymaps/slotthe/config.h
deleted file mode 100644
index 26235c9d916..00000000000
--- a/keyboards/keyboardio/atreus/keymaps/slotthe/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* © 2023  Tony Zorman <soliditsallgood@mailbox.org> (@slotThe)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#define BOTH_SHIFTS_TURNS_ON_CAPS_WORD
-#define TAPPING_TERM 175
-#define HOLD_ON_OTHER_KEY_PRESS
diff --git a/keyboards/keyboardio/atreus/keymaps/slotthe/keymap.c b/keyboards/keyboardio/atreus/keymaps/slotthe/keymap.c
deleted file mode 100644
index 6188f14ab97..00000000000
--- a/keyboards/keyboardio/atreus/keymaps/slotthe/keymap.c
+++ /dev/null
@@ -1,328 +0,0 @@
-/* © 2023  Tony Zorman <soliditsallgood@mailbox.org> (@slotThe)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-
-// NOTE: `M-x occur RET /// RET' gives a good overview.
-
-/// General macros
-
-#define LSPR_SC  LGUI_T(KC_SCLN)
-#define LALT_BR  LALT_T(KC_LBRC)
-#define LSFT_INS LSFT(KC_INS)
-#define OSMSFT   OSM(MOD_LSFT)
-#define Z_SFT    LSFT_T(KC_Z)
-#define ZE_SFT   LSFT_T(KC_0)
-#define SL_SFT   RSFT_T(KC_SLSH)
-#define RETSPR   LGUI_T(KC_ENT)
-
-/// Tap dance declarations
-
-// So far, tap dances do different things on
-//
-//   - a single press,
-//   - a double press,
-//   - when held,
-//
-// so expect this many keys as comments.
-enum tap_dances {
-  ALT_BR,  // [ ] lalt  (also works shifted, which gets us { and } for free)
-  CTL_PR,  // ( ) lctl
-  SFT_CI,  // ^ ^ lsft  (working around LSFT_T not being able to output shifted keys)
-  SFT_EX,  // ! ! lsft  (ditto)
-};
-
-#define CTLPAR TD(CTL_PR)
-#define ALTBRC TD(ALT_BR)
-#define SFTCRC TD(SFT_CI)
-#define SFTEXL TD(SFT_EX)
-
-/// Macro declarations
-
-enum custom_keycodes {
-  // ->              <-    =<<   >>=   <*>  <*    *>    <$>   <&>   <|>   =>     ::
-  RARR = SAFE_RANGE, LARR, LBND, RBND, APP, RAPP, LAPP, FMAP, PAMF, AALT, IMPLS, DCOL,
-};
-
-/// Key overrides
-
-const key_override_t **key_overrides = (const key_override_t *[]){
-  &ko_make_basic(MOD_MASK_SHIFT, KC_BSPC, KC_DEL), // S-BSP ≡ DEL
-  // Emacs got me used to these, so let's convince other programs that
-  // we are in fact sending the correct keys.
-  &ko_make_basic(MOD_MASK_CTRL, KC_I, KC_TAB),     // C-i ≡ Tab
-  &ko_make_basic(MOD_MASK_CTRL, KC_M, KC_ENT),     // C-m ≡ Return
-  NULL // Null terminate the array of overrides
-};
-
-/// Layers
-
-enum layer_names { _COLEMAK_DH, _LOWER, _RAISE, _ADJUST };
-
-#define LOWER    MO(_LOWER)
-#define RAISE    MO(_RAISE)
-#define ADJUST   MO(_ADJUST)
-#define D_RAISE  LT(_RAISE, KC_DOT)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Colemak base layer
-     .-----.-----.-----.-----.-----.           .-----.-----.-----.-----.-----.
-     |  Q  |  W  |  F  |  P  |  B  |           |  J  |  L  |  U  |  Y  | ;+S |
-     .-----.-----.-----.-----.-----.           .-----.-----.-----.-----.-----.
-     |  A  |  R  |  S  |  T  |  G  |           |  M  |  N  |  E  |  I  |  O  |
-     .-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.
-     | S+Z |  X  |  C  |  D  |  V  | ARP | REP |  K  |  H  |  ,  |  .  | S+/ |
-     .-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.
-     | ESC | TAB | SPR | L1  | SPC | A[] | BSC | C() | L2  |  -  |  '  | RET |
-     .-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.
-  */
-  [_COLEMAK_DH] = LAYOUT(
-    KC_Q,    KC_W,    KC_F,    KC_P,    KC_B,                      KC_J,    KC_L,    KC_U,    KC_Y,    LSPR_SC,
-    KC_A,    KC_R,    KC_S,    KC_T,    KC_G,                      KC_M,    KC_N,    KC_E,    KC_I,    KC_O,
-    Z_SFT,   KC_X,    KC_C,    KC_D,    KC_V,    QK_AREP, QK_REP,  KC_K,    KC_H,    KC_COMM, D_RAISE, SL_SFT,
-    KC_ESC,  KC_TAB,  KC_LGUI, LOWER,   KC_SPC,  ALTBRC,  KC_BSPC, CTLPAR,  RAISE,   KC_MINS, KC_QUOT, KC_ENT),
-
-  /* Layer 1 (LOWER)
-     .-----.-----.-----.-----.-----.           .-----.-----.-----.-----.-------.
-     |  &  | *>  | >>= | <&> |     |           |  =  |  +  |  *  |  -  | RET+M |
-     .-----.-----.-----.-----.-----.           .-----.-----.-----.-----.-------.
-     | ::  | =>  | =<< | <|> |  @  |           | LFT |  UP | DWN | RGT |   \   |
-     .-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-------.
-     | !+S | <*  | <*> | <$> | <-  |     | MEN |  -> |  $  |  #  |  %  |  ^+S  |
-     .-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-------.
-     |     |     |     |     |     |     |     |     | L3  | ALT |     |  S-I  |
-     .-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-------.
-  */
-  [_LOWER] = LAYOUT(
-    KC_AMPR, RAPP,    RBND,    PAMF,    _______,                   KC_EQL,  KC_PLUS, KC_ASTR, KC_MINS, RETSPR,
-    DCOL,    IMPLS,   LBND,    AALT,    KC_AT,                     KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_BSLS,
-    SFTEXL,  LAPP,    APP,     FMAP,    LARR,    _______, KC_APP,  RARR,    KC_DLR,  KC_HASH, KC_PERC, SFTCRC,
-    _______, _______, _______, _______, _______, _______, _______, _______, ADJUST,  KC_LALT, _______, LSFT_INS),
-
-  /* Layer 2 (RAISE)
-     .-----.-----.-----.-----.-----.           .-----.-----.-----.-----.-----.
-     |     |  7  |  8  |  9  |     |           |     |  +  |  *  |  -  |     |
-     .-----.-----.-----.-----.-----.           .-----.-----.-----.-----.-----.
-     |  :  |  4  |  5  |  6  |  =  |           |  &  |  `  |  _  |  '  |  "  |
-     .-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.
-     | 0+S |  1  |  2  |  3  |     |     |     |     |  !  |  #  |  %  | ^+S |
-     .-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.
-     |     |     |     | L3  |     |     |     |     |     |     |     |     |
-     .-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.
-  */
-  [_RAISE] = LAYOUT(
-    KC_DOT,  KC_7,    KC_8,    KC_9,    _______,                   _______, KC_PLUS, KC_ASTR, KC_MINS, _______,
-    KC_COLN, KC_4,    KC_5,    KC_6,    KC_EQL,                    KC_AMPR, KC_GRV,  KC_UNDS, KC_QUOT, KC_DQT,
-    ZE_SFT,  KC_1,    KC_2,    KC_3,    _______, _______, _______, _______, KC_EXLM, KC_HASH, KC_PERC, SFTCRC,
-    _______, _______, _______, ADJUST,  _______, _______, _______, _______, _______, _______, _______, _______),
-
-  /* Layer 3 (ADJUST)
-     .-----.-----.-----.-----.-----.           .-----.-----.-----.-----.-----.
-     |     |     |     |     |     |           |     | F7  | F8  | F9  | F10 |
-     .-----.-----.-----.-----.-----.           .-----.-----.-----.-----.-----.
-     |     |     |     |     |     |           |     | F4  | F5  | F6  | F11 |
-     .-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.
-     |     |     |     |     |     |     |     |     | F1  | F2  | F3  | F12 |
-     .-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.
-     |     |     |     |     |     |     |     |     |     |     |     |     |
-     .-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.
-  */
-  [_ADJUST] = LAYOUT(
-    _______, _______, _______, _______, AC_TOGG,                   _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,
-    _______, _______, _______, _______, _______,                   _______, KC_F4,   KC_F5,   KC_F6,   KC_F11,
-    _______, _______, _______, _______, _______, _______, _______, _______, KC_F1,   KC_F2,   KC_F3,   KC_F12,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______)
-};
-
-/// Macro definitions
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-  case RARR:
-    if (record->event.pressed) SEND_STRING("->");  break;
-  case LARR:
-    if (record->event.pressed) SEND_STRING("<-");  break;
-  case LBND:
-    if (record->event.pressed) SEND_STRING("=<<"); break;
-  case RBND:
-    if (record->event.pressed) SEND_STRING(">>="); break;
-  case APP:
-    if (record->event.pressed) SEND_STRING("<*>"); break;
-  case RAPP:
-    if (record->event.pressed) SEND_STRING("*>");  break;
-  case LAPP:
-    if (record->event.pressed) SEND_STRING("<*");  break;
-  case FMAP:
-    if (record->event.pressed) SEND_STRING("<$>"); break;
-  case PAMF:
-    if (record->event.pressed) SEND_STRING("<&>"); break;
-  case AALT:
-    if (record->event.pressed) SEND_STRING("<|>"); break;
-  case IMPLS:
-    if (record->event.pressed) SEND_STRING("=>");  break;
-  case DCOL:
-    if (record->event.pressed) SEND_STRING("::");  break;
-  }
-  return true;
-};
-
-//// Tap dance definitions
-
-// Heavily inspired by:
-//
-//     https://docs.qmk.fm/?ref=blog.splitkb.com#/feature_tap_dance?id=example-4
-
-typedef enum {
-  TD_NONE,
-  TD_UNKNOWN,
-  TD_SINGLE_TAP,
-  TD_SINGLE_HOLD,
-  TD_DOUBLE_TAP,
-} td_state_t;
-
-typedef struct {
-  bool is_press_action;
-  td_state_t state;
-} td_tap_t;
-
-// Return an integer that corresponds to what kind of tap dance should
-// be executed.
-//
-// Interrupted: If the state of a dance is "interrupted", that means
-//  that another key has been hit under the tapping term.
-//
-// Pressed: Whether or not the key is still being pressed. If this value
-//  is true, that means the tapping term has ended, but the key is still
-//  being pressed down. This generally means the key is being "held".
-td_state_t cur_dance(tap_dance_state_t *state) {
-  if (state->count == 1) {
-    if (state->pressed)         return TD_SINGLE_HOLD;
-    else                        return TD_SINGLE_TAP;
-  } else if (state->count == 2) return TD_DOUBLE_TAP;
-  else                          return TD_UNKNOWN;
-}
-
-//// ALT_BR
-
-static td_tap_t alt_br_state = {
-  .is_press_action = true,
-  .state = TD_NONE
-};
-
-void lalt_br_finished(tap_dance_state_t *state, void *user_data) {
-  alt_br_state.state = cur_dance(state);
-  switch (alt_br_state.state) {
-  case TD_SINGLE_TAP:  register_code(KC_LBRC); break;
-  case TD_SINGLE_HOLD: register_code(KC_LALT); break;
-  case TD_DOUBLE_TAP:  register_code(KC_RBRC); break;
-  default:             break;
-  }
-}
-
-void lalt_br_reset(tap_dance_state_t *state, void *user_data) {
-  switch (alt_br_state.state) {
-  case TD_SINGLE_TAP:  unregister_code(KC_LBRC); break;
-  case TD_SINGLE_HOLD: unregister_code(KC_LALT); break;
-  case TD_DOUBLE_TAP:  unregister_code(KC_RBRC); break;
-  default:             break;
-  }
-  alt_br_state.state = TD_NONE;
-}
-
-//// LCTL_PR
-
-static td_tap_t lctl_pr_state = {
-  .is_press_action = true,
-  .state = TD_NONE
-};
-
-void lctl_pr_finished(tap_dance_state_t *state, void *user_data) {
-  lctl_pr_state.state = cur_dance(state);
-  switch (lctl_pr_state.state) {
-  case TD_SINGLE_TAP:  register_code16(KC_LPRN); break;
-  case TD_SINGLE_HOLD: register_code(KC_LCTL);   break;
-  case TD_DOUBLE_TAP:  register_code16(KC_RPRN); break;
-  default:             break;
-  }
-}
-
-void lctl_pr_reset(tap_dance_state_t *state, void *user_data) {
-  switch (lctl_pr_state.state) {
-  case TD_SINGLE_TAP:  unregister_code16(KC_LPRN); break;
-  case TD_SINGLE_HOLD: unregister_code(KC_LCTL);   break;
-  case TD_DOUBLE_TAP:  unregister_code16(KC_RPRN); break;
-  default:             break;
-  }
-  lctl_pr_state.state = TD_NONE;
-}
-
-//// SFT_CI
-
-static td_tap_t lsft_ci_state = {
-  .is_press_action = true,
-  .state = TD_NONE
-};
-
-void lsft_ci_finished(tap_dance_state_t *state, void *user_data) {
-  lsft_ci_state.state = cur_dance(state);
-  switch (lsft_ci_state.state) {
-  case TD_SINGLE_TAP:  register_code16(KC_CIRC); break;
-  case TD_SINGLE_HOLD: register_code(KC_LSFT);   break;
-  default:             break;
-  }
-}
-
-void lsft_ci_reset(tap_dance_state_t *state, void *user_data) {
-  switch (lsft_ci_state.state) {
-  case TD_SINGLE_TAP:  unregister_code16(KC_CIRC); break;
-  case TD_SINGLE_HOLD: unregister_code(KC_LSFT);   break;
-  default:             break;
-  }
-  lsft_ci_state.state = TD_NONE;
-}
-
-//// SFT_EX
-
-static td_tap_t lsft_ex_state = {
-  .is_press_action = true,
-  .state = TD_NONE
-};
-
-void lsft_ex_finished(tap_dance_state_t *state, void *user_data) {
-  lsft_ex_state.state = cur_dance(state);
-  switch (lsft_ex_state.state) {
-  case TD_SINGLE_TAP:  register_code16(KC_EXLM); break;
-  case TD_SINGLE_HOLD: register_code(KC_LSFT);   break;
-  default:             break;
-  }
-}
-
-void lsft_ex_reset(tap_dance_state_t *state, void *user_data) {
-  switch (lsft_ex_state.state) {
-  case TD_SINGLE_TAP:  unregister_code16(KC_EXLM); break;
-  case TD_SINGLE_HOLD: unregister_code(KC_LSFT);   break;
-  default:             break;
-  }
-  lsft_ex_state.state = TD_NONE;
-}
-
-//// Actually define the tap-dance actions
-
-tap_dance_action_t tap_dance_actions[] = {
-  [ALT_BR] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, lalt_br_finished, lalt_br_reset),
-  [CTL_PR] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, lctl_pr_finished, lctl_pr_reset),
-  [SFT_CI] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, lsft_ci_finished, lsft_ci_reset),
-  [SFT_EX] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, lsft_ex_finished, lsft_ex_reset),
-};
diff --git a/keyboards/keyboardio/atreus/keymaps/slotthe/readme.md b/keyboards/keyboardio/atreus/keymaps/slotthe/readme.md
deleted file mode 100644
index d83bce1d2f2..00000000000
--- a/keyboards/keyboardio/atreus/keymaps/slotthe/readme.md
+++ /dev/null
@@ -1,251 +0,0 @@
-# SlotThe's Keyboardio Atreus Keymap
-
-Note: the following is (a relevant and shortened) excerpt from [this
-rewiev](https://tony-zorman.com/posts/atreus-review.html) of the
-keyboard itself. See there for, e.g., some thoughts about modifier
-placement.
-
-## Base layer
-
-    .-----.-----.-----.-----.-----.           .-----.-----.-----.-----.------.
-    |  Q  |  W  |  F  |  P  |  B  |           |  J  |  L  |  U  |  Y  | M4+; |
-    .-----.-----.-----.-----.-----.           .-----.-----.-----.-----.------.
-    |  A  |  R  |  S  |  T  |  G  |           |  M  |  N  |  E  |  I  |  O   |
-    .-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.------.
-    | S+Z |  X  |  C  |  D  |  V  | ARP | REP |  K  |  H  |  ,  |  .  | S+/  |
-    .-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.------.
-    | ESC | TAB | M4  | L1  | SPC | A[] | BSC | C() | L2  |  -  |  '  | RET  |
-    .-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.------.
-
-I use [Colemak Mod-DH][colemak-dh] as my layout, so this takes up most of the base of the keyboard.
-
-Perhaps strikingly, I opted for not putting Shift on the thumb,
-but recreating the "ordinary" one-on-each-side setup from the good old typewriter days.
-While I already have a key to access the `LOWER` (L1) layer with my left thumb,
-I had to sacrifice Shift so I could fit a key to the `RAISE` (L2) layer on the right thumb.
-This also jumps to the `ADJUST` (L3) layer when both `LOWER` and `RAISE` are held at the same time.
-I will gladly trade two layers for one Shift key.
-
-One of the most basic things—besides having layers—that one can do with QMK is [mod-taps][qmk:mod-tap].
-These are keys that act as modifiers when held, and as "ordinary" keys when pressed.
-For example, all of the `S+«key»` keys emit Shift when held and `«key»` when pressed.
-There is a slight delay between pressing the key and the press registering,
-since we have to wait for a possible tap,
-which keeps me from using modifiers on the home-row, as some people like to do.
-Likewise, the `M4+;` key acts as Super when held and as `;` when pressed.
-At this point, it is actually my main way to press the Super key,
-even though I don't find the real `M4` key particularly hard to hit with my thumb.
-Sometimes these things just happen,
-I suppose,
-though it may help that I press both outer keys of the top row (that is, `q` and `;`) with my ring finger
-instead of my pinky.
-
-The `A[]` and `C()` keys are utilising [tap dances][qmk:tap-dance],
-in order to do even more.
-Tap dances are very similar to mod-taps,
-only in addition to just differentiating between a "pressed" and a "held" state,
-QMK now also keeps track of *how often* a key has been tapped.
-So far, [my setup][qmk:slotthe:tapdances] here is quite basic;
-I only check whether a key was pressed once, twice, or is being held.
-This allows me to not need extra keys for parentheses,
-as they can fit on the modifier keys:
-
-  - `A[]`: Alt when held, `[` when pressed once, and `]` when pressed twice.
-    This one is especially neat, since tap dances play well with other modifiers,
-    so pressing `S-M1` once will result in `{` and pressing it twice gives `}`.
-
-  - `C()`: Control when held, `(` when pressed once, and `)` when pressed twice.
-
-I don't mind having the extra indirection for the respective closed delimiter,
-as [paredit][emacs:paredit],
-[puni][emacs:puni],
-`electric-pair-mode`,
-or a different package of choice usually takes care of inserting it.
-
-The `REP` and `AREP` keys make use of the [Repeat Key][qmk:repeat-key] functionality;
-basically, `REP` executes the key chord that was last pressed.
-On the other hand,
-`AREP` is an alternative, configurable, of "repeating" things;
-by default, it turns some directional movements
-around—e.g., `M-f` becomes `M-b`—but
-it can be made to pretty much input anything one wants.
-
-## Layer 1
-
-    .-----.-----.-----.-----.-----.           .-----.-----.-----.-----.-------.
-    |  &  | *>  | >>= | <&> |     |           |  =  |  +  |  *  |  -  | M4+RT |
-    .-----.-----.-----.-----.-----.           .-----.-----.-----.-----.-------.
-    | ::  | =>  | =<< | <|> |  @  |           | LFT |  UP | DWN | RGT |   \   |
-    .-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-------.
-    | S+! | <*  | <*> | <$> | <-  |     | MEN |  -> |  $  |  #  |  %  |  S+^  |
-    .-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-------.
-    |     |     |     |     |     |     |     |     | L3  | ALT |     | S-Ins |
-    .-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-------.
-
-Guess which programming language I like based on this layer's [macros][qmk:macros] :).
-
-Crucially, keys that were "Shift when held,
-*something* when pressed" on the base layer retain the Shift part of that functionality.
-This is used for the commutativity of the modifier
-keys—i.e., it does not matter whether I press `S-L1-«key»` or `L1-S-«key»`—which
-would otherwise drive me insane.
-The same goes for all fall-through keys:
-keys that appear blank in the above layout.
-These aren't blocked or anything,
-just no new functionality is added
-so the key falls back to what's on the next lowest layer.
-In plain terms,
-the key to the left of `L3` will still be Control,
-as I can comfortably press that while holding down something with my left hand.
-The same can't be said for the Alt key,
-which is on the left hand by default,
-so a separate binding for it has to be created on the right hand.
-Thus,
-as the two don't commute,
-key chords involving the LOWER layer and Alt are to be avoided if possible.
-
-The `S-Ins` key is not some sort of tap,
-but actually just emits a Shift-Insert,
-which can be used to paste stuff from the [X11 primary selection][x11:clipboard].
-
-## Layer 2
-
-    .-----.-----.-----.-----.-----.           .-----.-----.-----.-----.-----.
-    |     |  7  |  8  |  9  |     |           |     |  +  |  *  |  -  |     |
-    .-----.-----.-----.-----.-----.           .-----.-----.-----.-----.-----.
-    |  :  |  4  |  5  |  6  |  =  |           |     |  `  |  _  |  '  |  "  |
-    .-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.
-    | S+0 |  1  |  2  |  3  |     |     |     |     |     |  #  |  %  | S+^ |
-    .-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.
-    |     |     |     | L3  |     |     |     |     |     |     |     |     |
-    .-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.
-
-A relatively unspectacular layer,
-RAISE is mainly used for numbers,
-and number adjacent things.
-Some symbols related to this,
-like `=`, `+`, `*`, and `-`,
-are replicated from the LOWER layer.
-This is due to the above mentioned issues of inserting arithmetic.
-This layer also features \` and `'` quite prominently,
-as these are important for [CDLaTeX].
-Plus, putting `'` and `"` on this layer circumvents the difficult to hit key on the base layer.
-
-## Layer 3
-
-    .-----.-----.-----.-----.-----.           .-----.-----.-----.-----.-----.
-    |     |     |     |     |     |           |     | F7  | F8  | F9  | F10 |
-    .-----.-----.-----.-----.-----.           .-----.-----.-----.-----.-----.
-    |     |     |     |     |     |           |     | F4  | F5  | F6  | F11 |
-    .-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.
-    |     |     |     |     |     |     |     |     | F1  | F2  | F3  | F12 |
-    .-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.
-    |     |     |     |     |     |     |     |     |     |     |     |     |
-    .-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.-----.
-
-So far, only the seldom used F-keys are present here.
-As should be obvious, this is the least developed layer,
-and also the one that'll probably change the most in the future.
-Currently, I'm thinking of putting some XMonad specific bindings on here,
-which could even to free up the Super key to be used inside of Emacs
-for certain things—that would certainly be a worthwhile experiment.
-Other thoughts include things like volume and brightness controls,
-although this is less critical since my laptop keyboard is never far away.
-
-## Other features
-
-There are some features that aren't necessarily reflected in the keys themselves,
-yet are quite essential for day-to-day use.
-The TL;DR can be found in [rules.mk][./rules.mk].
-
-### [Key overrides][qmk:key-overrides]
-
-Quoting from the documentation
-
-> Key overrides allow you to override modifier-key combinations to send a different modifier-key combination
-> or perform completely custom actions.
-
-Some keys on the keyboard are quite hard to hit.
-On the default layout,
-one of these turns out to be the Tab key,
-which is nonetheless important in a lot of situations.
-Conveniently, Emacs interprets `C-i` as Tab, so there is less need to actually hit the "real" key.
-However, not all programs are quite so understanding—or old, I guess.
-With key overrides, one can send a real `TAB` whenever `C-i` is pressed;
-no special convention on how to interpret certain key chords required!
-I also rebound `C-m` to `RET` (with the same justification), and `S-BSP` to `DEL`.
-
-This is one of those features that I didn't know I needed,
-yet now couldn't live without anymore.
-I'm definitely looking forward to discovering new and interesting ways of using this!
-
-### [Autocorrect][qmk:autocorrect]
-
-This is a quaint little feature: auto-correct inside of your keyboard's firmware!
-I promise that it's not as bad as it sounds.
-It does not work automatically, thankfully, but is based off a given list of replacements.
-For example,
-
-    widht -> width
-
-would fire anytime one writes `widht`, which then gets replaced by `width`.
-This is based on (a trie of) the most recently pressed keys,
-so whenever one actually wants to write `widht`
-all that's needed is pressing, for example, any modifier during the insertion.
-
-As I've really just been trying this out for a laugh, my current word list is quite short:
-
-    :alot       ->  a lot
-    accesories  ->  accessories
-    accomodate  ->  accommodate
-    alledge     ->  allege
-
-In general,
-I think the solution to stop misspelling a word is not to remap key sequences on the firmware level,
-but to—you know—learn how to spell that word.
-Still,
-I can imagine at least one or two use-cases where something like this could be useful,
-so I figured it might be nice to make people aware of this features' existence.
-
-In addition—as I've found out on three separate occasions so far—using the words "auto-correct, but in firmware"
-makes people stare in utter disbelief and/or disgust at your keyboard.
-That alone makes this feature worth it.
-
-### [Caps Word][qmk:caps-word]
-
-Caps Word is a clever alternative to Caps Lock,
-which I enable by pressing both Shift keys together.
-After that,
-all of the letter keys are shifted,
-and `-` becomes `_`
-until a different key (excluding common sense ones like backspace) is pressed.
-This is very useful for, e.g.,
-writing long constants,
-as these tend to have capital names separated with underscores:
-writing `BOTH_SHIFTS_TURNS_ON_CAPS_WORD` has never been easier!
-
-One thing to note is that,
-while layer switching works just fine in "Caps Word mode",
-the [Tri Layer][qmk:tri-layer] feature does not seem to play nicely with it;
-i.e., the mode gets disabled when switching to these layers.
-This is also the reason why I have an explicit LOWER, RAISE, and ADJUST setup,
-instead of just using Tri Layer.
-One could fiddle with the `caps_word_press_user` callback,
-but it seemed much easier to just create one additional layer toggle instead.
-I haven't looked at how hard it would be to hack this into Caps Word,
-so maybe this is a future pull request.
-
-[CDLaTeX]: https://github.com/cdominik/cdlatex
-[colemak-dh]: https://colemakmods.github.io/mod-dh/
-[emacs:paredit]: https://paredit.org/
-[emacs:puni]: https://github.com/AmaiKinono/puni
-[qmk:autocorrect]: https://docs.qmk.fm/#/feature_autocorrect
-[qmk:caps-word]: https://docs.qmk.fm/#/feature_caps_word
-[qmk:key-overrides]: https://docs.qmk.fm/#/feature_key_overrides
-[qmk:macros]: https://docs.qmk.fm/#/feature_macros
-[qmk:mod-tap]: https://docs.qmk.fm/#/mod_tap
-[qmk:repeat-key]: https://docs.qmk.fm/#/feature_repeat_key
-[qmk:slotthe:tapdances]: https://github.com/slotThe/qmk_firmware/blob/keyboardio/atreus/slotThe/keyboards/keyboardio/atreus/keymaps/slotThe/keymap.c#L187
-[qmk:tap-dance]: https://docs.qmk.fm/#/feature_tap_dance
-[qmk:tri-layer]: https://docs.qmk.fm/#/feature_tri_layer
-[x11:clipboard]: https://www.uninformativ.de/blog/postings/2017-04-02/0/POSTING-en.html
diff --git a/keyboards/keyboardio/atreus/keymaps/slotthe/rules.mk b/keyboards/keyboardio/atreus/keymaps/slotthe/rules.mk
deleted file mode 100644
index b603193f858..00000000000
--- a/keyboards/keyboardio/atreus/keymaps/slotthe/rules.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-TAP_DANCE_ENABLE    = yes
-KEY_OVERRIDE_ENABLE = yes
-AUTOCORRECT_ENABLE  = yes
-CAPS_WORD_ENABLE    = yes
-REPEAT_KEY_ENABLE   = yes
-
-LTO_ENABLE      = yes
-COMMAND_ENABLE  = no
-MOUSEKEY_ENABLE = no
diff --git a/keyboards/keyboardio/model01/keymaps/tw1t611/keymap.c b/keyboards/keyboardio/model01/keymaps/tw1t611/keymap.c
deleted file mode 100644
index 900a3f29aa9..00000000000
--- a/keyboards/keyboardio/model01/keymaps/tw1t611/keymap.c
+++ /dev/null
@@ -1,50 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "keymap_german.h"
-
-/* layer constants */
-enum {
-  DEF = 0,
-  MOD,
-};
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[DEF] = LAYOUT(
-  _______, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   ,                      KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , DE_SS  ,
-  KC_ESC , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , RGB_MOD,    KC_MUTE, KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , DE_ADIA,
-  KC_TAB , KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , DE_SECT,    _______, KC_H   , KC_J   , KC_K   , KC_L   , DE_SLSH, DE_ODIA,
-  DE_PIPE, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , _______,    _______, KC_N   , KC_M   , DE_COMM, DE_DOT , DE_MINS, DE_UDIA,
-                                         KC_LALT,                                 KC_LGUI,
-                                            KC_SPC ,                           KC_ENT ,
-                                               KC_LSFT,                     MO(MOD),
-                                                  KC_BSPC,               KC_DEL ,
-                                      KC_LCTL,                                        KC_RCTL
-  ),
-[MOD] = LAYOUT(
-  KC_F12 , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  ,                      KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 ,
-  DE_CIRC, DE_QUOT, DE_DQUO, DE_LCBR, DE_RCBR, DE_GRV , RGB_TOG,    _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END , DE_EQL , DE_PERC,
-  DE_TILD, DE_EXLM, DE_DLR , DE_LPRN, DE_RPRN, DE_AMPR, _______,    _______, KC_LEFT, KC_DOWN, KC_UP  , KC_RGHT, DE_QUES, DE_ASTR,
-  DE_BSLS, DE_HASH, DE_LABK, DE_LBRC, DE_RBRC, DE_RABK, _______,    QK_BOOT, DE_AT  , DE_EURO, DE_SCLN, DE_COLN, DE_UNDS, DE_PLUS,
-                                         _______,                                 _______,
-                                            _______,                           _______,
-                                               _______,                     _______,
-                                                  _______,               _______,
-                                      _______,                                        _______
-  )
-};
-
-/* template for new layouts:
-LAYOUT(
-  _______, _______, _______, _______, _______, _______,                      _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______, _______, _______, _______, _______,
-                                         _______,                                 _______,
-                                            _______,                           _______,
-                                               _______,                     _______,
-                                                  _______,               _______,
-                                      _______,                                        _______
-  )
-*/
-
-/* vim: set ts=2 sw=2 et: */
diff --git a/keyboards/keyboardio/model01/keymaps/tw1t611/readme.md b/keyboards/keyboardio/model01/keymaps/tw1t611/readme.md
deleted file mode 100644
index b9d728831ce..00000000000
--- a/keyboards/keyboardio/model01/keymaps/tw1t611/readme.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Keymap for Keyboardio's Model01 by tw1t611
-
-Features:
-- german keymap
-- vim optimized
diff --git a/keyboards/keychron/c1_pro/ansi/rgb/rgb.c b/keyboards/keychron/c1_pro/ansi/rgb/rgb.c
index 38d4a96d3ee..e4c640d6bfa 100644
--- a/keyboards/keychron/c1_pro/ansi/rgb/rgb.c
+++ b/keyboards/keychron/c1_pro/ansi/rgb/rgb.c
@@ -25,100 +25,100 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_15,   G_15,   H_15},
-    {0, I_16,   G_16,   H_16},
-    {1, I_15,   G_15,   H_15},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {1, CB9_CA15,   CB7_CA15,   CB8_CA15},
 
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_15,   A_15,   B_15},
-    {0, C_16,   A_16,   B_16},
-    {1, I_16,   G_16,   H_16},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_14,   D_14,   E_14},
-    {0, F_15,   D_15,   E_15},
-    {0, F_16,   D_16,   E_16},
-    {1, I_13,   G_13,   H_13},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {1, CB9_CA13,   CB7_CA13,   CB8_CA13},
 
-    {1, I_1,    G_1,    H_1},
-    {1, I_2,    G_2,    H_2},
-    {1, I_3,    G_3,    H_3},
-    {1, I_4,    G_4,    H_4},
-    {1, I_5,    G_5,    H_5},
-    {1, I_6,    G_6,    H_6},
-    {1, I_7,    G_7,    H_7},
-    {1, I_8,    G_8,    H_8},
-    {1, I_9,    G_9,    H_9},
-    {1, I_10,   G_10,   H_10},
-    {1, I_11,   G_11,   H_11},
-    {1, I_12,   G_12,   H_12},
-    {1, I_14,   G_14,   H_14},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
 
-    {0, I_14,   G_14,   H_14}, // CAPS_MAC_WIN_LED_INDEX
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14}, // CAPS_MAC_WIN_LED_INDEX
 
-    {1, C_1,    A_1,    B_1},
-    {1, C_3,    A_3,    B_3},
-    {1, C_4,    A_4,    B_4},
-    {1, C_5,    A_5,    B_5},
-    {1, C_6,    A_6,    B_6},
-    {1, C_7,    A_7,    B_7},
-    {1, C_8,    A_8,    B_8},
-    {1, C_9,    A_9,    B_9},
-    {1, C_10,   A_10,   B_10},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_14,   A_14,   B_14},
-    {1, C_16,   A_16,   B_16},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_2,    D_2,    E_2},
-    {1, F_3,    D_3,    E_3},
-    {1, F_7,    D_7,    E_7},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_13,   D_13,   E_13},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
-    {1, F_16,   D_16,   E_16},
-    {1, C_15,   A_15,   B_15},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
 };
 
 // clang-format on
diff --git a/keyboards/keychron/c1_pro/ansi/white/white.c b/keyboards/keychron/c1_pro/ansi/white/white.c
index d7b75e0dd61..2b41845c9b5 100644
--- a/keyboards/keychron/c1_pro/ansi/white/white.c
+++ b/keyboards/keychron/c1_pro/ansi/white/white.c
@@ -23,102 +23,102 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   driver
  *   |  LED address
  *   |  |   */
-    {0, A_16}, // esc
-    {0, A_15}, // f1
-    {0, A_14}, // f2
-    {0, A_13}, // f3
-    {0, A_12}, // f4
-    {0, A_11}, // f5
-    {0, A_10}, // f6
-    {0, A_9},  // f7
-    {0, A_8},  // f8
-    {0, A_7},  // f9
-    {0, A_6},  // f10
-    {0, A_5},  // f11
-    {0, A_4},  // f12
-    {0, A_2},  // print
-    {0, A_1},  // siri
-    {0, G_1},  // light
+    {0, CB1_CA16}, // esc
+    {0, CB1_CA15}, // f1
+    {0, CB1_CA14}, // f2
+    {0, CB1_CA13}, // f3
+    {0, CB1_CA12}, // f4
+    {0, CB1_CA11}, // f5
+    {0, CB1_CA10}, // f6
+    {0, CB1_CA9},  // f7
+    {0, CB1_CA8},  // f8
+    {0, CB1_CA7},  // f9
+    {0, CB1_CA6},  // f10
+    {0, CB1_CA5},  // f11
+    {0, CB1_CA4},  // f12
+    {0, CB1_CA2},  // print
+    {0, CB1_CA1},  // siri
+    {0, CB7_CA1},  // light
 
-    {0, B_16}, // ~
-    {0, B_15}, // 1!
-    {0, B_14}, // 2@
-    {0, B_13}, // 3#
-    {0, B_12}, // 4$
-    {0, B_11}, // 5%
-    {0, B_10}, // 6^
-    {0, B_9},  // 7&
-    {0, B_8},  // 8*
-    {0, B_7},  // 9(
-    {0, B_6},  // 0)
-    {0, B_5},  // -_
-    {0, B_4},  // =+
-    {0, B_3},  // back space
-    {0, B_2},  // INS
-    {0, B_1},  // HOME
-    {0, H_1},  // PGUP
+    {0, CB2_CA16}, // ~
+    {0, CB2_CA15}, // 1!
+    {0, CB2_CA14}, // 2@
+    {0, CB2_CA13}, // 3#
+    {0, CB2_CA12}, // 4$
+    {0, CB2_CA11}, // 5%
+    {0, CB2_CA10}, // 6^
+    {0, CB2_CA9},  // 7&
+    {0, CB2_CA8},  // 8*
+    {0, CB2_CA7},  // 9(
+    {0, CB2_CA6},  // 0)
+    {0, CB2_CA5},  // -_
+    {0, CB2_CA4},  // =+
+    {0, CB2_CA3},  // back space
+    {0, CB2_CA2},  // INS
+    {0, CB2_CA1},  // HOME
+    {0, CB8_CA1},  // PGUP
 
-    {0, C_16}, // tab
-    {0, C_15}, // q
-    {0, C_14}, // w
-    {0, C_13}, // e
-    {0, C_12}, // r
-    {0, C_11}, // t
-    {0, C_10}, // y
-    {0, C_9},  // u
-    {0, C_8},  // i
-    {0, C_7},  // o
-    {0, C_6},  // p
-    {0, C_5},  // [{
-    {0, C_4},  // ]}
-    {0, C_3},  // \|
-    {0, C_2},  // DEL
-    {0, C_1},  // END
-    {0, G_6},  // PGDN
+    {0, CB3_CA16}, // tab
+    {0, CB3_CA15}, // q
+    {0, CB3_CA14}, // w
+    {0, CB3_CA13}, // e
+    {0, CB3_CA12}, // r
+    {0, CB3_CA11}, // t
+    {0, CB3_CA10}, // y
+    {0, CB3_CA9},  // u
+    {0, CB3_CA8},  // i
+    {0, CB3_CA7},  // o
+    {0, CB3_CA6},  // p
+    {0, CB3_CA5},  // [{
+    {0, CB3_CA4},  // ]}
+    {0, CB3_CA3},  // \|
+    {0, CB3_CA2},  // DEL
+    {0, CB3_CA1},  // END
+    {0, CB7_CA6},  // PGDN
 
-    {0, D_16}, // caps lock
-    {0, D_15}, // a
-    {0, D_14}, // s
-    {0, D_13}, // d
-    {0, D_12}, // f
-    {0, D_11}, // g
-    {0, D_10}, // h
-    {0, D_9},  // j
-    {0, D_8},  // k
-    {0, D_7},  // l
-    {0, D_6},  // ;:
-    {0, D_5},  // '"
-    {0, D_3},  // enter
+    {0, CB4_CA16}, // caps lock
+    {0, CB4_CA15}, // a
+    {0, CB4_CA14}, // s
+    {0, CB4_CA13}, // d
+    {0, CB4_CA12}, // f
+    {0, CB4_CA11}, // g
+    {0, CB4_CA10}, // h
+    {0, CB4_CA9},  // j
+    {0, CB4_CA8},  // k
+    {0, CB4_CA7},  // l
+    {0, CB4_CA6},  // ;:
+    {0, CB4_CA5},  // '"
+    {0, CB4_CA3},  // enter
 
-    {0, H_7},  // CPAS
-    {0, H_8},  // MAC
-    {0, H_9},  // WIN
+    {0, CB8_CA7},  // CPAS
+    {0, CB8_CA8},  // MAC
+    {0, CB8_CA9},  // WIN
 
-    {0, E_16}, // left shift
-    {0, E_14}, // z
-    {0, E_13}, // x
-    {0, E_12}, // c
-    {0, E_11}, // v
-    {0, E_10}, // b
-    {0, E_9},  // b
-    {0, E_8},  // n
-    {0, E_7},  // m
-    {0, E_6},  // ,<
-    {0, E_5},  // .>
-    {0, E_3},  // right shift
-    {0, E_1},  // up
+    {0, CB5_CA16}, // left shift
+    {0, CB5_CA14}, // z
+    {0, CB5_CA13}, // x
+    {0, CB5_CA12}, // c
+    {0, CB5_CA11}, // v
+    {0, CB5_CA10}, // b
+    {0, CB5_CA9},  // b
+    {0, CB5_CA8},  // n
+    {0, CB5_CA7},  // m
+    {0, CB5_CA6},  // ,<
+    {0, CB5_CA5},  // .>
+    {0, CB5_CA3},  // right shift
+    {0, CB5_CA1},  // up
 
-    {0, F_16}, // left ctrl
-    {0, F_15}, // left command
-    {0, F_14}, // left option
-    {0, F_10}, // space
-    {0, F_6},  // right command
-    {0, F_5},  // right option
-    {0, F_4},  // right ctrl
-    {0, F_3},  // Fn
-    {0, F_2},  // left
-    {0, F_1},  // down
-    {0, G_13}, // right
+    {0, CB6_CA16}, // left ctrl
+    {0, CB6_CA15}, // left command
+    {0, CB6_CA14}, // left option
+    {0, CB6_CA10}, // space
+    {0, CB6_CA6},  // right command
+    {0, CB6_CA5},  // right option
+    {0, CB6_CA4},  // right ctrl
+    {0, CB6_CA3},  // Fn
+    {0, CB6_CA2},  // left
+    {0, CB6_CA1},  // down
+    {0, CB7_CA13}, // right
 };
 
 // clang-format on
diff --git a/keyboards/keychron/c2_pro/ansi/rgb/rgb.c b/keyboards/keychron/c2_pro/ansi/rgb/rgb.c
index 6fce51417cb..4891ceea74e 100644
--- a/keyboards/keychron/c2_pro/ansi/rgb/rgb.c
+++ b/keyboards/keychron/c2_pro/ansi/rgb/rgb.c
@@ -24,119 +24,119 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_15,   G_15,   H_15},
-    {0, I_16,   G_16,   H_16},
-    {0, L_5,    J_5,    K_5},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {0, CB12_CA5,    CB10_CA5,    CB11_CA5},
 
-    {0, L_6,    J_6,    K_6}, // CapsLock
-    {0, L_7,    J_7,    K_7}, // NumLock
-    {0, L_8,    J_8,    K_8}, // Mac
-    {0, L_4,    J_4,    K_4}, // Win
+    {0, CB12_CA6,    CB10_CA6,    CB11_CA6}, // CapsLock
+    {0, CB12_CA7,    CB10_CA7,    CB11_CA7}, // NumLock
+    {0, CB12_CA8,    CB10_CA8,    CB11_CA8}, // Mac
+    {0, CB12_CA4,    CB10_CA4,    CB11_CA4}, // Win
 
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_15,   A_15,   B_15},
-    {0, C_16,   A_16,   B_16},
-    {0, L_9,    J_9,    K_9},
-    {0, L_10,   J_10,   K_10},
-    {0, L_11,   J_11,   K_11},
-    {0, L_12,   J_12,   K_12},
-    {0, L_13,   J_13,   K_13},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {0, CB12_CA9,    CB10_CA9,    CB11_CA9},
+    {0, CB12_CA10,   CB10_CA10,   CB11_CA10},
+    {0, CB12_CA11,   CB10_CA11,   CB11_CA11},
+    {0, CB12_CA12,   CB10_CA12,   CB11_CA12},
+    {0, CB12_CA13,   CB10_CA13,   CB11_CA13},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_14,   D_14,   E_14},
-    {0, F_15,   D_15,   E_15},
-    {0, F_16,   D_16,   E_16},
-    {0, L_14,   J_14,   K_14},
-    {0, L_15,   J_15,   K_15},
-    {0, L_16,   J_16,   K_16},
-    {1, L_1,    J_1,    K_1},
-    {1, L_2,    J_2,    K_2},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {0, CB12_CA14,   CB10_CA14,   CB11_CA14},
+    {0, CB12_CA15,   CB10_CA15,   CB11_CA15},
+    {0, CB12_CA16,   CB10_CA16,   CB11_CA16},
+    {1, CB12_CA1,    CB10_CA1,    CB11_CA1},
+    {1, CB12_CA2,    CB10_CA2,    CB11_CA2},
 
-    {1, C_16,   A_16,   B_16},
-    {1, C_15,   A_15,   B_15},
-    {1, C_14,   A_14,   B_14},
-    {1, C_13,   A_13,   B_13},
-    {1, C_12,   A_12,   B_12},
-    {1, C_11,   A_11,   B_11},
-    {1, C_10,   A_10,   B_10},
-    {1, C_9,    A_9,    B_9},
-    {1, C_8,    A_8,    B_8},
-    {1, C_7,    A_7,    B_7},
-    {1, C_6,    A_6,    B_6},
-    {1, C_5,    A_5,    B_5},
-    {1, C_3,    A_3,    B_3},
-    {1, L_3,    J_3,    K_3},
-    {1, L_4,    J_4,    K_4},
-    {1, L_5,    J_5,    K_5},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB12_CA3,    CB10_CA3,    CB11_CA3},
+    {1, CB12_CA4,    CB10_CA4,    CB11_CA4},
+    {1, CB12_CA5,    CB10_CA5,    CB11_CA5},
 
-    {1, I_16,   G_16,   H_16},
-    {1, I_14,   G_14,   H_14},
-    {1, I_13,   G_13,   H_13},
-    {1, I_12,   G_12,   H_12},
-    {1, I_11,   G_11,   H_11},
-    {1, I_10,   G_10,   H_10},
-    {1, I_9,    G_9,    H_9},
-    {1, I_8,    G_8,    H_8},
-    {1, I_7,    G_7,    H_7},
-    {1, I_6,    G_6,    H_6},
-    {1, I_5,    G_5,    H_5},
-    {1, I_3,    G_3,    H_3},
-    {1, I_1,    G_1,    H_1},
-    {1, L_6,    J_6,    K_6},
-    {1, L_7,    J_7,    K_7},
-    {1, L_8,    J_8,    K_8},
-    {1, L_9,    J_9,    K_9},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {1, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {1, CB12_CA6,    CB10_CA6,    CB11_CA6},
+    {1, CB12_CA7,    CB10_CA7,    CB11_CA7},
+    {1, CB12_CA8,    CB10_CA8,    CB11_CA8},
+    {1, CB12_CA9,    CB10_CA9,    CB11_CA9},
 
-    {1, F_16,   D_16,   E_16},
-    {1, F_15,   D_15,   E_15},
-    {1, F_14,   D_14,   E_14},
-    {1, F_10,   D_10,   E_10},
-    {1, F_6,    D_6,    E_6},
-    {1, F_5,    D_5,    E_5},
-    {1, F_4,    D_4,    E_4},
-    {1, F_3,    D_3,    E_3},
-    {1, F_2,    D_2,    E_2},
-    {1, F_1,    D_1,    E_1},
-    {1, L_10,   J_10,   K_10},
-    {1, L_11,   J_11,   K_11},
-    {1, L_12,   J_12,   K_12},
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {1, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {1, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB12_CA10,   CB10_CA10,   CB11_CA10},
+    {1, CB12_CA11,   CB10_CA11,   CB11_CA11},
+    {1, CB12_CA12,   CB10_CA12,   CB11_CA12},
 };
 #endif //RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/c2_pro/ansi/white/white.c b/keyboards/keychron/c2_pro/ansi/white/white.c
index 4bad7187cc3..3b10e550955 100644
--- a/keyboards/keychron/c2_pro/ansi/white/white.c
+++ b/keyboards/keychron/c2_pro/ansi/white/white.c
@@ -23,119 +23,119 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   driver
  *   |  LED address
  *   |  |   */
-    {0, A_16},
-    {0, A_15},
-    {0, A_14},
-    {0, A_13},
-    {0, A_12},
-    {0, A_11},
-    {0, A_10},
-    {0, A_9 },
-    {0, A_8 },
-    {0, A_7 },
-    {0, A_6 },
-    {0, A_5 },
-    {0, A_4 },
-    {0, A_2 },
-    {0, A_1 },
-    {0, G_1 },
+    {0, CB1_CA16},
+    {0, CB1_CA15},
+    {0, CB1_CA14},
+    {0, CB1_CA13},
+    {0, CB1_CA12},
+    {0, CB1_CA11},
+    {0, CB1_CA10},
+    {0, CB1_CA9 },
+    {0, CB1_CA8 },
+    {0, CB1_CA7 },
+    {0, CB1_CA6 },
+    {0, CB1_CA5 },
+    {0, CB1_CA4 },
+    {0, CB1_CA2 },
+    {0, CB1_CA1 },
+    {0, CB7_CA1 },
 
-    {0, G_2 },
-    {0, G_3 }, // NumLock
-    {0, G_4 }, // Mac
-    {0, G_5 }, // Win
+    {0, CB7_CA2 },
+    {0, CB7_CA3 }, // NumLock
+    {0, CB7_CA4 }, // Mac
+    {0, CB7_CA5 }, // Win
 
-    {0, B_16},
-    {0, B_15},
-    {0, B_14},
-    {0, B_13},
-    {0, B_12},
-    {0, B_11},
-    {0, B_10},
-    {0, B_9 },
-    {0, B_8 },
-    {0, B_7 },
-    {0, B_6 },
-    {0, B_5 },
-    {0, B_4 },
-    {0, B_3 },
-    {0, B_2 },
-    {0, B_1 },
-    {0, H_1 },
-    {0, H_2 },
-    {0, H_3 },
-    {0, H_4 },
-    {0, H_5 },
+    {0, CB2_CA16},
+    {0, CB2_CA15},
+    {0, CB2_CA14},
+    {0, CB2_CA13},
+    {0, CB2_CA12},
+    {0, CB2_CA11},
+    {0, CB2_CA10},
+    {0, CB2_CA9 },
+    {0, CB2_CA8 },
+    {0, CB2_CA7 },
+    {0, CB2_CA6 },
+    {0, CB2_CA5 },
+    {0, CB2_CA4 },
+    {0, CB2_CA3 },
+    {0, CB2_CA2 },
+    {0, CB2_CA1 },
+    {0, CB8_CA1 },
+    {0, CB8_CA2 },
+    {0, CB8_CA3 },
+    {0, CB8_CA4 },
+    {0, CB8_CA5 },
 
-    {0, C_16},
-    {0, C_15},
-    {0, C_14},
-    {0, C_13},
-    {0, C_12},
-    {0, C_11},
-    {0, C_10},
-    {0, C_9 },
-    {0, C_8 },
-    {0, C_7 },
-    {0, C_6 },
-    {0, C_5 },
-    {0, C_4 },
-    {0, C_3 },
-    {0, C_2 },
-    {0, C_1 },
-    {0, G_6 },
-    {0, G_7 },
-    {0, G_8 },
-    {0, G_9 },
-    {0, G_10},
+    {0, CB3_CA16},
+    {0, CB3_CA15},
+    {0, CB3_CA14},
+    {0, CB3_CA13},
+    {0, CB3_CA12},
+    {0, CB3_CA11},
+    {0, CB3_CA10},
+    {0, CB3_CA9 },
+    {0, CB3_CA8 },
+    {0, CB3_CA7 },
+    {0, CB3_CA6 },
+    {0, CB3_CA5 },
+    {0, CB3_CA4 },
+    {0, CB3_CA3 },
+    {0, CB3_CA2 },
+    {0, CB3_CA1 },
+    {0, CB7_CA6 },
+    {0, CB7_CA7 },
+    {0, CB7_CA8 },
+    {0, CB7_CA9 },
+    {0, CB7_CA10},
 
-    {0, D_16},
-    {0, D_15},
-    {0, D_14},
-    {0, D_13},
-    {0, D_12},
-    {0, D_11},
-    {0, D_10},
-    {0, D_9 },
-    {0, D_8 },
-    {0, D_7 },
-    {0, D_6 },
-    {0, D_5 },
-    {0, D_3 },
-    {0, H_7 },
-    {0, H_8 },
-    {0, H_9 },
+    {0, CB4_CA16},
+    {0, CB4_CA15},
+    {0, CB4_CA14},
+    {0, CB4_CA13},
+    {0, CB4_CA12},
+    {0, CB4_CA11},
+    {0, CB4_CA10},
+    {0, CB4_CA9 },
+    {0, CB4_CA8 },
+    {0, CB4_CA7 },
+    {0, CB4_CA6 },
+    {0, CB4_CA5 },
+    {0, CB4_CA3 },
+    {0, CB8_CA7 },
+    {0, CB8_CA8 },
+    {0, CB8_CA9 },
 
-    {0, E_16},
-    {0, E_14},
-    {0, E_13},
-    {0, E_12},
-    {0, E_11},
-    {0, E_10},
-    {0, E_9 },
-    {0, E_8 },
-    {0, E_7 },
-    {0, E_6 },
-    {0, E_5 },
-    {0, E_3 },
-    {0, E_1 },
-    {0, H_6 },
-    {0, H_11},
-    {0, H_12},
-    {0, H_10},
+    {0, CB5_CA16},
+    {0, CB5_CA14},
+    {0, CB5_CA13},
+    {0, CB5_CA12},
+    {0, CB5_CA11},
+    {0, CB5_CA10},
+    {0, CB5_CA9 },
+    {0, CB5_CA8 },
+    {0, CB5_CA7 },
+    {0, CB5_CA6 },
+    {0, CB5_CA5 },
+    {0, CB5_CA3 },
+    {0, CB5_CA1 },
+    {0, CB8_CA6 },
+    {0, CB8_CA11},
+    {0, CB8_CA12},
+    {0, CB8_CA10},
 
-    {0, F_16},
-    {0, F_15},
-    {0, F_14},
-    {0, F_10},
-    {0, F_6 },
-    {0, F_5 },
-    {0, F_4 },
-    {0, F_3 },
-    {0, F_2 },
-    {0, F_1 },
-    {0, G_13},
-    {0, G_11},
-    {0, G_12},
+    {0, CB6_CA16},
+    {0, CB6_CA15},
+    {0, CB6_CA14},
+    {0, CB6_CA10},
+    {0, CB6_CA6 },
+    {0, CB6_CA5 },
+    {0, CB6_CA4 },
+    {0, CB6_CA3 },
+    {0, CB6_CA2 },
+    {0, CB6_CA1 },
+    {0, CB7_CA13},
+    {0, CB7_CA11},
+    {0, CB7_CA12},
 };
 #endif //LED_MATRIX_ENABLE
diff --git a/keyboards/keychron/q0/base/base.c b/keyboards/keychron/q0/base/base.c
index b9774717303..af33e5c0a36 100644
--- a/keyboards/keychron/q0/base/base.c
+++ b/keyboards/keychron/q0/base/base.c
@@ -27,31 +27,31 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, F_5,    D_5,    E_5}, // 0
-    {0, I_5,    G_5,    H_5}, // 1
-    {0, L_5,    J_5,    K_5}, // 2
-    {0, C_5,    A_5,    B_5}, // 3
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5}, // 0
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5}, // 1
+    {0, CB12_CA5,    CB10_CA5,    CB11_CA5}, // 2
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5}, // 3
 
-    {0, F_4,    D_4,    E_4}, // 4
-    {0, I_4,    G_4,    H_4}, // 5
-    {0, L_4,    J_4,    K_4}, // 6
-    {0, C_4,    A_4,    B_4}, // 7
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4}, // 4
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4}, // 5
+    {0, CB12_CA4,    CB10_CA4,    CB11_CA4}, // 6
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4}, // 7
 
-    {0, F_6,    D_6,    E_6}, // 8
-    {0, I_6,    G_6,    H_6}, // 9
-    {0, L_6,    J_6,    K_6}, // 10
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6}, // 8
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6}, // 9
+    {0, CB12_CA6,    CB10_CA6,    CB11_CA6}, // 10
 
-    {0, F_3,    D_3,    E_3}, // 11
-    {0, I_3,    G_3,    H_3}, // 12
-    {0, L_3,    J_3,    K_3}, // 13
-    {0, C_6,    A_6,    B_6}, // 14
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3}, // 11
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3}, // 12
+    {0, CB12_CA3,    CB10_CA3,    CB11_CA3}, // 13
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6}, // 14
 
-    {0, F_2,    D_2,    E_2}, // 15
-    {0, I_2,    G_2,    H_2}, // 16
-    {0, L_2,    J_2,    K_2}, // 17
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2}, // 15
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2}, // 16
+    {0, CB12_CA2,    CB10_CA2,    CB11_CA2}, // 17
 
-    {0, F_1,    D_1,    E_1}, // 18
-    {0, L_1,    J_1,    K_1}, // 19
-    {0, C_2,    A_2,    B_2}, // 20
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1}, // 18
+    {0, CB12_CA1,    CB10_CA1,    CB11_CA1}, // 19
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2}, // 20
 };
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q0/plus/plus.c b/keyboards/keychron/q0/plus/plus.c
index 4af7a4572f9..55f71d2a230 100644
--- a/keyboards/keychron/q0/plus/plus.c
+++ b/keyboards/keychron/q0/plus/plus.c
@@ -27,36 +27,36 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
 
-    {0, 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, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
 
-    {0, 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, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
 
-    {0, 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, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
 
-    {0, 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, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
 
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_9,    D_9,    E_9},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
 };
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q10/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q10/ansi_encoder/ansi_encoder.c
index 06947e9d180..a4432cd4cea 100644
--- a/keyboards/keychron/q10/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/q10/ansi_encoder/ansi_encoder.c
@@ -27,99 +27,99 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_2,  A_2,  B_2},  // ESC
-    {0, C_3,  A_3,  B_3},  // F1
-    {0, C_4,  A_4,  B_4},  // F2
-    {0, C_5,  A_5,  B_5},  // F3
-    {0, C_6,  A_6,  B_6},  // F4
-    {0, C_7,  A_7,  B_7},  // F5
-    {0, C_8,  A_8,  B_8},  // F6
-    {0, C_9,  A_9,  B_9},  // F7
-    {0, C_10, A_10, B_10}, // F8
-    {0, C_11, A_11, B_11}, // F9
-    {0, C_12, A_12, B_12}, // F10
-    {0, C_13, A_13, B_13}, // F11
-    {0, C_14, A_14, B_14}, // F12
-    {0, C_15, A_15, B_15}, // INS
-    {0, C_16, A_16, B_16}, // DEL
+    {0, CB3_CA2,  CB1_CA2,  CB2_CA2},  // ESC
+    {0, CB3_CA3,  CB1_CA3,  CB2_CA3},  // F1
+    {0, CB3_CA4,  CB1_CA4,  CB2_CA4},  // F2
+    {0, CB3_CA5,  CB1_CA5,  CB2_CA5},  // F3
+    {0, CB3_CA6,  CB1_CA6,  CB2_CA6},  // F4
+    {0, CB3_CA7,  CB1_CA7,  CB2_CA7},  // F5
+    {0, CB3_CA8,  CB1_CA8,  CB2_CA8},  // F6
+    {0, CB3_CA9,  CB1_CA9,  CB2_CA9},  // F7
+    {0, CB3_CA10, CB1_CA10, CB2_CA10}, // F8
+    {0, CB3_CA11, CB1_CA11, CB2_CA11}, // F9
+    {0, CB3_CA12, CB1_CA12, CB2_CA12}, // F10
+    {0, CB3_CA13, CB1_CA13, CB2_CA13}, // F11
+    {0, CB3_CA14, CB1_CA14, CB2_CA14}, // F12
+    {0, CB3_CA15, CB1_CA15, CB2_CA15}, // INS
+    {0, CB3_CA16, CB1_CA16, CB2_CA16}, // DEL
 
-    {0, I_1,  G_1,  H_1},  // M1
-    {0, I_2,  G_2,  H_2},  // `~
-    {0, I_3,  G_3,  H_3},  // 1!
-    {0, I_4,  G_4,  H_4},  // 2@
-    {0, I_5,  G_5,  H_5},  // 3#
-    {0, I_6,  G_6,  H_6},  // 4$
-    {0, I_7,  G_7,  H_7},  // 5%
-    {0, I_8,  G_8,  H_8},  // 6^
-    {0, I_9,  G_9,  H_9},  // 7&
-    {0, I_10, G_10, H_10}, // 8*
-    {0, I_11, G_11, H_11}, // 9(
-    {0, I_12, G_12, H_12}, // 0)
-    {0, I_13, G_13, H_13}, // -_
-    {0, I_14, G_14, H_14}, // =+
-    {0, I_15, G_15, H_15}, // BackSpace
-    {0, I_16, G_16, H_16}, // PgUp
+    {0, CB9_CA1,  CB7_CA1,  CB8_CA1},  // M1
+    {0, CB9_CA2,  CB7_CA2,  CB8_CA2},  // `~
+    {0, CB9_CA3,  CB7_CA3,  CB8_CA3},  // 1!
+    {0, CB9_CA4,  CB7_CA4,  CB8_CA4},  // 2@
+    {0, CB9_CA5,  CB7_CA5,  CB8_CA5},  // 3#
+    {0, CB9_CA6,  CB7_CA6,  CB8_CA6},  // 4$
+    {0, CB9_CA7,  CB7_CA7,  CB8_CA7},  // 5%
+    {0, CB9_CA8,  CB7_CA8,  CB8_CA8},  // 6^
+    {0, CB9_CA9,  CB7_CA9,  CB8_CA9},  // 7&
+    {0, CB9_CA10, CB7_CA10, CB8_CA10}, // 8*
+    {0, CB9_CA11, CB7_CA11, CB8_CA11}, // 9(
+    {0, CB9_CA12, CB7_CA12, CB8_CA12}, // 0)
+    {0, CB9_CA13, CB7_CA13, CB8_CA13}, // -_
+    {0, CB9_CA14, CB7_CA14, CB8_CA14}, // =+
+    {0, CB9_CA15, CB7_CA15, CB8_CA15}, // BackSpace
+    {0, CB9_CA16, CB7_CA16, CB8_CA16}, // PgUp
 
-    {0, F_1,  D_1,  E_1},  // M2
-    {0, F_2,  D_2,  E_2},  // TAB
-    {0, F_3,  D_3,  E_3},  // Q
-    {0, F_4,  D_4,  E_4},  // W
-    {0, F_5,  D_5,  E_5},  // E
-    {0, F_6,  D_6,  E_6},  // R
-    {0, F_7,  D_7,  E_7},  // T
-    {0, F_8,  D_8,  E_8},  // Y
-    {0, F_9,  D_9,  E_9},  // U
-    {0, F_10, D_10, E_10}, // I
-    {0, F_11, D_11, E_11}, // O
-    {0, F_12, D_12, E_12}, // P
-    {0, F_13, D_13, E_13}, // [
-    {0, F_14, D_14, E_14}, // ]
-    {0, F_15, D_15, E_15}, // |
-    {0, F_16, D_16, E_16}, // PgDn
+    {0, CB6_CA1,  CB4_CA1,  CB5_CA1},  // M2
+    {0, CB6_CA2,  CB4_CA2,  CB5_CA2},  // TAB
+    {0, CB6_CA3,  CB4_CA3,  CB5_CA3},  // Q
+    {0, CB6_CA4,  CB4_CA4,  CB5_CA4},  // W
+    {0, CB6_CA5,  CB4_CA5,  CB5_CA5},  // E
+    {0, CB6_CA6,  CB4_CA6,  CB5_CA6},  // R
+    {0, CB6_CA7,  CB4_CA7,  CB5_CA7},  // T
+    {0, CB6_CA8,  CB4_CA8,  CB5_CA8},  // Y
+    {0, CB6_CA9,  CB4_CA9,  CB5_CA9},  // U
+    {0, CB6_CA10, CB4_CA10, CB5_CA10}, // I
+    {0, CB6_CA11, CB4_CA11, CB5_CA11}, // O
+    {0, CB6_CA12, CB4_CA12, CB5_CA12}, // P
+    {0, CB6_CA13, CB4_CA13, CB5_CA13}, // [
+    {0, CB6_CA14, CB4_CA14, CB5_CA14}, // ]
+    {0, CB6_CA15, CB4_CA15, CB5_CA15}, // |
+    {0, CB6_CA16, CB4_CA16, CB5_CA16}, // PgDn
 
-    {1, C_16, A_16, B_16}, // M3
-    {1, C_15, A_15, B_15}, // CapsLock
-    {1, C_14, A_14, B_14}, // A
-    {1, C_13, A_13, B_13}, // S
-    {1, C_12, A_12, B_12}, // D
-    {1, C_11, A_11, B_11}, // F
-    {1, C_10, A_10, B_10}, // G
-    {1, C_8,  A_8,  B_8},  // H
-    {1, C_7,  A_7,  B_7},  // J
-    {1, C_6,  A_6,  B_6},  // K
-    {1, C_5,  A_5,  B_5},  // L
-    {1, C_4,  A_4,  B_4},  // ;
-    {1, C_3,  A_3,  B_3},  // '
-    {1, C_2,  A_2,  B_2},  // Enter
-    {1, C_1,  A_1,  B_1},  // Home
+    {1, CB3_CA16, CB1_CA16, CB2_CA16}, // M3
+    {1, CB3_CA15, CB1_CA15, CB2_CA15}, // CapsLock
+    {1, CB3_CA14, CB1_CA14, CB2_CA14}, // A
+    {1, CB3_CA13, CB1_CA13, CB2_CA13}, // S
+    {1, CB3_CA12, CB1_CA12, CB2_CA12}, // D
+    {1, CB3_CA11, CB1_CA11, CB2_CA11}, // F
+    {1, CB3_CA10, CB1_CA10, CB2_CA10}, // G
+    {1, CB3_CA8,  CB1_CA8,  CB2_CA8},  // H
+    {1, CB3_CA7,  CB1_CA7,  CB2_CA7},  // J
+    {1, CB3_CA6,  CB1_CA6,  CB2_CA6},  // K
+    {1, CB3_CA5,  CB1_CA5,  CB2_CA5},  // L
+    {1, CB3_CA4,  CB1_CA4,  CB2_CA4},  // ;
+    {1, CB3_CA3,  CB1_CA3,  CB2_CA3},  // '
+    {1, CB3_CA2,  CB1_CA2,  CB2_CA2},  // Enter
+    {1, CB3_CA1,  CB1_CA1,  CB2_CA1},  // Home
 
-    {1, I_16, G_16, H_16}, // M4
-    {1, I_15, G_15, H_15}, // Shift_L
-    {1, I_13, G_13, H_13}, // Z
-    {1, I_12, G_12, H_12}, // X
-    {1, I_11, G_11, H_11}, // C
-    {1, I_10, G_10, H_10}, // V
-    {1, I_9,  G_9,  H_9},  // B
-    {1, I_8,  G_8,  H_8},  // B
-    {1, I_7,  G_7,  H_7},  // N
-    {1, I_6,  G_6,  H_6},  // M
-    {1, I_5,  G_5,  H_5},  // ,
-    {1, I_4,  G_4,  H_4},  // .
-    {1, I_3,  G_3,  H_3},  // ?
-    {1, I_2,  G_2,  H_2},  // Shift_R
-    {1, I_1,  G_1,  H_1},  // Up
+    {1, CB9_CA16, CB7_CA16, CB8_CA16}, // M4
+    {1, CB9_CA15, CB7_CA15, CB8_CA15}, // Shift_L
+    {1, CB9_CA13, CB7_CA13, CB8_CA13}, // Z
+    {1, CB9_CA12, CB7_CA12, CB8_CA12}, // X
+    {1, CB9_CA11, CB7_CA11, CB8_CA11}, // C
+    {1, CB9_CA10, CB7_CA10, CB8_CA10}, // V
+    {1, CB9_CA9,  CB7_CA9,  CB8_CA9},  // B
+    {1, CB9_CA8,  CB7_CA8,  CB8_CA8},  // B
+    {1, CB9_CA7,  CB7_CA7,  CB8_CA7},  // N
+    {1, CB9_CA6,  CB7_CA6,  CB8_CA6},  // M
+    {1, CB9_CA5,  CB7_CA5,  CB8_CA5},  // ,
+    {1, CB9_CA4,  CB7_CA4,  CB8_CA4},  // .
+    {1, CB9_CA3,  CB7_CA3,  CB8_CA3},  // ?
+    {1, CB9_CA2,  CB7_CA2,  CB8_CA2},  // Shift_R
+    {1, CB9_CA1,  CB7_CA1,  CB8_CA1},  // Up
 
-    {1, F_16, D_16, E_16}, // M5
-    {1, F_15, D_15, E_15}, // Ctrl_L
-    {1, F_14, D_14, E_14}, // Win_L
-    {1, F_13, D_13, E_13}, // Alt_L
-    {1, F_12, D_12, E_12}, // Space
-    {1, F_9,  D_9,  E_9},  // Fn
-    {1, F_8,  D_8,  E_8},  // Space
-    {1, F_7,  D_7,  E_7},  // Alt_R
-    {1, F_3,  D_3,  E_3},  // Left
-    {1, F_2,  D_2,  E_2},  // Down
-    {1, F_1,  D_1,  E_1},  // Right
+    {1, CB6_CA16, CB4_CA16, CB5_CA16}, // M5
+    {1, CB6_CA15, CB4_CA15, CB5_CA15}, // Ctrl_L
+    {1, CB6_CA14, CB4_CA14, CB5_CA14}, // Win_L
+    {1, CB6_CA13, CB4_CA13, CB5_CA13}, // Alt_L
+    {1, CB6_CA12, CB4_CA12, CB5_CA12}, // Space
+    {1, CB6_CA9,  CB4_CA9,  CB5_CA9},  // Fn
+    {1, CB6_CA8,  CB4_CA8,  CB5_CA8},  // Space
+    {1, CB6_CA7,  CB4_CA7,  CB5_CA7},  // Alt_R
+    {1, CB6_CA3,  CB4_CA3,  CB5_CA3},  // Left
+    {1, CB6_CA2,  CB4_CA2,  CB5_CA2},  // Down
+    {1, CB6_CA1,  CB4_CA1,  CB5_CA1},  // Right
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/q10/iso_encoder/iso_encoder.c b/keyboards/keychron/q10/iso_encoder/iso_encoder.c
index 2aebd936ecf..9ff43263b2d 100644
--- a/keyboards/keychron/q10/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/q10/iso_encoder/iso_encoder.c
@@ -27,100 +27,100 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_2,  A_2,  B_2},  // ESC
-    {0, C_3,  A_3,  B_3},  // F1
-    {0, C_4,  A_4,  B_4},  // F2
-    {0, C_5,  A_5,  B_5},  // F3
-    {0, C_6,  A_6,  B_6},  // F4
-    {0, C_7,  A_7,  B_7},  // F5
-    {0, C_8,  A_8,  B_8},  // F6
-    {0, C_9,  A_9,  B_9},  // F7
-    {0, C_10, A_10, B_10}, // F8
-    {0, C_11, A_11, B_11}, // F9
-    {0, C_12, A_12, B_12}, // F10
-    {0, C_13, A_13, B_13}, // F11
-    {0, C_14, A_14, B_14}, // F12
-    {0, C_15, A_15, B_15}, // INS
-    {0, C_16, A_16, B_16}, // DEL
+    {0, CB3_CA2,  CB1_CA2,  CB2_CA2},  // ESC
+    {0, CB3_CA3,  CB1_CA3,  CB2_CA3},  // F1
+    {0, CB3_CA4,  CB1_CA4,  CB2_CA4},  // F2
+    {0, CB3_CA5,  CB1_CA5,  CB2_CA5},  // F3
+    {0, CB3_CA6,  CB1_CA6,  CB2_CA6},  // F4
+    {0, CB3_CA7,  CB1_CA7,  CB2_CA7},  // F5
+    {0, CB3_CA8,  CB1_CA8,  CB2_CA8},  // F6
+    {0, CB3_CA9,  CB1_CA9,  CB2_CA9},  // F7
+    {0, CB3_CA10, CB1_CA10, CB2_CA10}, // F8
+    {0, CB3_CA11, CB1_CA11, CB2_CA11}, // F9
+    {0, CB3_CA12, CB1_CA12, CB2_CA12}, // F10
+    {0, CB3_CA13, CB1_CA13, CB2_CA13}, // F11
+    {0, CB3_CA14, CB1_CA14, CB2_CA14}, // F12
+    {0, CB3_CA15, CB1_CA15, CB2_CA15}, // INS
+    {0, CB3_CA16, CB1_CA16, CB2_CA16}, // DEL
 
-    {0, I_1,  G_1,  H_1},  // M1
-    {0, I_2,  G_2,  H_2},  // `~
-    {0, I_3,  G_3,  H_3},  // 1!
-    {0, I_4,  G_4,  H_4},  // 2@
-    {0, I_5,  G_5,  H_5},  // 3#
-    {0, I_6,  G_6,  H_6},  // 4$
-    {0, I_7,  G_7,  H_7},  // 5%
-    {0, I_8,  G_8,  H_8},  // 6^
-    {0, I_9,  G_9,  H_9},  // 7&
-    {0, I_10, G_10, H_10}, // 8*
-    {0, I_11, G_11, H_11}, // 9(
-    {0, I_12, G_12, H_12}, // 0)
-    {0, I_13, G_13, H_13}, // -_
-    {0, I_14, G_14, H_14}, // =+
-    {0, I_15, G_15, H_15}, // BackSpace
-    {0, I_16, G_16, H_16}, // PgUp
+    {0, CB9_CA1,  CB7_CA1,  CB8_CA1},  // M1
+    {0, CB9_CA2,  CB7_CA2,  CB8_CA2},  // `~
+    {0, CB9_CA3,  CB7_CA3,  CB8_CA3},  // 1!
+    {0, CB9_CA4,  CB7_CA4,  CB8_CA4},  // 2@
+    {0, CB9_CA5,  CB7_CA5,  CB8_CA5},  // 3#
+    {0, CB9_CA6,  CB7_CA6,  CB8_CA6},  // 4$
+    {0, CB9_CA7,  CB7_CA7,  CB8_CA7},  // 5%
+    {0, CB9_CA8,  CB7_CA8,  CB8_CA8},  // 6^
+    {0, CB9_CA9,  CB7_CA9,  CB8_CA9},  // 7&
+    {0, CB9_CA10, CB7_CA10, CB8_CA10}, // 8*
+    {0, CB9_CA11, CB7_CA11, CB8_CA11}, // 9(
+    {0, CB9_CA12, CB7_CA12, CB8_CA12}, // 0)
+    {0, CB9_CA13, CB7_CA13, CB8_CA13}, // -_
+    {0, CB9_CA14, CB7_CA14, CB8_CA14}, // =+
+    {0, CB9_CA15, CB7_CA15, CB8_CA15}, // BackSpace
+    {0, CB9_CA16, CB7_CA16, CB8_CA16}, // PgUp
 
-    {0, F_1,  D_1,  E_1},  // M2
-    {0, F_2,  D_2,  E_2},  // TAB
-    {0, F_3,  D_3,  E_3},  // Q
-    {0, F_4,  D_4,  E_4},  // W
-    {0, F_5,  D_5,  E_5},  // E
-    {0, F_6,  D_6,  E_6},  // R
-    {0, F_7,  D_7,  E_7},  // T
-    {0, F_8,  D_8,  E_8},  // Y
-    {0, F_9,  D_9,  E_9},  // U
-    {0, F_10, D_10, E_10}, // I
-    {0, F_11, D_11, E_11}, // O
-    {0, F_12, D_12, E_12}, // P
-    {0, F_13, D_13, E_13}, // [
-    {0, F_14, D_14, E_14}, // ]
-    {0, F_16, D_16, E_16}, // PgDn
+    {0, CB6_CA1,  CB4_CA1,  CB5_CA1},  // M2
+    {0, CB6_CA2,  CB4_CA2,  CB5_CA2},  // TAB
+    {0, CB6_CA3,  CB4_CA3,  CB5_CA3},  // Q
+    {0, CB6_CA4,  CB4_CA4,  CB5_CA4},  // W
+    {0, CB6_CA5,  CB4_CA5,  CB5_CA5},  // E
+    {0, CB6_CA6,  CB4_CA6,  CB5_CA6},  // R
+    {0, CB6_CA7,  CB4_CA7,  CB5_CA7},  // T
+    {0, CB6_CA8,  CB4_CA8,  CB5_CA8},  // Y
+    {0, CB6_CA9,  CB4_CA9,  CB5_CA9},  // U
+    {0, CB6_CA10, CB4_CA10, CB5_CA10}, // I
+    {0, CB6_CA11, CB4_CA11, CB5_CA11}, // O
+    {0, CB6_CA12, CB4_CA12, CB5_CA12}, // P
+    {0, CB6_CA13, CB4_CA13, CB5_CA13}, // [
+    {0, CB6_CA14, CB4_CA14, CB5_CA14}, // ]
+    {0, CB6_CA16, CB4_CA16, CB5_CA16}, // PgDn
 
-    {1, C_16, A_16, B_16}, // M3
-    {1, C_15, A_15, B_15}, // CapsLock
-    {1, C_14, A_14, B_14}, // A
-    {1, C_13, A_13, B_13}, // S
-    {1, C_12, A_12, B_12}, // D
-    {1, C_11, A_11, B_11}, // F
-    {1, C_10, A_10, B_10}, // G
-    {1, C_8,  A_8,  B_8},  // H
-    {1, C_7,  A_7,  B_7},  // J
-    {1, C_6,  A_6,  B_6},  // K
-    {1, C_5,  A_5,  B_5},  // L
-    {1, C_4,  A_4,  B_4},  // ;
-    {1, C_3,  A_3,  B_3},  // '
-    {0, F_15, D_15, E_15}, // |
-    {1, C_2,  A_2,  B_2},  // Enter
-    {1, C_1,  A_1,  B_1},  // Home
+    {1, CB3_CA16, CB1_CA16, CB2_CA16}, // M3
+    {1, CB3_CA15, CB1_CA15, CB2_CA15}, // CapsLock
+    {1, CB3_CA14, CB1_CA14, CB2_CA14}, // A
+    {1, CB3_CA13, CB1_CA13, CB2_CA13}, // S
+    {1, CB3_CA12, CB1_CA12, CB2_CA12}, // D
+    {1, CB3_CA11, CB1_CA11, CB2_CA11}, // F
+    {1, CB3_CA10, CB1_CA10, CB2_CA10}, // G
+    {1, CB3_CA8,  CB1_CA8,  CB2_CA8},  // H
+    {1, CB3_CA7,  CB1_CA7,  CB2_CA7},  // J
+    {1, CB3_CA6,  CB1_CA6,  CB2_CA6},  // K
+    {1, CB3_CA5,  CB1_CA5,  CB2_CA5},  // L
+    {1, CB3_CA4,  CB1_CA4,  CB2_CA4},  // ;
+    {1, CB3_CA3,  CB1_CA3,  CB2_CA3},  // '
+    {0, CB6_CA15, CB4_CA15, CB5_CA15}, // |
+    {1, CB3_CA2,  CB1_CA2,  CB2_CA2},  // Enter
+    {1, CB3_CA1,  CB1_CA1,  CB2_CA1},  // Home
 
-    {1, I_16, G_16, H_16}, // M4
-    {1, I_15, G_15, H_15}, // Shift_L
-    {1, I_14, G_14, H_14},
-    {1, I_13, G_13, H_13}, // Z
-    {1, I_12, G_12, H_12}, // X
-    {1, I_11, G_11, H_11}, // C
-    {1, I_10, G_10, H_10}, // V
-    {1, I_9,  G_9,  H_9},  // B
-    {1, I_8,  G_8,  H_8},  // B
-    {1, I_7,  G_7,  H_7},  // N
-    {1, I_6,  G_6,  H_6},  // M
-    {1, I_5,  G_5,  H_5},  // ,
-    {1, I_4,  G_4,  H_4},  // .
-    {1, I_3,  G_3,  H_3},  // ?
-    {1, I_2,  G_2,  H_2},  // Shift_R
-    {1, I_1,  G_1,  H_1},  // Up
+    {1, CB9_CA16, CB7_CA16, CB8_CA16}, // M4
+    {1, CB9_CA15, CB7_CA15, CB8_CA15}, // Shift_L
+    {1, CB9_CA14, CB7_CA14, CB8_CA14},
+    {1, CB9_CA13, CB7_CA13, CB8_CA13}, // Z
+    {1, CB9_CA12, CB7_CA12, CB8_CA12}, // X
+    {1, CB9_CA11, CB7_CA11, CB8_CA11}, // C
+    {1, CB9_CA10, CB7_CA10, CB8_CA10}, // V
+    {1, CB9_CA9,  CB7_CA9,  CB8_CA9},  // B
+    {1, CB9_CA8,  CB7_CA8,  CB8_CA8},  // B
+    {1, CB9_CA7,  CB7_CA7,  CB8_CA7},  // N
+    {1, CB9_CA6,  CB7_CA6,  CB8_CA6},  // M
+    {1, CB9_CA5,  CB7_CA5,  CB8_CA5},  // ,
+    {1, CB9_CA4,  CB7_CA4,  CB8_CA4},  // .
+    {1, CB9_CA3,  CB7_CA3,  CB8_CA3},  // ?
+    {1, CB9_CA2,  CB7_CA2,  CB8_CA2},  // Shift_R
+    {1, CB9_CA1,  CB7_CA1,  CB8_CA1},  // Up
 
-    {1, F_16, D_16, E_16}, // M5
-    {1, F_15, D_15, E_15}, // Ctrl_L
-    {1, F_14, D_14, E_14}, // Win_L
-    {1, F_13, D_13, E_13}, // Alt_L
-    {1, F_12, D_12, E_12}, // Space
-    {1, F_9,  D_9,  E_9},  // Fn
-    {1, F_8,  D_8,  E_8},  // Space
-    {1, F_7,  D_7,  E_7},  // Alt_R
-    {1, F_3,  D_3,  E_3},  // Left
-    {1, F_2,  D_2,  E_2},  // Down
-    {1, F_1,  D_1,  E_1},  // Right
+    {1, CB6_CA16, CB4_CA16, CB5_CA16}, // M5
+    {1, CB6_CA15, CB4_CA15, CB5_CA15}, // Ctrl_L
+    {1, CB6_CA14, CB4_CA14, CB5_CA14}, // Win_L
+    {1, CB6_CA13, CB4_CA13, CB5_CA13}, // Alt_L
+    {1, CB6_CA12, CB4_CA12, CB5_CA12}, // Space
+    {1, CB6_CA9,  CB4_CA9,  CB5_CA9},  // Fn
+    {1, CB6_CA8,  CB4_CA8,  CB5_CA8},  // Space
+    {1, CB6_CA7,  CB4_CA7,  CB5_CA7},  // Alt_R
+    {1, CB6_CA3,  CB4_CA3,  CB5_CA3},  // Left
+    {1, CB6_CA2,  CB4_CA2,  CB5_CA2},  // Down
+    {1, CB6_CA1,  CB4_CA1,  CB5_CA1},  // Right
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/q11/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q11/ansi_encoder/ansi_encoder.c
index 24b9836b2ec..49e428bc00d 100755
--- a/keyboards/keychron/q11/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/q11/ansi_encoder/ansi_encoder.c
@@ -24,105 +24,105 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, A_2,  C_2,  B_2},  // ESC
-    {0, A_3,  C_3,  B_3},  // F1
-    {0, A_4,  C_4,  B_4},  // F2
-    {0, A_5,  C_5,  B_5},  // F3
-    {0, A_6,  C_6,  B_6},  // F4
-    {0, A_7,  C_7,  B_7},  // F5
-    {0, A_8,  C_8,  B_8},  // F6
+    {0, CB1_CA2,  CB3_CA2,  CB2_CA2},  // ESC
+    {0, CB1_CA3,  CB3_CA3,  CB2_CA3},  // F1
+    {0, CB1_CA4,  CB3_CA4,  CB2_CA4},  // F2
+    {0, CB1_CA5,  CB3_CA5,  CB2_CA5},  // F3
+    {0, CB1_CA6,  CB3_CA6,  CB2_CA6},  // F4
+    {0, CB1_CA7,  CB3_CA7,  CB2_CA7},  // F5
+    {0, CB1_CA8,  CB3_CA8,  CB2_CA8},  // F6
 
-    {0, D_1,  F_1,  E_1},  // M1
-    {0, D_2,  F_2,  E_2},  // `~
-    {0, D_3,  F_3,  E_3},  // 1!
-    {0, D_4,  F_4,  E_4},  // 2@
-    {0, D_5,  F_5,  E_5},  // 3#
-    {0, D_6,  F_6,  E_6},  // 4$
-    {0, D_7,  F_7,  E_7},  // 5%
-    {0, D_8,  F_8,  E_8},  // 6^
+    {0, CB4_CA1,  CB6_CA1,  CB5_CA1},  // M1
+    {0, CB4_CA2,  CB6_CA2,  CB5_CA2},  // `~
+    {0, CB4_CA3,  CB6_CA3,  CB5_CA3},  // 1!
+    {0, CB4_CA4,  CB6_CA4,  CB5_CA4},  // 2@
+    {0, CB4_CA5,  CB6_CA5,  CB5_CA5},  // 3#
+    {0, CB4_CA6,  CB6_CA6,  CB5_CA6},  // 4$
+    {0, CB4_CA7,  CB6_CA7,  CB5_CA7},  // 5%
+    {0, CB4_CA8,  CB6_CA8,  CB5_CA8},  // 6^
 
-    {0, G_1,  I_1,  H_1},  // M2
-    {0, G_2,  I_2,  H_2},  // TAB
-    {0, G_3,  I_3,  H_3},  // Q
-    {0, G_4,  I_4,  H_4},  // W
-    {0, G_5,  I_5,  H_5},  // E
-    {0, G_6,  I_6,  H_6},  // R
-    {0, G_7,  I_7,  H_7},  // T
+    {0, CB7_CA1,  CB9_CA1,  CB8_CA1},  // M2
+    {0, CB7_CA2,  CB9_CA2,  CB8_CA2},  // TAB
+    {0, CB7_CA3,  CB9_CA3,  CB8_CA3},  // Q
+    {0, CB7_CA4,  CB9_CA4,  CB8_CA4},  // W
+    {0, CB7_CA5,  CB9_CA5,  CB8_CA5},  // E
+    {0, CB7_CA6,  CB9_CA6,  CB8_CA6},  // R
+    {0, CB7_CA7,  CB9_CA7,  CB8_CA7},  // T
 
-    {0, J_1,  L_1,  K_1},  // M3
-    {0, J_2,  L_2,  K_2},  // CapsJock
-    {0, J_3,  L_3,  K_3},  // A
-    {0, J_4,  L_4,  K_4},  // S
-    {0, J_5,  L_5,  K_5},  // D
-    {0, J_6,  L_6,  K_6},  // F
-    {0, J_7,  L_7,  K_7},  // G
+    {0, CB10_CA1,  CB12_CA1,  CB11_CA1},  // M3
+    {0, CB10_CA2,  CB12_CA2,  CB11_CA2},  // CapsJock
+    {0, CB10_CA3,  CB12_CA3,  CB11_CA3},  // A
+    {0, CB10_CA4,  CB12_CA4,  CB11_CA4},  // S
+    {0, CB10_CA5,  CB12_CA5,  CB11_CA5},  // D
+    {0, CB10_CA6,  CB12_CA6,  CB11_CA6},  // F
+    {0, CB10_CA7,  CB12_CA7,  CB11_CA7},  // G
 
-    {0, J_9,  L_9,  K_9},  // M4
-    {0, J_11, L_11, K_11}, // Shift_J
-    {0, J_12, L_12, K_12}, // Z
-    {0, J_13, L_13, K_13}, // X
-    {0, J_14, L_14, K_14}, // C
-    {0, J_15, L_15, K_15}, // V
-    {0, J_16, L_16, K_16}, // B
+    {0, CB10_CA9,  CB12_CA9,  CB11_CA9},  // M4
+    {0, CB10_CA11, CB12_CA11, CB11_CA11}, // Shift_J
+    {0, CB10_CA12, CB12_CA12, CB11_CA12}, // Z
+    {0, CB10_CA13, CB12_CA13, CB11_CA13}, // X
+    {0, CB10_CA14, CB12_CA14, CB11_CA14}, // C
+    {0, CB10_CA15, CB12_CA15, CB11_CA15}, // V
+    {0, CB10_CA16, CB12_CA16, CB11_CA16}, // B
 
-    {0, G_9,  I_9,  H_9},  // M5
-    {0, G_10, I_10, H_10}, // Ctrl_L
-    {0, G_11, I_11, H_11}, // WGn_L
-    {0, G_12, I_12, H_12}, // Alt_L
-    {0, G_13, I_13, H_13}, // Fn
-    {0, G_15, I_15, H_15}, // Space
+    {0, CB7_CA9,  CB9_CA9,  CB8_CA9},  // M5
+    {0, CB7_CA10, CB9_CA10, CB8_CA10}, // Ctrl_L
+    {0, CB7_CA11, CB9_CA11, CB8_CA11}, // WGn_L
+    {0, CB7_CA12, CB9_CA12, CB8_CA12}, // Alt_L
+    {0, CB7_CA13, CB9_CA13, CB8_CA13}, // Fn
+    {0, CB7_CA15, CB9_CA15, CB8_CA15}, // Space
 
-    {0, A_16, C_16, B_16}, // F7
-    {0, A_15, C_15, B_15}, // F8
-    {0, A_14, C_14, B_14}, // F9
-    {0, A_13, C_13, B_13}, // F11
-    {0, A_12, C_12, B_12}, // F11
-    {0, A_11, C_11, B_11}, // F12
-    {0, A_10, C_10, B_10}, // INS
-    {0, A_9,  C_9,  B_9},  // DEL
+    {0, CB1_CA16, CB3_CA16, CB2_CA16}, // F7
+    {0, CB1_CA15, CB3_CA15, CB2_CA15}, // F8
+    {0, CB1_CA14, CB3_CA14, CB2_CA14}, // F9
+    {0, CB1_CA13, CB3_CA13, CB2_CA13}, // F11
+    {0, CB1_CA12, CB3_CA12, CB2_CA12}, // F11
+    {0, CB1_CA11, CB3_CA11, CB2_CA11}, // F12
+    {0, CB1_CA10, CB3_CA10, CB2_CA10}, // INS
+    {0, CB1_CA9,  CB3_CA9,  CB2_CA9},  // DEL
 
-    {0, D_16, F_16, E_16}, // 7&
-    {0, D_15, F_15, E_15}, // 8*
-    {0, D_14, F_14, E_14}, // 9(
-    {0, D_13, F_13, E_13}, // 1)
-    {0, D_12, F_12, E_12}, // -_
-    {0, D_11, F_11, E_11}, // =+
-    {0, D_10, F_10, E_10}, // BackSpace
-    {0, D_8,  F_8,  E_8},  // PgUp
+    {0, CB4_CA16, CB6_CA16, CB5_CA16}, // 7&
+    {0, CB4_CA15, CB6_CA15, CB5_CA15}, // 8*
+    {0, CB4_CA14, CB6_CA14, CB5_CA14}, // 9(
+    {0, CB4_CA13, CB6_CA13, CB5_CA13}, // 1)
+    {0, CB4_CA12, CB6_CA12, CB5_CA12}, // -_
+    {0, CB4_CA11, CB6_CA11, CB5_CA11}, // =+
+    {0, CB4_CA10, CB6_CA10, CB5_CA10}, // BackSpace
+    {0, CB4_CA8,  CB6_CA8,  CB5_CA8},  // PgUp
 
-    {0, G_16, I_16, H_16}, // Y
-    {0, G_15, I_15, H_15}, // U
-    {0, G_14, I_14, H_14}, // G
-    {0, G_13, I_13, H_13}, // O
-    {0, G_12, I_12, H_12}, // P
-    {0, G_11, I_11, H_11}, // [
-    {0, G_10, I_10, H_10}, // ]
-    {0, G_9,  I_9,  H_9},  // \||
-    {0, G_8,  I_8,  H_8},  // PgDn
+    {0, CB7_CA16, CB9_CA16, CB8_CA16}, // Y
+    {0, CB7_CA15, CB9_CA15, CB8_CA15}, // U
+    {0, CB7_CA14, CB9_CA14, CB8_CA14}, // G
+    {0, CB7_CA13, CB9_CA13, CB8_CA13}, // O
+    {0, CB7_CA12, CB9_CA12, CB8_CA12}, // P
+    {0, CB7_CA11, CB9_CA11, CB8_CA11}, // [
+    {0, CB7_CA10, CB9_CA10, CB8_CA10}, // ]
+    {0, CB7_CA9,  CB9_CA9,  CB8_CA9},  // \||
+    {0, CB7_CA8,  CB9_CA8,  CB8_CA8},  // PgDn
 
-    {0, J_16, L_16, K_16}, // H
-    {0, J_15, L_15, K_15}, // J
-    {0, J_14, L_14, K_14}, // KKEY_PRESS_HOME
-    {0, J_13, L_13, K_13}, // J
-    {0, J_12, L_12, K_12}, // ;:
-    {0, J_11, L_11, K_11}, // '"
-    {0, J_9,  L_9,  K_9},  // Enter
-    {0, J_8,  L_8,  K_8},  // Home
+    {0, CB10_CA16, CB12_CA16, CB11_CA16}, // H
+    {0, CB10_CA15, CB12_CA15, CB11_CA15}, // J
+    {0, CB10_CA14, CB12_CA14, CB11_CA14}, // KKEY_PRESS_HOME
+    {0, CB10_CA13, CB12_CA13, CB11_CA13}, // J
+    {0, CB10_CA12, CB12_CA12, CB11_CA12}, // ;:
+    {0, CB10_CA11, CB12_CA11, CB11_CA11}, // '"
+    {0, CB10_CA9,  CB12_CA9,  CB11_CA9},  // Enter
+    {0, CB10_CA8,  CB12_CA8,  CB11_CA8},  // Home
 
-    {0, J_7,  L_7,  K_7},  // N
-    {0, J_6,  L_6,  K_6},  // M
-    {0, J_5,  L_5,  K_5},  // ,<
-    {0, J_4,  L_4,  K_4},  // .>
-    {0, J_3,  L_3,  K_3},  // ?/
-    {0, J_2,  L_2,  K_2},  // Shift_R
-    {0, J_1,  L_1,  K_1},  // Up
+    {0, CB10_CA7,  CB12_CA7,  CB11_CA7},  // N
+    {0, CB10_CA6,  CB12_CA6,  CB11_CA6},  // M
+    {0, CB10_CA5,  CB12_CA5,  CB11_CA5},  // ,<
+    {0, CB10_CA4,  CB12_CA4,  CB11_CA4},  // .>
+    {0, CB10_CA3,  CB12_CA3,  CB11_CA3},  // ?/
+    {0, CB10_CA2,  CB12_CA2,  CB11_CA2},  // Shift_R
+    {0, CB10_CA1,  CB12_CA1,  CB11_CA1},  // Up
 
-    {0, G_6,  I_6,  H_6},  // Space
-    {0, G_5,  I_5,  H_5},  // Win_R
-    {0, G_4,  I_4,  H_4},  // Fn
-    {0, G_3,  I_3,  H_3},  // Ctrl_R
-    {0, G_2,  I_2,  H_2},  // Left
-    {0, G_1,  I_1,  H_1},  // Down
-    {0, G_7,  I_7,  H_7},  // Right
+    {0, CB7_CA6,  CB9_CA6,  CB8_CA6},  // Space
+    {0, CB7_CA5,  CB9_CA5,  CB8_CA5},  // Win_R
+    {0, CB7_CA4,  CB9_CA4,  CB8_CA4},  // Fn
+    {0, CB7_CA3,  CB9_CA3,  CB8_CA3},  // Ctrl_R
+    {0, CB7_CA2,  CB9_CA2,  CB8_CA2},  // Left
+    {0, CB7_CA1,  CB9_CA1,  CB8_CA1},  // Down
+    {0, CB7_CA7,  CB9_CA7,  CB8_CA7},  // Right
 };
 #endif
diff --git a/keyboards/keychron/q11/iso_encoder/iso_encoder.c b/keyboards/keychron/q11/iso_encoder/iso_encoder.c
index feedfd17c39..8725598b1c2 100755
--- a/keyboards/keychron/q11/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/q11/iso_encoder/iso_encoder.c
@@ -24,106 +24,106 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |     G location
  *   |  |     |     B location
  *   |  |     |     | */
-    {0, A_2,  C_2,  B_2},  // ESC
-    {0, A_3,  C_3,  B_3},  // F1
-    {0, A_4,  C_4,  B_4},  // F2
-    {0, A_5,  C_5,  B_5},  // F3
-    {0, A_6,  C_6,  B_6},  // F4
-    {0, A_7,  C_7,  B_7},  // F5
-    {0, A_8,  C_8,  B_8},  // F6
+    {0, CB1_CA2,  CB3_CA2,  CB2_CA2},  // ESC
+    {0, CB1_CA3,  CB3_CA3,  CB2_CA3},  // F1
+    {0, CB1_CA4,  CB3_CA4,  CB2_CA4},  // F2
+    {0, CB1_CA5,  CB3_CA5,  CB2_CA5},  // F3
+    {0, CB1_CA6,  CB3_CA6,  CB2_CA6},  // F4
+    {0, CB1_CA7,  CB3_CA7,  CB2_CA7},  // F5
+    {0, CB1_CA8,  CB3_CA8,  CB2_CA8},  // F6
 
-    {0, D_1,  F_1,  E_1},  // M1
-    {0, D_2,  F_2,  E_2},  // `~
-    {0, D_3,  F_3,  E_3},  // 1!
-    {0, D_4,  F_4,  E_4},  // 2@
-    {0, D_5,  F_5,  E_5},  // 3#
-    {0, D_6,  F_6,  E_6},  // 4$
-    {0, D_7,  F_7,  E_7},  // 5%
-    {0, D_8,  F_8,  E_8},  // 6^
+    {0, CB4_CA1,  CB6_CA1,  CB5_CA1},  // M1
+    {0, CB4_CA2,  CB6_CA2,  CB5_CA2},  // `~
+    {0, CB4_CA3,  CB6_CA3,  CB5_CA3},  // 1!
+    {0, CB4_CA4,  CB6_CA4,  CB5_CA4},  // 2@
+    {0, CB4_CA5,  CB6_CA5,  CB5_CA5},  // 3#
+    {0, CB4_CA6,  CB6_CA6,  CB5_CA6},  // 4$
+    {0, CB4_CA7,  CB6_CA7,  CB5_CA7},  // 5%
+    {0, CB4_CA8,  CB6_CA8,  CB5_CA8},  // 6^
 
-    {0, G_1,  I_1,  H_1},  // M2
-    {0, G_2,  I_2,  H_2},  // TAB
-    {0, G_3,  I_3,  H_3},  // Q
-    {0, G_4,  I_4,  H_4},  // W
-    {0, G_5,  I_5,  H_5},  // E
-    {0, G_6,  I_6,  H_6},  // R
-    {0, G_7,  I_7,  H_7},  // T
+    {0, CB7_CA1,  CB9_CA1,  CB8_CA1},  // M2
+    {0, CB7_CA2,  CB9_CA2,  CB8_CA2},  // TAB
+    {0, CB7_CA3,  CB9_CA3,  CB8_CA3},  // Q
+    {0, CB7_CA4,  CB9_CA4,  CB8_CA4},  // W
+    {0, CB7_CA5,  CB9_CA5,  CB8_CA5},  // E
+    {0, CB7_CA6,  CB9_CA6,  CB8_CA6},  // R
+    {0, CB7_CA7,  CB9_CA7,  CB8_CA7},  // T
 
-    {0, J_1,  L_1,  K_1},  // M3
-    {0, J_2,  L_2,  K_2},  // CapsJock
-    {0, J_3,  L_3,  K_3},  // A
-    {0, J_4,  L_4,  K_4},  // S
-    {0, J_5,  L_5,  K_5},  // D
-    {0, J_6,  L_6,  K_6},  // F
-    {0, J_7,  L_7,  K_7},  // G
+    {0, CB10_CA1,  CB12_CA1,  CB11_CA1},  // M3
+    {0, CB10_CA2,  CB12_CA2,  CB11_CA2},  // CapsJock
+    {0, CB10_CA3,  CB12_CA3,  CB11_CA3},  // A
+    {0, CB10_CA4,  CB12_CA4,  CB11_CA4},  // S
+    {0, CB10_CA5,  CB12_CA5,  CB11_CA5},  // D
+    {0, CB10_CA6,  CB12_CA6,  CB11_CA6},  // F
+    {0, CB10_CA7,  CB12_CA7,  CB11_CA7},  // G
 
-    {0, J_9,  L_9,  K_9},  // M4
-    {0, J_10, L_10, K_10}, // Shift_L
-    {0, J_11, L_11, K_11}, // NUBS
-    {0, J_12, L_12, K_12}, // Z
-    {0, J_13, L_13, K_13}, // X
-    {0, J_14, L_14, K_14}, // C
-    {0, J_15, L_15, K_15}, // V
-    {0, J_16, L_16, K_16}, // B
+    {0, CB10_CA9,  CB12_CA9,  CB11_CA9},  // M4
+    {0, CB10_CA10, CB12_CA10, CB11_CA10}, // Shift_L
+    {0, CB10_CA11, CB12_CA11, CB11_CA11}, // NUBS
+    {0, CB10_CA12, CB12_CA12, CB11_CA12}, // Z
+    {0, CB10_CA13, CB12_CA13, CB11_CA13}, // X
+    {0, CB10_CA14, CB12_CA14, CB11_CA14}, // C
+    {0, CB10_CA15, CB12_CA15, CB11_CA15}, // V
+    {0, CB10_CA16, CB12_CA16, CB11_CA16}, // B
 
-    {0, G_9,  I_9,  H_9},  // M5
-    {0, G_10, I_10, H_10}, // Ctrl_L
-    {0, G_11, I_11, H_11}, // WGn_L
-    {0, G_12, I_12, H_12}, // Alt_L
-    {0, G_13, I_13, H_13}, // Fn
-    {0, G_15, I_15, H_15}, // Space
+    {0, CB7_CA9,  CB9_CA9,  CB8_CA9},  // M5
+    {0, CB7_CA10, CB9_CA10, CB8_CA10}, // Ctrl_L
+    {0, CB7_CA11, CB9_CA11, CB8_CA11}, // WGn_L
+    {0, CB7_CA12, CB9_CA12, CB8_CA12}, // Alt_L
+    {0, CB7_CA13, CB9_CA13, CB8_CA13}, // Fn
+    {0, CB7_CA15, CB9_CA15, CB8_CA15}, // Space
 
-    {0, A_16, C_16, B_16}, // F7
-    {0, A_15, C_15, B_15}, // F8
-    {0, A_14, C_14, B_14}, // F9
-    {0, A_13, C_13, B_13}, // F11
-    {0, A_12, C_12, B_12}, // F11
-    {0, A_11, C_11, B_11}, // F12
-    {0, A_10, C_10, B_10}, // INS
-    {0, A_9,  C_9,  B_9},  // DEL
+    {0, CB1_CA16, CB3_CA16, CB2_CA16}, // F7
+    {0, CB1_CA15, CB3_CA15, CB2_CA15}, // F8
+    {0, CB1_CA14, CB3_CA14, CB2_CA14}, // F9
+    {0, CB1_CA13, CB3_CA13, CB2_CA13}, // F11
+    {0, CB1_CA12, CB3_CA12, CB2_CA12}, // F11
+    {0, CB1_CA11, CB3_CA11, CB2_CA11}, // F12
+    {0, CB1_CA10, CB3_CA10, CB2_CA10}, // INS
+    {0, CB1_CA9,  CB3_CA9,  CB2_CA9},  // DEL
 
-    {0, D_16, F_16, E_16}, // 7&
-    {0, D_15, F_15, E_15}, // 8*
-    {0, D_14, F_14, E_14}, // 9(
-    {0, D_13, F_13, E_13}, // 1)
-    {0, D_12, F_12, E_12}, // -_
-    {0, D_11, F_11, E_11}, // =+
-    {0, D_10, F_10, E_10}, // BackSpace
-    {0, D_8,  F_8,  E_8},  // PgUp
+    {0, CB4_CA16, CB6_CA16, CB5_CA16}, // 7&
+    {0, CB4_CA15, CB6_CA15, CB5_CA15}, // 8*
+    {0, CB4_CA14, CB6_CA14, CB5_CA14}, // 9(
+    {0, CB4_CA13, CB6_CA13, CB5_CA13}, // 1)
+    {0, CB4_CA12, CB6_CA12, CB5_CA12}, // -_
+    {0, CB4_CA11, CB6_CA11, CB5_CA11}, // =+
+    {0, CB4_CA10, CB6_CA10, CB5_CA10}, // BackSpace
+    {0, CB4_CA8,  CB6_CA8,  CB5_CA8},  // PgUp
 
-    {0, G_16, I_16, H_16}, // Y
-    {0, G_15, I_15, H_15}, // U
-    {0, G_14, I_14, H_14}, // G
-    {0, G_13, I_13, H_13}, // O
-    {0, G_12, I_12, H_12}, // P
-    {0, G_11, I_11, H_11}, // [
-    {0, G_10, I_10, H_10}, // ]
-    {0, G_8,  I_8,  H_8},  // PgDn
+    {0, CB7_CA16, CB9_CA16, CB8_CA16}, // Y
+    {0, CB7_CA15, CB9_CA15, CB8_CA15}, // U
+    {0, CB7_CA14, CB9_CA14, CB8_CA14}, // G
+    {0, CB7_CA13, CB9_CA13, CB8_CA13}, // O
+    {0, CB7_CA12, CB9_CA12, CB8_CA12}, // P
+    {0, CB7_CA11, CB9_CA11, CB8_CA11}, // [
+    {0, CB7_CA10, CB9_CA10, CB8_CA10}, // ]
+    {0, CB7_CA8,  CB9_CA8,  CB8_CA8},  // PgDn
 
-    {0, J_16, L_16, K_16}, // H
-    {0, J_15, L_15, K_15}, // J
-    {0, J_14, L_14, K_14}, // KKEY_PRESS_HOME
-    {0, J_13, L_13, K_13}, // J
-    {0, J_12, L_12, K_12}, // ;:
-    {0, J_11, L_11, K_11}, // '"
-    {0, J_9,  L_9,  K_9},  // NUHS
-    {0, G_9,  I_9,  H_9},  // Enter
-    {0, J_8,  L_8,  K_8},  // Home
+    {0, CB10_CA16, CB12_CA16, CB11_CA16}, // H
+    {0, CB10_CA15, CB12_CA15, CB11_CA15}, // J
+    {0, CB10_CA14, CB12_CA14, CB11_CA14}, // KKEY_PRESS_HOME
+    {0, CB10_CA13, CB12_CA13, CB11_CA13}, // J
+    {0, CB10_CA12, CB12_CA12, CB11_CA12}, // ;:
+    {0, CB10_CA11, CB12_CA11, CB11_CA11}, // '"
+    {0, CB10_CA9,  CB12_CA9,  CB11_CA9},  // NUHS
+    {0, CB7_CA9,  CB9_CA9,  CB8_CA9},  // Enter
+    {0, CB10_CA8,  CB12_CA8,  CB11_CA8},  // Home
 
-    {0, J_7,  L_7,  K_7},  // N
-    {0, J_6,  L_6,  K_6},  // M
-    {0, J_5,  L_5,  K_5},  // ,<
-    {0, J_4,  L_4,  K_4},  // .>
-    {0, J_3,  L_3,  K_3},  // ?/
-    {0, J_2,  L_2,  K_2},  // Shift_R
-    {0, J_1,  L_1,  K_1},  // Up
+    {0, CB10_CA7,  CB12_CA7,  CB11_CA7},  // N
+    {0, CB10_CA6,  CB12_CA6,  CB11_CA6},  // M
+    {0, CB10_CA5,  CB12_CA5,  CB11_CA5},  // ,<
+    {0, CB10_CA4,  CB12_CA4,  CB11_CA4},  // .>
+    {0, CB10_CA3,  CB12_CA3,  CB11_CA3},  // ?/
+    {0, CB10_CA2,  CB12_CA2,  CB11_CA2},  // Shift_R
+    {0, CB10_CA1,  CB12_CA1,  CB11_CA1},  // Up
 
-    {0, G_6,  I_6,  H_6},  // Space
-    {0, G_5,  I_5,  H_5},  // Win_R
-    {0, G_4,  I_4,  H_4},  // Fn
-    {0, G_3,  I_3,  H_3},  // Ctrl_R
-    {0, G_2,  I_2,  H_2},  // Left
-    {0, G_1,  I_1,  H_1},  // Down
-    {0, G_7,  I_7,  H_7},  // Right
+    {0, CB7_CA6,  CB9_CA6,  CB8_CA6},  // Space
+    {0, CB7_CA5,  CB9_CA5,  CB8_CA5},  // Win_R
+    {0, CB7_CA4,  CB9_CA4,  CB8_CA4},  // Fn
+    {0, CB7_CA3,  CB9_CA3,  CB8_CA3},  // Ctrl_R
+    {0, CB7_CA2,  CB9_CA2,  CB8_CA2},  // Left
+    {0, CB7_CA1,  CB9_CA1,  CB8_CA1},  // Down
+    {0, CB7_CA7,  CB9_CA7,  CB8_CA7},  // Right
 };
 #endif
diff --git a/keyboards/keychron/q12/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q12/ansi_encoder/ansi_encoder.c
index e2acddd8944..ba32f58fc6a 100644
--- a/keyboards/keychron/q12/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/q12/ansi_encoder/ansi_encoder.c
@@ -24,116 +24,116 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    // {0, I_1,    G_1,    H_1}
-    {0, I_2,    G_2,    H_2},  // F13
-    {0, I_3,    G_3,    H_3},  // F14
-    {0, I_4,    G_4,    H_4},  // F15
-    {0, I_5,    G_5,    H_5},  // Esc
-    {0, I_6,    G_6,    H_6},  // F1
-    {0, I_7,    G_7,    H_7},  // F2
-    {0, I_8,    G_8,    H_8},  // F3
-    {0, I_9,    G_9,    H_9},  // F4
-    {0, I_10,   G_10,   H_10}, // F5
-    {0, I_11,   G_11,   H_11}, // F6
-    {0, I_12,   G_12,   H_12}, // F7
-    {0, I_13,   G_13,   H_13}, // F8
-    {0, I_14,   G_14,   H_14}, // F9
-    {0, I_15,   G_15,   H_15}, // F10
-    {0, I_16,   G_16,   H_16}, // F11
-    {0, L_16,   J_16,   K_16}, // F12
-    {0, L_15,   J_15,   K_15}, // DEL
-    {0, L_14,   J_14,   K_14}, // Light
+    // {0, CB9_CA1,    CB7_CA1,    CB8_CA1}
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},  // F13
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},  // F14
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},  // F15
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},  // Esc
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},  // F1
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},  // F2
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},  // F3
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},  // F4
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10}, // F5
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11}, // F6
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12}, // F7
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13}, // F8
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14}, // F9
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15}, // F10
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16}, // F11
+    {0, CB12_CA16,   CB10_CA16,   CB11_CA16}, // F12
+    {0, CB12_CA15,   CB10_CA15,   CB11_CA15}, // DEL
+    {0, CB12_CA14,   CB10_CA14,   CB11_CA14}, // Light
 
 
-    {0, C_1,    A_1,    B_1},  // num_lock
-    {0, C_2,    A_2,    B_2},  // /
-    {0, C_3,    A_3,    B_3},  // *
-    {0, C_4,    A_4,    B_4},  // -
-    {0, C_5,    A_5,    B_5},  // ~`
-    {0, C_6,    A_6,    B_6},  // 1!
-    {0, C_7,    A_7,    B_7},  // 2@
-    {0, C_8,    A_8,    B_8},  // 3#
-    {0, C_9,    A_9,    B_9},  // 4$
-    {0, C_10,   A_10,   B_10}, // 5%
-    {0, C_11,   A_11,   B_11}, // 6^
-    {0, C_12,   A_12,   B_12}, // 7&
-    {0, C_13,   A_13,   B_13}, // 8*
-    {0, C_14,   A_14,   B_14}, // 9(
-    {0, C_15,   A_15,   B_15}, // 0)
-    {0, C_16,   A_16,   B_16}, // -_
-    {0, L_13,   J_13,   K_13}, // =+
-    {0, L_12,   J_12,   K_12}, // BackSpace
-    {0, L_11,   J_11,   K_11}, // PgUp
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},  // num_lock
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},  // /
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},  // *
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},  // -
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},  // ~`
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},  // 1!
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},  // 2@
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},  // 3#
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},  // 4$
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10}, // 5%
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11}, // 6^
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12}, // 7&
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13}, // 8*
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14}, // 9(
+    {0, CB3_CA15,   CB1_CA15,   CB2_CA15}, // 0)
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16}, // -_
+    {0, CB12_CA13,   CB10_CA13,   CB11_CA13}, // =+
+    {0, CB12_CA12,   CB10_CA12,   CB11_CA12}, // BackSpace
+    {0, CB12_CA11,   CB10_CA11,   CB11_CA11}, // PgUp
 
-    {0, F_1,    D_1,    E_1},  // 7
-    {0, F_2,    D_2,    E_2},  // 8
-    {0, F_3,    D_3,    E_3},  // 9
-    {0, F_4,    D_4,    E_4},  // +
-    {0, F_5,    D_5,    E_5},  // TAB
-    {0, F_6,    D_6,    E_6},  // Q
-    {0, F_7,    D_7,    E_7},  // W
-    {0, F_8,    D_8,    E_8},  // E
-    {0, F_9,    D_9,    E_9},  // R
-    {0, F_10,   D_10,   E_10}, // T
-    {0, F_11,   D_11,   E_11}, // Y
-    {0, F_12,   D_12,   E_12}, // U
-    {0, F_13,   D_13,   E_13}, // I
-    {0, F_14,   D_14,   E_14}, // O
-    {0, F_15,   D_15,   E_15}, // P
-    {0, F_16,   D_16,   E_16}, // [
-    {0, L_10,   J_10,   K_10}, // ]
-    {0, L_9,    J_9,    K_9},  // \|
-    {0, L_8,    J_8,    K_8},  // PgDn
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},  // 7
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},  // 8
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},  // 9
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},  // +
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},  // TAB
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},  // Q
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},  // W
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},  // E
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},  // R
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10}, // T
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11}, // Y
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12}, // U
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13}, // I
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14}, // O
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15}, // P
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16}, // [
+    {0, CB12_CA10,   CB10_CA10,   CB11_CA10}, // ]
+    {0, CB12_CA9,    CB10_CA9,    CB11_CA9},  // \|
+    {0, CB12_CA8,    CB10_CA8,    CB11_CA8},  // PgDn
 
-    {1, C_16,   A_16,   B_16}, // 4
-    {1, C_15,   A_15,   B_15}, // 5
-    {1, C_14,   A_14,   B_14}, // 6
-    // {0, F_4,    D_4,    E_4},  // +
-    {1, C_12,   A_12,   B_12}, // CapsLock
-    {1, C_11,   A_11,   B_11}, // A
-    {1, C_10,   A_10,   B_10}, // S
-    {1, C_9,    A_9,    B_9},  // D
-    {1, C_8,    A_8,    B_8},  // F
-    {1, C_7,    A_7,    B_7},  // G
-    {1, C_6,    A_6,    B_6},  // H
-    {1, C_5,    A_5,    B_5},  // J
-    {1, C_4,    A_4,    B_4},  // k
-    {1, C_3,    A_3,    B_3},  // l
-    {1, C_2,    A_2,    B_2},  // ；
-    {1, C_1,    A_1,    B_1},  // '
-    {1, L_1,    J_1,    K_1},  // Enter
-    {1, L_2,    J_2,    K_2},  // Home
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16}, // 4
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15}, // 5
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14}, // 6
+    // {0, CB6_CA4,    CB4_CA4,    CB5_CA4},  // +
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12}, // CapsLock
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11}, // A
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10}, // S
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},  // D
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},  // F
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},  // G
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},  // H
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},  // J
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},  // k
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},  // l
+    {1, CB3_CA2,    CB1_CA2,    CB2_CA2},  // ；
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},  // '
+    {1, CB12_CA1,    CB10_CA1,    CB11_CA1},  // Enter
+    {1, CB12_CA2,    CB10_CA2,    CB11_CA2},  // Home
 
-    {1, I_16,   G_16,   H_16}, // 1
-    {1, I_15,   G_15,   H_15}, // 2
-    {1, I_14,   G_14,   H_14}, // 3
-    {1, I_13,   G_13,   H_13}, // Enter
-    {1, I_12,   G_12,   H_12}, //Shift_L
-    {1, I_10,   G_10,   H_10}, // Z
-    {1, I_9,    G_9,    H_9},  // X
-    {1, I_8,    G_8,    H_8},  // C
-    {1, I_7,    G_7,    H_7},  // V
-    {1, I_6,    G_6,    H_6},  // B
-    {1, I_5,    G_5,    H_5},  // N
-    {1, I_4,    G_4,    H_4},  // M
-    {1, I_3,    G_3,    H_3},  // ,
-    {1, I_2,    G_2,    H_2},  // .
-    {1, I_1,    G_1,    H_1},  // ?
-    {1, L_3,    J_3,    K_3},  // Shift_R
-    {1, L_4,    J_4,    K_4},  // Up
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16}, // 1
+    {1, CB9_CA15,   CB7_CA15,   CB8_CA15}, // 2
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14}, // 3
+    {1, CB9_CA13,   CB7_CA13,   CB8_CA13}, // Enter
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12}, //Shift_L
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10}, // Z
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},  // X
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},  // C
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},  // V
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},  // B
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},  // N
+    {1, CB9_CA4,    CB7_CA4,    CB8_CA4},  // M
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},  // ,
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},  // .
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},  // ?
+    {1, CB12_CA3,    CB10_CA3,    CB11_CA3},  // Shift_R
+    {1, CB12_CA4,    CB10_CA4,    CB11_CA4},  // Up
 
-    {1, F_16,   D_16,   E_16}, // 0
-    {1, F_14,   D_14,   E_14}, // .
-    {1, F_12,   D_12,   E_12}, // Ctrl_L
-    {1, F_11,   D_11,   E_11}, // Win_L
-    {1, F_10,   D_10,   E_10}, // Alt_L
-    {1, F_6,    D_6,    E_6},  // Space
-    {1, F_3,    D_3,    E_3},  // Alt_R
-    {1, F_2,    D_2,    E_2},  // Fn
-    {1, F_1,    D_1,    E_1},  // Ctrl_R
-    {1, L_5,    J_5,    K_5},  // Left
-    {1, L_6,    J_6,    K_6},  // Down
-    {1, L_7,    J_7,    K_7},  // Right
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16}, // 0
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14}, // .
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12}, // Ctrl_L
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11}, // Win_L
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10}, // Alt_L
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},  // Space
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},  // Alt_R
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},  // Fn
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},  // Ctrl_R
+    {1, CB12_CA5,    CB10_CA5,    CB11_CA5},  // Left
+    {1, CB12_CA6,    CB10_CA6,    CB11_CA6},  // Down
+    {1, CB12_CA7,    CB10_CA7,    CB11_CA7},  // Right
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/q12/iso_encoder/iso_encoder.c b/keyboards/keychron/q12/iso_encoder/iso_encoder.c
index f05a35dad8c..f9513e7f418 100644
--- a/keyboards/keychron/q12/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/q12/iso_encoder/iso_encoder.c
@@ -25,118 +25,118 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    // {0, I_1,    G_1,    H_1}
-    {0, I_2,    G_2,    H_2},  // F13
-    {0, I_3,    G_3,    H_3},  // F14
-    {0, I_4,    G_4,    H_4},  // F15
-    {0, I_5,    G_5,    H_5},  // Esc
-    {0, I_6,    G_6,    H_6},  // F1
-    {0, I_7,    G_7,    H_7},  // F2
-    {0, I_8,    G_8,    H_8},  // F3
-    {0, I_9,    G_9,    H_9},  // F4
-    {0, I_10,   G_10,   H_10}, // F5
-    {0, I_11,   G_11,   H_11}, // F6
-    {0, I_12,   G_12,   H_12}, // F7
-    {0, I_13,   G_13,   H_13}, // F8
-    {0, I_14,   G_14,   H_14}, // F9
-    {0, I_15,   G_15,   H_15}, // F10
-    {0, I_16,   G_16,   H_16}, // F11
-    {0, L_16,   J_16,   K_16}, // F12
-    {0, L_15,   J_15,   K_15}, // DEL
-    {0, L_14,   J_14,   K_14}, // Light
+    // {0, CB9_CA1,    CB7_CA1,    CB8_CA1}
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},  // F13
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},  // F14
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},  // F15
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},  // Esc
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},  // F1
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},  // F2
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},  // F3
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},  // F4
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10}, // F5
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11}, // F6
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12}, // F7
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13}, // F8
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14}, // F9
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15}, // F10
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16}, // F11
+    {0, CB12_CA16,   CB10_CA16,   CB11_CA16}, // F12
+    {0, CB12_CA15,   CB10_CA15,   CB11_CA15}, // DEL
+    {0, CB12_CA14,   CB10_CA14,   CB11_CA14}, // Light
 
 
-    {0, C_1,    A_1,    B_1},  // num_lock
-    {0, C_2,    A_2,    B_2},  // /
-    {0, C_3,    A_3,    B_3},  // *
-    {0, C_4,    A_4,    B_4},  // -
-    {0, C_5,    A_5,    B_5},  // ~`
-    {0, C_6,    A_6,    B_6},  // 1!
-    {0, C_7,    A_7,    B_7},  // 2@
-    {0, C_8,    A_8,    B_8},  // 3#
-    {0, C_9,    A_9,    B_9},  // 4$
-    {0, C_10,   A_10,   B_10}, // 5%
-    {0, C_11,   A_11,   B_11}, // 6^
-    {0, C_12,   A_12,   B_12}, // 7&
-    {0, C_13,   A_13,   B_13}, // 8*
-    {0, C_14,   A_14,   B_14}, // 9(
-    {0, C_15,   A_15,   B_15}, // 0)
-    {0, C_16,   A_16,   B_16}, // -_
-    {0, L_13,   J_13,   K_13}, // =+
-    {0, L_12,   J_12,   K_12}, // BackSpace
-    {0, L_11,   J_11,   K_11}, // PgUp
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},  // num_lock
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},  // /
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},  // *
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},  // -
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},  // ~`
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},  // 1!
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},  // 2@
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},  // 3#
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},  // 4$
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10}, // 5%
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11}, // 6^
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12}, // 7&
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13}, // 8*
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14}, // 9(
+    {0, CB3_CA15,   CB1_CA15,   CB2_CA15}, // 0)
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16}, // -_
+    {0, CB12_CA13,   CB10_CA13,   CB11_CA13}, // =+
+    {0, CB12_CA12,   CB10_CA12,   CB11_CA12}, // BackSpace
+    {0, CB12_CA11,   CB10_CA11,   CB11_CA11}, // PgUp
 
-    {0, F_1,    D_1,    E_1},  // 7
-    {0, F_2,    D_2,    E_2},  // 8
-    {0, F_3,    D_3,    E_3},  // 9
-    {0, F_4,    D_4,    E_4},  // +
-    {0, F_5,    D_5,    E_5},  // TAB
-    {0, F_6,    D_6,    E_6},  // Q
-    {0, F_7,    D_7,    E_7},  // W
-    {0, F_8,    D_8,    E_8},  // E
-    {0, F_9,    D_9,    E_9},  // R
-    {0, F_10,   D_10,   E_10}, // T
-    {0, F_11,   D_11,   E_11}, // Y
-    {0, F_12,   D_12,   E_12}, // U
-    {0, F_13,   D_13,   E_13}, // I
-    {0, F_14,   D_14,   E_14}, // O
-    {0, F_15,   D_15,   E_15}, // P
-    {0, F_16,   D_16,   E_16}, // [
-    {0, L_10,   J_10,   K_10}, // ]
-    // {0, L_9,    J_9,    K_9},  // \|
-    {0, L_8,    J_8,    K_8},  // PgDn
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},  // 7
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},  // 8
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},  // 9
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},  // +
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},  // TAB
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},  // Q
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},  // W
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},  // E
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},  // R
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10}, // T
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11}, // Y
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12}, // U
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13}, // I
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14}, // O
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15}, // P
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16}, // [
+    {0, CB12_CA10,   CB10_CA10,   CB11_CA10}, // ]
+    // {0, CB12_CA9,    CB10_CA9,    CB11_CA9},  // \|
+    {0, CB12_CA8,    CB10_CA8,    CB11_CA8},  // PgDn
 
-    {1, C_16,   A_16,   B_16}, // 4
-    {1, C_15,   A_15,   B_15}, // 5
-    {1, C_14,   A_14,   B_14}, // 6
-    // {0, F_4,    D_4,    E_4},  // +
-    {1, C_12,   A_12,   B_12}, // CapsLock
-    {1, C_11,   A_11,   B_11}, // A
-    {1, C_10,   A_10,   B_10}, // S
-    {1, C_9,    A_9,    B_9},  // D
-    {1, C_8,    A_8,    B_8},  // F
-    {1, C_7,    A_7,    B_7},  // G
-    {1, C_6,    A_6,    B_6},  // H
-    {1, C_5,    A_5,    B_5},  // J
-    {1, C_4,    A_4,    B_4},  // k
-    {1, C_3,    A_3,    B_3},  // l
-    {1, C_2,    A_2,    B_2},  // ；
-    {1, C_1,    A_1,    B_1},  // '
-    {1, L_1,    J_1,    K_1},  // #~
-    {0, L_9,    J_9,    K_9},  // Enter
-    {1, L_2,    J_2,    K_2},  // Home
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16}, // 4
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15}, // 5
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14}, // 6
+    // {0, CB6_CA4,    CB4_CA4,    CB5_CA4},  // +
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12}, // CapsLock
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11}, // A
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10}, // S
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},  // D
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},  // F
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},  // G
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},  // H
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},  // J
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},  // k
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},  // l
+    {1, CB3_CA2,    CB1_CA2,    CB2_CA2},  // ；
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},  // '
+    {1, CB12_CA1,    CB10_CA1,    CB11_CA1},  // #~
+    {0, CB12_CA9,    CB10_CA9,    CB11_CA9},  // Enter
+    {1, CB12_CA2,    CB10_CA2,    CB11_CA2},  // Home
 
-    {1, I_16,   G_16,   H_16}, // 1
-    {1, I_15,   G_15,   H_15}, // 2
-    {1, I_14,   G_14,   H_14}, // 3
-    {1, I_13,   G_13,   H_13}, // Enter
-    {1, I_12,   G_12,   H_12}, //Shift_L
-    {1, I_11,   G_11,   H_11}, // |
-    {1, I_10,   G_10,   H_10}, // Z
-    {1, I_9,    G_9,    H_9},  // X
-    {1, I_8,    G_8,    H_8},  // C
-    {1, I_7,    G_7,    H_7},  // V
-    {1, I_6,    G_6,    H_6},  // B
-    {1, I_5,    G_5,    H_5},  // N
-    {1, I_4,    G_4,    H_4},  // M
-    {1, I_3,    G_3,    H_3},  // ,
-    {1, I_2,    G_2,    H_2},  // .
-    {1, I_1,    G_1,    H_1},  // ?
-    {1, L_3,    J_3,    K_3},  // Shift_R
-    {1, L_4,    J_4,    K_4},  // Up
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16}, // 1
+    {1, CB9_CA15,   CB7_CA15,   CB8_CA15}, // 2
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14}, // 3
+    {1, CB9_CA13,   CB7_CA13,   CB8_CA13}, // Enter
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12}, //Shift_L
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11}, // |
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10}, // Z
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},  // X
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},  // C
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},  // V
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},  // B
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},  // N
+    {1, CB9_CA4,    CB7_CA4,    CB8_CA4},  // M
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},  // ,
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},  // .
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},  // ?
+    {1, CB12_CA3,    CB10_CA3,    CB11_CA3},  // Shift_R
+    {1, CB12_CA4,    CB10_CA4,    CB11_CA4},  // Up
 
-    {1, F_16,   D_16,   E_16}, // 0
-    {1, F_14,   D_14,   E_14}, // .
-    {1, F_12,   D_12,   E_12}, // Ctrl_L
-    {1, F_11,   D_11,   E_11}, // Win_L
-    {1, F_10,   D_10,   E_10}, // Alt_L
-    {1, F_6,    D_6,    E_6},  // Space
-    {1, F_3,    D_3,    E_3},  // Alt_R
-    {1, F_2,    D_2,    E_2},  // Fn
-    {1, F_1,    D_1,    E_1},  // Ctrl_R
-    {1, L_5,    J_5,    K_5},  // Left
-    {1, L_6,    J_6,    K_6},  // Down
-    {1, L_7,    J_7,    K_7},  // Right
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16}, // 0
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14}, // .
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12}, // Ctrl_L
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11}, // Win_L
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10}, // Alt_L
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},  // Space
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},  // Alt_R
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},  // Fn
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},  // Ctrl_R
+    {1, CB12_CA5,    CB10_CA5,    CB11_CA5},  // Left
+    {1, CB12_CA6,    CB10_CA6,    CB11_CA6},  // Down
+    {1, CB12_CA7,    CB10_CA7,    CB11_CA7},  // Right
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/q1v1/ansi/ansi.c b/keyboards/keychron/q1v1/ansi/ansi.c
index f45907eaf63..dfd2ee60875 100644
--- a/keyboards/keychron/q1v1/ansi/ansi.c
+++ b/keyboards/keychron/q1v1/ansi/ansi.c
@@ -24,93 +24,93 @@ const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_1,    A_1,    B_1},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_15,   A_15,   B_15},
-    {0, C_16,   A_16,   B_16},
+    {0, SW3_CS1,    SW1_CS1,    SW2_CS1},
+    {0, SW3_CS3,    SW1_CS3,    SW2_CS3},
+    {0, SW3_CS4,    SW1_CS4,    SW2_CS4},
+    {0, SW3_CS5,    SW1_CS5,    SW2_CS5},
+    {0, SW3_CS6,    SW1_CS6,    SW2_CS6},
+    {0, SW3_CS7,    SW1_CS7,    SW2_CS7},
+    {0, SW3_CS8,    SW1_CS8,    SW2_CS8},
+    {0, SW3_CS9,    SW1_CS9,    SW2_CS9},
+    {0, SW3_CS10,   SW1_CS10,   SW2_CS10},
+    {0, SW3_CS11,   SW1_CS11,   SW2_CS11},
+    {0, SW3_CS12,   SW1_CS12,   SW2_CS12},
+    {0, SW3_CS13,   SW1_CS13,   SW2_CS13},
+    {0, SW3_CS14,   SW1_CS14,   SW2_CS14},
+    {0, SW3_CS15,   SW1_CS15,   SW2_CS15},
+    {0, SW3_CS16,   SW1_CS16,   SW2_CS16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_14,   D_14,   E_14},
-    {0, F_16,   D_16,   E_16},
+    {0, SW6_CS1,    SW4_CS1,    SW5_CS1},
+    {0, SW6_CS2,    SW4_CS2,    SW5_CS2},
+    {0, SW6_CS3,    SW4_CS3,    SW5_CS3},
+    {0, SW6_CS4,    SW4_CS4,    SW5_CS4},
+    {0, SW6_CS5,    SW4_CS5,    SW5_CS5},
+    {0, SW6_CS6,    SW4_CS6,    SW5_CS6},
+    {0, SW6_CS7,    SW4_CS7,    SW5_CS7},
+    {0, SW6_CS8,    SW4_CS8,    SW5_CS8},
+    {0, SW6_CS9,    SW4_CS9,    SW5_CS9},
+    {0, SW6_CS10,   SW4_CS10,   SW5_CS10},
+    {0, SW6_CS11,   SW4_CS11,   SW5_CS11},
+    {0, SW6_CS12,   SW4_CS12,   SW5_CS12},
+    {0, SW6_CS13,   SW4_CS13,   SW5_CS13},
+    {0, SW6_CS14,   SW4_CS14,   SW5_CS14},
+    {0, SW6_CS16,   SW4_CS16,   SW5_CS16},
 
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_14,   G_14,   H_14},
-    {0, I_16,   G_16,   H_16},
+    {0, SW9_CS1,    SW7_CS1,    SW8_CS1},
+    {0, SW9_CS2,    SW7_CS2,    SW8_CS2},
+    {0, SW9_CS3,    SW7_CS3,    SW8_CS3},
+    {0, SW9_CS4,    SW7_CS4,    SW8_CS4},
+    {0, SW9_CS5,    SW7_CS5,    SW8_CS5},
+    {0, SW9_CS6,    SW7_CS6,    SW8_CS6},
+    {0, SW9_CS7,    SW7_CS7,    SW8_CS7},
+    {0, SW9_CS8,    SW7_CS8,    SW8_CS8},
+    {0, SW9_CS9,    SW7_CS9,    SW8_CS9},
+    {0, SW9_CS10,   SW7_CS10,   SW8_CS10},
+    {0, SW9_CS11,   SW7_CS11,   SW8_CS11},
+    {0, SW9_CS12,   SW7_CS12,   SW8_CS12},
+    {0, SW9_CS13,   SW7_CS13,   SW8_CS13},
+    {0, SW9_CS14,   SW7_CS14,   SW8_CS14},
+    {0, SW9_CS16,   SW7_CS16,   SW8_CS16},
 
-    {0, L_1,    J_1,    K_1},
-    {0, L_2,    J_2,    K_2},
-    {0, L_3,    J_3,    K_3},
-    {0, L_4,    J_4,    K_4},
-    {0, L_5,    J_5,    K_5},
-    {0, L_6,    J_6,    K_6},
-    {0, L_7,    J_7,    K_7},
-    {0, L_8,    J_8,    K_8},
-    {0, L_9,    J_9,    K_9},
-    {0, L_10,   J_10,   K_10},
-    {0, L_11,   J_11,   K_11},
-    {0, L_12,   J_12,   K_12},
-    {0, L_14,   J_14,   K_14},
-    {0, L_16,   J_16,   K_16},
+    {0, SW12_CS1,    SW10_CS1,    SW11_CS1},
+    {0, SW12_CS2,    SW10_CS2,    SW11_CS2},
+    {0, SW12_CS3,    SW10_CS3,    SW11_CS3},
+    {0, SW12_CS4,    SW10_CS4,    SW11_CS4},
+    {0, SW12_CS5,    SW10_CS5,    SW11_CS5},
+    {0, SW12_CS6,    SW10_CS6,    SW11_CS6},
+    {0, SW12_CS7,    SW10_CS7,    SW11_CS7},
+    {0, SW12_CS8,    SW10_CS8,    SW11_CS8},
+    {0, SW12_CS9,    SW10_CS9,    SW11_CS9},
+    {0, SW12_CS10,   SW10_CS10,   SW11_CS10},
+    {0, SW12_CS11,   SW10_CS11,   SW11_CS11},
+    {0, SW12_CS12,   SW10_CS12,   SW11_CS12},
+    {0, SW12_CS14,   SW10_CS14,   SW11_CS14},
+    {0, SW12_CS16,   SW10_CS16,   SW11_CS16},
 
-    {1, C_1,    A_1,    B_1},
-    {1, C_3,    A_3,    B_3},
-    {1, C_4,    A_4,    B_4},
-    {1, C_5,    A_5,    B_5},
-    {1, C_6,    A_6,    B_6},
-    {1, C_7,    A_7,    B_7},
-    {1, C_8,    A_8,    B_8},
-    {1, C_9,    A_9,    B_9},
-    {1, C_10,   A_10,   B_10},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_14,   A_14,   B_14},
-    {1, C_15,   A_15,   B_15},
+    {1, SW3_CS1,    SW1_CS1,    SW2_CS1},
+    {1, SW3_CS3,    SW1_CS3,    SW2_CS3},
+    {1, SW3_CS4,    SW1_CS4,    SW2_CS4},
+    {1, SW3_CS5,    SW1_CS5,    SW2_CS5},
+    {1, SW3_CS6,    SW1_CS6,    SW2_CS6},
+    {1, SW3_CS7,    SW1_CS7,    SW2_CS7},
+    {1, SW3_CS8,    SW1_CS8,    SW2_CS8},
+    {1, SW3_CS9,    SW1_CS9,    SW2_CS9},
+    {1, SW3_CS10,   SW1_CS10,   SW2_CS10},
+    {1, SW3_CS11,   SW1_CS11,   SW2_CS11},
+    {1, SW3_CS12,   SW1_CS12,   SW2_CS12},
+    {1, SW3_CS14,   SW1_CS14,   SW2_CS14},
+    {1, SW3_CS15,   SW1_CS15,   SW2_CS15},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_2,    D_2,    E_2},
-    {1, F_3,    D_3,    E_3},
-    {1, F_7,    D_7,    E_7},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_13,   D_13,   E_13},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
-    {1, F_16,   D_16,   E_16}
+    {1, SW6_CS1,    SW4_CS1,    SW5_CS1},
+    {1, SW6_CS2,    SW4_CS2,    SW5_CS2},
+    {1, SW6_CS3,    SW4_CS3,    SW5_CS3},
+    {1, SW6_CS7,    SW4_CS7,    SW5_CS7},
+    {1, SW6_CS11,   SW4_CS11,   SW5_CS11},
+    {1, SW6_CS12,   SW4_CS12,   SW5_CS12},
+    {1, SW6_CS13,   SW4_CS13,   SW5_CS13},
+    {1, SW6_CS14,   SW4_CS14,   SW5_CS14},
+    {1, SW6_CS15,   SW4_CS15,   SW5_CS15},
+    {1, SW6_CS16,   SW4_CS16,   SW5_CS16}
 
 };
 
diff --git a/keyboards/keychron/q1v1/ansi/keymaps/gtg465x/README.md b/keyboards/keychron/q1v1/ansi/keymaps/gtg465x/README.md
deleted file mode 100644
index c2d5799bb8b..00000000000
--- a/keyboards/keychron/q1v1/ansi/keymaps/gtg465x/README.md
+++ /dev/null
@@ -1,21 +0,0 @@
-# gtg465x's Keychron Q1 keymap
-
-- On macOS, F3 opens Mission Control and F4 opens Launchpad without needing to configure shortcuts in System Preferences
-- RGB lighting turns off when the computer sleeps
-- Caps Lock and alpha keys turn red to indicate when Caps Lock is on
-- When the Fn layer is active, RGB lighting turns off for keys that are not assigned
-
-## Changelog
-
-### 10/3/2021 - 1.0.3
-
-- Feature: When the Fn layer is active, RGB lighting turns off for keys that are not assigned
-
-### 10/1/2021 - 1.0.2
-
-- Added Caps Lock indicator (my implementation is different, but this was inspired by mkillewald)
-- Mission Control and Launchpad custom keycodes are now defined using the VIA user keycodes range so they can be labeled properly in VIA
-
-### 9/28/2021 - 1.0.1
-
-- Initial release
diff --git a/keyboards/keychron/q1v1/ansi/keymaps/gtg465x/config.h b/keyboards/keychron/q1v1/ansi/keymaps/gtg465x/config.h
deleted file mode 100644
index 4bab25c9234..00000000000
--- a/keyboards/keychron/q1v1/ansi/keymaps/gtg465x/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2021 @ Grayson Carr
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* RGB Matrix Configuration */
-#ifdef RGB_MATRIX_ENABLE
-#    define RGB_MATRIX_SLEEP
-#    define CAPS_LOCK_INDICATOR_COLOR RGB_RED
-#    define CAPS_LOCK_INDICATOR_LIGHT_ALPHAS
-#    define FN_LAYER_TRANSPARENT_KEYS_OFF
-#endif
diff --git a/keyboards/keychron/q1v1/ansi/keymaps/gtg465x/keymap.c b/keyboards/keychron/q1v1/ansi/keymaps/gtg465x/keymap.c
deleted file mode 100644
index 8da475c3c60..00000000000
--- a/keyboards/keychron/q1v1/ansi/keymaps/gtg465x/keymap.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/* Copyright 2021 @ Grayson Carr
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-#include "keymap_user.h"
-#ifdef RGB_MATRIX_ENABLE
-#    include "rgb_matrix_user.h"
-#endif
-
-// clang-format off
-
-#define KC_TASK LGUI(KC_TAB)
-#define KC_FLXP LGUI(KC_E)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-[MAC_BASE] = LAYOUT_ansi_82(
-     KC_ESC,             KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,  KC_DEL,   KC_INS,
-     KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,            KC_PGUP,
-     KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,            KC_PGDN,
-     KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,            KC_ENT,             KC_HOME,
-     KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,            KC_RSFT,  KC_UP,
-     KC_LCTL,  KC_LALT,  KC_LGUI,                                KC_SPC,                                 KC_RGUI, MO(MAC_FN),KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
-
-[MAC_FN] = LAYOUT_ansi_82(
-     KC_TRNS,            KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_TRNS,  KC_TRNS,
-     KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
-     RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
-     KC_TRNS,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,            KC_TRNS,
-     KC_TRNS,            KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,
-     KC_TRNS,  KC_TRNS,  KC_TRNS,                                KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS),
-
-[WIN_BASE] = LAYOUT_ansi_82(
-     KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_DEL,   KC_INS,
-     KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,            KC_PGUP,
-     KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,            KC_PGDN,
-     KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,            KC_ENT,             KC_HOME,
-     KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,            KC_RSFT,  KC_UP,
-     KC_LCTL,  KC_LGUI,  KC_LALT,                                KC_SPC,                                 KC_RALT, MO(WIN_FN),KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
-
-[WIN_FN] = LAYOUT_ansi_82(
-     KC_TRNS,            KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,  KC_TRNS,  KC_TRNS,
-     KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
-     RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
-     KC_TRNS,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,            KC_TRNS,
-     KC_TRNS,            KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,
-     KC_TRNS,  KC_TRNS,  KC_TRNS,                                KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS)
-
-};
-
-// clang-format on
-
-void matrix_init_user(void) {
-#ifdef RGB_MATRIX_ENABLE
-    rgb_matrix_init_user();
-#endif
-}
diff --git a/keyboards/keychron/q1v1/ansi/keymaps/gtg465x/keymap_user.h b/keyboards/keychron/q1v1/ansi/keymaps/gtg465x/keymap_user.h
deleted file mode 100644
index 728114d556f..00000000000
--- a/keyboards/keychron/q1v1/ansi/keymaps/gtg465x/keymap_user.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright 2021 @ Grayson Carr
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-// clang-format off
-
-enum layers {
-    MAC_BASE,
-    MAC_FN,
-    WIN_BASE,
-    WIN_FN
-};
-
-// clang-format on
diff --git a/keyboards/keychron/q1v1/ansi/keymaps/gtg465x/rgb_matrix_user.c b/keyboards/keychron/q1v1/ansi/keymaps/gtg465x/rgb_matrix_user.c
deleted file mode 100644
index b7d12f9466a..00000000000
--- a/keyboards/keychron/q1v1/ansi/keymaps/gtg465x/rgb_matrix_user.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/* Copyright 2021 @ Grayson Carr
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-#include "rgb_matrix_user.h"
-#include "keymap_user.h"
-
-keypos_t led_index_key_position[RGB_MATRIX_LED_COUNT];
-
-void rgb_matrix_init_user(void) {
-    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        for (uint8_t col = 0; col < MATRIX_COLS; col++) {
-            uint8_t led_index = g_led_config.matrix_co[row][col];
-            if (led_index != NO_LED) {
-                led_index_key_position[led_index] = (keypos_t){.row = row, .col = col};
-            }
-        }
-    }
-}
-
-bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
-    uint8_t current_layer = get_highest_layer(layer_state);
-    switch (current_layer) {
-        case MAC_BASE:
-        case WIN_BASE:
-#ifdef CAPS_LOCK_INDICATOR_COLOR
-            if (host_keyboard_led_state().caps_lock) {
-                rgb_matrix_set_color_by_keycode(led_min, led_max, current_layer, is_caps_lock_indicator, CAPS_LOCK_INDICATOR_COLOR);
-            }
-#endif
-            break;
-        case MAC_FN:
-        case WIN_FN:
-#ifdef FN_LAYER_TRANSPARENT_KEYS_OFF
-            rgb_matrix_set_color_by_keycode(led_min, led_max, current_layer, is_transparent, RGB_OFF);
-#endif
-            break;
-    }
-    return false;
-}
-
-void rgb_matrix_set_color_by_keycode(uint8_t led_min, uint8_t led_max, uint8_t layer, bool (*is_keycode)(uint16_t), uint8_t red, uint8_t green, uint8_t blue) {
-    for (uint8_t i = led_min; i < led_max; i++) {
-        uint16_t keycode = keymap_key_to_keycode(layer, led_index_key_position[i]);
-        if ((*is_keycode)(keycode)) {
-            rgb_matrix_set_color(i, red, green, blue);
-        }
-    }
-}
-
-bool is_caps_lock_indicator(uint16_t keycode) {
-#ifdef CAPS_LOCK_INDICATOR_LIGHT_ALPHAS
-    return (KC_A <= keycode && keycode <= KC_Z) || keycode == KC_CAPS;
-#else
-    return keycode == KC_CAPS;
-#endif
-}
-
-bool is_transparent(uint16_t keycode) { return keycode == KC_TRNS; }
diff --git a/keyboards/keychron/q1v1/ansi/keymaps/gtg465x/rgb_matrix_user.h b/keyboards/keychron/q1v1/ansi/keymaps/gtg465x/rgb_matrix_user.h
deleted file mode 100644
index dead4541676..00000000000
--- a/keyboards/keychron/q1v1/ansi/keymaps/gtg465x/rgb_matrix_user.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2021 @ Grayson Carr
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-void rgb_matrix_init_user(void);
-
-void rgb_matrix_set_color_by_keycode(uint8_t led_min, uint8_t led_max, uint8_t layer, bool (*is_keycode)(uint16_t), uint8_t red, uint8_t green, uint8_t blue);
-
-bool is_caps_lock_indicator(uint16_t keycode);
-bool is_transparent(uint16_t keycode);
diff --git a/keyboards/keychron/q1v1/ansi/keymaps/gtg465x/rules.mk b/keyboards/keychron/q1v1/ansi/keymaps/gtg465x/rules.mk
deleted file mode 100644
index 42ba38028d2..00000000000
--- a/keyboards/keychron/q1v1/ansi/keymaps/gtg465x/rules.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-VIA_ENABLE = yes
-MOUSEKEY_ENABLE = no
-
-ifeq ($(strip $(RGB_MATRIX_ENABLE)), yes)
-    SRC += rgb_matrix_user.c
-endif
diff --git a/keyboards/keychron/q1v1/ansi/keymaps/mkillewald/config.h b/keyboards/keychron/q1v1/ansi/keymaps/mkillewald/config.h
deleted file mode 100644
index acd208b8c67..00000000000
--- a/keyboards/keychron/q1v1/ansi/keymaps/mkillewald/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2021 @ Mike Killewald
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#ifdef RGB_MATRIX_ENABLE
-#    define RGB_MATRIX_SLEEP
-#    define CAPS_LOCK_INDICATOR_COLOR RGB_RED
-#    define FN_LAYER_COLOR RGB_ORANGE
-#endif
\ No newline at end of file
diff --git a/keyboards/keychron/q1v1/ansi/keymaps/mkillewald/keymap.c b/keyboards/keychron/q1v1/ansi/keymaps/mkillewald/keymap.c
deleted file mode 100644
index 4fc8ad58e54..00000000000
--- a/keyboards/keychron/q1v1/ansi/keymaps/mkillewald/keymap.c
+++ /dev/null
@@ -1,153 +0,0 @@
-/* Copyright 2021 @ Mike Killewald
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-#include "keymap_user.h"
-#ifdef RGB_MATRIX_ENABLE
-#    include "rgb_matrix_user.h"
-#endif
-
-// clang-format off
-
-typedef union {
-  uint32_t raw;
-  struct {
-    bool caps_lock_light_tab :1;
-    bool caps_lock_light_alphas :1;
-    bool fn_layer_transparent_keys_off :1;
-    bool fn_layer_color_enable :1;
-  };
-} user_config_t;
-
-user_config_t user_config;
-
-enum custom_keycodes {
-    KC_LIGHT_TAB_TOGGLE = QK_KB_2, // TECH DEBT: Starts at QK_KB_2 to maintain ordering with VIA definitions. See #19884. Revert to QK_KB_0 when VIA catches up with QMK.
-    KC_LIGHT_ALPHAS_TOGGLE,
-    KC_FN_LAYER_TRANSPARENT_KEYS_TOGGLE,
-    KC_FN_LAYER_COLOR_TOGGLE
-};
-
-#define KC_LTTOG KC_LIGHT_TAB_TOGGLE
-#define KC_LATOG KC_LIGHT_ALPHAS_TOGGLE
-#define KC_TKTOG KC_FN_LAYER_TRANSPARENT_KEYS_TOGGLE
-#define KC_FCTOG KC_FN_LAYER_COLOR_TOGGLE
-#define KC_TASK LGUI(KC_TAB)
-#define KC_FLXP LGUI(KC_E)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-[MAC_BASE] = LAYOUT_ansi_82(
-     KC_ESC,             KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,  KC_DEL,   KC_INS,
-     KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,            KC_PGUP,
-     KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,            KC_PGDN,
-     KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,            KC_ENT,             KC_HOME,
-     KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,            KC_RSFT,  KC_UP,
-     KC_LCTL,  KC_LALT,  KC_LGUI,                                KC_SPC,                                 KC_RGUI, MO(MAC_FN),KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
-
-[MAC_FN] = LAYOUT_ansi_82(
-     KC_TRNS,            KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_TRNS,  KC_TRNS,
-     KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
-     RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
-     KC_TRNS,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,            KC_TRNS,
-     KC_TRNS,            KC_LTTOG, KC_LATOG, KC_TKTOG, KC_FCTOG, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,
-     KC_TRNS,  KC_TRNS,  KC_TRNS,                                KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS),
-
-[WIN_BASE] = LAYOUT_ansi_82(
-     KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_DEL,   KC_INS,
-     KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,            KC_PGUP,
-     KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,            KC_PGDN,
-     KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,            KC_ENT,             KC_HOME,
-     KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,            KC_RSFT,  KC_UP,
-     KC_LCTL,  KC_LGUI,  KC_LALT,                                KC_SPC,                                 KC_RALT, MO(WIN_FN),KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
-
-[WIN_FN] = LAYOUT_ansi_82(
-     KC_TRNS,            KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,  KC_TRNS,  KC_TRNS,
-     KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
-     RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
-     KC_TRNS,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,            KC_TRNS,
-     KC_TRNS,            KC_LTTOG, KC_LATOG, KC_TKTOG, KC_FCTOG, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,
-     KC_TRNS,  KC_TRNS,  KC_TRNS,                                KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS)
-
-};
-
-// clang-format on
-
-void matrix_init_user(void) {
-#ifdef RGB_MATRIX_ENABLE
-    rgb_matrix_init_user();
-#endif
-}
-
-void keyboard_post_init_user(void) {
-    user_config.raw = eeconfig_read_user();
-}
-
-void eeconfig_init_user(void) {
-    user_config.raw = 0;
-    user_config.caps_lock_light_tab = false;
-    user_config.caps_lock_light_alphas = false;
-    user_config.fn_layer_transparent_keys_off = true;
-    user_config.fn_layer_color_enable = false;
-    eeconfig_update_user(user_config.raw);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case KC_LIGHT_TAB_TOGGLE:
-            if (record->event.pressed) {
-                user_config.caps_lock_light_tab ^= 1; // bitwise xor to toggle status bit
-                eeconfig_update_user(user_config.raw);
-            }
-            return false;  // Skip all further processing of this key
-        case KC_LIGHT_ALPHAS_TOGGLE:
-            if (record->event.pressed) {
-                user_config.caps_lock_light_alphas ^= 1;
-                eeconfig_update_user(user_config.raw);
-            }
-            return false;  // Skip all further processing of this key
-        case KC_FN_LAYER_TRANSPARENT_KEYS_TOGGLE:
-            if (record->event.pressed) {
-                user_config.fn_layer_transparent_keys_off ^= 1;
-                eeconfig_update_user(user_config.raw);
-            }
-            return false;  // Skip all further processing of this key
-        case KC_FN_LAYER_COLOR_TOGGLE:
-            if (record->event.pressed) {
-                user_config.fn_layer_color_enable ^= 1;
-                eeconfig_update_user(user_config.raw);
-            }
-            return false;  // Skip all further processing of this key
-        default:
-            return true;  // Process all other keycodes normally
-    }
-}
-
-bool get_caps_lock_light_tab(void) {
-    return user_config.caps_lock_light_tab;
-}
-
-bool get_caps_lock_light_alphas(void) {
-    return user_config.caps_lock_light_alphas;
-}
-
-bool get_fn_layer_transparent_keys_off(void) {
-    return user_config.fn_layer_transparent_keys_off;
-}
-
-bool get_fn_layer_color_enable(void) {
-    return user_config.fn_layer_color_enable;
-}
diff --git a/keyboards/keychron/q1v1/ansi/keymaps/mkillewald/keymap_user.h b/keyboards/keychron/q1v1/ansi/keymaps/mkillewald/keymap_user.h
deleted file mode 100644
index 87b1baf47f2..00000000000
--- a/keyboards/keychron/q1v1/ansi/keymaps/mkillewald/keymap_user.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2021 @ Mike Killewald
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-// clang-format off
-
-enum layers {
-    MAC_BASE,
-    MAC_FN,
-    WIN_BASE,
-    WIN_FN
-};
-
-// clang-format on
-
-bool get_caps_lock_light_tab(void);
-bool get_caps_lock_light_alphas(void);
-bool get_fn_layer_transparent_keys_off(void);
-bool get_fn_layer_color_enable(void);
\ No newline at end of file
diff --git a/keyboards/keychron/q1v1/ansi/keymaps/mkillewald/readme.md b/keyboards/keychron/q1v1/ansi/keymaps/mkillewald/readme.md
deleted file mode 100644
index 8ff2dbcc2cb..00000000000
--- a/keyboards/keychron/q1v1/ansi/keymaps/mkillewald/readme.md
+++ /dev/null
@@ -1,54 +0,0 @@
-## mkillewald's Keychron Q1 keymap (ANSI rev_0100) v1.0.4
-
-This keymap builds on the keymap by Grayson Carr (gtg465x) but adds a couple options.
-
-## Features:
-- On macOS, F3 opens Mission Control and F4 opens Launchpad without needing to configure shortcuts in System Preferences
-- RGB lighting turns off when the computer sleeps
-- Caps Lock RGB indicator
-    - the Caps Lock key will light when Caps Lock is enabled with the following options:
-        - #define CAPS_LOCK_INDICATOR_COLOR [color] in config.h to set the backlight color used for the indicator when Caps Lock is enabled (default: red)
-        - Fn+Z will toggle lighting the TAB key when Caps Lock is enabled. This is useful with non backlit keycaps/legends. (default: off)
-        - Fn+X will toggle lighting all the alpha keys when Caps Lock is enabled. (default: off)
-
-- Dynamic Fn layer RGB indicator
-    - When the Fn key is held down, any keys defined on the Fn layer in this firmware or in VIA will be highlighted with the following options:
-        - #define FN_LAYER_COLOR [color] in config.h to set a static color for defined keys (default: orange)
-        - Fn+C will toggle turning off RGB for keys with no definition (default: RGB off)
-        - Fn+V will toggle lighting the defined Fn layer keys with the static color set with FN_LAYER_COLOR (default: static color off)
-
-- All custom keycodes can be moved to different keys in VIA by using the ANY key with the following keycodes:
-    - USER(0) (default: F3) macOS Mission Control
-    - USER(1) (default: F4) macOS Launchpad
-    - USER(2) (default: Fn+Z) Caps Lock light Tab toggle
-    - USER(3) (default: Fn+X) Caps Lock light alphas toggle
-    - USER(4) (default: Fn+C) Fn layer non-defined keys RGB toggle
-    - USER(5) (default: Fn+V) Fn layer defined keys static color toggle
-
-RGB must be toggled on for all indicators to function. If you do not want an RGB mode active but still want the indicators, toggle RGB on and turn the brightness all the way off. The indicators will remain at full brightness.
-
-Please make sure to save any customizations you have made in VIA to a .json file before flashing the firmware. Sometimes it has been necessary to re-apply those changes in VIA after flashing the firmware. If that is the case, you will most likely need to manually add the USER(0) through USER(5) custom keycodes after loading your customizations from the saved .json file. Then re-save a new .json file which will have your previous customizations and the custom keycodes for future use as needed.
-    
-#### USE AT YOUR OWN RISK
-
-## Changelog:
-
-v1.0.4  October 9, 2021
-- Caps Lock and Fn layer toggles are now stored in eeprom so settings will remain when Q1 is unplugged
-
-v1.0.3  October 8, 2021
-- now using keycode toggles instead of preprocessor directive to set the various Caps Lock and Fn Layer RGB lighting options. This allows for setting the options from user space without having to recompile.
-
-v1.0.2  October 7, 2021
-- adapted Grayson Carr's (gtg465x) Caps Lock alphas and dynamic Fn layer RGB routines
-- added CAPS_LOCK_INDICATOR_LIGHT_TAB config option to enable/disable lighting Tab with Caps Lock indicator
-- added FN_LAYER_COLOR config option to set FN layer static color
-
-v1.0.1  October 7, 2021
-- Mission Control and Launchpad custom keycodes are now defined using the VIA user keycodes range so thay can be labeled properly in VIA (adopted change from gtg465x)
-
-v1.0.0  September 30, 2021
-- Initial release built upon keymap by Grayson Carr (gtg465x)
-- defined Mission Control (F3) and Launchpad (F4) keycodes for macOs
-- RGB backlight turns off when computer sleeps
-- added Caps Lock indicator lighting both the Caps Lock and Tab LEDs for better effect on non-backlit keycaps
diff --git a/keyboards/keychron/q1v1/ansi/keymaps/mkillewald/rgb_matrix_user.c b/keyboards/keychron/q1v1/ansi/keymaps/mkillewald/rgb_matrix_user.c
deleted file mode 100644
index c6fa5f1f155..00000000000
--- a/keyboards/keychron/q1v1/ansi/keymaps/mkillewald/rgb_matrix_user.c
+++ /dev/null
@@ -1,84 +0,0 @@
-/* Copyright 2021 @ Mike Killewald
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-#include "rgb_matrix_user.h"
-#include "keymap_user.h"
-
-keypos_t led_index_key_position[RGB_MATRIX_LED_COUNT];
-
-void rgb_matrix_init_user(void) {
-    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        for (uint8_t col = 0; col < MATRIX_COLS; col++) {
-            uint8_t led_index = g_led_config.matrix_co[row][col];
-            if (led_index != NO_LED) {
-                led_index_key_position[led_index] = (keypos_t){.row = row, .col = col};
-            }
-        }
-    }
-}
-
-bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
-    uint8_t current_layer = get_highest_layer(layer_state);
-    switch (current_layer) {
-        case MAC_BASE:
-        case WIN_BASE:
-#ifdef CAPS_LOCK_INDICATOR_COLOR
-            if (host_keyboard_led_state().caps_lock) {
-                rgb_matrix_set_color_by_keycode(led_min, led_max, current_layer, is_caps_lock_indicator, CAPS_LOCK_INDICATOR_COLOR);
-            }
-#endif
-            break;
-        case MAC_FN:
-        case WIN_FN:
-#ifdef FN_LAYER_COLOR
-            if (get_fn_layer_color_enable()) {
-                rgb_matrix_set_color_by_keycode(led_min, led_max, current_layer, is_not_transparent, FN_LAYER_COLOR);
-            }
-#endif
-            if (get_fn_layer_transparent_keys_off()) {
-                rgb_matrix_set_color_by_keycode(led_min, led_max, current_layer, is_transparent, RGB_OFF);
-            }
-            break;
-    }
-    return false;
-}
-
-void rgb_matrix_set_color_by_keycode(uint8_t led_min, uint8_t led_max, uint8_t layer, bool (*is_keycode)(uint16_t), uint8_t red, uint8_t green, uint8_t blue) {
-    for (uint8_t i = led_min; i < led_max; i++) {
-        uint16_t keycode = keymap_key_to_keycode(layer, led_index_key_position[i]);
-        if ((*is_keycode)(keycode)) {
-            rgb_matrix_set_color(i, red, green, blue);
-        }
-    }
-}
-
-bool is_caps_lock_indicator(uint16_t keycode) {
-    bool indicator = keycode == KC_CAPS;
-
-    if (get_caps_lock_light_tab()) {
-        indicator = keycode == KC_TAB || keycode == KC_CAPS;
-    }
-
-    if (get_caps_lock_light_alphas()) {
-        return (KC_A <= keycode && keycode <= KC_Z) || indicator;
-    } else {
-        return indicator;
-    }
-}
-
-bool is_transparent(uint16_t keycode) { return keycode == KC_TRNS; }
-bool is_not_transparent(uint16_t keycode) { return keycode != KC_TRNS; }
diff --git a/keyboards/keychron/q1v1/ansi/keymaps/mkillewald/rgb_matrix_user.h b/keyboards/keychron/q1v1/ansi/keymaps/mkillewald/rgb_matrix_user.h
deleted file mode 100644
index 1fb79c0b2a1..00000000000
--- a/keyboards/keychron/q1v1/ansi/keymaps/mkillewald/rgb_matrix_user.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2021 @ Mike Killewald
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-void rgb_matrix_init_user(void);
-
-void rgb_matrix_set_color_by_keycode(uint8_t led_min, uint8_t led_max, uint8_t layer, bool (*is_keycode)(uint16_t), uint8_t red, uint8_t green, uint8_t blue);
-
-bool is_caps_lock_indicator(uint16_t keycode);
-bool is_transparent(uint16_t keycode);
-bool is_not_transparent(uint16_t keycode);
-
diff --git a/keyboards/keychron/q1v1/ansi/keymaps/mkillewald/rules.mk b/keyboards/keychron/q1v1/ansi/keymaps/mkillewald/rules.mk
deleted file mode 100644
index af720e37ee7..00000000000
--- a/keyboards/keychron/q1v1/ansi/keymaps/mkillewald/rules.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-VIA_ENABLE = yes
-MOUSEKEY_ENABLE = no
-
-ifeq ($(strip $(RGB_MATRIX_ENABLE)), yes)
-    SRC += rgb_matrix_user.c
-endif
\ No newline at end of file
diff --git a/keyboards/keychron/q1v1/ansi/keymaps/teimor/config.h b/keyboards/keychron/q1v1/ansi/keymaps/teimor/config.h
deleted file mode 100644
index cd49d7b3d8d..00000000000
--- a/keyboards/keychron/q1v1/ansi/keymaps/teimor/config.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright 2022 @ Teimor Epstein
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#undef TAPPING_TERM
-#define TAPPING_TERM 200
-
-/* RGB Matrix Configuration */
-#ifdef RGB_MATRIX_ENABLE
-#    define RGB_MATRIX_SLEEP
-#    define MAC_LAYER_DEFAULT_COLOR RGB_CYAN
-#    define WIN_LAYER_DEFAULT_COLOR RGB_GREEN
-#    define CAPS_LOCK_INDICATOR_COLOR RGB_RED
-#    define CAPS_LOCK_INDICATOR_LIGHT_60
-#    define FN_LAYER_TRANSPARENT_KEYS_OFF
-#    define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR        // Sets the default mode, if none has been set
-#    define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS  // Sets the default brightness value, if none has been set
-#endif
diff --git a/keyboards/keychron/q1v1/ansi/keymaps/teimor/keymap.c b/keyboards/keychron/q1v1/ansi/keymaps/teimor/keymap.c
deleted file mode 100644
index 77af30c5b6a..00000000000
--- a/keyboards/keychron/q1v1/ansi/keymaps/teimor/keymap.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/* Copyright 2022 @ Teimor Epstein
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-#include "keymap_user.h"
-#ifdef RGB_MATRIX_ENABLE
-#    include "rgb_matrix_user.h"
-#endif
-
-// clang-format off
-
-#define TG_NKRO MAGIC_TOGGLE_NKRO
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [MAC_BASE] = LAYOUT_ansi_82(
-        KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,  KC_DEL,   KC_HOME,
-        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,           KC_END,
-        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,           KC_PGUP,
-        KC_LGMAC, KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,            KC_ENT,            KC_PGDN,
-        KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,            KC_RSFT,  KC_UP,
-        KC_LCTL,  KC_LALT,  KC_LGUI,                                KC_SPC,                                 KC_RGUI,  KC_MACFN, KC_RCTL,  KC_LEFT,  KC_DOWN, KC_RGHT),
-
-    [MAC_FN] = LAYOUT_ansi_82(
-        _______,            KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,  KC_MACPS, KC_INS,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,
-        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  QK_BOOT,            _______,
-        KC_CAPS,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  KC_LMAC,  _______,  _______,            _______,            _______,
-        _______,            _______,  _______,  _______,  _______,  _______,  TG_NKRO,  _______,  _______,  _______,  _______,            _______,  _______,
-        _______,  _______,  _______,                                _______,                                _______,  _______,  _______,  _______,  _______,  _______),
-
-    [WIN_BASE] = LAYOUT_ansi_82(
-        KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_DEL,   KC_HOME,
-        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,            KC_END,
-        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,            KC_PGUP,
-        KC_LGWIN, KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,            KC_ENT,             KC_PGDN,
-        KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,            KC_RSFT,  KC_UP,
-        KC_LCTL,  KC_LGUI,  KC_LALT,                                KC_SPC,                                 KC_RALT,  KC_WINFN, KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
-
-    [WIN_FN] = LAYOUT_ansi_82(
-        _______,            KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,  KC_PSCR,  KC_INS,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,
-        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  QK_BOOT,            _______,
-        KC_CAPS,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,            _______,            _______,
-        _______,            _______,  _______,  _______,  _______,  _______,  TG_NKRO,  _______,  _______,  _______,  _______,            _______,  _______,
-        _______,  _______,  _______,                                _______,                                _______,  _______,  _______,  _______,  _______,  _______)
-};
-
-// clang-format on
-
-void matrix_init_user(void) {
-#ifdef RGB_MATRIX_ENABLE
-    rgb_matrix_init_user();
-#endif
-}
diff --git a/keyboards/keychron/q1v1/ansi/keymaps/teimor/keymap_user.h b/keyboards/keychron/q1v1/ansi/keymaps/teimor/keymap_user.h
deleted file mode 100644
index 57ac5258c26..00000000000
--- a/keyboards/keychron/q1v1/ansi/keymaps/teimor/keymap_user.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Copyright 2022 @ Teimor Epstein
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-// clang-format off
-
-enum layers {
-    MAC_BASE,
-    MAC_FN,
-    WIN_BASE,
-    WIN_FN
-};
-
-// clang-format on
-
-// Tap dance enums
-enum {
-    MAC_CAPS_LANGUAGE_CHANGE,
-    WIN_CAPS_LANGUAGE_CHANGE,
-};
-
-#ifdef TAP_DANCE_ENABLE
-#   define KC_LGMAC TD(MAC_CAPS_LANGUAGE_CHANGE)
-#   define KC_LGWIN TD(WIN_CAPS_LANGUAGE_CHANGE)
-#else
-#   define KC_LGMAC KC_CAPS
-#   define KC_LGWIN KC_CAPS
-#endif
-#define KC_MACFN MO(MAC_FN)
-#define KC_WINFN MO(WIN_FN)
-#define KC_LMAC C(G(KC_Q))
-#define KC_MACPS G(S(KC_5))
-#define KC_TASK G(KC_TAB)
-#define KC_FLXP G(KC_E)
diff --git a/keyboards/keychron/q1v1/ansi/keymaps/teimor/readme.md b/keyboards/keychron/q1v1/ansi/keymaps/teimor/readme.md
deleted file mode 100644
index 9aa16f9a893..00000000000
--- a/keyboards/keychron/q1v1/ansi/keymaps/teimor/readme.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# teimor's Keychron Q1 keymap
-
-- Via Enabled.
-- Tap dance enabled.
-- On macOS, F3 opens Mission Control and F4 opens Launchpad without needing to configure shortcuts in System Preferences.
-- RGB lighting turns off when the computer sleeps.
-- The RGB lighting for keys that are not assigned turns off when the Fn layer is active
-- 60% layout turns red to indicate when Caps Lock is on.
-- Windows and macOS: A single tap will quickly change the language, and holding will trigger Caps Lock. (Using Tap Dance)
-- RGB Matrix based on layout - macOS base layout will turn on cyan color, Windows base layout will turn on green color.
-- `fn + N` will toggle NKRO, useful when using the keyboard on freebsd.
-- `fn + L` on macOS will lock the system.
-- `fn + del` will trigger screenshot on macOS and Windows.
diff --git a/keyboards/keychron/q1v1/ansi/keymaps/teimor/rgb_matrix_user.c b/keyboards/keychron/q1v1/ansi/keymaps/teimor/rgb_matrix_user.c
deleted file mode 100644
index fbc37fb5bfb..00000000000
--- a/keyboards/keychron/q1v1/ansi/keymaps/teimor/rgb_matrix_user.c
+++ /dev/null
@@ -1,92 +0,0 @@
-/* Copyright 2022 @ Teimor Epstein
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-#include "rgb_matrix_user.h"
-#include "keymap_user.h"
-
-keypos_t led_index_key_position[RGB_MATRIX_LED_COUNT];
-
-void rgb_matrix_init_user(void) {
-    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        for (uint8_t col = 0; col < MATRIX_COLS; col++) {
-            uint8_t led_index = g_led_config.matrix_co[row][col];
-            if (led_index != NO_LED) {
-                led_index_key_position[led_index] = (keypos_t){.row = row, .col = col};
-            }
-        }
-    }
-}
-
-bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
-    uint8_t current_layer = get_highest_layer(layer_state | default_layer_state);
-    switch (current_layer) {
-        case MAC_BASE:
-        case WIN_BASE:
-#if defined CAPS_LOCK_INDICATOR_COLOR && defined MAC_LAYER_DEFAULT_COLOR && defined WIN_LAYER_DEFAULT_COLOR
-            if (host_keyboard_led_state().caps_lock) {
-                rgb_matrix_set_color_by_keycode(led_min, led_max, current_layer, is_caps_lock_indicator, CAPS_LOCK_INDICATOR_COLOR);
-            } else if (current_layer == MAC_BASE)
-                rgb_matrix_set_color_all(MAC_LAYER_DEFAULT_COLOR);
-            else if (current_layer == WIN_BASE)
-                rgb_matrix_set_color_all(WIN_LAYER_DEFAULT_COLOR);
-#endif
-            break;
-        case MAC_FN:
-        case WIN_FN:
-#if defined MAC_LAYER_DEFAULT_COLOR && defined WIN_LAYER_DEFAULT_COLOR
-            if (current_layer == MAC_FN) {
-                rgb_matrix_set_color_by_keycode(led_min, led_max, current_layer, is_not_transparent, MAC_LAYER_DEFAULT_COLOR);
-            } else if (current_layer == WIN_FN) {
-                rgb_matrix_set_color_by_keycode(led_min, led_max, current_layer, is_not_transparent, WIN_LAYER_DEFAULT_COLOR);
-            }
-#endif
-#ifdef FN_LAYER_TRANSPARENT_KEYS_OFF
-            rgb_matrix_set_color_by_keycode(led_min, led_max, current_layer, is_transparent, RGB_OFF);
-#endif
-            break;
-    }
-    return false;
-}
-
-void rgb_matrix_set_color_by_keycode(uint8_t led_min, uint8_t led_max, uint8_t layer, bool (*is_keycode)(uint16_t), uint8_t red, uint8_t green, uint8_t blue) {
-    for (uint8_t i = led_min; i < led_max; i++) {
-        uint16_t keycode = keymap_key_to_keycode(layer, led_index_key_position[i]);
-        if ((*is_keycode)(keycode)) {
-            rgb_matrix_set_color(i, red, green, blue);
-        }
-#if defined MAC_LAYER_DEFAULT_COLOR && defined WIN_LAYER_DEFAULT_COLOR
-        else {
-            if (layer == MAC_BASE)
-                rgb_matrix_set_color(i, MAC_LAYER_DEFAULT_COLOR);
-            else if (layer == WIN_BASE)
-                rgb_matrix_set_color(i, WIN_LAYER_DEFAULT_COLOR);
-        }
-#endif
-    }
-}
-
-bool is_caps_lock_indicator(uint16_t keycode) {
-    bool indicator = keycode == KC_CAPS || keycode == KC_LGMAC || keycode == KC_LGWIN;
-#ifdef CAPS_LOCK_INDICATOR_LIGHT_60
-    return (KC_A <= keycode && keycode <= KC_CAPS) || (KC_LEFT_CTRL <= keycode && keycode <= KC_RIGHT_GUI) || keycode == KC_MACFN || keycode == KC_WINFN || indicator;
-#else
-    return indicator;
-#endif
-}
-
-bool is_transparent(uint16_t keycode) { return keycode == KC_TRNS; }
-bool is_not_transparent(uint16_t keycode) { return keycode != KC_TRNS; }
diff --git a/keyboards/keychron/q1v1/ansi/keymaps/teimor/rgb_matrix_user.h b/keyboards/keychron/q1v1/ansi/keymaps/teimor/rgb_matrix_user.h
deleted file mode 100644
index 5b53b5b8ec1..00000000000
--- a/keyboards/keychron/q1v1/ansi/keymaps/teimor/rgb_matrix_user.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2022 @ Teimor Epstein
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-void rgb_matrix_init_user(void);
-
-void rgb_matrix_set_color_by_keycode(uint8_t led_min, uint8_t led_max, uint8_t layer, bool (*is_keycode)(uint16_t), uint8_t red, uint8_t green, uint8_t blue);
-
-bool is_caps_lock_indicator(uint16_t keycode);
-bool is_transparent(uint16_t keycode);
-bool is_not_transparent(uint16_t keycode);
diff --git a/keyboards/keychron/q1v1/ansi/keymaps/teimor/rules.mk b/keyboards/keychron/q1v1/ansi/keymaps/teimor/rules.mk
deleted file mode 100644
index bafb40484bf..00000000000
--- a/keyboards/keychron/q1v1/ansi/keymaps/teimor/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-VIA_ENABLE = yes
-MOUSEKEY_ENABLE = no
-TAP_DANCE_ENABLE = yes
-
-ifeq ($(strip $(RGB_MATRIX_ENABLE)), yes)
-    SRC += rgb_matrix_user.c
-endif
-
-ifeq ($(strip $(TAP_DANCE_ENABLE)), yes)
-    SRC += tap_dance_user.c
-    SRC += tap_dance_setup.c
-    SRC += tap_dance_mac_caps.c
-    SRC += tap_dance_win_caps.c
-endif
diff --git a/keyboards/keychron/q1v1/ansi/keymaps/teimor/tap_dance_mac_caps.c b/keyboards/keychron/q1v1/ansi/keymaps/teimor/tap_dance_mac_caps.c
deleted file mode 100644
index dfb0346ff16..00000000000
--- a/keyboards/keychron/q1v1/ansi/keymaps/teimor/tap_dance_mac_caps.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/* Copyright 2021 @ Teimor Epstein
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* macOS CapsLock language change */
-#include "tap_dance_mac_caps.h"
-
-static td_tap_t mac_caps_language_tap_state = {.is_press_action = true, .state = TD_NONE};
-
-void mac_caps_language_finished(tap_dance_state_t *state, void *user_data) {
-    mac_caps_language_tap_state.state = current_dance(state);
-    switch (mac_caps_language_tap_state.state) {
-        case TD_SINGLE_TAP:
-            register_code(KC_LCTL);
-            register_code(KC_SPACE);
-            break;
-        case TD_SINGLE_HOLD:
-            register_code(KC_CAPS_LOCK);
-            break;
-        default:
-            break;
-    }
-}
-
-void mac_caps_language_reset(tap_dance_state_t *state, void *user_data) {
-    switch (mac_caps_language_tap_state.state) {
-        case TD_SINGLE_TAP:
-            unregister_code(KC_SPACE);
-            unregister_code(KC_LCTL);
-            break;
-        case TD_SINGLE_HOLD:
-            unregister_code(KC_CAPS_LOCK);
-            break;
-        default:
-            break;
-    }
-    mac_caps_language_tap_state.state = TD_NONE;
-}
diff --git a/keyboards/keychron/q1v1/ansi/keymaps/teimor/tap_dance_mac_caps.h b/keyboards/keychron/q1v1/ansi/keymaps/teimor/tap_dance_mac_caps.h
deleted file mode 100644
index ef552a2c2c9..00000000000
--- a/keyboards/keychron/q1v1/ansi/keymaps/teimor/tap_dance_mac_caps.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2021 @ Teimor Epstein
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* macOS CapsLock language change */
-#pragma once
-
-#include "tap_dance_setup.h"
-
-void mac_caps_language_finished(tap_dance_state_t *state, void *user_data);
-void mac_caps_language_reset(tap_dance_state_t *state, void *user_data);
diff --git a/keyboards/keychron/q1v1/ansi/keymaps/teimor/tap_dance_setup.c b/keyboards/keychron/q1v1/ansi/keymaps/teimor/tap_dance_setup.c
deleted file mode 100644
index 07257e556a1..00000000000
--- a/keyboards/keychron/q1v1/ansi/keymaps/teimor/tap_dance_setup.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/* Copyright 2022 @ Teimor Epstein
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "tap_dance_setup.h"
-
-td_state_t current_dance(tap_dance_state_t *state) {
-    if (state->count == 1) {
-        if (state->interrupted || !state->pressed) return TD_SINGLE_TAP;
-        /* Key has not been interrupted, but the key is still held. Means you w ant to send a 'HOLD'. */
-        else
-            return TD_SINGLE_HOLD;
-    } else if (state->count == 2) {
-        /* TD_DOUBLE_SINGLE_TAP is to distinguish between typing "pepper", and actually wanting a double tap
-           action when hitting 'pp'. Suggested use case for this return value is when you want to send two
-           keystrokes of the key, and not the 'double tap' action/macro. */
-        if (state->interrupted)
-            return TD_DOUBLE_SINGLE_TAP;
-        else if (state->pressed)
-            return TD_DOUBLE_HOLD;
-        else
-            return TD_DOUBLE_TAP;
-    }
-
-    /* Assumes no one is trying to type the same letter three times (at least not quickly).
-      If your tap dance key is 'KC_W', and you want to type "www." quickly - then you will need to add
-      an exception here to return a 'TD_TRIPLE_SINGLE_TAP', and define that enum just like 'TD_DOUBLE_SINGLE_TAP' */
-    if (state->count == 3) {
-        if (state->interrupted)
-            return TD_TRIPLE_SINGLE_TAP;
-        else if (state->pressed)
-            return TD_TRIPLE_HOLD;
-        else
-            return TD_TRIPLE_TAP;
-
-    } else
-        return TD_UNKNOWN;
-}
diff --git a/keyboards/keychron/q1v1/ansi/keymaps/teimor/tap_dance_setup.h b/keyboards/keychron/q1v1/ansi/keymaps/teimor/tap_dance_setup.h
deleted file mode 100644
index 5d2f4acd577..00000000000
--- a/keyboards/keychron/q1v1/ansi/keymaps/teimor/tap_dance_setup.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2022 @ Teimor Epstein
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include QMK_KEYBOARD_H
-
-typedef enum {
-    TD_NONE,
-    TD_UNKNOWN,
-    TD_SINGLE_TAP,
-    TD_SINGLE_HOLD,
-    TD_DOUBLE_TAP,
-    TD_DOUBLE_HOLD,
-    TD_DOUBLE_SINGLE_TAP,  // Send two single taps
-    TD_TRIPLE_TAP,
-    TD_TRIPLE_HOLD,
-    TD_TRIPLE_SINGLE_TAP  // Send three single tap
-} td_state_t;
-
-typedef struct {
-    bool       is_press_action;
-    td_state_t state;
-} td_tap_t;
-
-td_state_t current_dance(tap_dance_state_t *state);
diff --git a/keyboards/keychron/q1v1/ansi/keymaps/teimor/tap_dance_user.c b/keyboards/keychron/q1v1/ansi/keymaps/teimor/tap_dance_user.c
deleted file mode 100644
index ed8120572ee..00000000000
--- a/keyboards/keychron/q1v1/ansi/keymaps/teimor/tap_dance_user.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright 2022 @ Teimor Epstein
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "keymap_user.h"
-#include "tap_dance_mac_caps.h"
-#include "tap_dance_win_caps.h"
-
-// clang-format off
-
-tap_dance_action_t tap_dance_actions[] = {
-    [MAC_CAPS_LANGUAGE_CHANGE] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, mac_caps_language_finished, mac_caps_language_reset),
-    [WIN_CAPS_LANGUAGE_CHANGE] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, win_caps_language_finished, win_caps_language_reset)
-};
-
-// clang-format on
diff --git a/keyboards/keychron/q1v1/ansi/keymaps/teimor/tap_dance_win_caps.c b/keyboards/keychron/q1v1/ansi/keymaps/teimor/tap_dance_win_caps.c
deleted file mode 100644
index 1c7c438d2e5..00000000000
--- a/keyboards/keychron/q1v1/ansi/keymaps/teimor/tap_dance_win_caps.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/* Copyright 2022 @ Teimor Epstein
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* Windows CapsLock language change */
-#include "tap_dance_win_caps.h"
-
-static td_tap_t win_caps_language_tap_state = {.is_press_action = true, .state = TD_NONE};
-
-void win_caps_language_finished(tap_dance_state_t *state, void *user_data) {
-    win_caps_language_tap_state.state = current_dance(state);
-    switch (win_caps_language_tap_state.state) {
-        case TD_SINGLE_TAP:
-            register_code(KC_LGUI);
-            register_code(KC_SPACE);
-            break;
-        case TD_SINGLE_HOLD:
-            register_code(KC_CAPS_LOCK);
-            break;
-        default:
-            break;
-    }
-}
-
-void win_caps_language_reset(tap_dance_state_t *state, void *user_data) {
-    switch (win_caps_language_tap_state.state) {
-        case TD_SINGLE_TAP:
-            unregister_code(KC_SPACE);
-            unregister_code(KC_LGUI);
-            break;
-        case TD_SINGLE_HOLD:
-            unregister_code(KC_CAPS_LOCK);
-            break;
-        default:
-            break;
-    }
-    win_caps_language_tap_state.state = TD_NONE;
-}
diff --git a/keyboards/keychron/q1v1/ansi/keymaps/teimor/tap_dance_win_caps.h b/keyboards/keychron/q1v1/ansi/keymaps/teimor/tap_dance_win_caps.h
deleted file mode 100644
index 2289cce3269..00000000000
--- a/keyboards/keychron/q1v1/ansi/keymaps/teimor/tap_dance_win_caps.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2022 @ Teimor Epstein
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* Windows CapsLock language change */
-#pragma once
-
-#include "tap_dance_setup.h"
-
-void win_caps_language_finished(tap_dance_state_t *state, void *user_data);
-void win_caps_language_reset(tap_dance_state_t *state, void *user_data);
diff --git a/keyboards/keychron/q1v1/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q1v1/ansi_encoder/ansi_encoder.c
index 1c15ac633d5..d8679ee4821 100644
--- a/keyboards/keychron/q1v1/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/q1v1/ansi_encoder/ansi_encoder.c
@@ -24,93 +24,93 @@ const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_1,    A_1,    B_1},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_15,   A_15,   B_15},
-    {0, C_16,   A_16,   B_16},
+    {0, SW3_CS1,    SW1_CS1,    SW2_CS1},
+    {0, SW3_CS3,    SW1_CS3,    SW2_CS3},
+    {0, SW3_CS4,    SW1_CS4,    SW2_CS4},
+    {0, SW3_CS5,    SW1_CS5,    SW2_CS5},
+    {0, SW3_CS6,    SW1_CS6,    SW2_CS6},
+    {0, SW3_CS7,    SW1_CS7,    SW2_CS7},
+    {0, SW3_CS8,    SW1_CS8,    SW2_CS8},
+    {0, SW3_CS9,    SW1_CS9,    SW2_CS9},
+    {0, SW3_CS10,   SW1_CS10,   SW2_CS10},
+    {0, SW3_CS11,   SW1_CS11,   SW2_CS11},
+    {0, SW3_CS12,   SW1_CS12,   SW2_CS12},
+    {0, SW3_CS13,   SW1_CS13,   SW2_CS13},
+    {0, SW3_CS14,   SW1_CS14,   SW2_CS14},
+    {0, SW3_CS15,   SW1_CS15,   SW2_CS15},
+    {0, SW3_CS16,   SW1_CS16,   SW2_CS16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_14,   D_14,   E_14},
-    {0, F_16,   D_16,   E_16},
+    {0, SW6_CS1,    SW4_CS1,    SW5_CS1},
+    {0, SW6_CS2,    SW4_CS2,    SW5_CS2},
+    {0, SW6_CS3,    SW4_CS3,    SW5_CS3},
+    {0, SW6_CS4,    SW4_CS4,    SW5_CS4},
+    {0, SW6_CS5,    SW4_CS5,    SW5_CS5},
+    {0, SW6_CS6,    SW4_CS6,    SW5_CS6},
+    {0, SW6_CS7,    SW4_CS7,    SW5_CS7},
+    {0, SW6_CS8,    SW4_CS8,    SW5_CS8},
+    {0, SW6_CS9,    SW4_CS9,    SW5_CS9},
+    {0, SW6_CS10,   SW4_CS10,   SW5_CS10},
+    {0, SW6_CS11,   SW4_CS11,   SW5_CS11},
+    {0, SW6_CS12,   SW4_CS12,   SW5_CS12},
+    {0, SW6_CS13,   SW4_CS13,   SW5_CS13},
+    {0, SW6_CS14,   SW4_CS14,   SW5_CS14},
+    {0, SW6_CS16,   SW4_CS16,   SW5_CS16},
 
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_14,   G_14,   H_14},
-    {0, I_16,   G_16,   H_16},
+    {0, SW9_CS1,    SW7_CS1,    SW8_CS1},
+    {0, SW9_CS2,    SW7_CS2,    SW8_CS2},
+    {0, SW9_CS3,    SW7_CS3,    SW8_CS3},
+    {0, SW9_CS4,    SW7_CS4,    SW8_CS4},
+    {0, SW9_CS5,    SW7_CS5,    SW8_CS5},
+    {0, SW9_CS6,    SW7_CS6,    SW8_CS6},
+    {0, SW9_CS7,    SW7_CS7,    SW8_CS7},
+    {0, SW9_CS8,    SW7_CS8,    SW8_CS8},
+    {0, SW9_CS9,    SW7_CS9,    SW8_CS9},
+    {0, SW9_CS10,   SW7_CS10,   SW8_CS10},
+    {0, SW9_CS11,   SW7_CS11,   SW8_CS11},
+    {0, SW9_CS12,   SW7_CS12,   SW8_CS12},
+    {0, SW9_CS13,   SW7_CS13,   SW8_CS13},
+    {0, SW9_CS14,   SW7_CS14,   SW8_CS14},
+    {0, SW9_CS16,   SW7_CS16,   SW8_CS16},
 
-    {0, L_1,    J_1,    K_1},
-    {0, L_2,    J_2,    K_2},
-    {0, L_3,    J_3,    K_3},
-    {0, L_4,    J_4,    K_4},
-    {0, L_5,    J_5,    K_5},
-    {0, L_6,    J_6,    K_6},
-    {0, L_7,    J_7,    K_7},
-    {0, L_8,    J_8,    K_8},
-    {0, L_9,    J_9,    K_9},
-    {0, L_10,   J_10,   K_10},
-    {0, L_11,   J_11,   K_11},
-    {0, L_12,   J_12,   K_12},
-    {0, L_14,   J_14,   K_14},
-    {0, L_16,   J_16,   K_16},
+    {0, SW12_CS1,    SW10_CS1,    SW11_CS1},
+    {0, SW12_CS2,    SW10_CS2,    SW11_CS2},
+    {0, SW12_CS3,    SW10_CS3,    SW11_CS3},
+    {0, SW12_CS4,    SW10_CS4,    SW11_CS4},
+    {0, SW12_CS5,    SW10_CS5,    SW11_CS5},
+    {0, SW12_CS6,    SW10_CS6,    SW11_CS6},
+    {0, SW12_CS7,    SW10_CS7,    SW11_CS7},
+    {0, SW12_CS8,    SW10_CS8,    SW11_CS8},
+    {0, SW12_CS9,    SW10_CS9,    SW11_CS9},
+    {0, SW12_CS10,   SW10_CS10,   SW11_CS10},
+    {0, SW12_CS11,   SW10_CS11,   SW11_CS11},
+    {0, SW12_CS12,   SW10_CS12,   SW11_CS12},
+    {0, SW12_CS14,   SW10_CS14,   SW11_CS14},
+    {0, SW12_CS16,   SW10_CS16,   SW11_CS16},
 
-    {1, C_1,    A_1,    B_1},
-    {1, C_3,    A_3,    B_3},
-    {1, C_4,    A_4,    B_4},
-    {1, C_5,    A_5,    B_5},
-    {1, C_6,    A_6,    B_6},
-    {1, C_7,    A_7,    B_7},
-    {1, C_8,    A_8,    B_8},
-    {1, C_9,    A_9,    B_9},
-    {1, C_10,   A_10,   B_10},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_14,   A_14,   B_14},
-    {1, C_15,   A_15,   B_15},
+    {1, SW3_CS1,    SW1_CS1,    SW2_CS1},
+    {1, SW3_CS3,    SW1_CS3,    SW2_CS3},
+    {1, SW3_CS4,    SW1_CS4,    SW2_CS4},
+    {1, SW3_CS5,    SW1_CS5,    SW2_CS5},
+    {1, SW3_CS6,    SW1_CS6,    SW2_CS6},
+    {1, SW3_CS7,    SW1_CS7,    SW2_CS7},
+    {1, SW3_CS8,    SW1_CS8,    SW2_CS8},
+    {1, SW3_CS9,    SW1_CS9,    SW2_CS9},
+    {1, SW3_CS10,   SW1_CS10,   SW2_CS10},
+    {1, SW3_CS11,   SW1_CS11,   SW2_CS11},
+    {1, SW3_CS12,   SW1_CS12,   SW2_CS12},
+    {1, SW3_CS14,   SW1_CS14,   SW2_CS14},
+    {1, SW3_CS15,   SW1_CS15,   SW2_CS15},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_2,    D_2,    E_2},
-    {1, F_3,    D_3,    E_3},
-    {1, F_7,    D_7,    E_7},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_13,   D_13,   E_13},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
-    {1, F_16,   D_16,   E_16}
+    {1, SW6_CS1,    SW4_CS1,    SW5_CS1},
+    {1, SW6_CS2,    SW4_CS2,    SW5_CS2},
+    {1, SW6_CS3,    SW4_CS3,    SW5_CS3},
+    {1, SW6_CS7,    SW4_CS7,    SW5_CS7},
+    {1, SW6_CS11,   SW4_CS11,   SW5_CS11},
+    {1, SW6_CS12,   SW4_CS12,   SW5_CS12},
+    {1, SW6_CS13,   SW4_CS13,   SW5_CS13},
+    {1, SW6_CS14,   SW4_CS14,   SW5_CS14},
+    {1, SW6_CS15,   SW4_CS15,   SW5_CS15},
+    {1, SW6_CS16,   SW4_CS16,   SW5_CS16}
 };
 
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q1v1/iso/iso.c b/keyboards/keychron/q1v1/iso/iso.c
index 109eb012828..ef4f3425af0 100644
--- a/keyboards/keychron/q1v1/iso/iso.c
+++ b/keyboards/keychron/q1v1/iso/iso.c
@@ -24,94 +24,94 @@ const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_1,    A_1,    B_1},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_15,   A_15,   B_15},
-    {0, C_16,   A_16,   B_16},
+    {0, SW3_CS1,    SW1_CS1,    SW2_CS1},
+    {0, SW3_CS3,    SW1_CS3,    SW2_CS3},
+    {0, SW3_CS4,    SW1_CS4,    SW2_CS4},
+    {0, SW3_CS5,    SW1_CS5,    SW2_CS5},
+    {0, SW3_CS6,    SW1_CS6,    SW2_CS6},
+    {0, SW3_CS7,    SW1_CS7,    SW2_CS7},
+    {0, SW3_CS8,    SW1_CS8,    SW2_CS8},
+    {0, SW3_CS9,    SW1_CS9,    SW2_CS9},
+    {0, SW3_CS10,   SW1_CS10,   SW2_CS10},
+    {0, SW3_CS11,   SW1_CS11,   SW2_CS11},
+    {0, SW3_CS12,   SW1_CS12,   SW2_CS12},
+    {0, SW3_CS13,   SW1_CS13,   SW2_CS13},
+    {0, SW3_CS14,   SW1_CS14,   SW2_CS14},
+    {0, SW3_CS15,   SW1_CS15,   SW2_CS15},
+    {0, SW3_CS16,   SW1_CS16,   SW2_CS16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_14,   D_14,   E_14},
-    {0, F_16,   D_16,   E_16},
+    {0, SW6_CS1,    SW4_CS1,    SW5_CS1},
+    {0, SW6_CS2,    SW4_CS2,    SW5_CS2},
+    {0, SW6_CS3,    SW4_CS3,    SW5_CS3},
+    {0, SW6_CS4,    SW4_CS4,    SW5_CS4},
+    {0, SW6_CS5,    SW4_CS5,    SW5_CS5},
+    {0, SW6_CS6,    SW4_CS6,    SW5_CS6},
+    {0, SW6_CS7,    SW4_CS7,    SW5_CS7},
+    {0, SW6_CS8,    SW4_CS8,    SW5_CS8},
+    {0, SW6_CS9,    SW4_CS9,    SW5_CS9},
+    {0, SW6_CS10,   SW4_CS10,   SW5_CS10},
+    {0, SW6_CS11,   SW4_CS11,   SW5_CS11},
+    {0, SW6_CS12,   SW4_CS12,   SW5_CS12},
+    {0, SW6_CS13,   SW4_CS13,   SW5_CS13},
+    {0, SW6_CS14,   SW4_CS14,   SW5_CS14},
+    {0, SW6_CS16,   SW4_CS16,   SW5_CS16},
 
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_16,   G_16,   H_16},
+    {0, SW9_CS1,    SW7_CS1,    SW8_CS1},
+    {0, SW9_CS2,    SW7_CS2,    SW8_CS2},
+    {0, SW9_CS3,    SW7_CS3,    SW8_CS3},
+    {0, SW9_CS4,    SW7_CS4,    SW8_CS4},
+    {0, SW9_CS5,    SW7_CS5,    SW8_CS5},
+    {0, SW9_CS6,    SW7_CS6,    SW8_CS6},
+    {0, SW9_CS7,    SW7_CS7,    SW8_CS7},
+    {0, SW9_CS8,    SW7_CS8,    SW8_CS8},
+    {0, SW9_CS9,    SW7_CS9,    SW8_CS9},
+    {0, SW9_CS10,   SW7_CS10,   SW8_CS10},
+    {0, SW9_CS11,   SW7_CS11,   SW8_CS11},
+    {0, SW9_CS12,   SW7_CS12,   SW8_CS12},
+    {0, SW9_CS13,   SW7_CS13,   SW8_CS13},
+    {0, SW9_CS16,   SW7_CS16,   SW8_CS16},
 
-    {0, L_1,    J_1,    K_1},
-    {0, L_2,    J_2,    K_2},
-    {0, L_3,    J_3,    K_3},
-    {0, L_4,    J_4,    K_4},
-    {0, L_5,    J_5,    K_5},
-    {0, L_6,    J_6,    K_6},
-    {0, L_7,    J_7,    K_7},
-    {0, L_8,    J_8,    K_8},
-    {0, L_9,    J_9,    K_9},
-    {0, L_10,   J_10,   K_10},
-    {0, L_11,   J_11,   K_11},
-    {0, L_12,   J_12,   K_12},
-	{0, L_14,   J_14,   K_14},
-	{0, I_14,   G_14,   H_14},
-    {0, L_16,   J_16,   K_16},
+    {0, SW12_CS1,    SW10_CS1,    SW11_CS1},
+    {0, SW12_CS2,    SW10_CS2,    SW11_CS2},
+    {0, SW12_CS3,    SW10_CS3,    SW11_CS3},
+    {0, SW12_CS4,    SW10_CS4,    SW11_CS4},
+    {0, SW12_CS5,    SW10_CS5,    SW11_CS5},
+    {0, SW12_CS6,    SW10_CS6,    SW11_CS6},
+    {0, SW12_CS7,    SW10_CS7,    SW11_CS7},
+    {0, SW12_CS8,    SW10_CS8,    SW11_CS8},
+    {0, SW12_CS9,    SW10_CS9,    SW11_CS9},
+    {0, SW12_CS10,   SW10_CS10,   SW11_CS10},
+    {0, SW12_CS11,   SW10_CS11,   SW11_CS11},
+    {0, SW12_CS12,   SW10_CS12,   SW11_CS12},
+	{0, SW12_CS14,   SW10_CS14,   SW11_CS14},
+	{0, SW9_CS14,   SW7_CS14,   SW8_CS14},
+    {0, SW12_CS16,   SW10_CS16,   SW11_CS16},
 
-    {1, C_1,    A_1,    B_1},
-    {1, C_2,    A_2,    B_2},
-    {1, C_3,    A_3,    B_3},
-    {1, C_4,    A_4,    B_4},
-    {1, C_5,    A_5,    B_5},
-    {1, C_6,    A_6,    B_6},
-    {1, C_7,    A_7,    B_7},
-    {1, C_8,    A_8,    B_8},
-    {1, C_9,    A_9,    B_9},
-    {1, C_10,   A_10,   B_10},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_14,   A_14,   B_14},
-    {1, C_15,   A_15,   B_15},
+    {1, SW3_CS1,    SW1_CS1,    SW2_CS1},
+    {1, SW3_CS2,    SW1_CS2,    SW2_CS2},
+    {1, SW3_CS3,    SW1_CS3,    SW2_CS3},
+    {1, SW3_CS4,    SW1_CS4,    SW2_CS4},
+    {1, SW3_CS5,    SW1_CS5,    SW2_CS5},
+    {1, SW3_CS6,    SW1_CS6,    SW2_CS6},
+    {1, SW3_CS7,    SW1_CS7,    SW2_CS7},
+    {1, SW3_CS8,    SW1_CS8,    SW2_CS8},
+    {1, SW3_CS9,    SW1_CS9,    SW2_CS9},
+    {1, SW3_CS10,   SW1_CS10,   SW2_CS10},
+    {1, SW3_CS11,   SW1_CS11,   SW2_CS11},
+    {1, SW3_CS12,   SW1_CS12,   SW2_CS12},
+    {1, SW3_CS14,   SW1_CS14,   SW2_CS14},
+    {1, SW3_CS15,   SW1_CS15,   SW2_CS15},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_2,    D_2,    E_2},
-    {1, F_3,    D_3,    E_3},
-    {1, F_7,    D_7,    E_7},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_13,   D_13,   E_13},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
-    {1, F_16,   D_16,   E_16}
+    {1, SW6_CS1,    SW4_CS1,    SW5_CS1},
+    {1, SW6_CS2,    SW4_CS2,    SW5_CS2},
+    {1, SW6_CS3,    SW4_CS3,    SW5_CS3},
+    {1, SW6_CS7,    SW4_CS7,    SW5_CS7},
+    {1, SW6_CS11,   SW4_CS11,   SW5_CS11},
+    {1, SW6_CS12,   SW4_CS12,   SW5_CS12},
+    {1, SW6_CS13,   SW4_CS13,   SW5_CS13},
+    {1, SW6_CS14,   SW4_CS14,   SW5_CS14},
+    {1, SW6_CS15,   SW4_CS15,   SW5_CS15},
+    {1, SW6_CS16,   SW4_CS16,   SW5_CS16}
 };
 
 #define __ NO_LED
@@ -121,28 +121,28 @@ led_config_t g_led_config = {
         // Key Matrix to LED Index
 		{  0, __,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 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, 71, 57, 58 },
-		{ 59, __, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 80, 70, 13 },
-		{ 72, 73, 74, __, __, __, 75, __, __, __, 76, 77, 78, 79, 81 }
+		{ 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 57, 43 },
+		{ 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 72, 56, 58 },
+		{ 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 81, 71, 13 },
+		{ 73, 74, 75, __, __, __, 76, __, __, __, 77, 78, 79, 80, 82 }
 	},
 	{
         // LED Index to Physical Position
         {0,0},           {18,0},  {33,0},  {48,0},  {62,0},  {81,0},  {95,0},   {110,0},  {125,0},  {143,0},  {158,0},  {173,0},  {187,0},  {206,0},  {224,0},
         {0,15}, {15,15}, {29,15}, {44,15}, {59,15}, {73,15}, {88,15}, {103,15}, {118,15}, {132,15}, {147,15}, {162,15}, {176,15}, {198,15},           {224,15},
-        {4,26}, {22,26}, {37,26}, {51,26}, {66,26}, {81,26}, {95,26}, {110,26}, {125,26}, {140,26}, {154,26}, {169,26}, {184,26}, {202,26},           {224,26},
-        {6,38}, {26,38}, {40,38}, {55,38}, {70,38}, {84,38}, {99,38}, {114,38}, {129,38}, {143,38}, {158,38}, {173,38},           {196,38},           {224,38},
-        {9,49},          {33,49}, {48,49}, {62,49}, {77,49}, {92,49}, {106,49}, {121,49}, {136,49}, {151,49}, {165,49},           {185,49}, {209,52},
-        {2,61}, {20,61}, {39,61},                            {94,61},                               {147,61}, {162,61}, {176,61}, {195,64}, {209,64}, {224,64}
+        {4,26}, {22,26}, {37,26}, {51,26}, {66,26}, {81,26}, {95,26}, {110,26}, {125,26}, {140,26}, {154,26}, {169,26}, {184,26},                     {224,26},
+        {6,38}, {26,38}, {40,38}, {55,38}, {70,38}, {84,38}, {99,38}, {114,38}, {129,38}, {143,38}, {158,38}, {173,38}, {187,38}, {203,32},           {224,38},
+        {2,49}, {18,49}, {33,49}, {48,49}, {62,49}, {77,49}, {92,49}, {106,49}, {121,49}, {136,49}, {151,49}, {165,49},           {185,49}, {209,52},
+        {2,61}, {20,61}, {39,61}, {94,61},                            {147,61},                               {162,61}, {176,61}, {195,64}, {209,64}, {224,64}
     },
 	{
         // RGB LED Index to Flag
-        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,    1,
+        1,    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
         1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,    1,
-        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1,
-        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1,    1,
-        1,    4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1, 1,
-        1, 1, 1,          4,          1, 1, 1, 1, 1, 1
+        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,       1,
+        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,    1,
+        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1, 1,
+        1, 1, 1,           4,         1, 1, 1, 1, 1, 1
 	}
 };
 
diff --git a/keyboards/keychron/q1v1/iso/keymaps/kubahorak/README.md b/keyboards/keychron/q1v1/iso/keymaps/kubahorak/README.md
deleted file mode 100644
index 3cfae17543b..00000000000
--- a/keyboards/keychron/q1v1/iso/keymaps/kubahorak/README.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# kubahorak's Keychron Q1 keymap
-
-This ISO layout got heavily inspired by gtg465x's ANSI keymap (rev_0100).
-
-Features:
-- The rightest key column is: Ins, Home, PgUp, PgDn, which differs from the default.
-- RGB lighting turns off when the computer sleeps
-- Caps Lock and alpha keys turn red to indicate when Caps Lock is on
-- When the Fn layer is active, RGB lighting turns off for keys that are not assigned
-
-## Changelog
-
-### 2021-10-17 - 1.0.0
-
-- Initial release
-
diff --git a/keyboards/keychron/q1v1/iso/keymaps/kubahorak/config.h b/keyboards/keychron/q1v1/iso/keymaps/kubahorak/config.h
deleted file mode 100644
index 854c1d18eee..00000000000
--- a/keyboards/keychron/q1v1/iso/keymaps/kubahorak/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2021 Jakub Horak (@kubahorak)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#ifdef RGB_MATRIX_ENABLE
-/* from rev_0100/keymaps/gtg465x */
-#    define RGB_MATRIX_SLEEP
-#    define CAPS_LOCK_INDICATOR_COLOR RGB_RED
-#    define CAPS_LOCK_INDICATOR_LIGHT_ALPHAS
-#    define FN_LAYER_TRANSPARENT_KEYS_OFF
-#endif
diff --git a/keyboards/keychron/q1v1/iso/keymaps/kubahorak/keymap.c b/keyboards/keychron/q1v1/iso/keymaps/kubahorak/keymap.c
deleted file mode 100644
index 479988dfa9f..00000000000
--- a/keyboards/keychron/q1v1/iso/keymaps/kubahorak/keymap.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/* Copyright 2021 Jakub Horak (@kubahorak)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-#include "keymap_user.h"
-#ifdef RGB_MATRIX_ENABLE
-#    include "rgb_matrix_user.h"
-#endif
-
-// clang-format off
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[0] = LAYOUT_iso_83(
-            KC_ESC,    KC_BRID,   KC_BRIU,   KC_F3,    KC_F4,     RGB_VAD,   RGB_VAI,   KC_MPRV,   KC_MPLY,   KC_MNXT,   KC_MUTE,   KC_VOLD,   KC_VOLU,   KC_DEL,    KC_INS,
-            KC_GRV,    KC_1,      KC_2,      KC_3,     KC_4,      KC_5,      KC_6,      KC_7,      KC_8,      KC_9,      KC_0,      KC_MINS,   KC_EQL,    KC_BSPC,   KC_HOME,
-            KC_TAB,    KC_Q,      KC_W,      KC_E,     KC_R,      KC_T,      KC_Y,      KC_U,      KC_I,      KC_O,      KC_P,      KC_LBRC,   KC_RBRC,   KC_PGUP,
-            KC_CAPS,   KC_A,      KC_S,      KC_D,     KC_F,      KC_G,      KC_H,      KC_J,      KC_K,      KC_L,      KC_SCLN,   KC_QUOT,   KC_NUHS,   KC_ENT,    KC_PGDN,
-            KC_LSFT,   KC_NUBS,   KC_Z,      KC_X,     KC_C,      KC_V,      KC_B,      KC_N,      KC_M,      KC_COMM,   KC_DOT,    KC_SLSH,   KC_RSFT,   KC_UP,
-            KC_LCTL,   KC_LALT,   KC_LGUI,   KC_SPC,   KC_RGUI,   MO(1),     KC_RCTL,   KC_LEFT,   KC_DOWN,   KC_RGHT
-            ),
-	[1] = LAYOUT_iso_83(
-            KC_TRNS,   KC_F1,      KC_F2,     KC_F3,     KC_F4,     KC_F5,     KC_F6,     KC_F7,     KC_F8,     KC_F9,     KC_F10,    KC_F11,    KC_F12,    KC_TRNS,   KC_TRNS,
-            KC_TRNS,   KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_P7,     KC_P8,     KC_P9,     KC_PSLS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
-            RGB_TOG,   RGB_MOD,    RGB_VAI,   RGB_HUI,   RGB_SAI,   RGB_SPI,   KC_TRNS,   KC_P4,     KC_P5,     KC_P6,     KC_PAST,   KC_TRNS,   KC_TRNS,   KC_TRNS,
-            KC_TRNS,   RGB_RMOD,   RGB_VAD,   RGB_HUD,   RGB_SAD,   RGB_SPD,   KC_TRNS,   KC_P1,     KC_P2,     KC_P3,     KC_PMNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
-            KC_TRNS,   KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_P0,     KC_PDOT,   KC_PENT,   KC_PPLS,   KC_TRNS,   KC_TRNS,
-            KC_TRNS,   KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS
-            ),
-    [2] = LAYOUT_iso_83(
-            KC_ESC,    KC_F1,     KC_F2,     KC_F3,    KC_F4,     KC_F5,   KC_F6,     KC_F7,     KC_F8,     KC_F9,     KC_F10,    KC_F11,    KC_F12,    KC_DEL,    KC_INS,
-            KC_GRV,    KC_1,      KC_2,      KC_3,     KC_4,      KC_5,    KC_6,      KC_7,      KC_8,      KC_9,      KC_0,      KC_MINS,   KC_EQL,    KC_BSPC,   KC_HOME,
-            KC_TAB,    KC_Q,      KC_W,      KC_E,     KC_R,      KC_T,    KC_Y,      KC_U,      KC_I,      KC_O,      KC_P,      KC_LBRC,   KC_RBRC,   KC_PGUP,
-            KC_CAPS,   KC_A,      KC_S,      KC_D,     KC_F,      KC_G,    KC_H,      KC_J,      KC_K,      KC_L,      KC_SCLN,   KC_QUOT,   KC_NUHS,   KC_ENT,    KC_PGDN,
-            KC_LSFT,   KC_NUBS,   KC_Z,      KC_X,     KC_C,      KC_V,    KC_B,      KC_N,      KC_M,      KC_COMM,   KC_DOT,    KC_SLSH,   KC_RSFT,   KC_UP,
-            KC_LCTL,   KC_LGUI,   KC_LALT,   KC_SPC,   KC_RALT,   MO(3),   KC_RCTL,   KC_LEFT,   KC_DOWN,   KC_RGHT
-            ),
-	[3] = LAYOUT_iso_83(
-            KC_TRNS,   KC_BRID,    KC_BRIU,   LGUI(KC_TAB),   LGUI(KC_E),   RGB_VAD,   RGB_VAI,   KC_MPRV,   KC_MPLY,   KC_MNXT,   KC_MUTE,   KC_VOLD,   KC_VOLU,   KC_TRNS,   KC_TRNS,
-            KC_TRNS,   KC_TRNS,    KC_TRNS,   KC_TRNS,        KC_TRNS,      KC_TRNS,   KC_TRNS,   KC_P7,     KC_P8,     KC_P9,     KC_PSLS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
-            RGB_TOG,   RGB_MOD,    RGB_VAI,   RGB_HUI,        RGB_SAI,      RGB_SPI,   KC_TRNS,   KC_P4,     KC_P5,     KC_P6,     KC_PAST,   KC_TRNS,   KC_TRNS,   KC_TRNS,
-            KC_TRNS,   RGB_RMOD,   RGB_VAD,   RGB_HUD,        RGB_SAD,      RGB_SPD,   KC_TRNS,   KC_P1,     KC_P2,     KC_P3,     KC_PMNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
-            KC_TRNS,   KC_TRNS,    KC_TRNS,   KC_TRNS,        KC_TRNS,      KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_P0,     KC_PDOT,   KC_PENT,   KC_PPLS,   KC_TRNS,   KC_TRNS,
-            KC_TRNS,   KC_TRNS,    KC_TRNS,   KC_TRNS,        KC_TRNS,      KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS
-            )
-};
-
-// clang-format on
-
-void matrix_init_user(void) {
-#ifdef RGB_MATRIX_ENABLE
-    rgb_matrix_init_user();
-#endif
-}
diff --git a/keyboards/keychron/q1v1/iso/keymaps/kubahorak/rgb_matrix_user.c b/keyboards/keychron/q1v1/iso/keymaps/kubahorak/rgb_matrix_user.c
deleted file mode 100644
index 638aa77eb0a..00000000000
--- a/keyboards/keychron/q1v1/iso/keymaps/kubahorak/rgb_matrix_user.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/* Copyright 2021 @ Grayson Carr
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-#include "rgb_matrix_user.h"
-#include "keymap_user.h"
-
-keypos_t led_index_key_position[RGB_MATRIX_LED_COUNT];
-
-void rgb_matrix_init_user(void) {
-    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        for (uint8_t col = 0; col < MATRIX_COLS; col++) {
-            uint8_t led_index = g_led_config.matrix_co[row][col];
-            if (led_index != NO_LED) {
-                led_index_key_position[led_index] = (keypos_t){.row = row, .col = col};
-            }
-        }
-    }
-}
-
-bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
-    uint8_t current_layer = get_highest_layer(layer_state);
-    switch (current_layer) {
-        case MAC_BASE:
-        case WIN_BASE:
-#ifdef CAPS_LOCK_INDICATOR_COLOR
-            if (host_keyboard_led_state().caps_lock) {
-                rgb_matrix_set_color_by_keycode(led_min, led_max, current_layer, is_caps_lock_indicator, CAPS_LOCK_INDICATOR_COLOR);
-            }
-#endif
-            break;
-        case MAC_FN:
-        case WIN_FN:
-#ifdef FN_LAYER_TRANSPARENT_KEYS_OFF
-            rgb_matrix_set_color_by_keycode(led_min, led_max, current_layer, is_transparent, RGB_OFF);
-#endif
-            break;
-    }
-    return false;
-}
-
-void rgb_matrix_set_color_by_keycode(uint8_t led_min, uint8_t led_max, uint8_t layer, bool (*is_keycode)(uint16_t), uint8_t red, uint8_t green, uint8_t blue) {
-    for (uint8_t i = led_min; i < led_max; i++) {
-        uint16_t keycode = keymap_key_to_keycode(layer, led_index_key_position[i]);
-        if ((*is_keycode)(keycode)) {
-            rgb_matrix_set_color(i, red, green, blue);
-        }
-    }
-}
-
-bool is_caps_lock_indicator(uint16_t keycode) {
-    switch (keycode) {
-#ifdef CAPS_LOCK_INDICATOR_LIGHT_ALPHAS
-    case KC_A ... KC_Z:
-#endif
-    case KC_CAPS:
-        return true;
-    default:
-        return false;
-    }
-}
-
-bool is_transparent(uint16_t keycode) { return keycode == KC_TRNS; }
diff --git a/keyboards/keychron/q1v1/iso/keymaps/kubahorak/rgb_matrix_user.h b/keyboards/keychron/q1v1/iso/keymaps/kubahorak/rgb_matrix_user.h
deleted file mode 100644
index dead4541676..00000000000
--- a/keyboards/keychron/q1v1/iso/keymaps/kubahorak/rgb_matrix_user.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2021 @ Grayson Carr
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-void rgb_matrix_init_user(void);
-
-void rgb_matrix_set_color_by_keycode(uint8_t led_min, uint8_t led_max, uint8_t layer, bool (*is_keycode)(uint16_t), uint8_t red, uint8_t green, uint8_t blue);
-
-bool is_caps_lock_indicator(uint16_t keycode);
-bool is_transparent(uint16_t keycode);
diff --git a/keyboards/keychron/q1v1/iso/keymaps/kubahorak/rules.mk b/keyboards/keychron/q1v1/iso/keymaps/kubahorak/rules.mk
deleted file mode 100644
index af720e37ee7..00000000000
--- a/keyboards/keychron/q1v1/iso/keymaps/kubahorak/rules.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-VIA_ENABLE = yes
-MOUSEKEY_ENABLE = no
-
-ifeq ($(strip $(RGB_MATRIX_ENABLE)), yes)
-    SRC += rgb_matrix_user.c
-endif
\ No newline at end of file
diff --git a/keyboards/keychron/q1v1/iso/keymaps/mkillewald_iso/config.h b/keyboards/keychron/q1v1/iso/keymaps/mkillewald_iso/config.h
deleted file mode 100644
index acd208b8c67..00000000000
--- a/keyboards/keychron/q1v1/iso/keymaps/mkillewald_iso/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2021 @ Mike Killewald
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#ifdef RGB_MATRIX_ENABLE
-#    define RGB_MATRIX_SLEEP
-#    define CAPS_LOCK_INDICATOR_COLOR RGB_RED
-#    define FN_LAYER_COLOR RGB_ORANGE
-#endif
\ No newline at end of file
diff --git a/keyboards/keychron/q1v1/iso/keymaps/mkillewald_iso/keymap.c b/keyboards/keychron/q1v1/iso/keymaps/mkillewald_iso/keymap.c
deleted file mode 100644
index f86a84e468d..00000000000
--- a/keyboards/keychron/q1v1/iso/keymaps/mkillewald_iso/keymap.c
+++ /dev/null
@@ -1,153 +0,0 @@
-/* Copyright 2021 @ Mike Killewald
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-#include "keymap_user.h"
-#ifdef RGB_MATRIX_ENABLE
-#    include "rgb_matrix_user.h"
-#endif
-
-// clang-format off
-
-typedef union {
-  uint32_t raw;
-  struct {
-    bool caps_lock_light_tab :1;
-    bool caps_lock_light_alphas :1;
-    bool fn_layer_transparent_keys_off :1;
-    bool fn_layer_color_enable :1;
-  };
-} user_config_t;
-
-user_config_t user_config;
-
-enum custom_keycodes {
-    KC_LIGHT_TAB_TOGGLE = QK_KB_2, // TECH DEBT: Starts at QK_KB_2 to maintain ordering with VIA definitions. See #19884. Revert to QK_KB_0 when VIA catches up with QMK.
-    KC_LIGHT_ALPHAS_TOGGLE,
-    KC_FN_LAYER_TRANSPARENT_KEYS_TOGGLE,
-    KC_FN_LAYER_COLOR_TOGGLE
-};
-
-#define KC_LTTOG KC_LIGHT_TAB_TOGGLE
-#define KC_LATOG KC_LIGHT_ALPHAS_TOGGLE
-#define KC_TKTOG KC_FN_LAYER_TRANSPARENT_KEYS_TOGGLE
-#define KC_FCTOG KC_FN_LAYER_COLOR_TOGGLE
-#define KC_TASK LGUI(KC_TAB)
-#define KC_FLXP LGUI(KC_E)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-[MAC_BASE] = LAYOUT_iso_83(
-     KC_ESC,             KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,  KC_DEL,   KC_INS,
-     KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,            KC_PGUP,
-     KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,                      KC_PGDN,
-     KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS,  KC_ENT,             KC_HOME,
-     KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,            KC_RSFT,  KC_UP,
-     KC_LCTL,  KC_LALT,  KC_LGUI,                                KC_SPC,                                 KC_RGUI, MO(MAC_FN),KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
-
-[MAC_FN] = LAYOUT_iso_83(
-     KC_TRNS,            KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_TRNS,  KC_TRNS,
-     KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
-     RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,                      KC_TRNS,
-     KC_TRNS,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
-     KC_TRNS,  KC_TRNS,  KC_LTTOG, KC_LATOG, KC_TKTOG, KC_FCTOG, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,
-     KC_TRNS,  KC_TRNS,  KC_TRNS,                                KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS),
-
-[WIN_BASE] = LAYOUT_iso_83(
-     KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_DEL,   KC_INS,
-     KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,            KC_PGUP,
-     KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,                      KC_PGDN,
-     KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS,  KC_ENT,             KC_HOME,
-     KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,            KC_RSFT,  KC_UP,
-     KC_LCTL,  KC_LGUI,  KC_LALT,                                KC_SPC,                                 KC_RALT, MO(WIN_FN),KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
-
-[WIN_FN] = LAYOUT_iso_83(
-     KC_TRNS,            KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,  KC_TRNS,  KC_TRNS,
-     KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
-     RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,                      KC_TRNS,
-     KC_TRNS,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
-     KC_TRNS,  KC_TRNS,  KC_LTTOG, KC_LATOG, KC_TKTOG, KC_FCTOG, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,
-     KC_TRNS,  KC_TRNS,  KC_TRNS,                                KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS)
-
-};
-
-// clang-format on
-
-void matrix_init_user(void) {
-#ifdef RGB_MATRIX_ENABLE
-    rgb_matrix_init_user();
-#endif
-}
-
-void keyboard_post_init_user(void) {
-    user_config.raw = eeconfig_read_user();
-}
-
-void eeconfig_init_user(void) {
-    user_config.raw = 0;
-    user_config.caps_lock_light_tab = false;
-    user_config.caps_lock_light_alphas = false;
-    user_config.fn_layer_transparent_keys_off = true;
-    user_config.fn_layer_color_enable = false;
-    eeconfig_update_user(user_config.raw);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case KC_LIGHT_TAB_TOGGLE:
-            if (record->event.pressed) {
-                user_config.caps_lock_light_tab ^= 1; // bitwise xor to toggle status bit
-                eeconfig_update_user(user_config.raw);
-            }
-            return false;  // Skip all further processing of this key
-        case KC_LIGHT_ALPHAS_TOGGLE:
-            if (record->event.pressed) {
-                user_config.caps_lock_light_alphas ^= 1;
-                eeconfig_update_user(user_config.raw);
-            }
-            return false;  // Skip all further processing of this key
-        case KC_FN_LAYER_TRANSPARENT_KEYS_TOGGLE:
-            if (record->event.pressed) {
-                user_config.fn_layer_transparent_keys_off ^= 1;
-                eeconfig_update_user(user_config.raw);
-            }
-            return false;  // Skip all further processing of this key
-        case KC_FN_LAYER_COLOR_TOGGLE:
-            if (record->event.pressed) {
-                user_config.fn_layer_color_enable ^= 1;
-                eeconfig_update_user(user_config.raw);
-            }
-            return false;  // Skip all further processing of this key
-        default:
-            return true;  // Process all other keycodes normally
-    }
-}
-
-bool get_caps_lock_light_tab(void) {
-    return user_config.caps_lock_light_tab;
-}
-
-bool get_caps_lock_light_alphas(void) {
-    return user_config.caps_lock_light_alphas;
-}
-
-bool get_fn_layer_transparent_keys_off(void) {
-    return user_config.fn_layer_transparent_keys_off;
-}
-
-bool get_fn_layer_color_enable(void) {
-    return user_config.fn_layer_color_enable;
-}
diff --git a/keyboards/keychron/q1v1/iso/keymaps/mkillewald_iso/keymap_user.h b/keyboards/keychron/q1v1/iso/keymaps/mkillewald_iso/keymap_user.h
deleted file mode 100644
index 87b1baf47f2..00000000000
--- a/keyboards/keychron/q1v1/iso/keymaps/mkillewald_iso/keymap_user.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2021 @ Mike Killewald
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-// clang-format off
-
-enum layers {
-    MAC_BASE,
-    MAC_FN,
-    WIN_BASE,
-    WIN_FN
-};
-
-// clang-format on
-
-bool get_caps_lock_light_tab(void);
-bool get_caps_lock_light_alphas(void);
-bool get_fn_layer_transparent_keys_off(void);
-bool get_fn_layer_color_enable(void);
\ No newline at end of file
diff --git a/keyboards/keychron/q1v1/iso/keymaps/mkillewald_iso/readme.md b/keyboards/keychron/q1v1/iso/keymaps/mkillewald_iso/readme.md
deleted file mode 100644
index 25d835b1c02..00000000000
--- a/keyboards/keychron/q1v1/iso/keymaps/mkillewald_iso/readme.md
+++ /dev/null
@@ -1,54 +0,0 @@
-## mkillewald's Keychron Q1 keymap (ISO rev_0102) v1.0.4
-
-This keymap builds on the keymap by Grayson Carr (gtg465x) but adds a couple options.
-
-## Features:
-- On macOS, F3 opens Mission Control and F4 opens Launchpad without needing to configure shortcuts in System Preferences
-- RGB lighting turns off when the computer sleeps
-- Caps Lock RGB indicator
-    - the Caps Lock key will light when Caps Lock is enabled with the following options:
-        - #define CAPS_LOCK_INDICATOR_COLOR [color] in config.h to set the backlight color used for the indicator when Caps Lock is enabled (default: red)
-        - Fn+Z will toggle lighting the TAB key when Caps Lock is enabled. This is useful with non backlit keycaps/legends. (default: off)
-        - Fn+X will toggle lighting all the alpha keys when Caps Lock is enabled. (default: off)
-
-- Dynamic Fn layer RGB indicator
-    - When the Fn key is held down, any keys defined on the Fn layer in this firmware or in VIA will be highlighted with the following options:
-        - #define FN_LAYER_COLOR [color] in config.h to set a static color for defined keys (default: orange)
-        - Fn+C will toggle turning off RGB for keys with no definition (default: RGB off)
-        - Fn+V will toggle lighting the defined Fn layer keys with the static color set with FN_LAYER_COLOR (default: static color off)
-
-- All custom keycodes can be moved to different keys in VIA by using the ANY key with the following keycodes:
-    - USER(0) (default: F3) macOS Mission Control
-    - USER(1) (default: F4) macOS Launchpad
-    - USER(2) (default: Fn+Z) Caps Lock light Tab toggle
-    - USER(3) (default: Fn+X) Caps Lock light alphas toggle
-    - USER(4) (default: Fn+C) Fn layer non-defined keys RGB toggle
-    - USER(5) (default: Fn+V) Fn layer defined keys static color toggle
-
-RGB must be toggled on for all indicators to function. If you do not want an RGB mode active but still want the indicators, toggle RGB on and turn the brightness all the way off. The indicators will remain at full brightness.
-
-Please make sure to save any customizations you have made in VIA to a .json file before flashing the firmware. Sometimes it has been necessary to re-apply those changes in VIA after flashing the firmware. If that is the case, you will most likely need to manually add the USER(0) through USER(5) custom keycodes after loading your customizations from the saved .json file. Then re-save a new .json file which will have your previous customizations and the custom keycodes for future use as needed.
-    
-#### USE AT YOUR OWN RISK
-
-## Changelog:
-
-v1.0.4  October 9, 2021
-- Caps Lock and Fn layer toggles are now stored in eeprom so settings will remain when Q1 is unplugged
-
-v1.0.3  October 8, 2021
-- now using keycode toggles instead of preprocessor directives to set the various Caps Lock and Fn Layer RGB lighting options. This allows for setting the options from user space without having to recompile.
-
-v1.0.2  October 7, 2021
-- adapted Grayson Carr's (gtg465x) Caps Lock alphas and dynamic Fn layer RGB routines
-- added CAPS_LOCK_INDICATOR_LIGHT_TAB config option to enable/disable lighting Tab with Caps Lock indicator
-- added FN_LAYER_COLOR config option to set FN layer static color
-
-v1.0.1  October 7, 2021
-- Mission Control and Launchpad custom keycodes are now defined using the VIA user keycodes range so thay can be labeled properly in VIA (adopted change from gtg465x)
-
-v1.0.0  September 30, 2021
-- Initial release built upon keymap by Grayson Carr (gtg465x)
-- defined Mission Control (F3) and Launchpad (F4) keycodes for macOs
-- RGB backlight turns off when computer sleeps
-- added Caps Lock indicator lighting both the Caps Lock and Tab LEDs for better effect on non-backlit keycaps
diff --git a/keyboards/keychron/q1v1/iso/keymaps/mkillewald_iso/rgb_matrix_user.c b/keyboards/keychron/q1v1/iso/keymaps/mkillewald_iso/rgb_matrix_user.c
deleted file mode 100644
index c6fa5f1f155..00000000000
--- a/keyboards/keychron/q1v1/iso/keymaps/mkillewald_iso/rgb_matrix_user.c
+++ /dev/null
@@ -1,84 +0,0 @@
-/* Copyright 2021 @ Mike Killewald
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-#include "rgb_matrix_user.h"
-#include "keymap_user.h"
-
-keypos_t led_index_key_position[RGB_MATRIX_LED_COUNT];
-
-void rgb_matrix_init_user(void) {
-    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        for (uint8_t col = 0; col < MATRIX_COLS; col++) {
-            uint8_t led_index = g_led_config.matrix_co[row][col];
-            if (led_index != NO_LED) {
-                led_index_key_position[led_index] = (keypos_t){.row = row, .col = col};
-            }
-        }
-    }
-}
-
-bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
-    uint8_t current_layer = get_highest_layer(layer_state);
-    switch (current_layer) {
-        case MAC_BASE:
-        case WIN_BASE:
-#ifdef CAPS_LOCK_INDICATOR_COLOR
-            if (host_keyboard_led_state().caps_lock) {
-                rgb_matrix_set_color_by_keycode(led_min, led_max, current_layer, is_caps_lock_indicator, CAPS_LOCK_INDICATOR_COLOR);
-            }
-#endif
-            break;
-        case MAC_FN:
-        case WIN_FN:
-#ifdef FN_LAYER_COLOR
-            if (get_fn_layer_color_enable()) {
-                rgb_matrix_set_color_by_keycode(led_min, led_max, current_layer, is_not_transparent, FN_LAYER_COLOR);
-            }
-#endif
-            if (get_fn_layer_transparent_keys_off()) {
-                rgb_matrix_set_color_by_keycode(led_min, led_max, current_layer, is_transparent, RGB_OFF);
-            }
-            break;
-    }
-    return false;
-}
-
-void rgb_matrix_set_color_by_keycode(uint8_t led_min, uint8_t led_max, uint8_t layer, bool (*is_keycode)(uint16_t), uint8_t red, uint8_t green, uint8_t blue) {
-    for (uint8_t i = led_min; i < led_max; i++) {
-        uint16_t keycode = keymap_key_to_keycode(layer, led_index_key_position[i]);
-        if ((*is_keycode)(keycode)) {
-            rgb_matrix_set_color(i, red, green, blue);
-        }
-    }
-}
-
-bool is_caps_lock_indicator(uint16_t keycode) {
-    bool indicator = keycode == KC_CAPS;
-
-    if (get_caps_lock_light_tab()) {
-        indicator = keycode == KC_TAB || keycode == KC_CAPS;
-    }
-
-    if (get_caps_lock_light_alphas()) {
-        return (KC_A <= keycode && keycode <= KC_Z) || indicator;
-    } else {
-        return indicator;
-    }
-}
-
-bool is_transparent(uint16_t keycode) { return keycode == KC_TRNS; }
-bool is_not_transparent(uint16_t keycode) { return keycode != KC_TRNS; }
diff --git a/keyboards/keychron/q1v1/iso/keymaps/mkillewald_iso/rgb_matrix_user.h b/keyboards/keychron/q1v1/iso/keymaps/mkillewald_iso/rgb_matrix_user.h
deleted file mode 100644
index 1fb79c0b2a1..00000000000
--- a/keyboards/keychron/q1v1/iso/keymaps/mkillewald_iso/rgb_matrix_user.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2021 @ Mike Killewald
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-void rgb_matrix_init_user(void);
-
-void rgb_matrix_set_color_by_keycode(uint8_t led_min, uint8_t led_max, uint8_t layer, bool (*is_keycode)(uint16_t), uint8_t red, uint8_t green, uint8_t blue);
-
-bool is_caps_lock_indicator(uint16_t keycode);
-bool is_transparent(uint16_t keycode);
-bool is_not_transparent(uint16_t keycode);
-
diff --git a/keyboards/keychron/q1v1/iso/keymaps/mkillewald_iso/rules.mk b/keyboards/keychron/q1v1/iso/keymaps/mkillewald_iso/rules.mk
deleted file mode 100644
index af720e37ee7..00000000000
--- a/keyboards/keychron/q1v1/iso/keymaps/mkillewald_iso/rules.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-VIA_ENABLE = yes
-MOUSEKEY_ENABLE = no
-
-ifeq ($(strip $(RGB_MATRIX_ENABLE)), yes)
-    SRC += rgb_matrix_user.c
-endif
\ No newline at end of file
diff --git a/keyboards/keychron/q1v1/iso/keymaps/victorsavu3/config.h b/keyboards/keychron/q1v1/iso/keymaps/victorsavu3/config.h
deleted file mode 100644
index 02f08db4a7f..00000000000
--- a/keyboards/keychron/q1v1/iso/keymaps/victorsavu3/config.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* Copyright 2021 @ Victor-Gabriel Savu
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-// disable all default effects
-#undef ENABLE_RGB_MATRIX_BREATHING
-#undef ENABLE_RGB_MATRIX_CYCLE_ALL
-#undef ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#undef ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-#undef ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-#undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-#undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-#undef ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-#undef ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-#undef ENABLE_RGB_MATRIX_DUAL_BEACON
-#undef ENABLE_RGB_MATRIX_RAINBOW_BEACON
-#undef ENABLE_RGB_MATRIX_RAINDROPS
-#undef ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#undef ENABLE_RGB_MATRIX_DIGITAL_RAIN
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-#undef ENABLE_RGB_MATRIX_SPLASH
-#undef ENABLE_RGB_MATRIX_MULTISPLASH
-#undef ENABLE_RGB_MATRIX_SOLID_SPLASH
-#undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-
-// Allow fancy RGB
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-
-// Simple RGB
-#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-
-// Reactive RGB
-#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_TYPING_HEATMAP
-
-#define RGB_MATRIX_TYPING_HEATMAP_DECREASE_DELAY_MS 50
-
-// Unicode for Linux
-#define UNICODE_SELECTED_MODES UNICODE_MODE_LINUX
-#define UNICODE_KEY_LNX  LCTL(LSFT(KC_U))
-
-// Leader config
-#define LEADER_PER_KEY_TIMING
-#define LEADER_TIMEOUT 500
diff --git a/keyboards/keychron/q1v1/iso/keymaps/victorsavu3/keymap.c b/keyboards/keychron/q1v1/iso/keymaps/victorsavu3/keymap.c
deleted file mode 100644
index 5256c97dca7..00000000000
--- a/keyboards/keychron/q1v1/iso/keymaps/victorsavu3/keymap.c
+++ /dev/null
@@ -1,146 +0,0 @@
-/* Copyright 2021 @ Victor-Gabriel Savu
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-enum layers{
-  MAC_BASE,
-  MAC_FN,
-  WIN_BASE,
-  WIN_FN
-};
-
-#define KC_TASK LGUI(KC_TAB)
-#define KC_FLXP LGUI(KC_E)
-
-enum unicode_names {
-    GRIN,
-    SAD,
-};
-
-const uint32_t unicode_map[] PROGMEM = {
-    [GRIN]  = 0x1F600,  // 😀
-    [SAD]   = 0x1F61E,  // 😞
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-[MAC_BASE] = LAYOUT_iso_83(
-     KC_ESC,             KC_BRID,  KC_BRIU,  KC_F3,    KC_F4,    RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,  KC_DEL,   KC_INS,
-     KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,            KC_PGUP,
-     KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,                      KC_PGDN,
-     KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS,  KC_ENT,             KC_HOME,
-     KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,            KC_RSFT,  KC_UP,
-     KC_LCTL,  KC_LALT,  KC_LGUI,                                KC_SPC,                                 KC_RGUI, MO(MAC_FN),KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
-
-[MAC_FN] = LAYOUT_iso_83(
-     KC_TRNS,            KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_TRNS,  KC_TRNS,
-     KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
-     RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,                      KC_TRNS,
-     KC_TRNS,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
-     KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,
-     KC_TRNS,  KC_TRNS,  KC_TRNS,                                KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS),
-
-[WIN_BASE] = LAYOUT_iso_83(
-     KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_DEL,   UM(SAD),
-     KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,            UM(GRIN),
-     KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,                      KC_PGUP,
-     QK_LEAD,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS,  KC_ENT,             KC_PGDN,
-     KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,            KC_RSFT,  KC_UP,
-     KC_LCTL,  KC_LGUI,  KC_LALT,                                KC_SPC,                                 KC_RALT, MO(WIN_FN),KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
-
-[WIN_FN] = LAYOUT_iso_83(
-     KC_TRNS,            KC_BRID,  KC_BRIU,  KC_CALC,  KC_FLXP,  RGB_VAD,  RGB_VAI,  KC_TRNS,  KC_PSCR,  KC_MUTE,  KC_VOLD,  KC_VOLU,  KC_MPLY,  KC_TRNS,  KC_TRNS,
-     KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
-     RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,                      KC_TRNS,
-     KC_CAPS,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
-     KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_PGUP,
-     KC_TRNS,  KC_TRNS,  KC_TRNS,                                KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_HOME,  KC_PGDN,  KC_END)
-
-};
-
-static bool wiggle_mouse;
-static uint16_t wiggle_timer;
-static uint16_t next_wiggle;
-
-void leader_end_user(void) {
-    if (leader_sequence_one_key(QK_LEAD)) {
-        tap_code(KC_CAPS);
-    }
-
-    if (leader_sequence_four_keys(KC_I, KC_D, KC_L, KC_E)) {
-        wiggle_mouse = !wiggle_mouse;
-        wiggle_timer = timer_read();
-    }
-
-    if (leader_sequence_two_keys(KC_O, KC_K)) {
-        send_unicode_string("👍");
-    }
-
-    if (leader_sequence_three_keys(KC_S, KC_A, KC_D)) {
-        send_unicode_string("😞");
-    }
-
-    if (leader_sequence_five_keys(KC_C, KC_H, KC_E, KC_C, KC_K)) {
-        send_unicode_string("✅");
-    }
-
-    if (leader_sequence_five_keys(KC_C, KC_R, KC_O, KC_S, KC_S)) {
-        send_unicode_string("❎");
-    }
-
-    if (leader_sequence_five_keys(KC_T, KC_H, KC_A, KC_N, KC_K)) {
-        send_unicode_string("🙏");
-    }
-
-    if (leader_sequence_five_keys(KC_S, KC_M, KC_I, KC_L, KC_E)) {
-        send_unicode_string("😊");
-    }
-
-    if (leader_sequence_five_keys(KC_P, KC_A, KC_R, KC_T, KC_Y)) {
-        send_unicode_string("🎉");
-    }
-
-    if (leader_sequence_four_keys(KC_E, KC_Y, KC_E, KC_S)) {
-        send_unicode_string("(ಠ_ಠ)");
-    }
-
-    if (leader_sequence_five_keys(KC_M, KC_A, KC_G, KC_I, KC_C)) {
-        send_unicode_string("(ಠ_ಠ) 🪄 ⠁⭒*.✫.*⭒⠁");
-    }
-
-    if (leader_sequence_five_keys(KC_T, KC_A, KC_B, KC_L, KC_E)) {
-        send_unicode_string("(ノಠ痊ಠ)ノ彡┻━┻");
-    }
-
-    if (leader_sequence_five_keys(KC_S, KC_H, KC_R, KC_U, KC_G)) {
-        send_unicode_string("¯\\_(ツ)_/¯");
-    }
-}
-
-void matrix_scan_user(void) {
-    if (wiggle_mouse && timer_elapsed(wiggle_timer) > next_wiggle) {
-        wiggle_timer = timer_read();
-
-        uint8_t rval = TCNT0 + TCNT1 + TCNT3 + TCNT4;
-        next_wiggle = rval % 1000;
-
-        if (rval & 1) tap_code(KC_MS_UP);
-        if (rval & 2) tap_code(KC_MS_DOWN);
-        if (rval & 4) tap_code(KC_MS_LEFT);
-        if (rval & 8) tap_code(KC_MS_RIGHT);
-    }
-}
diff --git a/keyboards/keychron/q1v1/iso/keymaps/victorsavu3/readme.md b/keyboards/keychron/q1v1/iso/keymaps/victorsavu3/readme.md
deleted file mode 100644
index c96130816e9..00000000000
--- a/keyboards/keychron/q1v1/iso/keymaps/victorsavu3/readme.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# victorsavu3's Keychron Q1 keymap (ISO)
-
-Very similar to the default layout. Enables reactive and framebuffer RGB, but disables most effects enabled by keychron.
-Uses Caps Lock as a leader key for emojis and to enable a random mouse wiggler to prevent the system from going to sleep.
diff --git a/keyboards/keychron/q1v1/iso/keymaps/victorsavu3/rules.mk b/keyboards/keychron/q1v1/iso/keymaps/victorsavu3/rules.mk
deleted file mode 100644
index 853c414ec7e..00000000000
--- a/keyboards/keychron/q1v1/iso/keymaps/victorsavu3/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-MOUSEKEY_ENABLE = yes
-UNICODEMAP_ENABLE = yes
-LEADER_ENABLE = yes
diff --git a/keyboards/keychron/q1v1/iso_encoder/iso_encoder.c b/keyboards/keychron/q1v1/iso_encoder/iso_encoder.c
index e46a17cdc63..e1c535b3182 100644
--- a/keyboards/keychron/q1v1/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/q1v1/iso_encoder/iso_encoder.c
@@ -25,94 +25,94 @@ const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_1,    A_1,    B_1},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_15,   A_15,   B_15},
-    {0, C_16,   A_16,   B_16},
+    {0, SW3_CS1,    SW1_CS1,    SW2_CS1},
+    {0, SW3_CS3,    SW1_CS3,    SW2_CS3},
+    {0, SW3_CS4,    SW1_CS4,    SW2_CS4},
+    {0, SW3_CS5,    SW1_CS5,    SW2_CS5},
+    {0, SW3_CS6,    SW1_CS6,    SW2_CS6},
+    {0, SW3_CS7,    SW1_CS7,    SW2_CS7},
+    {0, SW3_CS8,    SW1_CS8,    SW2_CS8},
+    {0, SW3_CS9,    SW1_CS9,    SW2_CS9},
+    {0, SW3_CS10,   SW1_CS10,   SW2_CS10},
+    {0, SW3_CS11,   SW1_CS11,   SW2_CS11},
+    {0, SW3_CS12,   SW1_CS12,   SW2_CS12},
+    {0, SW3_CS13,   SW1_CS13,   SW2_CS13},
+    {0, SW3_CS14,   SW1_CS14,   SW2_CS14},
+    {0, SW3_CS15,   SW1_CS15,   SW2_CS15},
+    {0, SW3_CS16,   SW1_CS16,   SW2_CS16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_14,   D_14,   E_14},
-    {0, F_16,   D_16,   E_16},
+    {0, SW6_CS1,    SW4_CS1,    SW5_CS1},
+    {0, SW6_CS2,    SW4_CS2,    SW5_CS2},
+    {0, SW6_CS3,    SW4_CS3,    SW5_CS3},
+    {0, SW6_CS4,    SW4_CS4,    SW5_CS4},
+    {0, SW6_CS5,    SW4_CS5,    SW5_CS5},
+    {0, SW6_CS6,    SW4_CS6,    SW5_CS6},
+    {0, SW6_CS7,    SW4_CS7,    SW5_CS7},
+    {0, SW6_CS8,    SW4_CS8,    SW5_CS8},
+    {0, SW6_CS9,    SW4_CS9,    SW5_CS9},
+    {0, SW6_CS10,   SW4_CS10,   SW5_CS10},
+    {0, SW6_CS11,   SW4_CS11,   SW5_CS11},
+    {0, SW6_CS12,   SW4_CS12,   SW5_CS12},
+    {0, SW6_CS13,   SW4_CS13,   SW5_CS13},
+    {0, SW6_CS14,   SW4_CS14,   SW5_CS14},
+    {0, SW6_CS16,   SW4_CS16,   SW5_CS16},
 
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_16,   G_16,   H_16},
+    {0, SW9_CS1,    SW7_CS1,    SW8_CS1},
+    {0, SW9_CS2,    SW7_CS2,    SW8_CS2},
+    {0, SW9_CS3,    SW7_CS3,    SW8_CS3},
+    {0, SW9_CS4,    SW7_CS4,    SW8_CS4},
+    {0, SW9_CS5,    SW7_CS5,    SW8_CS5},
+    {0, SW9_CS6,    SW7_CS6,    SW8_CS6},
+    {0, SW9_CS7,    SW7_CS7,    SW8_CS7},
+    {0, SW9_CS8,    SW7_CS8,    SW8_CS8},
+    {0, SW9_CS9,    SW7_CS9,    SW8_CS9},
+    {0, SW9_CS10,   SW7_CS10,   SW8_CS10},
+    {0, SW9_CS11,   SW7_CS11,   SW8_CS11},
+    {0, SW9_CS12,   SW7_CS12,   SW8_CS12},
+    {0, SW9_CS13,   SW7_CS13,   SW8_CS13},
+    {0, SW9_CS16,   SW7_CS16,   SW8_CS16},
 
-    {0, L_1,    J_1,    K_1},
-    {0, L_2,    J_2,    K_2},
-    {0, L_3,    J_3,    K_3},
-    {0, L_4,    J_4,    K_4},
-    {0, L_5,    J_5,    K_5},
-    {0, L_6,    J_6,    K_6},
-    {0, L_7,    J_7,    K_7},
-    {0, L_8,    J_8,    K_8},
-    {0, L_9,    J_9,    K_9},
-    {0, L_10,   J_10,   K_10},
-    {0, L_11,   J_11,   K_11},
-    {0, L_12,   J_12,   K_12},
-    {0, L_14,   J_14,   K_14},
-    {0, I_14,   G_14,   H_14},
-    {0, L_16,   J_16,   K_16},
+    {0, SW12_CS1,    SW10_CS1,    SW11_CS1},
+    {0, SW12_CS2,    SW10_CS2,    SW11_CS2},
+    {0, SW12_CS3,    SW10_CS3,    SW11_CS3},
+    {0, SW12_CS4,    SW10_CS4,    SW11_CS4},
+    {0, SW12_CS5,    SW10_CS5,    SW11_CS5},
+    {0, SW12_CS6,    SW10_CS6,    SW11_CS6},
+    {0, SW12_CS7,    SW10_CS7,    SW11_CS7},
+    {0, SW12_CS8,    SW10_CS8,    SW11_CS8},
+    {0, SW12_CS9,    SW10_CS9,    SW11_CS9},
+    {0, SW12_CS10,   SW10_CS10,   SW11_CS10},
+    {0, SW12_CS11,   SW10_CS11,   SW11_CS11},
+    {0, SW12_CS12,   SW10_CS12,   SW11_CS12},
+    {0, SW12_CS14,   SW10_CS14,   SW11_CS14},
+    {0, SW9_CS14,   SW7_CS14,   SW8_CS14},
+    {0, SW12_CS16,   SW10_CS16,   SW11_CS16},
 
-    {1, C_1,    A_1,    B_1},
-    {1, C_2,    A_2,    B_2},
-    {1, C_3,    A_3,    B_3},
-    {1, C_4,    A_4,    B_4},
-    {1, C_5,    A_5,    B_5},
-    {1, C_6,    A_6,    B_6},
-    {1, C_7,    A_7,    B_7},
-    {1, C_8,    A_8,    B_8},
-    {1, C_9,    A_9,    B_9},
-    {1, C_10,   A_10,   B_10},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_14,   A_14,   B_14},
-    {1, C_15,   A_15,   B_15},
+    {1, SW3_CS1,    SW1_CS1,    SW2_CS1},
+    {1, SW3_CS2,    SW1_CS2,    SW2_CS2},
+    {1, SW3_CS3,    SW1_CS3,    SW2_CS3},
+    {1, SW3_CS4,    SW1_CS4,    SW2_CS4},
+    {1, SW3_CS5,    SW1_CS5,    SW2_CS5},
+    {1, SW3_CS6,    SW1_CS6,    SW2_CS6},
+    {1, SW3_CS7,    SW1_CS7,    SW2_CS7},
+    {1, SW3_CS8,    SW1_CS8,    SW2_CS8},
+    {1, SW3_CS9,    SW1_CS9,    SW2_CS9},
+    {1, SW3_CS10,   SW1_CS10,   SW2_CS10},
+    {1, SW3_CS11,   SW1_CS11,   SW2_CS11},
+    {1, SW3_CS12,   SW1_CS12,   SW2_CS12},
+    {1, SW3_CS14,   SW1_CS14,   SW2_CS14},
+    {1, SW3_CS15,   SW1_CS15,   SW2_CS15},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_2,    D_2,    E_2},
-    {1, F_3,    D_3,    E_3},
-    {1, F_7,    D_7,    E_7},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_13,   D_13,   E_13},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
-    {1, F_16,   D_16,   E_16}
+    {1, SW6_CS1,    SW4_CS1,    SW5_CS1},
+    {1, SW6_CS2,    SW4_CS2,    SW5_CS2},
+    {1, SW6_CS3,    SW4_CS3,    SW5_CS3},
+    {1, SW6_CS7,    SW4_CS7,    SW5_CS7},
+    {1, SW6_CS11,   SW4_CS11,   SW5_CS11},
+    {1, SW6_CS12,   SW4_CS12,   SW5_CS12},
+    {1, SW6_CS13,   SW4_CS13,   SW5_CS13},
+    {1, SW6_CS14,   SW4_CS14,   SW5_CS14},
+    {1, SW6_CS15,   SW4_CS15,   SW5_CS15},
+    {1, SW6_CS16,   SW4_CS16,   SW5_CS16}
 };
 
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q1v2/ansi/ansi.c b/keyboards/keychron/q1v2/ansi/ansi.c
index a25b597b036..a0ff08aa483 100644
--- a/keyboards/keychron/q1v2/ansi/ansi.c
+++ b/keyboards/keychron/q1v2/ansi/ansi.c
@@ -25,93 +25,93 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_16,   A_16,   B_16},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_14,   G_14,   H_14},
-    {0, I_16,   G_16,   H_16},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_14,   D_14,   E_14},
-    {0, F_16,   D_16,   E_16},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
 
-    {1, I_1,    G_1,    H_1},
-    {1, I_2,    G_2,    H_2},
-    {1, I_3,    G_3,    H_3},
-    {1, I_4,    G_4,    H_4},
-    {1, I_5,    G_5,    H_5},
-    {1, I_6,    G_6,    H_6},
-    {1, I_7,    G_7,    H_7},
-    {1, I_8,    G_8,    H_8},
-    {1, I_9,    G_9,    H_9},
-    {1, I_10,   G_10,   H_10},
-    {1, I_11,   G_11,   H_11},
-    {1, I_12,   G_12,   H_12},
-    {1, I_14,   G_14,   H_14},
-    {1, I_16,   G_16,   H_16},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_3,    D_3,    E_3},
-    {1, F_4,    D_4,    E_4},
-    {1, F_5,    D_5,    E_5},
-    {1, F_6,    D_6,    E_6},
-    {1, F_7,    D_7,    E_7},
-    {1, F_8,    D_8,    E_8},
-    {1, F_9,    D_9,    E_9},
-    {1, F_10,   D_10,   E_10},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {1, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {1, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
 
-    {1, C_1,    A_1,    B_1},
-    {1, C_2,    A_2,    B_2},
-    {1, C_3,    A_3,    B_3},
-    {1, C_7,    A_7,    B_7},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_13,   A_13,   B_13},
-    {1, C_14,   A_14,   B_14},
-    {1, C_15,   A_15,   B_15},
-    {1, C_16,   A_16,   B_16},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
 };
 
 #endif
diff --git a/keyboards/keychron/q1v2/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q1v2/ansi_encoder/ansi_encoder.c
index a25b597b036..a0ff08aa483 100644
--- a/keyboards/keychron/q1v2/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/q1v2/ansi_encoder/ansi_encoder.c
@@ -25,93 +25,93 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_16,   A_16,   B_16},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_14,   G_14,   H_14},
-    {0, I_16,   G_16,   H_16},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_14,   D_14,   E_14},
-    {0, F_16,   D_16,   E_16},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
 
-    {1, I_1,    G_1,    H_1},
-    {1, I_2,    G_2,    H_2},
-    {1, I_3,    G_3,    H_3},
-    {1, I_4,    G_4,    H_4},
-    {1, I_5,    G_5,    H_5},
-    {1, I_6,    G_6,    H_6},
-    {1, I_7,    G_7,    H_7},
-    {1, I_8,    G_8,    H_8},
-    {1, I_9,    G_9,    H_9},
-    {1, I_10,   G_10,   H_10},
-    {1, I_11,   G_11,   H_11},
-    {1, I_12,   G_12,   H_12},
-    {1, I_14,   G_14,   H_14},
-    {1, I_16,   G_16,   H_16},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_3,    D_3,    E_3},
-    {1, F_4,    D_4,    E_4},
-    {1, F_5,    D_5,    E_5},
-    {1, F_6,    D_6,    E_6},
-    {1, F_7,    D_7,    E_7},
-    {1, F_8,    D_8,    E_8},
-    {1, F_9,    D_9,    E_9},
-    {1, F_10,   D_10,   E_10},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {1, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {1, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
 
-    {1, C_1,    A_1,    B_1},
-    {1, C_2,    A_2,    B_2},
-    {1, C_3,    A_3,    B_3},
-    {1, C_7,    A_7,    B_7},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_13,   A_13,   B_13},
-    {1, C_14,   A_14,   B_14},
-    {1, C_15,   A_15,   B_15},
-    {1, C_16,   A_16,   B_16},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
 };
 
 #endif
diff --git a/keyboards/keychron/q1v2/iso/iso.c b/keyboards/keychron/q1v2/iso/iso.c
index 53cdea506f1..eba47a51bed 100644
--- a/keyboards/keychron/q1v2/iso/iso.c
+++ b/keyboards/keychron/q1v2/iso/iso.c
@@ -25,94 +25,94 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_16,   A_16,   B_16},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_14,   G_14,   H_14},
-    {0, I_16,   G_16,   H_16},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_16,   D_16,   E_16},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
 
-    {1, I_1,    G_1,    H_1},
-    {1, I_2,    G_2,    H_2},
-    {1, I_3,    G_3,    H_3},
-    {1, I_4,    G_4,    H_4},
-    {1, I_5,    G_5,    H_5},
-    {1, I_6,    G_6,    H_6},
-    {1, I_7,    G_7,    H_7},
-    {1, I_8,    G_8,    H_8},
-    {1, I_9,    G_9,    H_9},
-    {1, I_10,   G_10,   H_10},
-    {1, I_11,   G_11,   H_11},
-    {1, I_12,   G_12,   H_12},
-    {1, I_14,   G_14,   H_14},
-    {0, F_14,   D_14,   E_14},
-    {1, I_16,   G_16,   H_16},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_2,    D_2,    E_2},
-    {1, F_3,    D_3,    E_3},
-    {1, F_4,    D_4,    E_4},
-    {1, F_5,    D_5,    E_5},
-    {1, F_6,    D_6,    E_6},
-    {1, F_7,    D_7,    E_7},
-    {1, F_8,    D_8,    E_8},
-    {1, F_9,    D_9,    E_9},
-    {1, F_10,   D_10,   E_10},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {1, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {1, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
 
-    {1, C_1,    A_1,    B_1},
-    {1, C_2,    A_2,    B_2},
-    {1, C_3,    A_3,    B_3},
-    {1, C_7,    A_7,    B_7},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_13,   A_13,   B_13},
-    {1, C_14,   A_14,   B_14},
-    {1, C_15,   A_15,   B_15},
-    {1, C_16,   A_16,   B_16},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
 };
 
 #endif
diff --git a/keyboards/keychron/q1v2/iso_encoder/iso_encoder.c b/keyboards/keychron/q1v2/iso_encoder/iso_encoder.c
index 53cdea506f1..eba47a51bed 100644
--- a/keyboards/keychron/q1v2/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/q1v2/iso_encoder/iso_encoder.c
@@ -25,94 +25,94 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_16,   A_16,   B_16},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_14,   G_14,   H_14},
-    {0, I_16,   G_16,   H_16},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_16,   D_16,   E_16},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
 
-    {1, I_1,    G_1,    H_1},
-    {1, I_2,    G_2,    H_2},
-    {1, I_3,    G_3,    H_3},
-    {1, I_4,    G_4,    H_4},
-    {1, I_5,    G_5,    H_5},
-    {1, I_6,    G_6,    H_6},
-    {1, I_7,    G_7,    H_7},
-    {1, I_8,    G_8,    H_8},
-    {1, I_9,    G_9,    H_9},
-    {1, I_10,   G_10,   H_10},
-    {1, I_11,   G_11,   H_11},
-    {1, I_12,   G_12,   H_12},
-    {1, I_14,   G_14,   H_14},
-    {0, F_14,   D_14,   E_14},
-    {1, I_16,   G_16,   H_16},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_2,    D_2,    E_2},
-    {1, F_3,    D_3,    E_3},
-    {1, F_4,    D_4,    E_4},
-    {1, F_5,    D_5,    E_5},
-    {1, F_6,    D_6,    E_6},
-    {1, F_7,    D_7,    E_7},
-    {1, F_8,    D_8,    E_8},
-    {1, F_9,    D_9,    E_9},
-    {1, F_10,   D_10,   E_10},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {1, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {1, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
 
-    {1, C_1,    A_1,    B_1},
-    {1, C_2,    A_2,    B_2},
-    {1, C_3,    A_3,    B_3},
-    {1, C_7,    A_7,    B_7},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_13,   A_13,   B_13},
-    {1, C_14,   A_14,   B_14},
-    {1, C_15,   A_15,   B_15},
-    {1, C_16,   A_16,   B_16},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
 };
 
 #endif
diff --git a/keyboards/keychron/q1v2/jis/jis.c b/keyboards/keychron/q1v2/jis/jis.c
index d43d64dd826..5ba663de460 100644
--- a/keyboards/keychron/q1v2/jis/jis.c
+++ b/keyboards/keychron/q1v2/jis/jis.c
@@ -25,97 +25,97 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_16,   A_16,   B_16},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_14,   G_14,   H_14},
-    {0, I_15,   G_15,   H_15},
-    {0, I_16,   G_16,   H_16},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_16,   D_16,   E_16},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
 
-    {1, I_1,    G_1,    H_1},
-    {1, I_2,    G_2,    H_2},
-    {1, I_3,    G_3,    H_3},
-    {1, I_4,    G_4,    H_4},
-    {1, I_5,    G_5,    H_5},
-    {1, I_6,    G_6,    H_6},
-    {1, I_7,    G_7,    H_7},
-    {1, I_8,    G_8,    H_8},
-    {1, I_9,    G_9,    H_9},
-    {1, I_10,   G_10,   H_10},
-    {1, I_11,   G_11,   H_11},
-    {1, I_12,   G_12,   H_12},
-    {1, I_14,   G_14,   H_14},
-    {0, F_14,   D_14,   E_14},
-    {1, I_16,   G_16,   H_16},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_3,    D_3,    E_3},
-    {1, F_4,    D_4,    E_4},
-    {1, F_5,    D_5,    E_5},
-    {1, F_6,    D_6,    E_6},
-    {1, F_7,    D_7,    E_7},
-    {1, F_8,    D_8,    E_8},
-    {1, F_9,    D_9,    E_9},
-    {1, F_10,   D_10,   E_10},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_13,   D_13,   E_13},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {1, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {1, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
 
-    {1, C_1,    A_1,    B_1},
-    {1, C_2,    A_2,    B_2},
-    {1, C_3,    A_3,    B_3},
-    {1, C_4,    A_4,    B_4},
-    {1, C_7,    A_7,    B_7},
-    {1, C_10,   A_10,   B_10},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_13,   A_13,   B_13},
-    {1, C_14,   A_14,   B_14},
-    {1, C_15,   A_15,   B_15},
-    {1, C_16,   A_16,   B_16},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
 };
 
 #endif
diff --git a/keyboards/keychron/q1v2/jis_encoder/jis_encoder.c b/keyboards/keychron/q1v2/jis_encoder/jis_encoder.c
index d43d64dd826..5ba663de460 100644
--- a/keyboards/keychron/q1v2/jis_encoder/jis_encoder.c
+++ b/keyboards/keychron/q1v2/jis_encoder/jis_encoder.c
@@ -25,97 +25,97 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_16,   A_16,   B_16},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_14,   G_14,   H_14},
-    {0, I_15,   G_15,   H_15},
-    {0, I_16,   G_16,   H_16},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_16,   D_16,   E_16},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
 
-    {1, I_1,    G_1,    H_1},
-    {1, I_2,    G_2,    H_2},
-    {1, I_3,    G_3,    H_3},
-    {1, I_4,    G_4,    H_4},
-    {1, I_5,    G_5,    H_5},
-    {1, I_6,    G_6,    H_6},
-    {1, I_7,    G_7,    H_7},
-    {1, I_8,    G_8,    H_8},
-    {1, I_9,    G_9,    H_9},
-    {1, I_10,   G_10,   H_10},
-    {1, I_11,   G_11,   H_11},
-    {1, I_12,   G_12,   H_12},
-    {1, I_14,   G_14,   H_14},
-    {0, F_14,   D_14,   E_14},
-    {1, I_16,   G_16,   H_16},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_3,    D_3,    E_3},
-    {1, F_4,    D_4,    E_4},
-    {1, F_5,    D_5,    E_5},
-    {1, F_6,    D_6,    E_6},
-    {1, F_7,    D_7,    E_7},
-    {1, F_8,    D_8,    E_8},
-    {1, F_9,    D_9,    E_9},
-    {1, F_10,   D_10,   E_10},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_13,   D_13,   E_13},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {1, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {1, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
 
-    {1, C_1,    A_1,    B_1},
-    {1, C_2,    A_2,    B_2},
-    {1, C_3,    A_3,    B_3},
-    {1, C_4,    A_4,    B_4},
-    {1, C_7,    A_7,    B_7},
-    {1, C_10,   A_10,   B_10},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_13,   A_13,   B_13},
-    {1, C_14,   A_14,   B_14},
-    {1, C_15,   A_15,   B_15},
-    {1, C_16,   A_16,   B_16},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
 };
 
 #endif
diff --git a/keyboards/keychron/q2/ansi/ansi.c b/keyboards/keychron/q2/ansi/ansi.c
index 64abe016a6f..f26fa9c697b 100644
--- a/keyboards/keychron/q2/ansi/ansi.c
+++ b/keyboards/keychron/q2/ansi/ansi.c
@@ -24,77 +24,77 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_16,   A_16,   B_16},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_14,   D_14,   E_14},
-    {0, F_16,   D_16,   E_16},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
 
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {1, I_5,    G_5,    H_5},
-    {1, I_6,    G_6,    H_6},
-    {1, I_7,    G_7,    H_7},
-    {1, I_8,    G_8,    H_8},
-    {1, I_9,    G_9,    H_9},
-    {1, I_10,   G_10,   H_10},
-    {1, I_11,   G_11,   H_11},
-    {1, I_12,   G_12,   H_12},
-    {1, I_14,   G_14,   H_14},
-    {1, I_16,   G_16,   H_16},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {1, C_1,    A_1,    B_1},
-    {1, C_3,    A_3,    B_3},
-    {1, C_4,    A_4,    B_4},
-    {1, C_5,    A_5,    B_5},
-    {1, C_6,    A_6,    B_6},
-    {1, C_7,    A_7,    B_7},
-    {1, C_8,    A_8,    B_8},
-    {1, C_9,    A_9,    B_9},
-    {1, C_10,   A_10,   B_10},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_14,   A_14,   B_14},
-    {1, C_15,   A_15,   B_15},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_2,    D_2,    E_2},
-    {1, F_3,    D_3,    E_3},
-    {1, F_7,    D_7,    E_7},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_13,   D_13,   E_13},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
-    {1, F_16,   D_16,   E_16},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16},
 };
 
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q2/ansi/keymaps/ladduro/config.h b/keyboards/keychron/q2/ansi/keymaps/ladduro/config.h
deleted file mode 100644
index a357fbb1646..00000000000
--- a/keyboards/keychron/q2/ansi/keymaps/ladduro/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2022 @ Ionut Micu
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* RGB Matrix Configuration */
-#ifdef RGB_MATRIX_ENABLE
-#    define RGB_MATRIX_SLEEP
-#    define CAPS_LOCK_INDICATOR_COLOR RGB_RED
-#    define CAPS_LOCK_INDICATOR_LIGHT_ALPHAS
-#    define FN_LAYER_TRANSPARENT_KEYS_OFF
-#endif
\ No newline at end of file
diff --git a/keyboards/keychron/q2/ansi/keymaps/ladduro/keymap.c b/keyboards/keychron/q2/ansi/keymaps/ladduro/keymap.c
deleted file mode 100644
index 55ee7a9732c..00000000000
--- a/keyboards/keychron/q2/ansi/keymaps/ladduro/keymap.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/* Copyright 2022 @ Ionut Micu
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-#include "keymap_user.h"
-#ifdef RGB_MATRIX_ENABLE
-#    include "rgb_matrix_user.h"
-#endif
-
-#define KC_WAVE S(KC_GRV)
-#define KC_TASK LGUI(KC_TAB)
-#define KC_FLXP LGUI(KC_E)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [MAC_BASE] = LAYOUT_ansi_67(
-        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,   KC_BSPC,          KC_INS,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,  KC_RBRC,  KC_BSLS,          KC_DEL,
-        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,            KC_ENT,           KC_HOME,
-        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,            KC_RSFT, KC_UP,
-        KC_LCTL, KC_LOPT, KC_LCMD,                            KC_SPC,                             KC_RCMD, MO(_FN1), MO(_FN3), KC_LEFT, KC_DOWN, KC_RGHT),
-
-    [WIN_BASE] = LAYOUT_ansi_67(
-        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,   KC_BSPC,          KC_INS,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,  KC_RBRC,  KC_BSLS,          KC_DEL,
-        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,            KC_ENT,           KC_HOME,
-        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,            KC_RSFT, KC_UP,
-        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(_FN2), MO(_FN3), KC_LEFT, KC_DOWN, KC_RGHT),
-
-    [_FN1] = LAYOUT_ansi_67(
-        KC_GRV,  KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD,  KC_VOLU, KC_TRNS,          KC_TRNS,
-        RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,          KC_TRNS,
-        KC_TRNS, RGB_RMOD,RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,           KC_TRNS,          KC_TRNS,
-        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,           KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-
-    [_FN2] = LAYOUT_ansi_67(
-        KC_GRV,  KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD,  KC_VOLU, KC_TRNS,          KC_TRNS,
-        RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,          KC_TRNS,
-        KC_TRNS, RGB_RMOD,RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,           KC_TRNS,          KC_TRNS,
-        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,           KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-
-    [_FN3] = LAYOUT_ansi_67(
-        KC_WAVE, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,   KC_F12,  KC_TRNS,          KC_TRNS,
-        RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,          KC_TRNS,
-        KC_TRNS, RGB_RMOD,RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,           KC_TRNS,          KC_TRNS,
-        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,           KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
-};
-
-void matrix_init_user(void) {
-#ifdef RGB_MATRIX_ENABLE
-    rgb_matrix_init_user();
-#endif
-}
diff --git a/keyboards/keychron/q2/ansi/keymaps/ladduro/readme.md b/keyboards/keychron/q2/ansi/keymaps/ladduro/readme.md
deleted file mode 100644
index 42ca81a1a1e..00000000000
--- a/keyboards/keychron/q2/ansi/keymaps/ladduro/readme.md
+++ /dev/null
@@ -1,29 +0,0 @@
-# Ladduro keymap for Keychron Q2 (ANSI rev_0110) v1.01
-
-This keymap ports Q1 logic (by gtg465x) for RGB caps lock indicator and layer RBG assigned key.
-
-## Features:
-- On macOS, F3 opens Mission Control and F4 opens Launchpad without needing to configure shortcuts in System Preferences
-- RGB lighting turns off when the computer sleeps
-- Caps Lock and alpha keys turn red to indicate when Caps Lock is on
-- When the Fn layer is active, RGB lighting turns off for keys that are not assigned
-
-Make example for this keyboard (after setting up your build environment):
-
-    make keychron/q2/rev_0110:ladduro
-
-Flashing example for this keyboard:
-
-    make keychron/q2/rev_0110:ladduro:flash
-
-See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
-
-## Changelog
-
-### 14/03/2021 - 1.
-
-- Initial release
-
-### 02/04/2021 - 1.01
-
-- Remove via enable from rules.mk as it breaks the layout for some reason
diff --git a/keyboards/keychron/q2/ansi/keymaps/ladduro/rgb_matrix_user.c b/keyboards/keychron/q2/ansi/keymaps/ladduro/rgb_matrix_user.c
deleted file mode 100644
index 604f54a7050..00000000000
--- a/keyboards/keychron/q2/ansi/keymaps/ladduro/rgb_matrix_user.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/* Copyright 2022 @ Ionut Micu
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-#include "rgb_matrix_user.h"
-#include "keymap_user.h"
-
-keypos_t led_index_key_position[RGB_MATRIX_LED_COUNT];
-
-void rgb_matrix_init_user(void) {
-    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        for (uint8_t col = 0; col < MATRIX_COLS; col++) {
-            uint8_t led_index = g_led_config.matrix_co[row][col];
-            if (led_index != NO_LED) {
-                led_index_key_position[led_index] = (keypos_t){.row = row, .col = col};
-            }
-        }
-    }
-}
-
-bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
-    uint8_t current_layer = get_highest_layer(layer_state);
-    switch (current_layer) {
-        case MAC_BASE:
-        case WIN_BASE:
-#ifdef CAPS_LOCK_INDICATOR_COLOR
-            if (host_keyboard_led_state().caps_lock) {
-                rgb_matrix_set_color_by_keycode(led_min, led_max, current_layer, is_caps_lock_indicator, CAPS_LOCK_INDICATOR_COLOR);
-            }
-#endif
-            break;
-        case _FN1:
-        case _FN2:
-        case _FN3:
-#ifdef FN_LAYER_TRANSPARENT_KEYS_OFF
-            rgb_matrix_set_color_by_keycode(led_min, led_max, current_layer, is_transparent, RGB_OFF);
-#endif
-            break;
-    }
-    return false;
-}
-
-void rgb_matrix_set_color_by_keycode(uint8_t led_min, uint8_t led_max, uint8_t layer, bool (*is_keycode)(uint16_t), uint8_t red, uint8_t green, uint8_t blue) {
-    for (uint8_t i = led_min; i < led_max; i++) {
-        uint16_t keycode = keymap_key_to_keycode(layer, led_index_key_position[i]);
-        if ((*is_keycode)(keycode)) {
-            rgb_matrix_set_color(i, red, green, blue);
-        }
-    }
-}
-
-bool is_caps_lock_indicator(uint16_t keycode) {
-#ifdef CAPS_LOCK_INDICATOR_LIGHT_ALPHAS
-    return (KC_A <= keycode && keycode <= KC_Z) || keycode == KC_CAPS;
-#else
-    return keycode == KC_CAPS;
-#endif
-}
-
-bool is_transparent(uint16_t keycode) { return keycode == KC_TRNS; }
diff --git a/keyboards/keychron/q2/ansi/keymaps/ladduro/rgb_matrix_user.h b/keyboards/keychron/q2/ansi/keymaps/ladduro/rgb_matrix_user.h
deleted file mode 100644
index 4d33f483aee..00000000000
--- a/keyboards/keychron/q2/ansi/keymaps/ladduro/rgb_matrix_user.h
+++ /dev/null
@@ -1,25 +0,0 @@
-
-/* Copyright 2022 @ Ionut Micu
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-void rgb_matrix_init_user(void);
-
-void rgb_matrix_set_color_by_keycode(uint8_t led_min, uint8_t led_max, uint8_t layer, bool (*is_keycode)(uint16_t), uint8_t red, uint8_t green, uint8_t blue);
-
-bool is_caps_lock_indicator(uint16_t keycode);
-bool is_transparent(uint16_t keycode);
\ No newline at end of file
diff --git a/keyboards/keychron/q2/ansi/keymaps/ladduro/rules.mk b/keyboards/keychron/q2/ansi/keymaps/ladduro/rules.mk
deleted file mode 100644
index c0ee640cd24..00000000000
--- a/keyboards/keychron/q2/ansi/keymaps/ladduro/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-MOUSEKEY_ENABLE = no
-
-ifeq ($(strip $(RGB_MATRIX_ENABLE)), yes)
-    SRC += rgb_matrix_user.c
-endif
diff --git a/keyboards/keychron/q2/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q2/ansi_encoder/ansi_encoder.c
index 64abe016a6f..f26fa9c697b 100644
--- a/keyboards/keychron/q2/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/q2/ansi_encoder/ansi_encoder.c
@@ -24,77 +24,77 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_16,   A_16,   B_16},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_14,   D_14,   E_14},
-    {0, F_16,   D_16,   E_16},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
 
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {1, I_5,    G_5,    H_5},
-    {1, I_6,    G_6,    H_6},
-    {1, I_7,    G_7,    H_7},
-    {1, I_8,    G_8,    H_8},
-    {1, I_9,    G_9,    H_9},
-    {1, I_10,   G_10,   H_10},
-    {1, I_11,   G_11,   H_11},
-    {1, I_12,   G_12,   H_12},
-    {1, I_14,   G_14,   H_14},
-    {1, I_16,   G_16,   H_16},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {1, C_1,    A_1,    B_1},
-    {1, C_3,    A_3,    B_3},
-    {1, C_4,    A_4,    B_4},
-    {1, C_5,    A_5,    B_5},
-    {1, C_6,    A_6,    B_6},
-    {1, C_7,    A_7,    B_7},
-    {1, C_8,    A_8,    B_8},
-    {1, C_9,    A_9,    B_9},
-    {1, C_10,   A_10,   B_10},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_14,   A_14,   B_14},
-    {1, C_15,   A_15,   B_15},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_2,    D_2,    E_2},
-    {1, F_3,    D_3,    E_3},
-    {1, F_7,    D_7,    E_7},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_13,   D_13,   E_13},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
-    {1, F_16,   D_16,   E_16},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16},
 };
 
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q2/iso/iso.c b/keyboards/keychron/q2/iso/iso.c
index 7da02c4a797..a54ec4d718b 100644
--- a/keyboards/keychron/q2/iso/iso.c
+++ b/keyboards/keychron/q2/iso/iso.c
@@ -24,78 +24,78 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_16,   A_16,   B_16},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_16,   D_16,   E_16},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
 
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {1, I_5,    G_5,    H_5},
-    {1, I_6,    G_6,    H_6},
-    {1, I_7,    G_7,    H_7},
-    {1, I_8,    G_8,    H_8},
-    {1, I_9,    G_9,    H_9},
-    {1, I_10,   G_10,   H_10},
-    {1, I_11,   G_11,   H_11},
-    {1, I_12,   G_12,   H_12},
-    {1, I_14,   G_14,   H_14},
-    {0, F_14,   D_14,   E_14},
-    {1, I_16,   G_16,   H_16},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {1, C_1,    A_1,    B_1},
-	{1, C_2,    A_2,    B_2},
-    {1, C_3,    A_3,    B_3},
-    {1, C_4,    A_4,    B_4},
-    {1, C_5,    A_5,    B_5},
-    {1, C_6,    A_6,    B_6},
-    {1, C_7,    A_7,    B_7},
-    {1, C_8,    A_8,    B_8},
-    {1, C_9,    A_9,    B_9},
-    {1, C_10,   A_10,   B_10},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_14,   A_14,   B_14},
-    {1, C_15,   A_15,   B_15},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+	{1, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_2,    D_2,    E_2},
-    {1, F_3,    D_3,    E_3},
-    {1, F_7,    D_7,    E_7},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_13,   D_13,   E_13},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
-    {1, F_16,   D_16,   E_16}
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16}
 };
 
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q2/iso_encoder/iso_encoder.c b/keyboards/keychron/q2/iso_encoder/iso_encoder.c
index 7da02c4a797..a54ec4d718b 100644
--- a/keyboards/keychron/q2/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/q2/iso_encoder/iso_encoder.c
@@ -24,78 +24,78 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_16,   A_16,   B_16},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_16,   D_16,   E_16},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
 
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {1, I_5,    G_5,    H_5},
-    {1, I_6,    G_6,    H_6},
-    {1, I_7,    G_7,    H_7},
-    {1, I_8,    G_8,    H_8},
-    {1, I_9,    G_9,    H_9},
-    {1, I_10,   G_10,   H_10},
-    {1, I_11,   G_11,   H_11},
-    {1, I_12,   G_12,   H_12},
-    {1, I_14,   G_14,   H_14},
-    {0, F_14,   D_14,   E_14},
-    {1, I_16,   G_16,   H_16},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {1, C_1,    A_1,    B_1},
-	{1, C_2,    A_2,    B_2},
-    {1, C_3,    A_3,    B_3},
-    {1, C_4,    A_4,    B_4},
-    {1, C_5,    A_5,    B_5},
-    {1, C_6,    A_6,    B_6},
-    {1, C_7,    A_7,    B_7},
-    {1, C_8,    A_8,    B_8},
-    {1, C_9,    A_9,    B_9},
-    {1, C_10,   A_10,   B_10},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_14,   A_14,   B_14},
-    {1, C_15,   A_15,   B_15},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+	{1, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_2,    D_2,    E_2},
-    {1, F_3,    D_3,    E_3},
-    {1, F_7,    D_7,    E_7},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_13,   D_13,   E_13},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
-    {1, F_16,   D_16,   E_16}
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16}
 };
 
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q2/jis/jis.c b/keyboards/keychron/q2/jis/jis.c
index b8d36be505e..b46ee106017 100644
--- a/keyboards/keychron/q2/jis/jis.c
+++ b/keyboards/keychron/q2/jis/jis.c
@@ -25,81 +25,81 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_15,   A_15,   B_15},
-    {0, C_16,   A_16,   B_16},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_16,   D_16,   E_16},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
 
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {1, I_6,    G_6,    H_6},
-    {1, I_7,    G_7,    H_7},
-    {1, I_8,    G_8,    H_8},
-    {1, I_9,    G_9,    H_9},
-    {1, I_10,   G_10,   H_10},
-    {1, I_11,   G_11,   H_11},
-    {1, I_12,   G_12,   H_12},
-    {1, I_14,   G_14,   H_14},
-    {0, F_14,   D_14,   E_14},
-    {1, I_16,   G_16,   H_16},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {1, C_1,    A_1,    B_1},
-    {1, C_3,    A_3,    B_3},
-    {1, C_4,    A_4,    B_4},
-    {1, C_5,    A_5,    B_5},
-    {1, C_6,    A_6,    B_6},
-    {1, C_7,    A_7,    B_7},
-    {1, C_8,    A_8,    B_8},
-    {1, C_9,    A_9,    B_9},
-    {1, C_10,   A_10,   B_10},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_13,   A_13,   B_13},
-    {1, C_14,   A_14,   B_14},
-    {1, C_15,   A_15,   B_15},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_2,    D_2,    E_2},
-    {1, F_3,    D_3,    E_3},
-    {1, F_4,    D_4,    E_4},
-    {1, F_7,    D_7,    E_7},
-    {1, F_10,   D_10,   E_10},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_13,   D_13,   E_13},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
-    {1, F_16,   D_16,   E_16}
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16}
 };
 
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q2/jis_encoder/jis_encoder.c b/keyboards/keychron/q2/jis_encoder/jis_encoder.c
index b8d36be505e..b46ee106017 100644
--- a/keyboards/keychron/q2/jis_encoder/jis_encoder.c
+++ b/keyboards/keychron/q2/jis_encoder/jis_encoder.c
@@ -25,81 +25,81 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_15,   A_15,   B_15},
-    {0, C_16,   A_16,   B_16},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_16,   D_16,   E_16},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
 
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {1, I_6,    G_6,    H_6},
-    {1, I_7,    G_7,    H_7},
-    {1, I_8,    G_8,    H_8},
-    {1, I_9,    G_9,    H_9},
-    {1, I_10,   G_10,   H_10},
-    {1, I_11,   G_11,   H_11},
-    {1, I_12,   G_12,   H_12},
-    {1, I_14,   G_14,   H_14},
-    {0, F_14,   D_14,   E_14},
-    {1, I_16,   G_16,   H_16},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {1, C_1,    A_1,    B_1},
-    {1, C_3,    A_3,    B_3},
-    {1, C_4,    A_4,    B_4},
-    {1, C_5,    A_5,    B_5},
-    {1, C_6,    A_6,    B_6},
-    {1, C_7,    A_7,    B_7},
-    {1, C_8,    A_8,    B_8},
-    {1, C_9,    A_9,    B_9},
-    {1, C_10,   A_10,   B_10},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_13,   A_13,   B_13},
-    {1, C_14,   A_14,   B_14},
-    {1, C_15,   A_15,   B_15},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_2,    D_2,    E_2},
-    {1, F_3,    D_3,    E_3},
-    {1, F_4,    D_4,    E_4},
-    {1, F_7,    D_7,    E_7},
-    {1, F_10,   D_10,   E_10},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_13,   D_13,   E_13},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
-    {1, F_16,   D_16,   E_16}
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16}
 };
 
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q3/ansi/ansi.c b/keyboards/keychron/q3/ansi/ansi.c
index a2793b040c6..f14e9f28cef 100644
--- a/keyboards/keychron/q3/ansi/ansi.c
+++ b/keyboards/keychron/q3/ansi/ansi.c
@@ -25,98 +25,98 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_15,   G_15,   H_15},
-    {0, I_16,   G_16,   H_16},
-    {1, I_15,   G_15,   H_15},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {1, CB9_CA15,   CB7_CA15,   CB8_CA15},
 
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_15,   A_15,   B_15},
-    {0, C_16,   A_16,   B_16},
-    {1, I_16,   G_16,   H_16},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_14,   D_14,   E_14},
-    {0, F_15,   D_15,   E_15},
-    {0, F_16,   D_16,   E_16},
-    {1, I_13,   G_13,   H_13},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {1, CB9_CA13,   CB7_CA13,   CB8_CA13},
 
-    {1, I_1,    G_1,    H_1},
-    {1, I_2,    G_2,    H_2},
-    {1, I_3,    G_3,    H_3},
-    {1, I_4,    G_4,    H_4},
-    {1, I_5,    G_5,    H_5},
-    {1, I_6,    G_6,    H_6},
-    {1, I_7,    G_7,    H_7},
-    {1, I_8,    G_8,    H_8},
-    {1, I_9,    G_9,    H_9},
-    {1, I_10,   G_10,   H_10},
-    {1, I_11,   G_11,   H_11},
-    {1, I_12,   G_12,   H_12},
-    {1, I_14,   G_14,   H_14},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
 
-    {1, C_1,    A_1,    B_1},
-    {1, C_3,    A_3,    B_3},
-    {1, C_4,    A_4,    B_4},
-    {1, C_5,    A_5,    B_5},
-    {1, C_6,    A_6,    B_6},
-    {1, C_7,    A_7,    B_7},
-    {1, C_8,    A_8,    B_8},
-    {1, C_9,    A_9,    B_9},
-    {1, C_10,   A_10,   B_10},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_14,   A_14,   B_14},
-    {1, C_16,   A_16,   B_16},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_2,    D_2,    E_2},
-    {1, F_3,    D_3,    E_3},
-    {1, F_7,    D_7,    E_7},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_13,   D_13,   E_13},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
-    {1, F_16,   D_16,   E_16},
-    {1, C_15,   A_15,   B_15},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
 };
 
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q3/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q3/ansi_encoder/ansi_encoder.c
index 3b88a83d381..ac6c3757771 100644
--- a/keyboards/keychron/q3/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/q3/ansi_encoder/ansi_encoder.c
@@ -25,98 +25,98 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_15,   G_15,   H_15},
-    {0, I_16,   G_16,   H_16},
-    {1, I_15,   G_15,   H_15},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {1, CB9_CA15,   CB7_CA15,   CB8_CA15},
 
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_15,   A_15,   B_15},
-    {0, C_16,   A_16,   B_16},
-    {1, I_16,   G_16,   H_16},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_14,   D_14,   E_14},
-    {0, F_15,   D_15,   E_15},
-    {0, F_16,   D_16,   E_16},
-    {1, I_13,   G_13,   H_13},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {1, CB9_CA13,   CB7_CA13,   CB8_CA13},
 
-    {1, I_1,    G_1,    H_1},
-    {1, I_2,    G_2,    H_2},
-    {1, I_3,    G_3,    H_3},
-    {1, I_4,    G_4,    H_4},
-    {1, I_5,    G_5,    H_5},
-    {1, I_6,    G_6,    H_6},
-    {1, I_7,    G_7,    H_7},
-    {1, I_8,    G_8,    H_8},
-    {1, I_9,    G_9,    H_9},
-    {1, I_10,   G_10,   H_10},
-    {1, I_11,   G_11,   H_11},
-    {1, I_12,   G_12,   H_12},
-    {1, I_14,   G_14,   H_14},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
 
-    {1, C_1,    A_1,    B_1},
-    {1, C_3,    A_3,    B_3},
-    {1, C_4,    A_4,    B_4},
-    {1, C_5,    A_5,    B_5},
-    {1, C_6,    A_6,    B_6},
-    {1, C_7,    A_7,    B_7},
-    {1, C_8,    A_8,    B_8},
-    {1, C_9,    A_9,    B_9},
-    {1, C_10,   A_10,   B_10},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_14,   A_14,   B_14},
-    {1, C_16,   A_16,   B_16},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_2,    D_2,    E_2},
-    {1, F_3,    D_3,    E_3},
-    {1, F_7,    D_7,    E_7},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_13,   D_13,   E_13},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
-    {1, F_16,   D_16,   E_16},
-    {1, C_15,   A_15,   B_15},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
 };
 
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q3/iso/iso.c b/keyboards/keychron/q3/iso/iso.c
index 37f418e66b4..6a942028d51 100644
--- a/keyboards/keychron/q3/iso/iso.c
+++ b/keyboards/keychron/q3/iso/iso.c
@@ -25,99 +25,99 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_15,   G_15,   H_15},
-    {0, I_16,   G_16,   H_16},
-    {1, I_15,   G_15,   H_15},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {1, CB9_CA15,   CB7_CA15,   CB8_CA15},
 
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_15,   A_15,   B_15},
-    {0, C_16,   A_16,   B_16},
-    {1, I_16,   G_16,   H_16},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_15,   D_15,   E_15},
-    {0, F_16,   D_16,   E_16},
-    {1, I_13,   G_13,   H_13},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {1, CB9_CA13,   CB7_CA13,   CB8_CA13},
 
-    {1, I_1,    G_1,    H_1},
-    {1, I_2,    G_2,    H_2},
-    {1, I_3,    G_3,    H_3},
-    {1, I_4,    G_4,    H_4},
-    {1, I_5,    G_5,    H_5},
-    {1, I_6,    G_6,    H_6},
-    {1, I_7,    G_7,    H_7},
-    {1, I_8,    G_8,    H_8},
-    {1, I_9,    G_9,    H_9},
-    {1, I_10,   G_10,   H_10},
-    {1, I_11,   G_11,   H_11},
-    {1, I_12,   G_12,   H_12},
-    {1, I_14,   G_14,   H_14},
-    {0, F_14,   D_14,   E_14},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
 
-    {1, C_1,    A_1,    B_1},
-    {1, C_2,    A_2,    B_2},
-    {1, C_3,    A_3,    B_3},
-    {1, C_4,    A_4,    B_4},
-    {1, C_5,    A_5,    B_5},
-    {1, C_6,    A_6,    B_6},
-    {1, C_7,    A_7,    B_7},
-    {1, C_8,    A_8,    B_8},
-    {1, C_9,    A_9,    B_9},
-    {1, C_10,   A_10,   B_10},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_14,   A_14,   B_14},
-    {1, C_16,   A_16,   B_16},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_2,    D_2,    E_2},
-    {1, F_3,    D_3,    E_3},
-    {1, F_7,    D_7,    E_7},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_13,   D_13,   E_13},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
-    {1, F_16,   D_16,   E_16},
-    {1, C_15,   A_15,   B_15},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
 };
 
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q3/iso_encoder/iso_encoder.c b/keyboards/keychron/q3/iso_encoder/iso_encoder.c
index 37f418e66b4..6a942028d51 100644
--- a/keyboards/keychron/q3/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/q3/iso_encoder/iso_encoder.c
@@ -25,99 +25,99 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_15,   G_15,   H_15},
-    {0, I_16,   G_16,   H_16},
-    {1, I_15,   G_15,   H_15},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {1, CB9_CA15,   CB7_CA15,   CB8_CA15},
 
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_15,   A_15,   B_15},
-    {0, C_16,   A_16,   B_16},
-    {1, I_16,   G_16,   H_16},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_15,   D_15,   E_15},
-    {0, F_16,   D_16,   E_16},
-    {1, I_13,   G_13,   H_13},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {1, CB9_CA13,   CB7_CA13,   CB8_CA13},
 
-    {1, I_1,    G_1,    H_1},
-    {1, I_2,    G_2,    H_2},
-    {1, I_3,    G_3,    H_3},
-    {1, I_4,    G_4,    H_4},
-    {1, I_5,    G_5,    H_5},
-    {1, I_6,    G_6,    H_6},
-    {1, I_7,    G_7,    H_7},
-    {1, I_8,    G_8,    H_8},
-    {1, I_9,    G_9,    H_9},
-    {1, I_10,   G_10,   H_10},
-    {1, I_11,   G_11,   H_11},
-    {1, I_12,   G_12,   H_12},
-    {1, I_14,   G_14,   H_14},
-    {0, F_14,   D_14,   E_14},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
 
-    {1, C_1,    A_1,    B_1},
-    {1, C_2,    A_2,    B_2},
-    {1, C_3,    A_3,    B_3},
-    {1, C_4,    A_4,    B_4},
-    {1, C_5,    A_5,    B_5},
-    {1, C_6,    A_6,    B_6},
-    {1, C_7,    A_7,    B_7},
-    {1, C_8,    A_8,    B_8},
-    {1, C_9,    A_9,    B_9},
-    {1, C_10,   A_10,   B_10},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_14,   A_14,   B_14},
-    {1, C_16,   A_16,   B_16},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_2,    D_2,    E_2},
-    {1, F_3,    D_3,    E_3},
-    {1, F_7,    D_7,    E_7},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_13,   D_13,   E_13},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
-    {1, F_16,   D_16,   E_16},
-    {1, C_15,   A_15,   B_15},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
 };
 
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q3/jis/jis.c b/keyboards/keychron/q3/jis/jis.c
index 0fc70b1af3d..3c51076020c 100644
--- a/keyboards/keychron/q3/jis/jis.c
+++ b/keyboards/keychron/q3/jis/jis.c
@@ -25,102 +25,102 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, I_1,    G_1,    H_1},  // ESC
-    {0, I_2,    G_2,    H_2},  // F1
-    {0, I_3,    G_3,    H_3},  // F2
-    {0, I_4,    G_4,    H_4},  // F3
-    {0, I_5,    G_5,    H_5},  // F4
-    {0, I_6,    G_6,    H_6},  // F5
-    {0, I_7,    G_7,    H_7},  // F6
-    {0, I_8,    G_8,    H_8},  // F7
-    {0, I_9,    G_9,    H_9},  // F8
-    {0, I_10,   G_10,   H_10}, // F9
-    {0, I_11,   G_11,   H_11}, // F10
-    {0, I_12,   G_12,   H_12}, // F11
-    {0, I_13,   G_13,   H_13}, // F12
-    {0, I_15,   G_15,   H_15}, // Print
-    {0, I_16,   G_16,   H_16}, // Cortana
-    {1, I_15,   G_15,   H_15}, // Light
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},  // ESC
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},  // F1
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},  // F2
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},  // F3
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},  // F4
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},  // F5
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},  // F6
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},  // F7
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},  // F8
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10}, // F9
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11}, // F10
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12}, // F11
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13}, // F12
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15}, // Print
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16}, // Cortana
+    {1, CB9_CA15,   CB7_CA15,   CB8_CA15}, // Light
 
-    {0, C_1,    A_1,    B_1},  // `~
-    {0, C_2,    A_2,    B_2},  // 1!
-    {0, C_3,    A_3,    B_3},  // 2@
-    {0, C_4,    A_4,    B_4},  // 3#
-    {0, C_5,    A_5,    B_5},  // 4$
-    {0, C_6,    A_6,    B_6},  // 5%
-    {0, C_7,    A_7,    B_7},  // 6^
-    {0, C_8,    A_8,    B_8},  // 7&
-    {0, C_9,    A_9,    B_9},  // 8*
-    {0, C_10,   A_10,   B_10}, // 9()
-    {0, C_11,   A_11,   B_11}, // 0)
-    {0, C_12,   A_12,   B_12}, // -_
-    {0, C_13,   A_13,   B_13}, // =+
-    {0, I_13,   G_13,   H_13}, // |
-    {0, I_14,   G_14,   H_14}, // Backspace
-    {0, C_15,   A_15,   B_15}, // Ins
-    {0, C_16,   A_16,   B_16}, // Home
-    {1, I_16,   G_16,   H_16}, // Page Up
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},  // `~
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},  // 1!
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},  // 2@
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},  // 3#
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},  // 4$
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},  // 5%
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},  // 6^
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},  // 7&
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},  // 8*
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10}, // 9()
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11}, // 0)
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12}, // -_
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13}, // =+
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13}, // |
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14}, // Backspace
+    {0, CB3_CA15,   CB1_CA15,   CB2_CA15}, // Ins
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16}, // Home
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16}, // Page Up
 
-    {0, F_1,    D_1,    E_1},  // tab
-    {0, F_2,    D_2,    E_2},  // Q
-    {0, F_3,    D_3,    E_3},  // W
-    {0, F_4,    D_4,    E_4},  // E
-    {0, F_5,    D_5,    E_5},  // R
-    {0, F_6,    D_6,    E_6},  // T
-    {0, F_7,    D_7,    E_7},  // Y
-    {0, F_8,    D_8,    E_8},  // U
-    {0, F_9,    D_9,    E_9},  // I
-    {0, F_10,   D_10,   E_10}, // O
-    {0, F_11,   D_11,   E_11}, // P
-    {0, F_12,   D_12,   E_12}, // [{
-    {0, F_14,   D_14,   E_14}, // }}
-    {0, F_15,   D_15,   E_15}, // Del
-    {0, F_16,   D_16,   E_16}, // End
-    {1, I_13,   G_13,   H_13}, // Page Down
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},  // tab
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},  // Q
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},  // W
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},  // E
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},  // R
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},  // T
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},  // Y
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},  // U
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},  // I
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10}, // O
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11}, // P
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12}, // [{
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14}, // }}
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15}, // Del
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16}, // End
+    {1, CB9_CA13,   CB7_CA13,   CB8_CA13}, // Page Down
 
-    {1, I_1,    G_1,    H_1},  // Cpas
-    {1, I_2,    G_2,    H_2},  // A
-    {1, I_3,    G_3,    H_3},  // S
-    {1, I_4,    G_4,    H_4},  // D
-    {1, I_5,    G_5,    H_5},  // F
-    {1, I_6,    G_6,    H_6},  // G
-    {1, I_7,    G_7,    H_7},  // H
-    {1, I_8,    G_8,    H_8},  // J
-    {1, I_9,    G_9,    H_9},  // K
-    {1, I_10,   G_10,   H_10}, // L
-    {1, I_11,   G_11,   H_11}, // ;
-    {1, I_12,   G_12,   H_12}, // :
-    {1, I_14,   G_14,   H_14}, // #~
-    {0, F_13,   D_13,   E_13}, // Enter
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},  // Cpas
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},  // A
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},  // S
+    {1, CB9_CA4,    CB7_CA4,    CB8_CA4},  // D
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},  // F
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},  // G
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},  // H
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},  // J
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},  // K
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10}, // L
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11}, // ;
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12}, // :
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14}, // #~
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13}, // Enter
 
-    {1, C_1,    A_1,    B_1},  // LShift
-    {1, C_3,    A_3,    B_3},  // Z
-    {1, C_4,    A_4,    B_4},  // X
-    {1, C_5,    A_5,    B_5},  // C
-    {1, C_6,    A_6,    B_6},  // V
-    {1, C_7,    A_7,    B_7},  // B
-    {1, C_8,    A_8,    B_8},  // N
-    {1, C_9,    A_9,    B_9},  // M
-    {1, C_10,   A_10,   B_10}, // ,<
-    {1, C_11,   A_11,   B_11}, // .>
-    {1, C_12,   A_12,   B_12}, // /?
-    {1, C_13,   A_13,   B_13}, // |
-    {1, C_14,   A_14,   B_14}, // RShift
-    {1, C_16,   A_16,   B_16}, // Up
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},  // LShift
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},  // Z
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},  // X
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},  // C
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},  // V
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},  // B
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},  // N
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},  // M
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10}, // ,<
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11}, // .>
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12}, // /?
+    {1, CB3_CA13,   CB1_CA13,   CB2_CA13}, // |
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14}, // RShift
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16}, // Up
 
-    {1, F_1,    D_1,    E_1},  // LCtrl
-    {1, F_2,    D_2,    E_2},  // LWin
-    {1, F_3,    D_3,    E_3},  // LAlt
-    {1, F_4,    D_4,    E_4},  // NUm
-    {1, F_7,    D_7,    E_7},  // Space
-    {1, F_10,   D_10,   E_10}, // Jap
-    {1, F_11,   D_11,   E_11}, // RAlt
-    {1, F_12,   D_12,   E_12}, // RWin
-    {1, F_13,   D_13,   E_13}, // Fn
-    {1, F_14,   D_14,   E_14}, // RCtrl
-    {1, F_15,   D_15,   E_15}, // Left
-    {1, F_16,   D_16,   E_16}, // Down
-    {1, C_15,   A_15,   B_15}, // Right
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},  // LCtrl
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},  // LWin
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},  // LAlt
+    {1, CB6_CA4,    CB4_CA4,    CB5_CA4},  // NUm
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},  // Space
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10}, // Jap
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11}, // RAlt
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12}, // RWin
+    {1, CB6_CA13,   CB4_CA13,   CB5_CA13}, // Fn
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14}, // RCtrl
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15}, // Left
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16}, // Down
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15}, // Right
 };
 
 #endif // GB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q3/jis_encoder/jis_encoder.c b/keyboards/keychron/q3/jis_encoder/jis_encoder.c
index df4a6a467b6..aa34222bf39 100644
--- a/keyboards/keychron/q3/jis_encoder/jis_encoder.c
+++ b/keyboards/keychron/q3/jis_encoder/jis_encoder.c
@@ -25,103 +25,103 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, I_1,    G_1,    H_1},  // ESC
-    {0, I_2,    G_2,    H_2},  // F1
-    {0, I_3,    G_3,    H_3},  // F2
-    {0, I_4,    G_4,    H_4},  // F3
-    {0, I_5,    G_5,    H_5},  // F4
-    {0, I_6,    G_6,    H_6},  // F5
-    {0, I_7,    G_7,    H_7},  // F6
-    {0, I_8,    G_8,    H_8},  // F7
-    {0, I_9,    G_9,    H_9},  // F8
-    {0, I_10,   G_10,   H_10}, // F9
-    {0, I_11,   G_11,   H_11}, // F10
-    {0, I_12,   G_12,   H_12}, // F11
-    {0, I_13,   G_13,   H_13}, // F12
-    {0, I_14,   G_14,   H_14}, // Mute
-    {0, I_15,   G_15,   H_15}, // Print
-    {0, I_16,   G_16,   H_16}, // Cortana
-    {1, I_15,   G_15,   H_15}, // Light
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},  // ESC
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},  // F1
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},  // F2
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},  // F3
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},  // F4
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},  // F5
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},  // F6
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},  // F7
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},  // F8
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10}, // F9
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11}, // F10
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12}, // F11
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13}, // F12
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14}, // Mute
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15}, // Print
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16}, // Cortana
+    {1, CB9_CA15,   CB7_CA15,   CB8_CA15}, // Light
 
-    {0, C_1,    A_1,    B_1},  // `~
-    {0, C_2,    A_2,    B_2},  // 1!
-    {0, C_3,    A_3,    B_3},  // 2@
-    {0, C_4,    A_4,    B_4},  // 3#
-    {0, C_5,    A_5,    B_5},  // 4$
-    {0, C_6,    A_6,    B_6},  // 5%
-    {0, C_7,    A_7,    B_7},  // 6^
-    {0, C_8,    A_8,    B_8},  // 7&
-    {0, C_9,    A_9,    B_9},  // 8*
-    {0, C_10,   A_10,   B_10}, // 9()
-    {0, C_11,   A_11,   B_11}, // 0)
-    {0, C_12,   A_12,   B_12}, // -_
-    {0, C_13,   A_13,   B_13}, // =+
-    {0, C_14,   A_14,   B_14}, // |
-    {1, F_6,    D_6,    E_6},  // Backspace
-    {0, C_15,   A_15,   B_15}, // Ins
-    {0, C_16,   A_16,   B_16}, // Home
-    {1, I_16,   G_16,   H_16}, // Page Up
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},  // `~
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},  // 1!
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},  // 2@
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},  // 3#
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},  // 4$
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},  // 5%
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},  // 6^
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},  // 7&
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},  // 8*
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10}, // 9()
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11}, // 0)
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12}, // -_
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13}, // =+
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14}, // |
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},  // Backspace
+    {0, CB3_CA15,   CB1_CA15,   CB2_CA15}, // Ins
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16}, // Home
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16}, // Page Up
 
-    {0, F_1,    D_1,    E_1},  // tab
-    {0, F_2,    D_2,    E_2},  // Q
-    {0, F_3,    D_3,    E_3},  // W
-    {0, F_4,    D_4,    E_4},  // E
-    {0, F_5,    D_5,    E_5},  // R
-    {0, F_6,    D_6,    E_6},  // T
-    {0, F_7,    D_7,    E_7},  // Y
-    {0, F_8,    D_8,    E_8},  // U
-    {0, F_9,    D_9,    E_9},  // I
-    {0, F_10,   D_10,   E_10}, // O
-    {0, F_11,   D_11,   E_11}, // P
-    {0, F_12,   D_12,   E_12}, // [{
-    {0, F_13,   D_13,   E_13}, // }}
-    {0, F_15,   D_15,   E_15}, // Del
-    {0, F_16,   D_16,   E_16}, // End
-    {1, I_13,   G_13,   H_13}, // Page Down
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},  // tab
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},  // Q
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},  // W
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},  // E
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},  // R
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},  // T
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},  // Y
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},  // U
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},  // I
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10}, // O
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11}, // P
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12}, // [{
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13}, // }}
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15}, // Del
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16}, // End
+    {1, CB9_CA13,   CB7_CA13,   CB8_CA13}, // Page Down
 
-    {1, I_1,    G_1,    H_1},  // Cpas
-    {1, I_2,    G_2,    H_2},  // A
-    {1, I_3,    G_3,    H_3},  // S
-    {1, I_4,    G_4,    H_4},  // D
-    {1, I_5,    G_5,    H_5},  // F
-    {1, I_6,    G_6,    H_6},  // G
-    {1, I_7,    G_7,    H_7},  // H
-    {1, I_8,    G_8,    H_8},  // J
-    {1, I_9,    G_9,    H_9},  // K
-    {1, I_10,   G_10,   H_10}, // L
-    {1, I_11,   G_11,   H_11}, // ;
-    {1, I_12,   G_12,   H_12}, // :
-    {1, I_14,   G_14,   H_14}, // #~
-    {0, F_14,   D_14,   E_14}, // Enter
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},  // Cpas
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},  // A
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},  // S
+    {1, CB9_CA4,    CB7_CA4,    CB8_CA4},  // D
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},  // F
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},  // G
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},  // H
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},  // J
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},  // K
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10}, // L
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11}, // ;
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12}, // :
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14}, // #~
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14}, // Enter
 
-    {1, C_1,    A_1,    B_1},  // LShift
-    {1, C_3,    A_3,    B_3},  // Z
-    {1, C_4,    A_4,    B_4},  // X
-    {1, C_5,    A_5,    B_5},  // C
-    {1, C_6,    A_6,    B_6},  // V
-    {1, C_7,    A_7,    B_7},  // B
-    {1, C_8,    A_8,    B_8},  // N
-    {1, C_9,    A_9,    B_9},  // M
-    {1, C_10,   A_10,   B_10}, // ,<
-    {1, C_11,   A_11,   B_11}, // .>
-    {1, C_12,   A_12,   B_12}, // /?
-    {1, C_13,   A_13,   B_13}, // |
-    {1, C_14,   A_14,   B_14}, // RShift
-    {1, C_16,   A_16,   B_16}, // Up
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},  // LShift
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},  // Z
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},  // X
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},  // C
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},  // V
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},  // B
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},  // N
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},  // M
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10}, // ,<
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11}, // .>
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12}, // /?
+    {1, CB3_CA13,   CB1_CA13,   CB2_CA13}, // |
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14}, // RShift
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16}, // Up
 
-    {1, F_1,    D_1,    E_1},  // LCtrl
-    {1, F_2,    D_2,    E_2},  // LWin
-    {1, F_3,    D_3,    E_3},  // LAlt
-    {1, F_4,    D_4,    E_4},  // NUm
-    {1, F_7,    D_7,    E_7},  // Space
-    {1, F_10,   D_10,   E_10}, // Jap
-    {1, F_11,   D_11,   E_11}, // RAlt
-    {1, F_12,   D_12,   E_12}, // RWin
-    {1, F_13,   D_13,   E_13}, // Fn
-    {1, F_14,   D_14,   E_14}, // RCtrl
-    {1, F_15,   D_15,   E_15}, // Left
-    {1, F_16,   D_16,   E_16}, // Down
-    {1, C_15,   A_15,   B_15}, // Right
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},  // LCtrl
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},  // LWin
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},  // LAlt
+    {1, CB6_CA4,    CB4_CA4,    CB5_CA4},  // NUm
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},  // Space
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10}, // Jap
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11}, // RAlt
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12}, // RWin
+    {1, CB6_CA13,   CB4_CA13,   CB5_CA13}, // Fn
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14}, // RCtrl
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15}, // Left
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16}, // Down
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15}, // Right
 };
 
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q4/ansi/v1/v1.c b/keyboards/keychron/q4/ansi/v1/v1.c
index f9e2946bb3e..ee5551fbb8b 100644
--- a/keyboards/keychron/q4/ansi/v1/v1.c
+++ b/keyboards/keychron/q4/ansi/v1/v1.c
@@ -25,71 +25,71 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_14,   D_14,   E_14},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
 
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {1, I_4,    G_4,    H_4},
-    {1, I_5,    G_5,    H_5},
-    {1, I_6,    G_6,    H_6},
-    {1, I_7,    G_7,    H_7},
-    {1, I_8,    G_8,    H_8},
-    {1, I_9,    G_9,    H_9},
-    {1, I_10,   G_10,   H_10},
-    {1, I_11,   G_11,   H_11},
-    {1, I_12,   G_12,   H_12},
-    {1, I_14,   G_14,   H_14},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
 
-    {1, C_1,    A_1,    B_1},
-    {1, C_3,    A_3,    B_3},
-    {1, C_4,    A_4,    B_4},
-    {1, C_5,    A_5,    B_5},
-    {1, C_6,    A_6,    B_6},
-    {1, C_7,    A_7,    B_7},
-    {1, C_8,    A_8,    B_8},
-    {1, C_9,    A_9,    B_9},
-    {1, C_10,   A_10,   B_10},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_14,   A_14,   B_14},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_2,    D_2,    E_2},
-    {1, F_3,    D_3,    E_3},
-    {1, F_7,    D_7,    E_7},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_13,   D_13,   E_13},
-    {1, F_14,   D_14,   E_14},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
 };
 
 #endif
diff --git a/keyboards/keychron/q4/ansi/v2/v2.c b/keyboards/keychron/q4/ansi/v2/v2.c
index f7564c02a1a..1a0e2711f3e 100644
--- a/keyboards/keychron/q4/ansi/v2/v2.c
+++ b/keyboards/keychron/q4/ansi/v2/v2.c
@@ -25,71 +25,71 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_14,   D_14,   E_14},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
 
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_14,   G_14,   H_14},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14},
 
-    {0, L_1,    J_1,    K_1},
-    {0, L_2,    J_2,    K_2},
-    {0, L_3,    J_3,    K_3},
-    {0, L_4,    J_4,    K_4},
-    {0, L_5,    J_5,    K_5},
-    {0, L_6,    J_6,    K_6},
-    {0, L_7,    J_7,    K_7},
-    {0, L_8,    J_8,    K_8},
-    {0, L_9,    J_9,    K_9},
-    {0, L_10,   J_10,   K_10},
-    {0, L_11,   J_11,   K_11},
-    {0, L_12,   J_12,   K_12},
-    {0, L_14,   J_14,   K_14},
+    {0, CB12_CA1,    CB10_CA1,    CB11_CA1},
+    {0, CB12_CA2,    CB10_CA2,    CB11_CA2},
+    {0, CB12_CA3,    CB10_CA3,    CB11_CA3},
+    {0, CB12_CA4,    CB10_CA4,    CB11_CA4},
+    {0, CB12_CA5,    CB10_CA5,    CB11_CA5},
+    {0, CB12_CA6,    CB10_CA6,    CB11_CA6},
+    {0, CB12_CA7,    CB10_CA7,    CB11_CA7},
+    {0, CB12_CA8,    CB10_CA8,    CB11_CA8},
+    {0, CB12_CA9,    CB10_CA9,    CB11_CA9},
+    {0, CB12_CA10,   CB10_CA10,   CB11_CA10},
+    {0, CB12_CA11,   CB10_CA11,   CB11_CA11},
+    {0, CB12_CA12,   CB10_CA12,   CB11_CA12},
+    {0, CB12_CA14,   CB10_CA14,   CB11_CA14},
 
-    {0, C_1,    A_1,    B_1},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_14,   A_14,   B_14},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
 
-    {0, C_15,   A_15,   B_15},
-    {0, C_16,   A_16,   B_16},
-    {0, L_15,   J_15,   K_15},
-    {0, L_16,   J_16,   K_16},
-    {0, I_15,   G_15,   H_15},
-    {0, I_16,   G_16,   H_16},
-    {0, F_15,   D_15,   E_15},
-    {0, F_16,   D_16,   E_16},
+    {0, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {0, CB12_CA15,   CB10_CA15,   CB11_CA15},
+    {0, CB12_CA16,   CB10_CA16,   CB11_CA16},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
 };
 
 #endif
diff --git a/keyboards/keychron/q4/info.json b/keyboards/keychron/q4/info.json
index e314477ab94..59f6caef923 100644
--- a/keyboards/keychron/q4/info.json
+++ b/keyboards/keychron/q4/info.json
@@ -16,16 +16,13 @@
         }
     },
     "features": {
-        "audio": false,
-        "backlight": false,
         "bootmagic": true,
         "command": false,
         "console": false,
         "extrakey": true,
         "mousekey": true,
         "nkro": true,
-        "rgb_matrix": true,
-        "rgblight": false
+        "rgb_matrix": true
     },
     "matrix_pins": {
         "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9"],
diff --git a/keyboards/keychron/q4/iso/iso.c b/keyboards/keychron/q4/iso/iso.c
index c30f06c6bd9..7f796238f5e 100644
--- a/keyboards/keychron/q4/iso/iso.c
+++ b/keyboards/keychron/q4/iso/iso.c
@@ -25,72 +25,72 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_14,   D_14,   E_14},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
 
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
 
-    {0, L_1,    J_1,    K_1},
-    {0, L_2,    J_2,    K_2},
-    {0, L_3,    J_3,    K_3},
-    {0, L_4,    J_4,    K_4},
-    {0, L_5,    J_5,    K_5},
-    {0, L_6,    J_6,    K_6},
-    {0, L_7,    J_7,    K_7},
-    {0, L_8,    J_8,    K_8},
-    {0, L_9,    J_9,    K_9},
-    {0, L_10,   J_10,   K_10},
-    {0, L_11,   J_11,   K_11},
-    {0, L_12,   J_12,   K_12},
-    {0, L_14,   J_14,   K_14},
-    {0, I_14,   G_14,   H_14},
+    {0, CB12_CA1,    CB10_CA1,    CB11_CA1},
+    {0, CB12_CA2,    CB10_CA2,    CB11_CA2},
+    {0, CB12_CA3,    CB10_CA3,    CB11_CA3},
+    {0, CB12_CA4,    CB10_CA4,    CB11_CA4},
+    {0, CB12_CA5,    CB10_CA5,    CB11_CA5},
+    {0, CB12_CA6,    CB10_CA6,    CB11_CA6},
+    {0, CB12_CA7,    CB10_CA7,    CB11_CA7},
+    {0, CB12_CA8,    CB10_CA8,    CB11_CA8},
+    {0, CB12_CA9,    CB10_CA9,    CB11_CA9},
+    {0, CB12_CA10,   CB10_CA10,   CB11_CA10},
+    {0, CB12_CA11,   CB10_CA11,   CB11_CA11},
+    {0, CB12_CA12,   CB10_CA12,   CB11_CA12},
+    {0, CB12_CA14,   CB10_CA14,   CB11_CA14},
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14},
 
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_14,   A_14,   B_14},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
 
-    {0, C_15,   A_15,   B_15},
-    {0, C_16,   A_16,   B_16},
-    {0, L_15,   J_15,   K_15},
-    {0, L_16,   J_16,   K_16},
-    {0, I_15,   G_15,   H_15},
-    {0, I_16,   G_16,   H_16},
-    {0, F_15,   D_15,   E_15},
-    {0, F_16,   D_16,   E_16},
+    {0, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {0, CB12_CA15,   CB10_CA15,   CB11_CA15},
+    {0, CB12_CA16,   CB10_CA16,   CB11_CA16},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
 };
 
 #endif
diff --git a/keyboards/keychron/q5/ansi/ansi.c b/keyboards/keychron/q5/ansi/ansi.c
index 1b74c0eef90..bc6622dd7f6 100644
--- a/keyboards/keychron/q5/ansi/ansi.c
+++ b/keyboards/keychron/q5/ansi/ansi.c
@@ -25,111 +25,111 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_14,   G_14,   H_14},
-    {0, I_15,   G_15,   H_15},
-    {0, I_16,   G_16,   H_16},
-    {0, L_12,   J_12,   K_12},
-    {0, L_13,   J_13,   K_13},
-    {0, L_14,   J_14,   K_14},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {0, CB12_CA12,   CB10_CA12,   CB11_CA12},
+    {0, CB12_CA13,   CB10_CA13,   CB11_CA13},
+    {0, CB12_CA14,   CB10_CA14,   CB11_CA14},
 
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_16,   A_16,   B_16},
-    {0, L_9,    J_9,    K_9},
-    {0, L_10,   J_10,   K_10},
-    {0, L_11,   J_11,   K_11},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {0, CB12_CA9,    CB10_CA9,    CB11_CA9},
+    {0, CB12_CA10,   CB10_CA10,   CB11_CA10},
+    {0, CB12_CA11,   CB10_CA11,   CB11_CA11},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_14,   D_14,   E_14},
-    {0, F_15,   D_15,   E_15},
-    {0, F_16,   D_16,   E_16},
-    {0, L_15,   J_15,   K_15},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {0, CB12_CA15,   CB10_CA15,   CB11_CA15},
 
-    {1, C_16,   A_16,   B_16},
-    {1, C_15,   A_15,   B_15},
-    {1, C_14,   A_14,   B_14},
-    {1, C_13,   A_13,   B_13},
-    {1, C_12,   A_12,   B_12},
-    {1, C_11,   A_11,   B_11},
-    {1, C_10,   A_10,   B_10},
-    {1, C_9,    A_9,    B_9},
-    {1, C_8,    A_8,    B_8},
-    {1, C_7,    A_7,    B_7},
-    {1, C_6,    A_6,    B_6},
-    {1, C_5,    A_5,    B_5},
-    {1, C_3,    A_3,    B_3},
-    {1, C_1,    A_1,    B_1},
-    {1, L_3,    J_3,    K_3},
-    {1, L_4,    J_4,    K_4},
-    {0, L_16,   J_16,   K_16},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB12_CA3,    CB10_CA3,    CB11_CA3},
+    {1, CB12_CA4,    CB10_CA4,    CB11_CA4},
+    {0, CB12_CA16,   CB10_CA16,   CB11_CA16},
 
-    {1, I_16,   G_16,   H_16},
-    {1, I_14,   G_14,   H_14},
-    {1, I_13,   G_13,   H_13},
-    {1, I_12,   G_12,   H_12},
-    {1, I_11,   G_11,   H_11},
-    {1, I_10,   G_10,   H_10},
-    {1, I_9,    G_9,    H_9},
-    {1, I_8,    G_8,    H_8},
-    {1, I_7,    G_7,    H_7},
-    {1, I_6,    G_6,    H_6},
-    {1, I_5,    G_5,    H_5},
-    {1, I_3,    G_3,    H_3},
-    {1, I_2,    G_2,    H_2},
-    {1, I_1,    G_1,    H_1},
-    {1, L_5,    J_5,    K_5},
-    {1, L_6,    J_6,    K_6},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {1, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {1, CB12_CA5,    CB10_CA5,    CB11_CA5},
+    {1, CB12_CA6,    CB10_CA6,    CB11_CA6},
 
-    {1, F_16,   D_16,   E_16},
-    {1, F_15,   D_15,   E_15},
-    {1, F_14,   D_14,   E_14},
-    {1, F_10,   D_10,   E_10},
-    {1, F_6,    D_6,    E_6},
-    {1, F_5,    D_5,    E_5},
-    {1, F_4,    D_4,    E_4},
-    {1, F_3,    D_3,    E_3},
-    {1, F_2,    D_2,    E_2},
-    {1, F_1,    D_1,    E_1},
-    {1, L_1,    J_1,    K_1},
-    {1, L_2,    J_2,    K_2},
-    {1, L_7,    J_7,    K_7}
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {1, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {1, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB12_CA1,    CB10_CA1,    CB11_CA1},
+    {1, CB12_CA2,    CB10_CA2,    CB11_CA2},
+    {1, CB12_CA7,    CB10_CA7,    CB11_CA7}
 };
 
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q5/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q5/ansi_encoder/ansi_encoder.c
index 646deb11153..760fdcbc97b 100644
--- a/keyboards/keychron/q5/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/q5/ansi_encoder/ansi_encoder.c
@@ -27,111 +27,111 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, I_1,    G_1,    H_1},
-    // {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    // {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_14,   G_14,   H_14},
-    {0, I_15,   G_15,   H_15},
-    {0, I_16,   G_16,   H_16},
-    {0, L_12,   J_12,   K_12},
-    {0, L_13,   J_13,   K_13},
-    {0, L_14,   J_14,   K_14},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    // {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    // {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {0, CB12_CA12,   CB10_CA12,   CB11_CA12},
+    {0, CB12_CA13,   CB10_CA13,   CB11_CA13},
+    {0, CB12_CA14,   CB10_CA14,   CB11_CA14},
 
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_16,   A_16,   B_16},
-    {0, L_9,    J_9,    K_9},
-    {0, L_10,   J_10,   K_10},
-    {0, L_11,   J_11,   K_11},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {0, CB12_CA9,    CB10_CA9,    CB11_CA9},
+    {0, CB12_CA10,   CB10_CA10,   CB11_CA10},
+    {0, CB12_CA11,   CB10_CA11,   CB11_CA11},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_14,   D_14,   E_14},
-    {0, F_15,   D_15,   E_15},
-    {0, F_16,   D_16,   E_16},
-    {0, L_15,   J_15,   K_15},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {0, CB12_CA15,   CB10_CA15,   CB11_CA15},
 
-    {1, C_16,   A_16,   B_16},
-    {1, C_15,   A_15,   B_15},
-    {1, C_14,   A_14,   B_14},
-    {1, C_13,   A_13,   B_13},
-    {1, C_12,   A_12,   B_12},
-    {1, C_11,   A_11,   B_11},
-    {1, C_10,   A_10,   B_10},
-    {1, C_9,    A_9,    B_9},
-    {1, C_8,    A_8,    B_8},
-    {1, C_7,    A_7,    B_7},
-    {1, C_6,    A_6,    B_6},
-    {1, C_5,    A_5,    B_5},
-    {1, C_3,    A_3,    B_3},
-    {1, C_1,    A_1,    B_1},
-    {1, L_3,    J_3,    K_3},
-    {1, L_4,    J_4,    K_4},
-    {0, L_16,   J_16,   K_16},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB12_CA3,    CB10_CA3,    CB11_CA3},
+    {1, CB12_CA4,    CB10_CA4,    CB11_CA4},
+    {0, CB12_CA16,   CB10_CA16,   CB11_CA16},
 
-    {1, I_16,   G_16,   H_16},
-    {1, I_14,   G_14,   H_14},
-    {1, I_13,   G_13,   H_13},
-    {1, I_12,   G_12,   H_12},
-    {1, I_11,   G_11,   H_11},
-    {1, I_10,   G_10,   H_10},
-    {1, I_9,    G_9,    H_9},
-    {1, I_8,    G_8,    H_8},
-    {1, I_7,    G_7,    H_7},
-    {1, I_6,    G_6,    H_6},
-    {1, I_5,    G_5,    H_5},
-    {1, I_3,    G_3,    H_3},
-    {1, I_2,    G_2,    H_2},
-    {1, I_1,    G_1,    H_1},
-    {1, L_5,    J_5,    K_5},
-    {1, L_6,    J_6,    K_6},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {1, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {1, CB12_CA5,    CB10_CA5,    CB11_CA5},
+    {1, CB12_CA6,    CB10_CA6,    CB11_CA6},
 
-    {1, F_16,   D_16,   E_16},
-    {1, F_15,   D_15,   E_15},
-    {1, F_14,   D_14,   E_14},
-    {1, F_10,   D_10,   E_10},
-    {1, F_6,    D_6,    E_6},
-    {1, F_5,    D_5,    E_5},
-    {1, F_4,    D_4,    E_4},
-    {1, F_3,    D_3,    E_3},
-    {1, F_2,    D_2,    E_2},
-    {1, F_1,    D_1,    E_1},
-    {1, L_1,    J_1,    K_1},
-    {1, L_2,    J_2,    K_2},
-    {1, L_7,    J_7,    K_7}
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {1, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {1, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB12_CA1,    CB10_CA1,    CB11_CA1},
+    {1, CB12_CA2,    CB10_CA2,    CB11_CA2},
+    {1, CB12_CA7,    CB10_CA7,    CB11_CA7}
 };
 
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q5/iso/iso.c b/keyboards/keychron/q5/iso/iso.c
index e5a6399f7a2..e08df9ab65e 100644
--- a/keyboards/keychron/q5/iso/iso.c
+++ b/keyboards/keychron/q5/iso/iso.c
@@ -27,112 +27,112 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_14,   G_14,   H_14},
-    {0, I_15,   G_15,   H_15},
-    {0, I_16,   G_16,   H_16},
-    {0, L_12,   J_12,   K_12},
-    {0, L_13,   J_13,   K_13},
-    {0, L_14,   J_14,   K_14},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {0, CB12_CA12,   CB10_CA12,   CB11_CA12},
+    {0, CB12_CA13,   CB10_CA13,   CB11_CA13},
+    {0, CB12_CA14,   CB10_CA14,   CB11_CA14},
 
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_16,   A_16,   B_16},
-    {0, L_9,    J_9,    K_9},
-    {0, L_10,   J_10,   K_10},
-    {0, L_11,   J_11,   K_11},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {0, CB12_CA9,    CB10_CA9,    CB11_CA9},
+    {0, CB12_CA10,   CB10_CA10,   CB11_CA10},
+    {0, CB12_CA11,   CB10_CA11,   CB11_CA11},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_15,   D_15,   E_15},
-    {0, F_16,   D_16,   E_16},
-    {0, L_15,   J_15,   K_15},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {0, CB12_CA15,   CB10_CA15,   CB11_CA15},
 
-    {1, C_16,   A_16,   B_16},
-    {1, C_15,   A_15,   B_15},
-    {1, C_14,   A_14,   B_14},
-    {1, C_13,   A_13,   B_13},
-    {1, C_12,   A_12,   B_12},
-    {1, C_11,   A_11,   B_11},
-    {1, C_10,   A_10,   B_10},
-    {1, C_9,    A_9,    B_9},
-    {1, C_8,    A_8,    B_8},
-    {1, C_7,    A_7,    B_7},
-    {1, C_6,    A_6,    B_6},
-    {1, C_5,    A_5,    B_5},
-    {1, C_3,    A_3,    B_3},
-    {0, F_14,   D_14,   E_14},
-    {1, C_1,    A_1,    B_1},
-    {1, L_3,    J_3,    K_3},
-    {1, L_4,    J_4,    K_4},
-    {0, L_16,   J_16,   K_16},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB12_CA3,    CB10_CA3,    CB11_CA3},
+    {1, CB12_CA4,    CB10_CA4,    CB11_CA4},
+    {0, CB12_CA16,   CB10_CA16,   CB11_CA16},
 
-    {1, I_16,   G_16,   H_16},
-    {1, I_15,   G_15,   H_15},
-    {1, I_14,   G_14,   H_14},
-    {1, I_13,   G_13,   H_13},
-    {1, I_12,   G_12,   H_12},
-    {1, I_11,   G_11,   H_11},
-    {1, I_10,   G_10,   H_10},
-    {1, I_9,    G_9,    H_9},
-    {1, I_8,    G_8,    H_8},
-    {1, I_7,    G_7,    H_7},
-    {1, I_6,    G_6,    H_6},
-    {1, I_5,    G_5,    H_5},
-    {1, I_3,    G_3,    H_3},
-    {1, I_2,    G_2,    H_2},
-    {1, I_1,    G_1,    H_1},
-    {1, L_5,    J_5,    K_5},
-    {1, L_6,    J_6,    K_6},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {1, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {1, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {1, CB12_CA5,    CB10_CA5,    CB11_CA5},
+    {1, CB12_CA6,    CB10_CA6,    CB11_CA6},
 
-    {1, F_16,   D_16,   E_16},
-    {1, F_15,   D_15,   E_15},
-    {1, F_14,   D_14,   E_14},
-    {1, F_10,   D_10,   E_10},
-    {1, F_6,    D_6,    E_6},
-    {1, F_5,    D_5,    E_5},
-    {1, F_4,    D_4,    E_4},
-    {1, F_3,    D_3,    E_3},
-    {1, F_2,    D_2,    E_2},
-    {1, F_1,    D_1,    E_1},
-    {1, L_1,    J_1,    K_1},
-    {1, L_2,    J_2,    K_2},
-    {1, L_7,    J_7,    K_7}
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {1, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {1, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB12_CA1,    CB10_CA1,    CB11_CA1},
+    {1, CB12_CA2,    CB10_CA2,    CB11_CA2},
+    {1, CB12_CA7,    CB10_CA7,    CB11_CA7}
 };
 
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q5/iso_encoder/iso_encoder.c b/keyboards/keychron/q5/iso_encoder/iso_encoder.c
index 887931c0543..e0505e6fb9a 100644
--- a/keyboards/keychron/q5/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/q5/iso_encoder/iso_encoder.c
@@ -27,110 +27,110 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, I_1,    G_1,    H_1},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_14,   G_14,   H_14},
-    {0, I_15,   G_15,   H_15},
-    {0, I_16,   G_16,   H_16},
-    {0, L_12,   J_12,   K_12},
-    {0, L_13,   J_13,   K_13},
-    {0, L_14,   J_14,   K_14},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {0, CB12_CA12,   CB10_CA12,   CB11_CA12},
+    {0, CB12_CA13,   CB10_CA13,   CB11_CA13},
+    {0, CB12_CA14,   CB10_CA14,   CB11_CA14},
 
-    {0, C_1,    A_1,    B_1},  // `~
-    {0, C_2,    A_2,    B_2},  // 1!
-    {0, C_3,    A_3,    B_3},  // 2@
-    {0, C_4,    A_4,    B_4},  // 3#
-    {0, C_5,    A_5,    B_5},  // 4$
-    {0, C_6,    A_6,    B_6},  // 5%
-    {0, C_7,    A_7,    B_7},  // 6^
-    {0, C_8,    A_8,    B_8},  // 7&
-    {0, C_9,    A_9,    B_9},  // 8*
-    {0, C_10,   A_10,   B_10}, // 9(
-    {0, C_11,   A_11,   B_11}, // 0)
-    {0, C_12,   A_12,   B_12}, // -_
-    {0, C_13,   A_13,   B_13}, // =+
-    {0, C_14,   A_14,   B_14}, // BackSpace
-    {0, C_16,   A_16,   B_16}, // Numlock
-    {0, L_9,    J_9,    K_9},  // /
-    {0, L_10,   J_10,   K_10}, // *
-    {0, L_11,   J_11,   K_11}, // -
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},  // `~
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},  // 1!
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},  // 2@
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},  // 3#
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},  // 4$
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},  // 5%
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},  // 6^
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},  // 7&
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},  // 8*
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10}, // 9(
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11}, // 0)
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12}, // -_
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13}, // =+
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14}, // BackSpace
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16}, // Numlock
+    {0, CB12_CA9,    CB10_CA9,    CB11_CA9},  // /
+    {0, CB12_CA10,   CB10_CA10,   CB11_CA10}, // *
+    {0, CB12_CA11,   CB10_CA11,   CB11_CA11}, // -
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_15,   D_15,   E_15},
-    {0, F_16,   D_16,   E_16},
-    {0, L_15,   J_15,   K_15},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {0, CB12_CA15,   CB10_CA15,   CB11_CA15},
 
-    {1, C_16,   A_16,   B_16},
-    {1, C_15,   A_15,   B_15},
-    {1, C_14,   A_14,   B_14},
-    {1, C_13,   A_13,   B_13},
-    {1, C_12,   A_12,   B_12},
-    {1, C_11,   A_11,   B_11},
-    {1, C_10,   A_10,   B_10},
-    {1, C_9,    A_9,    B_9},
-    {1, C_8,    A_8,    B_8},
-    {1, C_7,    A_7,    B_7},
-    {1, C_6,    A_6,    B_6},
-    {1, C_5,    A_5,    B_5},
-    {1, C_3,    A_3,    B_3},
-    {0, F_14,   D_14,   E_14},
-    {1, C_1,    A_1,    B_1},
-    {1, L_3,    J_3,    K_3},
-    {1, L_4,    J_4,    K_4},
-    {0, L_16,   J_16,   K_16},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB12_CA3,    CB10_CA3,    CB11_CA3},
+    {1, CB12_CA4,    CB10_CA4,    CB11_CA4},
+    {0, CB12_CA16,   CB10_CA16,   CB11_CA16},
 
-    {1, I_16,   G_16,   H_16},
-    {1, I_15,   G_15,   H_15},
-    {1, I_14,   G_14,   H_14},
-    {1, I_13,   G_13,   H_13},
-    {1, I_12,   G_12,   H_12},
-    {1, I_11,   G_11,   H_11},
-    {1, I_10,   G_10,   H_10},
-    {1, I_9,    G_9,    H_9},
-    {1, I_8,    G_8,    H_8},
-    {1, I_7,    G_7,    H_7},
-    {1, I_6,    G_6,    H_6},
-    {1, I_5,    G_5,    H_5},
-    {1, I_3,    G_3,    H_3},
-    {1, I_2,    G_2,    H_2},
-    {1, I_1,    G_1,    H_1},
-    {1, L_5,    J_5,    K_5},
-    {1, L_6,    J_6,    K_6},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {1, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {1, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {1, CB12_CA5,    CB10_CA5,    CB11_CA5},
+    {1, CB12_CA6,    CB10_CA6,    CB11_CA6},
 
-    {1, F_16,   D_16,   E_16},
-    {1, F_15,   D_15,   E_15},
-    {1, F_14,   D_14,   E_14},
-    {1, F_10,   D_10,   E_10},
-    {1, F_6,    D_6,    E_6},
-    {1, F_5,    D_5,    E_5},
-    {1, F_4,    D_4,    E_4},
-    {1, F_3,    D_3,    E_3},
-    {1, F_2,    D_2,    E_2},
-    {1, F_1,    D_1,    E_1},
-    {1, L_1,    J_1,    K_1},
-    {1, L_2,    J_2,    K_2},
-    {1, L_7,    J_7,    K_7}
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {1, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {1, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB12_CA1,    CB10_CA1,    CB11_CA1},
+    {1, CB12_CA2,    CB10_CA2,    CB11_CA2},
+    {1, CB12_CA7,    CB10_CA7,    CB11_CA7}
 };
 
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q6/ansi/ansi.c b/keyboards/keychron/q6/ansi/ansi.c
index b9f249e281e..62a22971e11 100644
--- a/keyboards/keychron/q6/ansi/ansi.c
+++ b/keyboards/keychron/q6/ansi/ansi.c
@@ -27,119 +27,119 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_15,   G_15,   H_15},
-    {0, I_16,   G_16,   H_16},
-    {0, L_5,    J_5,    K_5},
-    {0, L_6,    J_6,    K_6},
-    {0, L_7,    J_7,    K_7},
-    {0, L_8,    J_8,    K_8},
-    {0, L_4,    J_4,    K_4},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {0, CB12_CA5,    CB10_CA5,    CB11_CA5},
+    {0, CB12_CA6,    CB10_CA6,    CB11_CA6},
+    {0, CB12_CA7,    CB10_CA7,    CB11_CA7},
+    {0, CB12_CA8,    CB10_CA8,    CB11_CA8},
+    {0, CB12_CA4,    CB10_CA4,    CB11_CA4},
 
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_15,   A_15,   B_15},
-    {0, C_16,   A_16,   B_16},
-    {0, L_9,    J_9,    K_9},
-    {0, L_10,   J_10,   K_10},
-    {0, L_11,   J_11,   K_11},
-    {0, L_12,   J_12,   K_12},
-    {0, L_13,   J_13,   K_13},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {0, CB12_CA9,    CB10_CA9,    CB11_CA9},
+    {0, CB12_CA10,   CB10_CA10,   CB11_CA10},
+    {0, CB12_CA11,   CB10_CA11,   CB11_CA11},
+    {0, CB12_CA12,   CB10_CA12,   CB11_CA12},
+    {0, CB12_CA13,   CB10_CA13,   CB11_CA13},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_14,   D_14,   E_14},
-    {0, F_15,   D_15,   E_15},
-    {0, F_16,   D_16,   E_16},
-    {0, L_14,   J_14,   K_14},
-    {0, L_15,   J_15,   K_15},
-    {0, L_16,   J_16,   K_16},
-    {1, L_1,    J_1,    K_1},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {0, CB12_CA14,   CB10_CA14,   CB11_CA14},
+    {0, CB12_CA15,   CB10_CA15,   CB11_CA15},
+    {0, CB12_CA16,   CB10_CA16,   CB11_CA16},
+    {1, CB12_CA1,    CB10_CA1,    CB11_CA1},
 
-    {1, C_16,   A_16,   B_16},
-    {1, C_15,   A_15,   B_15},
-    {1, C_14,   A_14,   B_14},
-    {1, C_13,   A_13,   B_13},
-    {1, C_12,   A_12,   B_12},
-    {1, C_11,   A_11,   B_11},
-    {1, C_10,   A_10,   B_10},
-    {1, C_9,    A_9,    B_9},
-    {1, C_8,    A_8,    B_8},
-    {1, C_7,    A_7,    B_7},
-    {1, C_6,    A_6,    B_6},
-    {1, C_5,    A_5,    B_5},
-    {1, C_3,    A_3,    B_3},
-    {1, L_3,    J_3,    K_3},
-    {1, L_4,    J_4,    K_4},
-    {1, L_5,    J_5,    K_5},
-    {1, L_2,    J_2,    K_2},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB12_CA3,    CB10_CA3,    CB11_CA3},
+    {1, CB12_CA4,    CB10_CA4,    CB11_CA4},
+    {1, CB12_CA5,    CB10_CA5,    CB11_CA5},
+    {1, CB12_CA2,    CB10_CA2,    CB11_CA2},
 
-    {1, I_16,   G_16,   H_16},
-    {1, I_14,   G_14,   H_14},
-    {1, I_13,   G_13,   H_13},
-    {1, I_12,   G_12,   H_12},
-    {1, I_11,   G_11,   H_11},
-    {1, I_10,   G_10,   H_10},
-    {1, I_9,    G_9,    H_9},
-    {1, I_8,    G_8,    H_8},
-    {1, I_7,    G_7,    H_7},
-    {1, I_6,    G_6,    H_6},
-    {1, I_5,    G_5,    H_5},
-    {1, I_3,    G_3,    H_3},
-    {1, I_1,    G_1,    H_1},
-    {1, L_6,    J_6,    K_6},
-    {1, L_7,    J_7,    K_7},
-    {1, L_8,    J_8,    K_8},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {1, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {1, CB12_CA6,    CB10_CA6,    CB11_CA6},
+    {1, CB12_CA7,    CB10_CA7,    CB11_CA7},
+    {1, CB12_CA8,    CB10_CA8,    CB11_CA8},
 
-    {1, F_16,   D_16,   E_16},
-    {1, F_15,   D_15,   E_15},
-    {1, F_14,   D_14,   E_14},
-    {1, F_10,   D_10,   E_10},
-    {1, F_6,    D_6,    E_6},
-    {1, F_5,    D_5,    E_5},
-    {1, F_4,    D_4,    E_4},
-    {1, F_3,    D_3,    E_3},
-    {1, F_2,    D_2,    E_2},
-    {1, F_1,    D_1,    E_1},
-    {1, L_10,   J_10,   K_10},
-    {1, L_11,   J_11,   K_11},
-    {1, L_12,   J_12,   K_12},
-    {1, L_9,    J_9,    K_9},
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {1, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {1, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB12_CA10,   CB10_CA10,   CB11_CA10},
+    {1, CB12_CA11,   CB10_CA11,   CB11_CA11},
+    {1, CB12_CA12,   CB10_CA12,   CB11_CA12},
+    {1, CB12_CA9,    CB10_CA9,    CB11_CA9},
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/q6/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q6/ansi_encoder/ansi_encoder.c
index 40643290992..b3d8a6bd4ca 100644
--- a/keyboards/keychron/q6/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/q6/ansi_encoder/ansi_encoder.c
@@ -27,119 +27,119 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_15,   G_15,   H_15},
-    {0, I_16,   G_16,   H_16},
-    {0, L_5,    J_5,    K_5},
-    {0, L_6,    J_6,    K_6},
-    {0, L_7,    J_7,    K_7},
-    {0, L_8,    J_8,    K_8},
-    {0, L_4,    J_4,    K_4},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {0, CB12_CA5,    CB10_CA5,    CB11_CA5},
+    {0, CB12_CA6,    CB10_CA6,    CB11_CA6},
+    {0, CB12_CA7,    CB10_CA7,    CB11_CA7},
+    {0, CB12_CA8,    CB10_CA8,    CB11_CA8},
+    {0, CB12_CA4,    CB10_CA4,    CB11_CA4},
 
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_15,   A_15,   B_15},
-    {0, C_16,   A_16,   B_16},
-    {0, L_9,    J_9,    K_9},
-    {0, L_10,   J_10,   K_10},
-    {0, L_11,   J_11,   K_11},
-    {0, L_12,   J_12,   K_12},
-    {0, L_13,   J_13,   K_13},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {0, CB12_CA9,    CB10_CA9,    CB11_CA9},
+    {0, CB12_CA10,   CB10_CA10,   CB11_CA10},
+    {0, CB12_CA11,   CB10_CA11,   CB11_CA11},
+    {0, CB12_CA12,   CB10_CA12,   CB11_CA12},
+    {0, CB12_CA13,   CB10_CA13,   CB11_CA13},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_14,   D_14,   E_14},
-    {0, F_15,   D_15,   E_15},
-    {0, F_16,   D_16,   E_16},
-    {0, L_14,   J_14,   K_14},
-    {0, L_15,   J_15,   K_15},
-    {0, L_16,   J_16,   K_16},
-    {1, L_1,    J_1,    K_1},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {0, CB12_CA14,   CB10_CA14,   CB11_CA14},
+    {0, CB12_CA15,   CB10_CA15,   CB11_CA15},
+    {0, CB12_CA16,   CB10_CA16,   CB11_CA16},
+    {1, CB12_CA1,    CB10_CA1,    CB11_CA1},
 
-    {1, C_16,   A_16,   B_16},
-    {1, C_15,   A_15,   B_15},
-    {1, C_14,   A_14,   B_14},
-    {1, C_13,   A_13,   B_13},
-    {1, C_12,   A_12,   B_12},
-    {1, C_11,   A_11,   B_11},
-    {1, C_10,   A_10,   B_10},
-    {1, C_9,    A_9,    B_9},
-    {1, C_8,    A_8,    B_8},
-    {1, C_7,    A_7,    B_7},
-    {1, C_6,    A_6,    B_6},
-    {1, C_5,    A_5,    B_5},
-    {1, C_3,    A_3,    B_3},
-    {1, L_3,    J_3,    K_3},
-    {1, L_4,    J_4,    K_4},
-    {1, L_5,    J_5,    K_5},
-    {1, L_2,    J_2,    K_2},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB12_CA3,    CB10_CA3,    CB11_CA3},
+    {1, CB12_CA4,    CB10_CA4,    CB11_CA4},
+    {1, CB12_CA5,    CB10_CA5,    CB11_CA5},
+    {1, CB12_CA2,    CB10_CA2,    CB11_CA2},
 
-    {1, I_16,   G_16,   H_16},
-    {1, I_14,   G_14,   H_14},
-    {1, I_13,   G_13,   H_13},
-    {1, I_12,   G_12,   H_12},
-    {1, I_11,   G_11,   H_11},
-    {1, I_10,   G_10,   H_10},
-    {1, I_9,    G_9,    H_9},
-    {1, I_8,    G_8,    H_8},
-    {1, I_7,    G_7,    H_7},
-    {1, I_6,    G_6,    H_6},
-    {1, I_5,    G_5,    H_5},
-    {1, I_3,    G_3,    H_3},
-    {1, I_1,    G_1,    H_1},
-    {1, L_6,    J_6,    K_6},
-    {1, L_7,    J_7,    K_7},
-    {1, L_8,    J_8,    K_8},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {1, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {1, CB12_CA6,    CB10_CA6,    CB11_CA6},
+    {1, CB12_CA7,    CB10_CA7,    CB11_CA7},
+    {1, CB12_CA8,    CB10_CA8,    CB11_CA8},
 
-    {1, F_16,   D_16,   E_16},
-    {1, F_15,   D_15,   E_15},
-    {1, F_14,   D_14,   E_14},
-    {1, F_10,   D_10,   E_10},
-    {1, F_6,    D_6,    E_6},
-    {1, F_5,    D_5,    E_5},
-    {1, F_4,    D_4,    E_4},
-    {1, F_3,    D_3,    E_3},
-    {1, F_2,    D_2,    E_2},
-    {1, F_1,    D_1,    E_1},
-    {1, L_10,   J_10,   K_10},
-    {1, L_11,   J_11,   K_11},
-    {1, L_12,   J_12,   K_12},
-    {1, L_9,    J_9,    K_9},
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {1, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {1, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB12_CA10,   CB10_CA10,   CB11_CA10},
+    {1, CB12_CA11,   CB10_CA11,   CB11_CA11},
+    {1, CB12_CA12,   CB10_CA12,   CB11_CA12},
+    {1, CB12_CA9,    CB10_CA9,    CB11_CA9},
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/q6/iso/iso.c b/keyboards/keychron/q6/iso/iso.c
index 8cdee4cf3b2..eb6cab855ac 100644
--- a/keyboards/keychron/q6/iso/iso.c
+++ b/keyboards/keychron/q6/iso/iso.c
@@ -27,120 +27,120 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_15,   G_15,   H_15},
-    {0, I_16,   G_16,   H_16},
-    {0, L_5,    J_5,    K_5},
-    {0, L_6,    J_6,    K_6},
-    {0, L_7,    J_7,    K_7},
-    {0, L_8,    J_8,    K_8},
-    {0, L_4,    J_4,    K_4},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {0, CB12_CA5,    CB10_CA5,    CB11_CA5},
+    {0, CB12_CA6,    CB10_CA6,    CB11_CA6},
+    {0, CB12_CA7,    CB10_CA7,    CB11_CA7},
+    {0, CB12_CA8,    CB10_CA8,    CB11_CA8},
+    {0, CB12_CA4,    CB10_CA4,    CB11_CA4},
 
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_15,   A_15,   B_15},
-    {0, C_16,   A_16,   B_16},
-    {0, L_9,    J_9,    K_9},
-    {0, L_10,   J_10,   K_10},
-    {0, L_11,   J_11,   K_11},
-    {0, L_12,   J_12,   K_12},
-    {0, L_13,   J_13,   K_13},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {0, CB12_CA9,    CB10_CA9,    CB11_CA9},
+    {0, CB12_CA10,   CB10_CA10,   CB11_CA10},
+    {0, CB12_CA11,   CB10_CA11,   CB11_CA11},
+    {0, CB12_CA12,   CB10_CA12,   CB11_CA12},
+    {0, CB12_CA13,   CB10_CA13,   CB11_CA13},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_15,   D_15,   E_15},
-    {0, F_16,   D_16,   E_16},
-    {0, L_14,   J_14,   K_14},
-    {0, L_15,   J_15,   K_15},
-    {0, L_16,   J_16,   K_16},
-    {1, L_1,    J_1,    K_1},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {0, CB12_CA14,   CB10_CA14,   CB11_CA14},
+    {0, CB12_CA15,   CB10_CA15,   CB11_CA15},
+    {0, CB12_CA16,   CB10_CA16,   CB11_CA16},
+    {1, CB12_CA1,    CB10_CA1,    CB11_CA1},
 
-    {1, C_16,   A_16,   B_16},
-    {1, C_15,   A_15,   B_15},
-    {1, C_14,   A_14,   B_14},
-    {1, C_13,   A_13,   B_13},
-    {1, C_12,   A_12,   B_12},
-    {1, C_11,   A_11,   B_11},
-    {1, C_10,   A_10,   B_10},
-    {1, C_9,    A_9,    B_9},
-    {1, C_8,    A_8,    B_8},
-    {1, C_7,    A_7,    B_7},
-    {1, C_6,    A_6,    B_6},
-    {1, C_5,    A_5,    B_5},
-    {1, C_3,    A_3,    B_3},
-    {0, F_14,   D_14,   E_14},
-    {1, L_3,    J_3,    K_3},
-    {1, L_4,    J_4,    K_4},
-    {1, L_5,    J_5,    K_5},
-    {1, L_2,    J_2,    K_2},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB12_CA3,    CB10_CA3,    CB11_CA3},
+    {1, CB12_CA4,    CB10_CA4,    CB11_CA4},
+    {1, CB12_CA5,    CB10_CA5,    CB11_CA5},
+    {1, CB12_CA2,    CB10_CA2,    CB11_CA2},
 
-    {1, I_16,   G_16,   H_16},
-    {1, I_15,   G_15,   H_15},
-    {1, I_14,   G_14,   H_14},
-    {1, I_13,   G_13,   H_13},
-    {1, I_12,   G_12,   H_12},
-    {1, I_11,   G_11,   H_11},
-    {1, I_10,   G_10,   H_10},
-    {1, I_9,    G_9,    H_9},
-    {1, I_8,    G_8,    H_8},
-    {1, I_7,    G_7,    H_7},
-    {1, I_6,    G_6,    H_6},
-    {1, I_5,    G_5,    H_5},
-    {1, I_3,    G_3,    H_3},
-    {1, I_1,    G_1,    H_1},
-    {1, L_6,    J_6,    K_6},
-    {1, L_7,    J_7,    K_7},
-    {1, L_8,    J_8,    K_8},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {1, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {1, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {1, CB12_CA6,    CB10_CA6,    CB11_CA6},
+    {1, CB12_CA7,    CB10_CA7,    CB11_CA7},
+    {1, CB12_CA8,    CB10_CA8,    CB11_CA8},
 
-    {1, F_16,   D_16,   E_16},
-    {1, F_15,   D_15,   E_15},
-    {1, F_14,   D_14,   E_14},
-    {1, F_10,   D_10,   E_10},
-    {1, F_6,    D_6,    E_6},
-    {1, F_5,    D_5,    E_5},
-    {1, F_4,    D_4,    E_4},
-    {1, F_3,    D_3,    E_3},
-    {1, F_2,    D_2,    E_2},
-    {1, F_1,    D_1,    E_1},
-    {1, L_10,   J_10,   K_10},
-    {1, L_11,   J_11,   K_11},
-    {1, L_12,   J_12,   K_12},
-    {1, L_9,    J_9,    K_9},
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {1, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {1, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB12_CA10,   CB10_CA10,   CB11_CA10},
+    {1, CB12_CA11,   CB10_CA11,   CB11_CA11},
+    {1, CB12_CA12,   CB10_CA12,   CB11_CA12},
+    {1, CB12_CA9,    CB10_CA9,    CB11_CA9},
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/q6/iso_encoder/iso_encoder.c b/keyboards/keychron/q6/iso_encoder/iso_encoder.c
index 5ff71379c97..439e1cee50b 100644
--- a/keyboards/keychron/q6/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/q6/iso_encoder/iso_encoder.c
@@ -27,120 +27,120 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_15,   G_15,   H_15},
-    {0, I_16,   G_16,   H_16},
-    {0, L_5,    J_5,    K_5},
-    {0, L_6,    J_6,    K_6},
-    {0, L_7,    J_7,    K_7},
-    {0, L_8,    J_8,    K_8},
-    {0, L_4,    J_4,    K_4},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {0, CB12_CA5,    CB10_CA5,    CB11_CA5},
+    {0, CB12_CA6,    CB10_CA6,    CB11_CA6},
+    {0, CB12_CA7,    CB10_CA7,    CB11_CA7},
+    {0, CB12_CA8,    CB10_CA8,    CB11_CA8},
+    {0, CB12_CA4,    CB10_CA4,    CB11_CA4},
 
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_15,   A_15,   B_15},
-    {0, C_16,   A_16,   B_16},
-    {0, L_9,    J_9,    K_9},
-    {0, L_10,   J_10,   K_10},
-    {0, L_11,   J_11,   K_11},
-    {0, L_12,   J_12,   K_12},
-    {0, L_13,   J_13,   K_13},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {0, CB12_CA9,    CB10_CA9,    CB11_CA9},
+    {0, CB12_CA10,   CB10_CA10,   CB11_CA10},
+    {0, CB12_CA11,   CB10_CA11,   CB11_CA11},
+    {0, CB12_CA12,   CB10_CA12,   CB11_CA12},
+    {0, CB12_CA13,   CB10_CA13,   CB11_CA13},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_15,   D_15,   E_15},
-    {0, F_16,   D_16,   E_16},
-    {0, L_14,   J_14,   K_14},
-    {0, L_15,   J_15,   K_15},
-    {0, L_16,   J_16,   K_16},
-    {1, L_1,    J_1,    K_1},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {0, CB12_CA14,   CB10_CA14,   CB11_CA14},
+    {0, CB12_CA15,   CB10_CA15,   CB11_CA15},
+    {0, CB12_CA16,   CB10_CA16,   CB11_CA16},
+    {1, CB12_CA1,    CB10_CA1,    CB11_CA1},
 
-    {1, C_16,   A_16,   B_16},
-    {1, C_15,   A_15,   B_15},
-    {1, C_14,   A_14,   B_14},
-    {1, C_13,   A_13,   B_13},
-    {1, C_12,   A_12,   B_12},
-    {1, C_11,   A_11,   B_11},
-    {1, C_10,   A_10,   B_10},
-    {1, C_9,    A_9,    B_9},
-    {1, C_8,    A_8,    B_8},
-    {1, C_7,    A_7,    B_7},
-    {1, C_6,    A_6,    B_6},
-    {1, C_5,    A_5,    B_5},
-    {1, C_3,    A_3,    B_3},
-    {0, F_14,   D_14,   E_14},
-    {1, L_3,    J_3,    K_3},
-    {1, L_4,    J_4,    K_4},
-    {1, L_5,    J_5,    K_5},
-    {1, L_2,    J_2,    K_2},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB12_CA3,    CB10_CA3,    CB11_CA3},
+    {1, CB12_CA4,    CB10_CA4,    CB11_CA4},
+    {1, CB12_CA5,    CB10_CA5,    CB11_CA5},
+    {1, CB12_CA2,    CB10_CA2,    CB11_CA2},
 
-    {1, I_16,   G_16,   H_16},
-    {1, I_15,   G_15,   H_15},
-    {1, I_14,   G_14,   H_14},
-    {1, I_13,   G_13,   H_13},
-    {1, I_12,   G_12,   H_12},
-    {1, I_11,   G_11,   H_11},
-    {1, I_10,   G_10,   H_10},
-    {1, I_9,    G_9,    H_9},
-    {1, I_8,    G_8,    H_8},
-    {1, I_7,    G_7,    H_7},
-    {1, I_6,    G_6,    H_6},
-    {1, I_5,    G_5,    H_5},
-    {1, I_3,    G_3,    H_3},
-    {1, I_1,    G_1,    H_1},
-    {1, L_6,    J_6,    K_6},
-    {1, L_7,    J_7,    K_7},
-    {1, L_8,    J_8,    K_8},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {1, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {1, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {1, CB12_CA6,    CB10_CA6,    CB11_CA6},
+    {1, CB12_CA7,    CB10_CA7,    CB11_CA7},
+    {1, CB12_CA8,    CB10_CA8,    CB11_CA8},
 
-    {1, F_16,   D_16,   E_16},
-    {1, F_15,   D_15,   E_15},
-    {1, F_14,   D_14,   E_14},
-    {1, F_10,   D_10,   E_10},
-    {1, F_6,    D_6,    E_6},
-    {1, F_5,    D_5,    E_5},
-    {1, F_4,    D_4,    E_4},
-    {1, F_3,    D_3,    E_3},
-    {1, F_2,    D_2,    E_2},
-    {1, F_1,    D_1,    E_1},
-    {1, L_10,   J_10,   K_10},
-    {1, L_11,   J_11,   K_11},
-    {1, L_12,   J_12,   K_12},
-    {1, L_9,    J_9,    K_9},
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {1, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {1, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB12_CA10,   CB10_CA10,   CB11_CA10},
+    {1, CB12_CA11,   CB10_CA11,   CB11_CA11},
+    {1, CB12_CA12,   CB10_CA12,   CB11_CA12},
+    {1, CB12_CA9,    CB10_CA9,    CB11_CA9},
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/q60/ansi/ansi.c b/keyboards/keychron/q60/ansi/ansi.c
index f02d45b42ae..8b702eb5a60 100644
--- a/keyboards/keychron/q60/ansi/ansi.c
+++ b/keyboards/keychron/q60/ansi/ansi.c
@@ -27,70 +27,70 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_14,   D_14,   E_14},
-    {0, F_15,   D_15,   E_15},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
 
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_14,   G_14,   H_14},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14},
 
-    {0, L_1,    J_1,    K_1},
-    {0, L_2,    J_2,    K_2},
-    {0, L_3,    J_3,    K_3},
-    {0, L_4,    J_4,    K_4},
-    {0, L_5,    J_5,    K_5},
-    {0, L_6,    J_6,    K_6},
-    {0, L_7,    J_7,    K_7},
-    {0, L_8,    J_8,    K_8},
-    {0, L_9,    J_9,    K_9},
-    {0, L_10,   J_10,   K_10},
-    {0, L_11,   J_11,   K_11},
-    {0, L_12,   J_12,   K_12},
-    {0, L_14,   J_14,   K_14},
+    {0, CB12_CA1,    CB10_CA1,    CB11_CA1},
+    {0, CB12_CA2,    CB10_CA2,    CB11_CA2},
+    {0, CB12_CA3,    CB10_CA3,    CB11_CA3},
+    {0, CB12_CA4,    CB10_CA4,    CB11_CA4},
+    {0, CB12_CA5,    CB10_CA5,    CB11_CA5},
+    {0, CB12_CA6,    CB10_CA6,    CB11_CA6},
+    {0, CB12_CA7,    CB10_CA7,    CB11_CA7},
+    {0, CB12_CA8,    CB10_CA8,    CB11_CA8},
+    {0, CB12_CA9,    CB10_CA9,    CB11_CA9},
+    {0, CB12_CA10,   CB10_CA10,   CB11_CA10},
+    {0, CB12_CA11,   CB10_CA11,   CB11_CA11},
+    {0, CB12_CA12,   CB10_CA12,   CB11_CA12},
+    {0, CB12_CA14,   CB10_CA14,   CB11_CA14},
 
-    {0, C_1,    A_1,    B_1},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
 
-    {0, C_15,   A_15,   B_15},
-    {0, C_16,   A_16,   B_16},
-    {0, L_16,   J_16,   K_16},
-    {0, I_15,   G_15,   H_15},
-    {0, I_16,   G_16,   H_16},
+    {0, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {0, CB12_CA16,   CB10_CA16,   CB11_CA16},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/q65/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q65/ansi_encoder/ansi_encoder.c
index 3ed44a73873..6c4c2abe21d 100644
--- a/keyboards/keychron/q65/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/q65/ansi_encoder/ansi_encoder.c
@@ -25,82 +25,82 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_15, A_15, B_15}, // Esc
-    {0, C_14, A_14, B_14}, // 1!
-    {0, C_13, A_13, B_13}, // 2@
-    {0, C_12, A_12, B_12}, // 3#
-    {0, C_11, A_11, B_11}, // 4$
-    {0, C_10, A_10, B_10}, // 5%
-    {0, C_9,  A_9,  B_9},  // 6^
-    {0, C_8,  A_8,  B_8},  // 7&
-    {0, C_7,  A_7,  B_7},  // 8*
-    {0, C_6,  A_6,  B_6},  // 9(
-    {0, C_5,  A_5,  B_5},  // 0)
-    {0, C_4,  A_4,  B_4},  // -_
-    {0, C_3,  A_3,  B_3},  // =+
-    {0, C_2,  A_2,  B_2},  // BackSpace
-    {0, C_1,  A_1,  B_1},  // Delete
+    {0, CB3_CA15, CB1_CA15, CB2_CA15}, // Esc
+    {0, CB3_CA14, CB1_CA14, CB2_CA14}, // 1!
+    {0, CB3_CA13, CB1_CA13, CB2_CA13}, // 2@
+    {0, CB3_CA12, CB1_CA12, CB2_CA12}, // 3#
+    {0, CB3_CA11, CB1_CA11, CB2_CA11}, // 4$
+    {0, CB3_CA10, CB1_CA10, CB2_CA10}, // 5%
+    {0, CB3_CA9,  CB1_CA9,  CB2_CA9},  // 6^
+    {0, CB3_CA8,  CB1_CA8,  CB2_CA8},  // 7&
+    {0, CB3_CA7,  CB1_CA7,  CB2_CA7},  // 8*
+    {0, CB3_CA6,  CB1_CA6,  CB2_CA6},  // 9(
+    {0, CB3_CA5,  CB1_CA5,  CB2_CA5},  // 0)
+    {0, CB3_CA4,  CB1_CA4,  CB2_CA4},  // -_
+    {0, CB3_CA3,  CB1_CA3,  CB2_CA3},  // =+
+    {0, CB3_CA2,  CB1_CA2,  CB2_CA2},  // BackSpace
+    {0, CB3_CA1,  CB1_CA1,  CB2_CA1},  // Delete
 
-    {0, F_16, D_16, E_16}, // Macro2
-    {0, F_15, D_15, E_15}, // Tab
-    {0, F_14, D_14, E_14}, // Q
-    {0, F_13, D_13, E_13}, // W
-    {0, F_12, D_12, E_12}, // E
-    {0, F_11, D_11, E_11}, // R
-    {0, F_10, D_10, E_10}, // T
-    {0, F_9,  D_9,  E_9},  // Y
-    {0, F_8,  D_8,  E_8},  // U
-    {0, F_7,  D_7,  E_7},  // I
-    {0, F_6,  D_6,  E_6},  // O
-    {0, F_5,  D_5,  E_5},  // P
-    {0, F_4,  D_4,  E_4},  // [{
-    {0, F_3,  D_3,  E_3},  // ]}
-    {0, F_2,  D_2,  E_2},  // |
-    {0, F_1,  D_1,  E_1},  // PageUp
+    {0, CB6_CA16, CB4_CA16, CB5_CA16}, // Macro2
+    {0, CB6_CA15, CB4_CA15, CB5_CA15}, // Tab
+    {0, CB6_CA14, CB4_CA14, CB5_CA14}, // Q
+    {0, CB6_CA13, CB4_CA13, CB5_CA13}, // W
+    {0, CB6_CA12, CB4_CA12, CB5_CA12}, // E
+    {0, CB6_CA11, CB4_CA11, CB5_CA11}, // R
+    {0, CB6_CA10, CB4_CA10, CB5_CA10}, // T
+    {0, CB6_CA9,  CB4_CA9,  CB5_CA9},  // Y
+    {0, CB6_CA8,  CB4_CA8,  CB5_CA8},  // U
+    {0, CB6_CA7,  CB4_CA7,  CB5_CA7},  // I
+    {0, CB6_CA6,  CB4_CA6,  CB5_CA6},  // O
+    {0, CB6_CA5,  CB4_CA5,  CB5_CA5},  // P
+    {0, CB6_CA4,  CB4_CA4,  CB5_CA4},  // [{
+    {0, CB6_CA3,  CB4_CA3,  CB5_CA3},  // ]}
+    {0, CB6_CA2,  CB4_CA2,  CB5_CA2},  // |
+    {0, CB6_CA1,  CB4_CA1,  CB5_CA1},  // PageUp
 
-    {1, C_16, A_16, B_16}, // Macro3
-    {1, C_15, A_15, B_15}, // CapsLock
-    {1, C_14, A_14, B_14}, // A
-    {1, C_13, A_13, B_13}, // S
-    {1, C_12, A_12, B_12}, // D
-    {1, C_11, A_11, B_11}, // F
-    {1, C_10, A_10, B_10}, // G
-    {1, C_9,  A_9,  B_9},  // H
-    {1, C_8,  A_8,  B_8},  // J
-    {1, C_7,  A_7,  B_7},  // K
-    {1, C_6,  A_6,  B_6},  // L
-    {1, C_5,  A_5,  B_5},  // ;:
-    {1, C_4,  A_4,  B_4},  // '"
-    {1, C_2,  A_2,  B_2},  // Enter
-    {1, C_1,  A_1,  B_1},  // PageDown
+    {1, CB3_CA16, CB1_CA16, CB2_CA16}, // Macro3
+    {1, CB3_CA15, CB1_CA15, CB2_CA15}, // CapsLock
+    {1, CB3_CA14, CB1_CA14, CB2_CA14}, // A
+    {1, CB3_CA13, CB1_CA13, CB2_CA13}, // S
+    {1, CB3_CA12, CB1_CA12, CB2_CA12}, // D
+    {1, CB3_CA11, CB1_CA11, CB2_CA11}, // F
+    {1, CB3_CA10, CB1_CA10, CB2_CA10}, // G
+    {1, CB3_CA9,  CB1_CA9,  CB2_CA9},  // H
+    {1, CB3_CA8,  CB1_CA8,  CB2_CA8},  // J
+    {1, CB3_CA7,  CB1_CA7,  CB2_CA7},  // K
+    {1, CB3_CA6,  CB1_CA6,  CB2_CA6},  // L
+    {1, CB3_CA5,  CB1_CA5,  CB2_CA5},  // ;:
+    {1, CB3_CA4,  CB1_CA4,  CB2_CA4},  // '"
+    {1, CB3_CA2,  CB1_CA2,  CB2_CA2},  // Enter
+    {1, CB3_CA1,  CB1_CA1,  CB2_CA1},  // PageDown
 
-    {1, I_16, G_16, H_16}, // Macro4
-    {1, I_15, G_15, H_15}, // LeftShift
-    {1, I_13, G_13, H_13}, // Z
-    {1, I_12, G_12, H_12}, // X
-    {1, I_11, G_11, H_11}, // C
-    {1, I_10, G_10, H_10}, // V
-    {1, I_9,  G_9,  H_9},  // B
-    {1, I_8,  G_8,  H_8},  // N
-    {1, I_7,  G_7,  H_7},  // M
-    {1, I_6,  G_6,  H_6},  // ,<
-    {1, I_5,  G_5,  H_5},  // .>
-    {1, I_4,  G_4,  H_4},  // /?
-    {1, I_3,  G_3,  H_3},  // RightShift
-    {1, I_2,  G_2,  H_2},  // Up
-    {1, I_1,  G_1,  H_1},  // Home
+    {1, CB9_CA16, CB7_CA16, CB8_CA16}, // Macro4
+    {1, CB9_CA15, CB7_CA15, CB8_CA15}, // LeftShift
+    {1, CB9_CA13, CB7_CA13, CB8_CA13}, // Z
+    {1, CB9_CA12, CB7_CA12, CB8_CA12}, // X
+    {1, CB9_CA11, CB7_CA11, CB8_CA11}, // C
+    {1, CB9_CA10, CB7_CA10, CB8_CA10}, // V
+    {1, CB9_CA9,  CB7_CA9,  CB8_CA9},  // B
+    {1, CB9_CA8,  CB7_CA8,  CB8_CA8},  // N
+    {1, CB9_CA7,  CB7_CA7,  CB8_CA7},  // M
+    {1, CB9_CA6,  CB7_CA6,  CB8_CA6},  // ,<
+    {1, CB9_CA5,  CB7_CA5,  CB8_CA5},  // .>
+    {1, CB9_CA4,  CB7_CA4,  CB8_CA4},  // /?
+    {1, CB9_CA3,  CB7_CA3,  CB8_CA3},  // RightShift
+    {1, CB9_CA2,  CB7_CA2,  CB8_CA2},  // Up
+    {1, CB9_CA1,  CB7_CA1,  CB8_CA1},  // Home
 
-    {1, F_16, D_16, E_16}, // Macro5
-    {1, F_15, D_15, E_15}, // LeftControl
-    {1, F_14, D_14, E_14}, // LeftOption
-    {1, F_13, D_13, E_13}, // LeftCommand
-    {1, F_9,  D_9,  E_9},  // Space
-    {1, F_6,  D_6,  E_6},  // RightCommand
-    {1, F_5,  D_5,  E_5},  // Fn1
-    {1, F_4,  D_4,  E_4},  // Fn2
-    {1, F_3,  D_3,  E_3},  // Left
-    {1, F_2,  D_2,  E_2},  // Down
-    {1, F_1,  D_1,  E_1},  // Right
+    {1, CB6_CA16, CB4_CA16, CB5_CA16}, // Macro5
+    {1, CB6_CA15, CB4_CA15, CB5_CA15}, // LeftControl
+    {1, CB6_CA14, CB4_CA14, CB5_CA14}, // LeftOption
+    {1, CB6_CA13, CB4_CA13, CB5_CA13}, // LeftCommand
+    {1, CB6_CA9,  CB4_CA9,  CB5_CA9},  // Space
+    {1, CB6_CA6,  CB4_CA6,  CB5_CA6},  // RightCommand
+    {1, CB6_CA5,  CB4_CA5,  CB5_CA5},  // Fn1
+    {1, CB6_CA4,  CB4_CA4,  CB5_CA4},  // Fn2
+    {1, CB6_CA3,  CB4_CA3,  CB5_CA3},  // Left
+    {1, CB6_CA2,  CB4_CA2,  CB5_CA2},  // Down
+    {1, CB6_CA1,  CB4_CA1,  CB5_CA1},  // Right
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/q7/ansi/ansi.c b/keyboards/keychron/q7/ansi/ansi.c
index 828028b39e1..ef21433f575 100644
--- a/keyboards/keychron/q7/ansi/ansi.c
+++ b/keyboards/keychron/q7/ansi/ansi.c
@@ -27,82 +27,82 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_15,   A_15,   B_15},
-    {0, C_16,   A_16,   B_16},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_14,   D_14,   E_14},
-    {0, F_15,   D_15,   E_15},
-    {0, F_16,   D_16,   E_16},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
 
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {1, I_6,    G_6,    H_6},
-    {1, I_7,    G_7,    H_7},
-    {1, I_8,    G_8,    H_8},
-    {1, I_9,    G_9,    H_9},
-    {1, I_10,   G_10,   H_10},
-    {1, I_11,   G_11,   H_11},
-    {1, I_12,   G_12,   H_12},
-    {1, I_14,   G_14,   H_14},
-    {1, I_15,   G_15,   H_15},
-    {1, I_16,   G_16,   H_16},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {1, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {1, C_1,    A_1,    B_1},
-    {1, C_3,    A_3,    B_3},
-    {1, C_4,    A_4,    B_4},
-    {1, C_5,    A_5,    B_5},
-    {1, C_6,    A_6,    B_6},
-    {1, C_7,    A_7,    B_7},
-    {1, C_8,    A_8,    B_8},
-    {1, C_9,    A_9,    B_9},
-    {1, C_10,   A_10,   B_10},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_14,   A_14,   B_14},
-    {1, C_15,   A_15,   B_15},
-    {1, C_16,   A_16,   B_16},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_2,    D_2,    E_2},
-    {1, F_3,    D_3,    E_3},
-    {1, F_7,    D_7,    E_7},
-    {1, F_10,   D_10,   E_10},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_13,   D_13,   E_13},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
-    {1, F_16,   D_16,   E_16},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16},
 };
 
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q7/iso/iso.c b/keyboards/keychron/q7/iso/iso.c
index 85774429b8a..dfda79c8435 100644
--- a/keyboards/keychron/q7/iso/iso.c
+++ b/keyboards/keychron/q7/iso/iso.c
@@ -25,83 +25,83 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_15,   A_15,   B_15},
-    {0, C_16,   A_16,   B_16},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_15,   D_15,   E_15},
-    {0, F_16,   D_16,   E_16},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
 
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {1, I_6,    G_6,    H_6},
-    {1, I_7,    G_7,    H_7},
-    {1, I_8,    G_8,    H_8},
-    {1, I_9,    G_9,    H_9},
-    {1, I_10,   G_10,   H_10},
-    {1, I_11,   G_11,   H_11},
-    {1, I_12,   G_12,   H_12},
-    {1, I_14,   G_14,   H_14},
-    {0, F_14,   D_14,   E_14},
-    {1, I_15,   G_15,   H_15},
-    {1, I_16,   G_16,   H_16},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {1, C_1,    A_1,    B_1},
-    {1, C_2,    A_2,    B_2},
-    {1, C_3,    A_3,    B_3},
-    {1, C_4,    A_4,    B_4},
-    {1, C_5,    A_5,    B_5},
-    {1, C_6,    A_6,    B_6},
-    {1, C_7,    A_7,    B_7},
-    {1, C_8,    A_8,    B_8},
-    {1, C_9,    A_9,    B_9},
-    {1, C_10,   A_10,   B_10},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_14,   A_14,   B_14},
-    {1, C_15,   A_15,   B_15},
-    {1, C_16,   A_16,   B_16},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_2,    D_2,    E_2},
-    {1, F_3,    D_3,    E_3},
-    {1, F_7,    D_7,    E_7},
-    {1, F_10,   D_10,   E_10},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_13,   D_13,   E_13},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
-    {1, F_16,   D_16,   E_16},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16},
 };
 
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q8/ansi/ansi.c b/keyboards/keychron/q8/ansi/ansi.c
index fbb68134488..e60752d7ddb 100644
--- a/keyboards/keychron/q8/ansi/ansi.c
+++ b/keyboards/keychron/q8/ansi/ansi.c
@@ -27,80 +27,80 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_14,   G_14,   H_14},
-    {0, I_15,   G_15,   H_15},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_14,   D_14,   E_14},
-    {0, F_15,   D_15,   E_15},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
 
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {1, C_10,   A_10,   B_10},
-    // {1, C_9,    A_9,    B_9},
-    {1, C_8,    A_8,    B_8},
-    {1, C_7,    A_7,    B_7},
-    {1, C_6,    A_6,    B_6},
-    {1, C_5,    A_5,    B_5},
-    {1, C_4,    A_4,    B_4},
-    {1, C_3,    A_3,    B_3},
-    {1, C_2,    A_2,    B_2},
-    {1, C_1,    A_1,    B_1},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    // {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
 
-    {1, I_15,   G_15,   H_15},
-    {1, I_13,   G_13,   H_13},
-    {1, I_12,   G_12,   H_12},
-    {1, I_11,   G_11,   H_11},
-    {1, I_10,   G_10,   H_10},
-    {1, I_9,    G_9,    H_9},
-    {1, I_8,    G_8,    H_8},
-    {1, I_7,    G_7,    H_7},
-    {1, I_6,    G_6,    H_6},
-    {1, I_5,    G_5,    H_5},
-    {1, I_4,    G_4,    H_4},
-    {1, I_3,    G_3,    H_3},
-    {1, I_2,    G_2,    H_2},
-    {1, I_1,    G_1,    H_1},
+    {1, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {1, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
 
-    {1, F_15,   D_15,   E_15},
-    {1, F_14,   D_14,   E_14},
-    {1, F_13,   D_13,   E_13},
-    {1, F_12,   D_12,   E_12},
-    {1, F_9,    D_9,    E_9},
-    {1, F_8,    D_8,    E_8},
-    {1, F_7,    D_7,    E_7},
-    {1, F_6,    D_6,    E_6},
-    {1, F_3,    D_3,    E_3},
-    {1, F_2,    D_2,    E_2},
-    {1, F_1,    D_1,    E_1}
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {1, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1}
 };
 
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q8/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q8/ansi_encoder/ansi_encoder.c
index fbb68134488..e60752d7ddb 100644
--- a/keyboards/keychron/q8/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/q8/ansi_encoder/ansi_encoder.c
@@ -27,80 +27,80 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_14,   G_14,   H_14},
-    {0, I_15,   G_15,   H_15},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_14,   D_14,   E_14},
-    {0, F_15,   D_15,   E_15},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
 
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {1, C_10,   A_10,   B_10},
-    // {1, C_9,    A_9,    B_9},
-    {1, C_8,    A_8,    B_8},
-    {1, C_7,    A_7,    B_7},
-    {1, C_6,    A_6,    B_6},
-    {1, C_5,    A_5,    B_5},
-    {1, C_4,    A_4,    B_4},
-    {1, C_3,    A_3,    B_3},
-    {1, C_2,    A_2,    B_2},
-    {1, C_1,    A_1,    B_1},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    // {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
 
-    {1, I_15,   G_15,   H_15},
-    {1, I_13,   G_13,   H_13},
-    {1, I_12,   G_12,   H_12},
-    {1, I_11,   G_11,   H_11},
-    {1, I_10,   G_10,   H_10},
-    {1, I_9,    G_9,    H_9},
-    {1, I_8,    G_8,    H_8},
-    {1, I_7,    G_7,    H_7},
-    {1, I_6,    G_6,    H_6},
-    {1, I_5,    G_5,    H_5},
-    {1, I_4,    G_4,    H_4},
-    {1, I_3,    G_3,    H_3},
-    {1, I_2,    G_2,    H_2},
-    {1, I_1,    G_1,    H_1},
+    {1, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {1, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
 
-    {1, F_15,   D_15,   E_15},
-    {1, F_14,   D_14,   E_14},
-    {1, F_13,   D_13,   E_13},
-    {1, F_12,   D_12,   E_12},
-    {1, F_9,    D_9,    E_9},
-    {1, F_8,    D_8,    E_8},
-    {1, F_7,    D_7,    E_7},
-    {1, F_6,    D_6,    E_6},
-    {1, F_3,    D_3,    E_3},
-    {1, F_2,    D_2,    E_2},
-    {1, F_1,    D_1,    E_1}
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {1, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1}
 };
 
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q8/iso/iso.c b/keyboards/keychron/q8/iso/iso.c
index aab7ab357b4..720c1eb34be 100644
--- a/keyboards/keychron/q8/iso/iso.c
+++ b/keyboards/keychron/q8/iso/iso.c
@@ -27,80 +27,80 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_14,   G_14,   H_14},
-    {0, I_15,   G_15,   H_15},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_15,   D_15,   E_15},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
 
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {1, C_10,   A_10,   B_10},
-    {1, C_8,    A_8,    B_8},
-    {1, C_7,    A_7,    B_7},
-    {1, C_6,    A_6,    B_6},
-    {1, C_5,    A_5,    B_5},
-    {1, C_4,    A_4,    B_4},
-    {1, C_3,    A_3,    B_3},
-    {1, C_2,    A_2,    B_2},
-    {0, F_14,   D_14,   E_14},
-    {1, C_1,    A_1,    B_1},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
 
-    {1, I_15,   G_15,   H_15},
-    {1, I_14,   G_14,   H_14},
-    {1, I_13,   G_13,   H_13},
-    {1, I_12,   G_12,   H_12},
-    {1, I_11,   G_11,   H_11},
-    {1, I_10,   G_10,   H_10},
-    {1, I_9,    G_9,    H_9},
-    {1, I_8,    G_8,    H_8},
-    {1, I_7,    G_7,    H_7},
-    {1, I_6,    G_6,    H_6},
-    {1, I_5,    G_5,    H_5},
-    {1, I_4,    G_4,    H_4},
-    {1, I_3,    G_3,    H_3},
-    {1, I_2,    G_2,    H_2},
-    {1, I_1,    G_1,    H_1},
+    {1, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {1, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
 
-    {1, F_15,   D_15,   E_15},
-    {1, F_14,   D_14,   E_14},
-    {1, F_13,   D_13,   E_13},
-    {1, F_12,   D_12,   E_12},
-    {1, F_9,    D_9,    E_9},
-    {1, F_8,    D_8,    E_8},
-    {1, F_7,    D_7,    E_7},
-    {1, F_6,    D_6,    E_6},
-    {1, F_3,    D_3,    E_3},
-    {1, F_2,    D_2,    E_2},
-    {1, F_1,    D_1,    E_1}
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {1, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1}
 };
 
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q8/iso_encoder/iso_encoder.c b/keyboards/keychron/q8/iso_encoder/iso_encoder.c
index aab7ab357b4..720c1eb34be 100644
--- a/keyboards/keychron/q8/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/q8/iso_encoder/iso_encoder.c
@@ -27,80 +27,80 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_14,   G_14,   H_14},
-    {0, I_15,   G_15,   H_15},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_15,   D_15,   E_15},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
 
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {1, C_10,   A_10,   B_10},
-    {1, C_8,    A_8,    B_8},
-    {1, C_7,    A_7,    B_7},
-    {1, C_6,    A_6,    B_6},
-    {1, C_5,    A_5,    B_5},
-    {1, C_4,    A_4,    B_4},
-    {1, C_3,    A_3,    B_3},
-    {1, C_2,    A_2,    B_2},
-    {0, F_14,   D_14,   E_14},
-    {1, C_1,    A_1,    B_1},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
 
-    {1, I_15,   G_15,   H_15},
-    {1, I_14,   G_14,   H_14},
-    {1, I_13,   G_13,   H_13},
-    {1, I_12,   G_12,   H_12},
-    {1, I_11,   G_11,   H_11},
-    {1, I_10,   G_10,   H_10},
-    {1, I_9,    G_9,    H_9},
-    {1, I_8,    G_8,    H_8},
-    {1, I_7,    G_7,    H_7},
-    {1, I_6,    G_6,    H_6},
-    {1, I_5,    G_5,    H_5},
-    {1, I_4,    G_4,    H_4},
-    {1, I_3,    G_3,    H_3},
-    {1, I_2,    G_2,    H_2},
-    {1, I_1,    G_1,    H_1},
+    {1, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {1, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
 
-    {1, F_15,   D_15,   E_15},
-    {1, F_14,   D_14,   E_14},
-    {1, F_13,   D_13,   E_13},
-    {1, F_12,   D_12,   E_12},
-    {1, F_9,    D_9,    E_9},
-    {1, F_8,    D_8,    E_8},
-    {1, F_7,    D_7,    E_7},
-    {1, F_6,    D_6,    E_6},
-    {1, F_3,    D_3,    E_3},
-    {1, F_2,    D_2,    E_2},
-    {1, F_1,    D_1,    E_1}
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {1, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1}
 };
 
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q9/ansi/ansi.c b/keyboards/keychron/q9/ansi/ansi.c
index 0034c79c789..e00c7f7e9d8 100644
--- a/keyboards/keychron/q9/ansi/ansi.c
+++ b/keyboards/keychron/q9/ansi/ansi.c
@@ -27,61 +27,61 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, L_16,   J_16,   K_16},
-    {0, L_15,   J_15,   K_15},
-    {0, L_14,   J_14,   K_14},
-    {0, L_13,   J_13,   K_13},
-    {0, L_12,   J_12,   K_12},
-    {0, L_11,   J_11,   K_11},
-    {0, L_10,   J_10,   K_10},
-    {0, L_9,    J_9,    K_9},
-    {0, L_8,    J_8,    K_8},
-    {0, L_7,    J_7,    K_7},
-    {0, L_6,    J_6,    K_6},
-    {0, L_5,    J_5,    K_5},
-    {0, L_4,    J_4,    K_4},
-    {0, L_3,    J_3,    K_3},
-    {0, L_2,    J_2,    K_2},
+    {0, CB12_CA16,   CB10_CA16,   CB11_CA16},
+    {0, CB12_CA15,   CB10_CA15,   CB11_CA15},
+    {0, CB12_CA14,   CB10_CA14,   CB11_CA14},
+    {0, CB12_CA13,   CB10_CA13,   CB11_CA13},
+    {0, CB12_CA12,   CB10_CA12,   CB11_CA12},
+    {0, CB12_CA11,   CB10_CA11,   CB11_CA11},
+    {0, CB12_CA10,   CB10_CA10,   CB11_CA10},
+    {0, CB12_CA9,    CB10_CA9,    CB11_CA9},
+    {0, CB12_CA8,    CB10_CA8,    CB11_CA8},
+    {0, CB12_CA7,    CB10_CA7,    CB11_CA7},
+    {0, CB12_CA6,    CB10_CA6,    CB11_CA6},
+    {0, CB12_CA5,    CB10_CA5,    CB11_CA5},
+    {0, CB12_CA4,    CB10_CA4,    CB11_CA4},
+    {0, CB12_CA3,    CB10_CA3,    CB11_CA3},
+    {0, CB12_CA2,    CB10_CA2,    CB11_CA2},
 
-    {0, C_16,   A_16,   B_16},
-    {0, C_15,   A_15,   B_15},
-    {0, C_14,   A_14,   B_14},
-    {0, C_13,   A_13,   B_13},
-    {0, C_12,   A_12,   B_12},
-    {0, C_11,   A_11,   B_11},
-    {0, C_10,   A_10,   B_10},
-    {0, C_9,    A_9,    B_9},
-    {0, C_8,    A_8,    B_8},
-    {0, C_7,    A_7,    B_7},
-    {0, C_6,    A_6,    B_6},
-    {0, C_5,    A_5,    B_5},
-    {0, C_3,    A_3,    B_3},
-    {0, C_2,    A_2,    B_2},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {0, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
 
-    {0, I_16,   G_16,   H_16},
-    {0, I_14,   G_14,   H_14},
-    {0, I_13,   G_13,   H_13},
-    {0, I_12,   G_12,   H_12},
-    {0, I_11,   G_11,   H_11},
-    {0, I_10,   G_10,   H_10},
-    {0, I_9,    G_9,    H_9},
-    {0, I_8,    G_8,    H_8},
-    {0, I_7,    G_7,    H_7},
-    {0, I_6,    G_6,    H_6},
-    {0, I_5,    G_5,    H_5},
-    {0, I_3,    G_3,    H_3},
-    {0, I_2,    G_2,    H_2},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
 
-    {0, F_16,   D_16,   E_16},
-    {0, F_15,   D_15,   E_15},
-    {0, F_14,   D_14,   E_14},
-    {0, F_10,   D_10,   E_10},
-    {0, F_6,    D_6,    E_6},
-    {0, F_5,    D_5,    E_5},
-    {0, F_4,    D_4,    E_4},
-    {0, F_3,    D_3,    E_3},
-    {0, F_2,    D_2,    E_2},
-    {0, C_4,    A_4,    B_4}
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4}
 };
 
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q9/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q9/ansi_encoder/ansi_encoder.c
index 0034c79c789..e00c7f7e9d8 100644
--- a/keyboards/keychron/q9/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/q9/ansi_encoder/ansi_encoder.c
@@ -27,61 +27,61 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, L_16,   J_16,   K_16},
-    {0, L_15,   J_15,   K_15},
-    {0, L_14,   J_14,   K_14},
-    {0, L_13,   J_13,   K_13},
-    {0, L_12,   J_12,   K_12},
-    {0, L_11,   J_11,   K_11},
-    {0, L_10,   J_10,   K_10},
-    {0, L_9,    J_9,    K_9},
-    {0, L_8,    J_8,    K_8},
-    {0, L_7,    J_7,    K_7},
-    {0, L_6,    J_6,    K_6},
-    {0, L_5,    J_5,    K_5},
-    {0, L_4,    J_4,    K_4},
-    {0, L_3,    J_3,    K_3},
-    {0, L_2,    J_2,    K_2},
+    {0, CB12_CA16,   CB10_CA16,   CB11_CA16},
+    {0, CB12_CA15,   CB10_CA15,   CB11_CA15},
+    {0, CB12_CA14,   CB10_CA14,   CB11_CA14},
+    {0, CB12_CA13,   CB10_CA13,   CB11_CA13},
+    {0, CB12_CA12,   CB10_CA12,   CB11_CA12},
+    {0, CB12_CA11,   CB10_CA11,   CB11_CA11},
+    {0, CB12_CA10,   CB10_CA10,   CB11_CA10},
+    {0, CB12_CA9,    CB10_CA9,    CB11_CA9},
+    {0, CB12_CA8,    CB10_CA8,    CB11_CA8},
+    {0, CB12_CA7,    CB10_CA7,    CB11_CA7},
+    {0, CB12_CA6,    CB10_CA6,    CB11_CA6},
+    {0, CB12_CA5,    CB10_CA5,    CB11_CA5},
+    {0, CB12_CA4,    CB10_CA4,    CB11_CA4},
+    {0, CB12_CA3,    CB10_CA3,    CB11_CA3},
+    {0, CB12_CA2,    CB10_CA2,    CB11_CA2},
 
-    {0, C_16,   A_16,   B_16},
-    {0, C_15,   A_15,   B_15},
-    {0, C_14,   A_14,   B_14},
-    {0, C_13,   A_13,   B_13},
-    {0, C_12,   A_12,   B_12},
-    {0, C_11,   A_11,   B_11},
-    {0, C_10,   A_10,   B_10},
-    {0, C_9,    A_9,    B_9},
-    {0, C_8,    A_8,    B_8},
-    {0, C_7,    A_7,    B_7},
-    {0, C_6,    A_6,    B_6},
-    {0, C_5,    A_5,    B_5},
-    {0, C_3,    A_3,    B_3},
-    {0, C_2,    A_2,    B_2},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {0, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
 
-    {0, I_16,   G_16,   H_16},
-    {0, I_14,   G_14,   H_14},
-    {0, I_13,   G_13,   H_13},
-    {0, I_12,   G_12,   H_12},
-    {0, I_11,   G_11,   H_11},
-    {0, I_10,   G_10,   H_10},
-    {0, I_9,    G_9,    H_9},
-    {0, I_8,    G_8,    H_8},
-    {0, I_7,    G_7,    H_7},
-    {0, I_6,    G_6,    H_6},
-    {0, I_5,    G_5,    H_5},
-    {0, I_3,    G_3,    H_3},
-    {0, I_2,    G_2,    H_2},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
 
-    {0, F_16,   D_16,   E_16},
-    {0, F_15,   D_15,   E_15},
-    {0, F_14,   D_14,   E_14},
-    {0, F_10,   D_10,   E_10},
-    {0, F_6,    D_6,    E_6},
-    {0, F_5,    D_5,    E_5},
-    {0, F_4,    D_4,    E_4},
-    {0, F_3,    D_3,    E_3},
-    {0, F_2,    D_2,    E_2},
-    {0, C_4,    A_4,    B_4}
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4}
 };
 
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q9/iso/iso.c b/keyboards/keychron/q9/iso/iso.c
index e6a06b39098..f059b4bf58e 100644
--- a/keyboards/keychron/q9/iso/iso.c
+++ b/keyboards/keychron/q9/iso/iso.c
@@ -27,62 +27,62 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, L_16, J_16, K_16}, // Tab
-    {0, L_15, J_15, K_15}, // Q
-    {0, L_14, J_14, K_14}, // W
-    {0, L_13, J_13, K_13}, // E
-    {0, L_12, J_12, K_12}, // R
-    {0, L_11, J_11, K_11}, // T
-    {0, L_10, J_10, K_10}, // Y
-    {0, L_9,  J_9,  K_9},  // U
-    {0, L_8,  J_8,  K_8},  // I
-    {0, L_7,  J_7,  K_7},  // O
-    {0, L_6,  J_6,  K_6},  // P
-    {0, L_5,  J_5,  K_5},  // [
-    {0, L_4,  J_4,  K_4},  // ]
-    {0, L_2,  J_2,  K_2},  // Del
+    {0, CB12_CA16, CB10_CA16, CB11_CA16}, // Tab
+    {0, CB12_CA15, CB10_CA15, CB11_CA15}, // Q
+    {0, CB12_CA14, CB10_CA14, CB11_CA14}, // W
+    {0, CB12_CA13, CB10_CA13, CB11_CA13}, // E
+    {0, CB12_CA12, CB10_CA12, CB11_CA12}, // R
+    {0, CB12_CA11, CB10_CA11, CB11_CA11}, // T
+    {0, CB12_CA10, CB10_CA10, CB11_CA10}, // Y
+    {0, CB12_CA9,  CB10_CA9,  CB11_CA9},  // U
+    {0, CB12_CA8,  CB10_CA8,  CB11_CA8},  // I
+    {0, CB12_CA7,  CB10_CA7,  CB11_CA7},  // O
+    {0, CB12_CA6,  CB10_CA6,  CB11_CA6},  // P
+    {0, CB12_CA5,  CB10_CA5,  CB11_CA5},  // [
+    {0, CB12_CA4,  CB10_CA4,  CB11_CA4},  // ]
+    {0, CB12_CA2,  CB10_CA2,  CB11_CA2},  // Del
 
-    {0, C_16, A_16, B_16}, // CapsLock
-    {0, C_15, A_15, B_15}, // A
-    {0, C_14, A_14, B_14}, // S
-    {0, C_13, A_13, B_13}, // D
-    {0, C_12, A_12, B_12}, // F
-    {0, C_11, A_11, B_11}, // G
-    {0, C_10, A_10, B_10}, // H
-    {0, C_9,  A_9,  B_9},  // J
-    {0, C_8,  A_8,  B_8},  // K
-    {0, C_7,  A_7,  B_7},  // L
-    {0, C_6,  A_6,  B_6},  // ;
-    {0, C_5,  A_5,  B_5},  // '
-    {0, C_3,  A_3,  B_3},  // #
-    {0, L_3,  J_3,  K_3},  // Enter
-    {0, C_2,  A_2,  B_2},  // Home
+    {0, CB3_CA16, CB1_CA16, CB2_CA16}, // CapsLock
+    {0, CB3_CA15, CB1_CA15, CB2_CA15}, // A
+    {0, CB3_CA14, CB1_CA14, CB2_CA14}, // S
+    {0, CB3_CA13, CB1_CA13, CB2_CA13}, // D
+    {0, CB3_CA12, CB1_CA12, CB2_CA12}, // F
+    {0, CB3_CA11, CB1_CA11, CB2_CA11}, // G
+    {0, CB3_CA10, CB1_CA10, CB2_CA10}, // H
+    {0, CB3_CA9,  CB1_CA9,  CB2_CA9},  // J
+    {0, CB3_CA8,  CB1_CA8,  CB2_CA8},  // K
+    {0, CB3_CA7,  CB1_CA7,  CB2_CA7},  // L
+    {0, CB3_CA6,  CB1_CA6,  CB2_CA6},  // ;
+    {0, CB3_CA5,  CB1_CA5,  CB2_CA5},  // '
+    {0, CB3_CA3,  CB1_CA3,  CB2_CA3},  // #
+    {0, CB12_CA3,  CB10_CA3,  CB11_CA3},  // Enter
+    {0, CB3_CA2,  CB1_CA2,  CB2_CA2},  // Home
 
-    {0, I_16, G_16, H_16}, // LeftShift
-    {0, I_15, G_15, H_15}, // |
-    {0, I_14, G_14, H_14}, // Z
-    {0, I_13, G_13, H_13}, // X
-    {0, I_12, G_12, H_12}, // C
-    {0, I_11, G_11, H_11}, // V
-    {0, I_10, G_10, H_10}, // B
-    {0, I_9,  G_9,  H_9},  // N
-    {0, I_8,  G_8,  H_8},  // M
-    {0, I_7,  G_7,  H_7},  // ,
-    {0, I_6,  G_6,  H_6},  // .
-    {0, I_5,  G_5,  H_5},  // ?
-    {0, I_3,  G_3,  H_3},  // RightShift
-    {0, I_2,  G_2,  H_2},  // Up
+    {0, CB9_CA16, CB7_CA16, CB8_CA16}, // LeftShift
+    {0, CB9_CA15, CB7_CA15, CB8_CA15}, // |
+    {0, CB9_CA14, CB7_CA14, CB8_CA14}, // Z
+    {0, CB9_CA13, CB7_CA13, CB8_CA13}, // X
+    {0, CB9_CA12, CB7_CA12, CB8_CA12}, // C
+    {0, CB9_CA11, CB7_CA11, CB8_CA11}, // V
+    {0, CB9_CA10, CB7_CA10, CB8_CA10}, // B
+    {0, CB9_CA9,  CB7_CA9,  CB8_CA9},  // N
+    {0, CB9_CA8,  CB7_CA8,  CB8_CA8},  // M
+    {0, CB9_CA7,  CB7_CA7,  CB8_CA7},  // ,
+    {0, CB9_CA6,  CB7_CA6,  CB8_CA6},  // .
+    {0, CB9_CA5,  CB7_CA5,  CB8_CA5},  // ?
+    {0, CB9_CA3,  CB7_CA3,  CB8_CA3},  // RightShift
+    {0, CB9_CA2,  CB7_CA2,  CB8_CA2},  // Up
 
-    {0, F_16, D_16, E_16}, // LeftCtrl
-    {0, F_15, D_15, E_15}, // LeftWin
-    {0, F_14, D_14, E_14}, // LeftAlt
-    {0, F_10, D_10, E_10}, // Space
-    {0, F_6,  D_6,  E_6},  // RightAlt
-    {0, F_5,  D_5,  E_5},  // Fn1
-    {0, F_4,  D_4,  E_4},  // Fn2
-    {0, F_3,  D_3,  E_3},  // Left
-    {0, F_2,  D_2,  E_2},  // Down
-    {0, C_4,  A_4,  B_4}   // Right
+    {0, CB6_CA16, CB4_CA16, CB5_CA16}, // LeftCtrl
+    {0, CB6_CA15, CB4_CA15, CB5_CA15}, // LeftWin
+    {0, CB6_CA14, CB4_CA14, CB5_CA14}, // LeftAlt
+    {0, CB6_CA10, CB4_CA10, CB5_CA10}, // Space
+    {0, CB6_CA6,  CB4_CA6,  CB5_CA6},  // RightAlt
+    {0, CB6_CA5,  CB4_CA5,  CB5_CA5},  // Fn1
+    {0, CB6_CA4,  CB4_CA4,  CB5_CA4},  // Fn2
+    {0, CB6_CA3,  CB4_CA3,  CB5_CA3},  // Left
+    {0, CB6_CA2,  CB4_CA2,  CB5_CA2},  // Down
+    {0, CB3_CA4,  CB1_CA4,  CB2_CA4}   // Right
 };
 
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q9/iso_encoder/iso_encoder.c b/keyboards/keychron/q9/iso_encoder/iso_encoder.c
index d607880eb25..1fdb4fc8cbb 100644
--- a/keyboards/keychron/q9/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/q9/iso_encoder/iso_encoder.c
@@ -27,62 +27,62 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, L_16, J_16, K_16}, // Tab
-    {0, L_15, J_15, K_15}, // Q
-    {0, L_14, J_14, K_14}, // W
-    {0, L_13, J_13, K_13}, // E
-    {0, L_12, J_12, K_12}, // R
-    {0, L_11, J_11, K_11}, // T
-    {0, L_10, J_10, K_10}, // Y
-    {0, L_9,  J_9,  K_9},  // U
-    {0, L_8,  J_8,  K_8},  // I
-    {0, L_7,  J_7,  K_7},  // O
-    {0, L_6,  J_6,  K_6},  // P
-    {0, L_5,  J_5,  K_5},  // [
-    {0, L_4,  J_4,  K_4},  // ]
-    // {0, L_2,  J_2,  K_2},  // Mute
+    {0, CB12_CA16, CB10_CA16, CB11_CA16}, // Tab
+    {0, CB12_CA15, CB10_CA15, CB11_CA15}, // Q
+    {0, CB12_CA14, CB10_CA14, CB11_CA14}, // W
+    {0, CB12_CA13, CB10_CA13, CB11_CA13}, // E
+    {0, CB12_CA12, CB10_CA12, CB11_CA12}, // R
+    {0, CB12_CA11, CB10_CA11, CB11_CA11}, // T
+    {0, CB12_CA10, CB10_CA10, CB11_CA10}, // Y
+    {0, CB12_CA9,  CB10_CA9,  CB11_CA9},  // U
+    {0, CB12_CA8,  CB10_CA8,  CB11_CA8},  // I
+    {0, CB12_CA7,  CB10_CA7,  CB11_CA7},  // O
+    {0, CB12_CA6,  CB10_CA6,  CB11_CA6},  // P
+    {0, CB12_CA5,  CB10_CA5,  CB11_CA5},  // [
+    {0, CB12_CA4,  CB10_CA4,  CB11_CA4},  // ]
+    // {0, CB12_CA2,  CB10_CA2,  CB11_CA2},  // Mute
 
-    {0, C_16, A_16, B_16}, // CapsLock
-    {0, C_15, A_15, B_15}, // A
-    {0, C_14, A_14, B_14}, // S
-    {0, C_13, A_13, B_13}, // D
-    {0, C_12, A_12, B_12}, // F
-    {0, C_11, A_11, B_11}, // G
-    {0, C_10, A_10, B_10}, // H
-    {0, C_9,  A_9,  B_9},  // J
-    {0, C_8,  A_8,  B_8},  // K
-    {0, C_7,  A_7,  B_7},  // L
-    {0, C_6,  A_6,  B_6},  // ;
-    {0, C_5,  A_5,  B_5},  // '
-    {0, C_3,  A_3,  B_3},  // #
-    {0, L_3,  J_3,  K_3},  // Enter
-    {0, C_2,  A_2,  B_2},  // Home
+    {0, CB3_CA16, CB1_CA16, CB2_CA16}, // CapsLock
+    {0, CB3_CA15, CB1_CA15, CB2_CA15}, // A
+    {0, CB3_CA14, CB1_CA14, CB2_CA14}, // S
+    {0, CB3_CA13, CB1_CA13, CB2_CA13}, // D
+    {0, CB3_CA12, CB1_CA12, CB2_CA12}, // F
+    {0, CB3_CA11, CB1_CA11, CB2_CA11}, // G
+    {0, CB3_CA10, CB1_CA10, CB2_CA10}, // H
+    {0, CB3_CA9,  CB1_CA9,  CB2_CA9},  // J
+    {0, CB3_CA8,  CB1_CA8,  CB2_CA8},  // K
+    {0, CB3_CA7,  CB1_CA7,  CB2_CA7},  // L
+    {0, CB3_CA6,  CB1_CA6,  CB2_CA6},  // ;
+    {0, CB3_CA5,  CB1_CA5,  CB2_CA5},  // '
+    {0, CB3_CA3,  CB1_CA3,  CB2_CA3},  // #
+    {0, CB12_CA3,  CB10_CA3,  CB11_CA3},  // Enter
+    {0, CB3_CA2,  CB1_CA2,  CB2_CA2},  // Home
 
-    {0, I_16, G_16, H_16}, // LeftShift
-    {0, I_15, G_15, H_15}, // |
-    {0, I_14, G_14, H_14}, // Z
-    {0, I_13, G_13, H_13}, // X
-    {0, I_12, G_12, H_12}, // C
-    {0, I_11, G_11, H_11}, // V
-    {0, I_10, G_10, H_10}, // B
-    {0, I_9,  G_9,  H_9},  // N
-    {0, I_8,  G_8,  H_8},  // M
-    {0, I_7,  G_7,  H_7},  // ,
-    {0, I_6,  G_6,  H_6},  // .
-    {0, I_5,  G_5,  H_5},  // ?
-    {0, I_3,  G_3,  H_3},  // RightShift
-    {0, I_2,  G_2,  H_2},  // Up
+    {0, CB9_CA16, CB7_CA16, CB8_CA16}, // LeftShift
+    {0, CB9_CA15, CB7_CA15, CB8_CA15}, // |
+    {0, CB9_CA14, CB7_CA14, CB8_CA14}, // Z
+    {0, CB9_CA13, CB7_CA13, CB8_CA13}, // X
+    {0, CB9_CA12, CB7_CA12, CB8_CA12}, // C
+    {0, CB9_CA11, CB7_CA11, CB8_CA11}, // V
+    {0, CB9_CA10, CB7_CA10, CB8_CA10}, // B
+    {0, CB9_CA9,  CB7_CA9,  CB8_CA9},  // N
+    {0, CB9_CA8,  CB7_CA8,  CB8_CA8},  // M
+    {0, CB9_CA7,  CB7_CA7,  CB8_CA7},  // ,
+    {0, CB9_CA6,  CB7_CA6,  CB8_CA6},  // .
+    {0, CB9_CA5,  CB7_CA5,  CB8_CA5},  // ?
+    {0, CB9_CA3,  CB7_CA3,  CB8_CA3},  // RightShift
+    {0, CB9_CA2,  CB7_CA2,  CB8_CA2},  // Up
 
-    {0, F_16, D_16, E_16}, // LeftCtrl
-    {0, F_15, D_15, E_15}, // LeftWin
-    {0, F_14, D_14, E_14}, // LeftAlt
-    {0, F_10, D_10, E_10}, // Space
-    {0, F_6,  D_6,  E_6},  // RightAlt
-    {0, F_5,  D_5,  E_5},  // Fn1
-    {0, F_4,  D_4,  E_4},  // Fn2
-    {0, F_3,  D_3,  E_3},  // Left
-    {0, F_2,  D_2,  E_2},  // Down
-    {0, C_4,  A_4,  B_4}   // Right
+    {0, CB6_CA16, CB4_CA16, CB5_CA16}, // LeftCtrl
+    {0, CB6_CA15, CB4_CA15, CB5_CA15}, // LeftWin
+    {0, CB6_CA14, CB4_CA14, CB5_CA14}, // LeftAlt
+    {0, CB6_CA10, CB4_CA10, CB5_CA10}, // Space
+    {0, CB6_CA6,  CB4_CA6,  CB5_CA6},  // RightAlt
+    {0, CB6_CA5,  CB4_CA5,  CB5_CA5},  // Fn1
+    {0, CB6_CA4,  CB4_CA4,  CB5_CA4},  // Fn2
+    {0, CB6_CA3,  CB4_CA3,  CB5_CA3},  // Left
+    {0, CB6_CA2,  CB4_CA2,  CB5_CA2},  // Down
+    {0, CB3_CA4,  CB1_CA4,  CB2_CA4}   // Right
 };
 
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q9_plus/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q9_plus/ansi_encoder/ansi_encoder.c
index ffc213b75b9..f9277d570b2 100755
--- a/keyboards/keychron/q9_plus/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/q9_plus/ansi_encoder/ansi_encoder.c
@@ -24,62 +24,62 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, L_16,   J_16,   K_16},
-    {0, L_15,   J_15,   K_15},
-    {0, L_14,   J_14,   K_14},
-    {0, L_13,   J_13,   K_13},
-    {0, L_12,   J_12,   K_12},
-    {0, L_11,   J_11,   K_11},
-    {0, L_10,   J_10,   K_10},
-    {0, L_9,    J_9,    K_9},
-    {0, L_8,    J_8,    K_8},
-    {0, L_7,    J_7,    K_7},
-    {0, L_6,    J_6,    K_6},
-    {0, L_5,    J_5,    K_5},
-    {0, L_4,    J_4,    K_4},
-    {0, L_3,    J_3,    K_3},
-    // {0, L_2,    J_2,    K_2},
+    {0, CB12_CA16,   CB10_CA16,   CB11_CA16},
+    {0, CB12_CA15,   CB10_CA15,   CB11_CA15},
+    {0, CB12_CA14,   CB10_CA14,   CB11_CA14},
+    {0, CB12_CA13,   CB10_CA13,   CB11_CA13},
+    {0, CB12_CA12,   CB10_CA12,   CB11_CA12},
+    {0, CB12_CA11,   CB10_CA11,   CB11_CA11},
+    {0, CB12_CA10,   CB10_CA10,   CB11_CA10},
+    {0, CB12_CA9,    CB10_CA9,    CB11_CA9},
+    {0, CB12_CA8,    CB10_CA8,    CB11_CA8},
+    {0, CB12_CA7,    CB10_CA7,    CB11_CA7},
+    {0, CB12_CA6,    CB10_CA6,    CB11_CA6},
+    {0, CB12_CA5,    CB10_CA5,    CB11_CA5},
+    {0, CB12_CA4,    CB10_CA4,    CB11_CA4},
+    {0, CB12_CA3,    CB10_CA3,    CB11_CA3},
+    // {0, CB12_CA2,    CB10_CA2,    CB11_CA2},
 
-    {0, C_16,   A_16,   B_16},
-    {0, C_15,   A_15,   B_15},
-    {0, C_14,   A_14,   B_14},
-    {0, C_13,   A_13,   B_13},
-    {0, C_12,   A_12,   B_12},
-    {0, C_11,   A_11,   B_11},
-    {0, C_10,   A_10,   B_10},
-    {0, C_9,    A_9,    B_9},
-    {0, C_8,    A_8,    B_8},
-    {0, C_7,    A_7,    B_7},
-    {0, C_6,    A_6,    B_6},
-    {0, C_5,    A_5,    B_5},
-    {0, C_3,    A_3,    B_3},
-    {0, C_2,    A_2,    B_2},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {0, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
 
-    {0, I_16,   G_16,   H_16},
-    {0, I_14,   G_14,   H_14},
-    {0, I_13,   G_13,   H_13},
-    {0, I_12,   G_12,   H_12},
-    {0, I_11,   G_11,   H_11},
-    {0, I_10,   G_10,   H_10},
-    {0, I_9,    G_9,    H_9},
-    {0, I_8,    G_8,    H_8},
-    {0, I_7,    G_7,    H_7},
-    {0, I_6,    G_6,    H_6},
-    {0, I_5,    G_5,    H_5},
-    {0, I_3,    G_3,    H_3},
-    {0, I_2,    G_2,    H_2},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
 
-    {0, F_16,   D_16,   E_16},
-    {0, F_15,   D_15,   E_15},
-    {0, F_14,   D_14,   E_14},
-    {0, F_13,   D_13,   E_13},
-    {0, F_10,   D_10,   E_10},
-    {0, F_7,    D_7,    E_7},
-    {0, F_6,    D_6,    E_6},
-    {0, F_5,    D_5,    E_5},
-    {0, F_4,    D_4,    E_4},
-    {0, F_3,    D_3,    E_3},
-    {0, F_2,    D_2,    E_2},
-    {0, C_4,    A_4,    B_4},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
 };
 #endif
diff --git a/keyboards/keychron/s1/ansi/rgb/rgb.c b/keyboards/keychron/s1/ansi/rgb/rgb.c
index e81e7db402f..af6390f7532 100644
--- a/keyboards/keychron/s1/ansi/rgb/rgb.c
+++ b/keyboards/keychron/s1/ansi/rgb/rgb.c
@@ -27,95 +27,95 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, I_1,  G_1,  H_1},  // esc
-    {0, I_2,  G_2,  H_2},  // f1
-    {0, I_3,  G_3,  H_3},  // f2
-    {0, I_4,  G_4,  H_4},  // f3
-    {0, I_5,  G_5,  H_5},  // f4
-    {0, I_6,  G_6,  H_6},  // f4
-    {0, I_7,  G_7,  H_7},  // f6
-    {0, I_8,  G_8,  H_8},  // f7
-    {0, I_9,  G_9,  H_9},  // f8
-    {0, I_10, G_10, H_10}, // f9
-    {0, I_11, G_11, H_11}, // f10
-    {0, I_12, G_12, H_12}, // f11
-    {0, I_13, G_13, H_13}, // f12
-    {0, I_14, G_14, H_14}, // print
-    {0, I_15, G_15, H_15}, // del
-    {0, I_16, G_16, H_16}, // light
+    {0, CB9_CA1,  CB7_CA1,  CB8_CA1},  // esc
+    {0, CB9_CA2,  CB7_CA2,  CB8_CA2},  // f1
+    {0, CB9_CA3,  CB7_CA3,  CB8_CA3},  // f2
+    {0, CB9_CA4,  CB7_CA4,  CB8_CA4},  // f3
+    {0, CB9_CA5,  CB7_CA5,  CB8_CA5},  // f4
+    {0, CB9_CA6,  CB7_CA6,  CB8_CA6},  // f4
+    {0, CB9_CA7,  CB7_CA7,  CB8_CA7},  // f6
+    {0, CB9_CA8,  CB7_CA8,  CB8_CA8},  // f7
+    {0, CB9_CA9,  CB7_CA9,  CB8_CA9},  // f8
+    {0, CB9_CA10, CB7_CA10, CB8_CA10}, // f9
+    {0, CB9_CA11, CB7_CA11, CB8_CA11}, // f10
+    {0, CB9_CA12, CB7_CA12, CB8_CA12}, // f11
+    {0, CB9_CA13, CB7_CA13, CB8_CA13}, // f12
+    {0, CB9_CA14, CB7_CA14, CB8_CA14}, // print
+    {0, CB9_CA15, CB7_CA15, CB8_CA15}, // del
+    {0, CB9_CA16, CB7_CA16, CB8_CA16}, // light
 
-    {0, F_1,  D_1,  E_1},  // ~
-    {0, F_2,  D_2,  E_2},  // 1!
-    {0, F_3,  D_3,  E_3},  // 2@
-    {0, F_4,  D_4,  E_4},  // 3#
-    {0, F_5,  D_5,  E_5},  // 4$
-    {0, F_6,  D_6,  E_6},  // 5%
-    {0, F_7,  D_7,  E_7},  // 6^
-    {0, F_8,  D_8,  E_8},  // 7&
-    {0, F_9,  D_9,  E_9},  // 8*
-    {0, F_10, D_10, E_10}, // 9(
-    {0, F_11, D_11, E_11}, // 0)
-    {0, F_12, D_12, E_12}, // -_
-    {0, F_13, D_13, E_13}, // =+
-    {0, F_14, D_14, E_14}, // back space
-    {0, F_16, D_16, E_16}, // page up
+    {0, CB6_CA1,  CB4_CA1,  CB5_CA1},  // ~
+    {0, CB6_CA2,  CB4_CA2,  CB5_CA2},  // 1!
+    {0, CB6_CA3,  CB4_CA3,  CB5_CA3},  // 2@
+    {0, CB6_CA4,  CB4_CA4,  CB5_CA4},  // 3#
+    {0, CB6_CA5,  CB4_CA5,  CB5_CA5},  // 4$
+    {0, CB6_CA6,  CB4_CA6,  CB5_CA6},  // 5%
+    {0, CB6_CA7,  CB4_CA7,  CB5_CA7},  // 6^
+    {0, CB6_CA8,  CB4_CA8,  CB5_CA8},  // 7&
+    {0, CB6_CA9,  CB4_CA9,  CB5_CA9},  // 8*
+    {0, CB6_CA10, CB4_CA10, CB5_CA10}, // 9(
+    {0, CB6_CA11, CB4_CA11, CB5_CA11}, // 0)
+    {0, CB6_CA12, CB4_CA12, CB5_CA12}, // -_
+    {0, CB6_CA13, CB4_CA13, CB5_CA13}, // =+
+    {0, CB6_CA14, CB4_CA14, CB5_CA14}, // back space
+    {0, CB6_CA16, CB4_CA16, CB5_CA16}, // page up
 
-    {0, C_1,  A_1,  B_1},  // tab
-    {0, C_2,  A_2,  B_2},  // q
-    {0, C_3,  A_3,  B_3},  // w
-    {0, C_4,  A_4,  B_4},  // e
-    {0, C_5,  A_5,  B_5},  // r
-    {0, C_6,  A_6,  B_6},  // t
-    {0, C_7,  A_7,  B_7},  // y
-    {0, C_8,  A_8,  B_8},  // u
-    {0, C_9,  A_9,  B_9},  // i
-    {0, C_10, A_10, B_10}, // o
-    {0, C_11, A_11, B_11}, // p
-    {0, C_12, A_12, B_12}, // [{
-    {0, C_13, A_13, B_13}, // ]}
-    {0, C_14, A_14, B_14}, // |
-    {0, C_16, A_16, B_16}, // page down
+    {0, CB3_CA1,  CB1_CA1,  CB2_CA1},  // tab
+    {0, CB3_CA2,  CB1_CA2,  CB2_CA2},  // q
+    {0, CB3_CA3,  CB1_CA3,  CB2_CA3},  // w
+    {0, CB3_CA4,  CB1_CA4,  CB2_CA4},  // e
+    {0, CB3_CA5,  CB1_CA5,  CB2_CA5},  // r
+    {0, CB3_CA6,  CB1_CA6,  CB2_CA6},  // t
+    {0, CB3_CA7,  CB1_CA7,  CB2_CA7},  // y
+    {0, CB3_CA8,  CB1_CA8,  CB2_CA8},  // u
+    {0, CB3_CA9,  CB1_CA9,  CB2_CA9},  // i
+    {0, CB3_CA10, CB1_CA10, CB2_CA10}, // o
+    {0, CB3_CA11, CB1_CA11, CB2_CA11}, // p
+    {0, CB3_CA12, CB1_CA12, CB2_CA12}, // [{
+    {0, CB3_CA13, CB1_CA13, CB2_CA13}, // ]}
+    {0, CB3_CA14, CB1_CA14, CB2_CA14}, // |
+    {0, CB3_CA16, CB1_CA16, CB2_CA16}, // page down
 
-    {1, I_1,  G_1,  H_1},  // caps lock
-    {1, I_2,  G_2,  H_2},  // a
-    {1, I_3,  G_3,  H_3},  // s
-    {1, I_4,  G_4,  H_4},  // d
-    {1, I_5,  G_5,  H_5},  // f
-    {1, I_6,  G_6,  H_6},  // g
-    {1, I_7,  G_7,  H_7},  // h
-    {1, I_8,  G_8,  H_8},  // j
-    {1, I_9,  G_9,  H_9},  // k
-    {1, I_10, G_10, H_10}, // l
-    {1, I_11, G_11, H_11}, // ;:
-    {1, I_12, G_12, H_12}, // '"
-    {1, I_14, G_14, H_14}, // enter
-    {1, I_16, G_16, H_16}, // home
+    {1, CB9_CA1,  CB7_CA1,  CB8_CA1},  // caps lock
+    {1, CB9_CA2,  CB7_CA2,  CB8_CA2},  // a
+    {1, CB9_CA3,  CB7_CA3,  CB8_CA3},  // s
+    {1, CB9_CA4,  CB7_CA4,  CB8_CA4},  // d
+    {1, CB9_CA5,  CB7_CA5,  CB8_CA5},  // f
+    {1, CB9_CA6,  CB7_CA6,  CB8_CA6},  // g
+    {1, CB9_CA7,  CB7_CA7,  CB8_CA7},  // h
+    {1, CB9_CA8,  CB7_CA8,  CB8_CA8},  // j
+    {1, CB9_CA9,  CB7_CA9,  CB8_CA9},  // k
+    {1, CB9_CA10, CB7_CA10, CB8_CA10}, // l
+    {1, CB9_CA11, CB7_CA11, CB8_CA11}, // ;:
+    {1, CB9_CA12, CB7_CA12, CB8_CA12}, // '"
+    {1, CB9_CA14, CB7_CA14, CB8_CA14}, // enter
+    {1, CB9_CA16, CB7_CA16, CB8_CA16}, // home
 
-    {1, C_1,  A_1,  B_1},  // left shift
-    {1, C_3,  A_3,  B_3},  // z
-    {1, C_4,  A_4,  B_4},  // x
-    {1, C_5,  A_5,  B_5},  // c
-    {1, C_6,  A_6,  B_6},  // v
-    {1, C_7,  A_7,  B_7},  // b
-    {1, C_8,  A_8,  B_8},  // b
-    {1, C_9,  A_9,  B_9},  // n
-    {1, C_10, A_10, B_10}, // m
-    {1, C_11, A_11, B_11}, // ,<
-    {1, C_12, A_12, B_12}, // .>
-    {1, C_13, A_13, B_13}, // right shift
-    {1, C_14, A_14, B_14}, // up
-    {1, C_16, A_16, B_16}, // end
+    {1, CB3_CA1,  CB1_CA1,  CB2_CA1},  // left shift
+    {1, CB3_CA3,  CB1_CA3,  CB2_CA3},  // z
+    {1, CB3_CA4,  CB1_CA4,  CB2_CA4},  // x
+    {1, CB3_CA5,  CB1_CA5,  CB2_CA5},  // c
+    {1, CB3_CA6,  CB1_CA6,  CB2_CA6},  // v
+    {1, CB3_CA7,  CB1_CA7,  CB2_CA7},  // b
+    {1, CB3_CA8,  CB1_CA8,  CB2_CA8},  // b
+    {1, CB3_CA9,  CB1_CA9,  CB2_CA9},  // n
+    {1, CB3_CA10, CB1_CA10, CB2_CA10}, // m
+    {1, CB3_CA11, CB1_CA11, CB2_CA11}, // ,<
+    {1, CB3_CA12, CB1_CA12, CB2_CA12}, // .>
+    {1, CB3_CA13, CB1_CA13, CB2_CA13}, // right shift
+    {1, CB3_CA14, CB1_CA14, CB2_CA14}, // up
+    {1, CB3_CA16, CB1_CA16, CB2_CA16}, // end
 
-    {1, F_1,  D_1,  E_1},  // left
-    {1, F_2,  D_2,  E_2},  // left command
-    {1, F_3,  D_3,  E_3},  // left optin
-    {1, F_7,  D_7,  E_7},  // space
-    {1, F_10, D_10, E_10}, // right command
-    {1, F_11, D_11, E_11}, // fn
-    {1, F_12, D_12, E_12}, // right ctrl
-    {1, F_13, D_13, E_13}, // left
-    {1, F_14, D_14, E_14}, // down
-    {1, F_16, D_16, E_16}, // right
+    {1, CB6_CA1,  CB4_CA1,  CB5_CA1},  // left
+    {1, CB6_CA2,  CB4_CA2,  CB5_CA2},  // left command
+    {1, CB6_CA3,  CB4_CA3,  CB5_CA3},  // left optin
+    {1, CB6_CA7,  CB4_CA7,  CB5_CA7},  // space
+    {1, CB6_CA10, CB4_CA10, CB5_CA10}, // right command
+    {1, CB6_CA11, CB4_CA11, CB5_CA11}, // fn
+    {1, CB6_CA12, CB4_CA12, CB5_CA12}, // right ctrl
+    {1, CB6_CA13, CB4_CA13, CB5_CA13}, // left
+    {1, CB6_CA14, CB4_CA14, CB5_CA14}, // down
+    {1, CB6_CA16, CB4_CA16, CB5_CA16}, // right
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/s1/ansi/white/white.c b/keyboards/keychron/s1/ansi/white/white.c
index d6a5eaf2320..69623863d1f 100644
--- a/keyboards/keychron/s1/ansi/white/white.c
+++ b/keyboards/keychron/s1/ansi/white/white.c
@@ -25,95 +25,95 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   driver
  *   |  LED address
  *   |  |   */
-    {0, F_1},  // esc
-    {0, F_2},  // f1
-    {0, F_3},  // f2
-    {0, F_4},  // f3
-    {0, F_5},  // f4
-    {0, F_6},  // f4
-    {0, F_7},  // f6
-    {0, F_8},  // f7
-    {0, F_9},  // f8
-    {0, F_10}, // f9
-    {0, F_11}, // f10
-    {0, F_12}, // f11
-    {0, F_13}, // f12
-    {0, F_14}, // print
-    {0, F_15}, // del
-    {0, F_16}, // light
+    {0, CB6_CA1},  // esc
+    {0, CB6_CA2},  // f1
+    {0, CB6_CA3},  // f2
+    {0, CB6_CA4},  // f3
+    {0, CB6_CA5},  // f4
+    {0, CB6_CA6},  // f4
+    {0, CB6_CA7},  // f6
+    {0, CB6_CA8},  // f7
+    {0, CB6_CA9},  // f8
+    {0, CB6_CA10}, // f9
+    {0, CB6_CA11}, // f10
+    {0, CB6_CA12}, // f11
+    {0, CB6_CA13}, // f12
+    {0, CB6_CA14}, // print
+    {0, CB6_CA15}, // del
+    {0, CB6_CA16}, // light
 
-    {0, E_1},  // ~
-    {0, E_2},  // 1!
-    {0, E_3},  // 2@
-    {0, E_4},  // 3#
-    {0, E_5},  // 4$
-    {0, E_6},  // 5%
-    {0, E_7},  // 6^
-    {0, E_8},  // 7&
-    {0, E_9},  // 8*
-    {0, E_10}, // 9(
-    {0, E_11}, // 0)
-    {0, E_12}, // -_
-    {0, E_13}, // =+
-    {0, E_14}, // back space
-    {0, E_16}, // page up
+    {0, CB5_CA1},  // ~
+    {0, CB5_CA2},  // 1!
+    {0, CB5_CA3},  // 2@
+    {0, CB5_CA4},  // 3#
+    {0, CB5_CA5},  // 4$
+    {0, CB5_CA6},  // 5%
+    {0, CB5_CA7},  // 6^
+    {0, CB5_CA8},  // 7&
+    {0, CB5_CA9},  // 8*
+    {0, CB5_CA10}, // 9(
+    {0, CB5_CA11}, // 0)
+    {0, CB5_CA12}, // -_
+    {0, CB5_CA13}, // =+
+    {0, CB5_CA14}, // back space
+    {0, CB5_CA16}, // page up
 
-    {0, D_1},  // tab
-    {0, D_2},  // q
-    {0, D_3},  // w
-    {0, D_4},  // e
-    {0, D_5},  // r
-    {0, D_6},  // t
-    {0, D_7},  // y
-    {0, D_8},  // u
-    {0, D_9},  // i
-    {0, D_10}, // o
-    {0, D_11}, // p
-    {0, D_12}, // [{
-    {0, D_13}, // ]}
-    {0, D_14}, // |
-    {0, D_16}, // page down
+    {0, CB4_CA1},  // tab
+    {0, CB4_CA2},  // q
+    {0, CB4_CA3},  // w
+    {0, CB4_CA4},  // e
+    {0, CB4_CA5},  // r
+    {0, CB4_CA6},  // t
+    {0, CB4_CA7},  // y
+    {0, CB4_CA8},  // u
+    {0, CB4_CA9},  // i
+    {0, CB4_CA10}, // o
+    {0, CB4_CA11}, // p
+    {0, CB4_CA12}, // [{
+    {0, CB4_CA13}, // ]}
+    {0, CB4_CA14}, // |
+    {0, CB4_CA16}, // page down
 
-    {0, C_1},  // caps lock
-    {0, C_2},  // a
-    {0, C_3},  // s
-    {0, C_4},  // d
-    {0, C_5},  // f
-    {0, C_6},  // g
-    {0, C_7},  // h
-    {0, C_8},  // j
-    {0, C_9},  // k
-    {0, C_10}, // l
-    {0, C_11}, // ;:
-    {0, C_12}, // '"
-    {0, C_14}, // enter
-    {0, C_16}, // home
+    {0, CB3_CA1},  // caps lock
+    {0, CB3_CA2},  // a
+    {0, CB3_CA3},  // s
+    {0, CB3_CA4},  // d
+    {0, CB3_CA5},  // f
+    {0, CB3_CA6},  // g
+    {0, CB3_CA7},  // h
+    {0, CB3_CA8},  // j
+    {0, CB3_CA9},  // k
+    {0, CB3_CA10}, // l
+    {0, CB3_CA11}, // ;:
+    {0, CB3_CA12}, // '"
+    {0, CB3_CA14}, // enter
+    {0, CB3_CA16}, // home
 
-    {0, B_1},  // left shift
-    {0, B_3},  // z
-    {0, B_4},  // x
-    {0, B_5},  // c
-    {0, B_6},  // v
-    {0, B_7},  // b
-    {0, B_8},  // b
-    {0, B_9},  // n
-    {0, B_10}, // m
-    {0, B_11}, // ,<
-    {0, B_12}, // .>
-    {0, B_13}, // right shift
-    {0, B_14}, // up
-    {0, B_16}, // end
+    {0, CB2_CA1},  // left shift
+    {0, CB2_CA3},  // z
+    {0, CB2_CA4},  // x
+    {0, CB2_CA5},  // c
+    {0, CB2_CA6},  // v
+    {0, CB2_CA7},  // b
+    {0, CB2_CA8},  // b
+    {0, CB2_CA9},  // n
+    {0, CB2_CA10}, // m
+    {0, CB2_CA11}, // ,<
+    {0, CB2_CA12}, // .>
+    {0, CB2_CA13}, // right shift
+    {0, CB2_CA14}, // up
+    {0, CB2_CA16}, // end
 
-    {0, A_1},  // left
-    {0, A_2},  // left command
-    {0, A_3},  // left optin
-    {0, A_7},  // space
-    {0, A_10}, // right command
-    {0, A_11}, // fn
-    {0, A_12}, // right ctrl
-    {0, A_13}, // left
-    {0, A_14}, // down
-    {0, A_16}, // right
+    {0, CB1_CA1},  // left
+    {0, CB1_CA2},  // left command
+    {0, CB1_CA3},  // left optin
+    {0, CB1_CA7},  // space
+    {0, CB1_CA10}, // right command
+    {0, CB1_CA11}, // fn
+    {0, CB1_CA12}, // right ctrl
+    {0, CB1_CA13}, // left
+    {0, CB1_CA14}, // down
+    {0, CB1_CA16}, // right
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/v1/ansi/ansi.c b/keyboards/keychron/v1/ansi/ansi.c
index 2db3ab782dd..a78d5dd4d78 100644
--- a/keyboards/keychron/v1/ansi/ansi.c
+++ b/keyboards/keychron/v1/ansi/ansi.c
@@ -27,93 +27,93 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_16,   A_16,   B_16},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_14,   G_14,   H_14},
-    {0, I_16,   G_16,   H_16},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_14,   D_14,   E_14},
-    {0, F_16,   D_16,   E_16},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
 
-    {1, I_1,    G_1,    H_1},
-    {1, I_2,    G_2,    H_2},
-    {1, I_3,    G_3,    H_3},
-    {1, I_4,    G_4,    H_4},
-    {1, I_5,    G_5,    H_5},
-    {1, I_6,    G_6,    H_6},
-    {1, I_7,    G_7,    H_7},
-    {1, I_8,    G_8,    H_8},
-    {1, I_9,    G_9,    H_9},
-    {1, I_10,   G_10,   H_10},
-    {1, I_11,   G_11,   H_11},
-    {1, I_12,   G_12,   H_12},
-    {1, I_14,   G_14,   H_14},
-    {1, I_16,   G_16,   H_16},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_3,    D_3,    E_3},
-    {1, F_4,    D_4,    E_4},
-    {1, F_5,    D_5,    E_5},
-    {1, F_6,    D_6,    E_6},
-    {1, F_7,    D_7,    E_7},
-    {1, F_8,    D_8,    E_8},
-    {1, F_9,    D_9,    E_9},
-    {1, F_10,   D_10,   E_10},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {1, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {1, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
 
-    {1, C_1,    A_1,    B_1},
-    {1, C_2,    A_2,    B_2},
-    {1, C_3,    A_3,    B_3},
-    {1, C_7,    A_7,    B_7},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_13,   A_13,   B_13},
-    {1, C_14,   A_14,   B_14},
-    {1, C_15,   A_15,   B_15},
-    {1, C_16,   A_16,   B_16},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/v1/ansi_encoder/ansi_encoder.c b/keyboards/keychron/v1/ansi_encoder/ansi_encoder.c
index 2db3ab782dd..a78d5dd4d78 100644
--- a/keyboards/keychron/v1/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/v1/ansi_encoder/ansi_encoder.c
@@ -27,93 +27,93 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_16,   A_16,   B_16},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_14,   G_14,   H_14},
-    {0, I_16,   G_16,   H_16},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_14,   D_14,   E_14},
-    {0, F_16,   D_16,   E_16},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
 
-    {1, I_1,    G_1,    H_1},
-    {1, I_2,    G_2,    H_2},
-    {1, I_3,    G_3,    H_3},
-    {1, I_4,    G_4,    H_4},
-    {1, I_5,    G_5,    H_5},
-    {1, I_6,    G_6,    H_6},
-    {1, I_7,    G_7,    H_7},
-    {1, I_8,    G_8,    H_8},
-    {1, I_9,    G_9,    H_9},
-    {1, I_10,   G_10,   H_10},
-    {1, I_11,   G_11,   H_11},
-    {1, I_12,   G_12,   H_12},
-    {1, I_14,   G_14,   H_14},
-    {1, I_16,   G_16,   H_16},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_3,    D_3,    E_3},
-    {1, F_4,    D_4,    E_4},
-    {1, F_5,    D_5,    E_5},
-    {1, F_6,    D_6,    E_6},
-    {1, F_7,    D_7,    E_7},
-    {1, F_8,    D_8,    E_8},
-    {1, F_9,    D_9,    E_9},
-    {1, F_10,   D_10,   E_10},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {1, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {1, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
 
-    {1, C_1,    A_1,    B_1},
-    {1, C_2,    A_2,    B_2},
-    {1, C_3,    A_3,    B_3},
-    {1, C_7,    A_7,    B_7},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_13,   A_13,   B_13},
-    {1, C_14,   A_14,   B_14},
-    {1, C_15,   A_15,   B_15},
-    {1, C_16,   A_16,   B_16},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/v1/iso/iso.c b/keyboards/keychron/v1/iso/iso.c
index dff029055ba..a1095dcc926 100644
--- a/keyboards/keychron/v1/iso/iso.c
+++ b/keyboards/keychron/v1/iso/iso.c
@@ -27,94 +27,94 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_16,   A_16,   B_16},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_14,   G_14,   H_14},
-    {0, I_16,   G_16,   H_16},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_16,   D_16,   E_16},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
 
-    {1, I_1,    G_1,    H_1},
-    {1, I_2,    G_2,    H_2},
-    {1, I_3,    G_3,    H_3},
-    {1, I_4,    G_4,    H_4},
-    {1, I_5,    G_5,    H_5},
-    {1, I_6,    G_6,    H_6},
-    {1, I_7,    G_7,    H_7},
-    {1, I_8,    G_8,    H_8},
-    {1, I_9,    G_9,    H_9},
-    {1, I_10,   G_10,   H_10},
-    {1, I_11,   G_11,   H_11},
-    {1, I_12,   G_12,   H_12},
-    {1, I_14,   G_14,   H_14},
-    {0, F_14,   D_14,   E_14},
-    {1, I_16,   G_16,   H_16},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_2,    D_2,    E_2},
-    {1, F_3,    D_3,    E_3},
-    {1, F_4,    D_4,    E_4},
-    {1, F_5,    D_5,    E_5},
-    {1, F_6,    D_6,    E_6},
-    {1, F_7,    D_7,    E_7},
-    {1, F_8,    D_8,    E_8},
-    {1, F_9,    D_9,    E_9},
-    {1, F_10,   D_10,   E_10},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {1, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {1, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
 
-    {1, C_1,    A_1,    B_1},
-    {1, C_2,    A_2,    B_2},
-    {1, C_3,    A_3,    B_3},
-    {1, C_7,    A_7,    B_7},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_13,   A_13,   B_13},
-    {1, C_14,   A_14,   B_14},
-    {1, C_15,   A_15,   B_15},
-    {1, C_16,   A_16,   B_16},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/v1/iso_encoder/iso_encoder.c b/keyboards/keychron/v1/iso_encoder/iso_encoder.c
index dff029055ba..a1095dcc926 100644
--- a/keyboards/keychron/v1/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/v1/iso_encoder/iso_encoder.c
@@ -27,94 +27,94 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_16,   A_16,   B_16},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_14,   G_14,   H_14},
-    {0, I_16,   G_16,   H_16},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_16,   D_16,   E_16},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
 
-    {1, I_1,    G_1,    H_1},
-    {1, I_2,    G_2,    H_2},
-    {1, I_3,    G_3,    H_3},
-    {1, I_4,    G_4,    H_4},
-    {1, I_5,    G_5,    H_5},
-    {1, I_6,    G_6,    H_6},
-    {1, I_7,    G_7,    H_7},
-    {1, I_8,    G_8,    H_8},
-    {1, I_9,    G_9,    H_9},
-    {1, I_10,   G_10,   H_10},
-    {1, I_11,   G_11,   H_11},
-    {1, I_12,   G_12,   H_12},
-    {1, I_14,   G_14,   H_14},
-    {0, F_14,   D_14,   E_14},
-    {1, I_16,   G_16,   H_16},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_2,    D_2,    E_2},
-    {1, F_3,    D_3,    E_3},
-    {1, F_4,    D_4,    E_4},
-    {1, F_5,    D_5,    E_5},
-    {1, F_6,    D_6,    E_6},
-    {1, F_7,    D_7,    E_7},
-    {1, F_8,    D_8,    E_8},
-    {1, F_9,    D_9,    E_9},
-    {1, F_10,   D_10,   E_10},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {1, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {1, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
 
-    {1, C_1,    A_1,    B_1},
-    {1, C_2,    A_2,    B_2},
-    {1, C_3,    A_3,    B_3},
-    {1, C_7,    A_7,    B_7},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_13,   A_13,   B_13},
-    {1, C_14,   A_14,   B_14},
-    {1, C_15,   A_15,   B_15},
-    {1, C_16,   A_16,   B_16},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/v1/jis/jis.c b/keyboards/keychron/v1/jis/jis.c
index 029c58fd709..d3b3f9aa900 100644
--- a/keyboards/keychron/v1/jis/jis.c
+++ b/keyboards/keychron/v1/jis/jis.c
@@ -27,97 +27,97 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_16,   A_16,   B_16},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_14,   G_14,   H_14},
-    {0, I_15,   G_15,   H_15},
-    {0, I_16,   G_16,   H_16},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_16,   D_16,   E_16},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
 
-    {1, I_1,    G_1,    H_1},
-    {1, I_2,    G_2,    H_2},
-    {1, I_3,    G_3,    H_3},
-    {1, I_4,    G_4,    H_4},
-    {1, I_5,    G_5,    H_5},
-    {1, I_6,    G_6,    H_6},
-    {1, I_7,    G_7,    H_7},
-    {1, I_8,    G_8,    H_8},
-    {1, I_9,    G_9,    H_9},
-    {1, I_10,   G_10,   H_10},
-    {1, I_11,   G_11,   H_11},
-    {1, I_12,   G_12,   H_12},
-    {1, I_14,   G_14,   H_14},
-    {0, F_14,   D_14,   E_14},
-    {1, I_16,   G_16,   H_16},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_3,    D_3,    E_3},
-    {1, F_4,    D_4,    E_4},
-    {1, F_5,    D_5,    E_5},
-    {1, F_6,    D_6,    E_6},
-    {1, F_7,    D_7,    E_7},
-    {1, F_8,    D_8,    E_8},
-    {1, F_9,    D_9,    E_9},
-    {1, F_10,   D_10,   E_10},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_13,   D_13,   E_13},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {1, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {1, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
 
-    {1, C_1,    A_1,    B_1},
-    {1, C_2,    A_2,    B_2},
-    {1, C_3,    A_3,    B_3},
-    {1, C_4,    A_4,    B_4},
-    {1, C_7,    A_7,    B_7},
-    {1, C_10,   A_10,   B_10},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_13,   A_13,   B_13},
-    {1, C_14,   A_14,   B_14},
-    {1, C_15,   A_15,   B_15},
-    {1, C_16,   A_16,   B_16},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/v1/jis_encoder/jis_encoder.c b/keyboards/keychron/v1/jis_encoder/jis_encoder.c
index 029c58fd709..d3b3f9aa900 100644
--- a/keyboards/keychron/v1/jis_encoder/jis_encoder.c
+++ b/keyboards/keychron/v1/jis_encoder/jis_encoder.c
@@ -27,97 +27,97 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_16,   A_16,   B_16},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_14,   G_14,   H_14},
-    {0, I_15,   G_15,   H_15},
-    {0, I_16,   G_16,   H_16},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_16,   D_16,   E_16},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
 
-    {1, I_1,    G_1,    H_1},
-    {1, I_2,    G_2,    H_2},
-    {1, I_3,    G_3,    H_3},
-    {1, I_4,    G_4,    H_4},
-    {1, I_5,    G_5,    H_5},
-    {1, I_6,    G_6,    H_6},
-    {1, I_7,    G_7,    H_7},
-    {1, I_8,    G_8,    H_8},
-    {1, I_9,    G_9,    H_9},
-    {1, I_10,   G_10,   H_10},
-    {1, I_11,   G_11,   H_11},
-    {1, I_12,   G_12,   H_12},
-    {1, I_14,   G_14,   H_14},
-    {0, F_14,   D_14,   E_14},
-    {1, I_16,   G_16,   H_16},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_3,    D_3,    E_3},
-    {1, F_4,    D_4,    E_4},
-    {1, F_5,    D_5,    E_5},
-    {1, F_6,    D_6,    E_6},
-    {1, F_7,    D_7,    E_7},
-    {1, F_8,    D_8,    E_8},
-    {1, F_9,    D_9,    E_9},
-    {1, F_10,   D_10,   E_10},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_13,   D_13,   E_13},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {1, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {1, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
 
-    {1, C_1,    A_1,    B_1},
-    {1, C_2,    A_2,    B_2},
-    {1, C_3,    A_3,    B_3},
-    {1, C_4,    A_4,    B_4},
-    {1, C_7,    A_7,    B_7},
-    {1, C_10,   A_10,   B_10},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_13,   A_13,   B_13},
-    {1, C_14,   A_14,   B_14},
-    {1, C_15,   A_15,   B_15},
-    {1, C_16,   A_16,   B_16},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/v10/ansi_encoder/ansi_encoder.c b/keyboards/keychron/v10/ansi_encoder/ansi_encoder.c
index 10cf2a85fdd..7a58d4deefb 100644
--- a/keyboards/keychron/v10/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/v10/ansi_encoder/ansi_encoder.c
@@ -27,99 +27,99 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_2,  A_2,  B_2},  // ESC
-    {0, C_3,  A_3,  B_3},  // F1
-    {0, C_4,  A_4,  B_4},  // F2
-    {0, C_5,  A_5,  B_5},  // F3
-    {0, C_6,  A_6,  B_6},  // F4
-    {0, C_7,  A_7,  B_7},  // F5
-    {0, C_8,  A_8,  B_8},  // F6
-    {0, C_9,  A_9,  B_9},  // F7
-    {0, C_10, A_10, B_10}, // F8
-    {0, C_11, A_11, B_11}, // F9
-    {0, C_12, A_12, B_12}, // F10
-    {0, C_13, A_13, B_13}, // F11
-    {0, C_14, A_14, B_14}, // F12
-    {0, C_15, A_15, B_15}, // INS
-    {0, C_16, A_16, B_16}, // DEL
+    {0, CB3_CA2,  CB1_CA2,  CB2_CA2},  // ESC
+    {0, CB3_CA3,  CB1_CA3,  CB2_CA3},  // F1
+    {0, CB3_CA4,  CB1_CA4,  CB2_CA4},  // F2
+    {0, CB3_CA5,  CB1_CA5,  CB2_CA5},  // F3
+    {0, CB3_CA6,  CB1_CA6,  CB2_CA6},  // F4
+    {0, CB3_CA7,  CB1_CA7,  CB2_CA7},  // F5
+    {0, CB3_CA8,  CB1_CA8,  CB2_CA8},  // F6
+    {0, CB3_CA9,  CB1_CA9,  CB2_CA9},  // F7
+    {0, CB3_CA10, CB1_CA10, CB2_CA10}, // F8
+    {0, CB3_CA11, CB1_CA11, CB2_CA11}, // F9
+    {0, CB3_CA12, CB1_CA12, CB2_CA12}, // F10
+    {0, CB3_CA13, CB1_CA13, CB2_CA13}, // F11
+    {0, CB3_CA14, CB1_CA14, CB2_CA14}, // F12
+    {0, CB3_CA15, CB1_CA15, CB2_CA15}, // INS
+    {0, CB3_CA16, CB1_CA16, CB2_CA16}, // DEL
 
-    {0, I_1,  G_1,  H_1},  // M1
-    {0, I_2,  G_2,  H_2},  // `~
-    {0, I_3,  G_3,  H_3},  // 1!
-    {0, I_4,  G_4,  H_4},  // 2@
-    {0, I_5,  G_5,  H_5},  // 3#
-    {0, I_6,  G_6,  H_6},  // 4$
-    {0, I_7,  G_7,  H_7},  // 5%
-    {0, I_8,  G_8,  H_8},  // 6^
-    {0, I_9,  G_9,  H_9},  // 7&
-    {0, I_10, G_10, H_10}, // 8*
-    {0, I_11, G_11, H_11}, // 9(
-    {0, I_12, G_12, H_12}, // 0)
-    {0, I_13, G_13, H_13}, // -_
-    {0, I_14, G_14, H_14}, // =+
-    {0, I_15, G_15, H_15}, // BackSpace
-    {0, I_16, G_16, H_16}, // PgUp
+    {0, CB9_CA1,  CB7_CA1,  CB8_CA1},  // M1
+    {0, CB9_CA2,  CB7_CA2,  CB8_CA2},  // `~
+    {0, CB9_CA3,  CB7_CA3,  CB8_CA3},  // 1!
+    {0, CB9_CA4,  CB7_CA4,  CB8_CA4},  // 2@
+    {0, CB9_CA5,  CB7_CA5,  CB8_CA5},  // 3#
+    {0, CB9_CA6,  CB7_CA6,  CB8_CA6},  // 4$
+    {0, CB9_CA7,  CB7_CA7,  CB8_CA7},  // 5%
+    {0, CB9_CA8,  CB7_CA8,  CB8_CA8},  // 6^
+    {0, CB9_CA9,  CB7_CA9,  CB8_CA9},  // 7&
+    {0, CB9_CA10, CB7_CA10, CB8_CA10}, // 8*
+    {0, CB9_CA11, CB7_CA11, CB8_CA11}, // 9(
+    {0, CB9_CA12, CB7_CA12, CB8_CA12}, // 0)
+    {0, CB9_CA13, CB7_CA13, CB8_CA13}, // -_
+    {0, CB9_CA14, CB7_CA14, CB8_CA14}, // =+
+    {0, CB9_CA15, CB7_CA15, CB8_CA15}, // BackSpace
+    {0, CB9_CA16, CB7_CA16, CB8_CA16}, // PgUp
 
-    {0, F_1,  D_1,  E_1},  // M2
-    {0, F_2,  D_2,  E_2},  // TAB
-    {0, F_3,  D_3,  E_3},  // Q
-    {0, F_4,  D_4,  E_4},  // W
-    {0, F_5,  D_5,  E_5},  // E
-    {0, F_6,  D_6,  E_6},  // R
-    {0, F_7,  D_7,  E_7},  // T
-    {0, F_8,  D_8,  E_8},  // Y
-    {0, F_9,  D_9,  E_9},  // U
-    {0, F_10, D_10, E_10}, // I
-    {0, F_11, D_11, E_11}, // O
-    {0, F_12, D_12, E_12}, // P
-    {0, F_13, D_13, E_13}, // [
-    {0, F_14, D_14, E_14}, // ]
-    {0, F_15, D_15, E_15}, // |
-    {0, F_16, D_16, E_16}, // PgDn
+    {0, CB6_CA1,  CB4_CA1,  CB5_CA1},  // M2
+    {0, CB6_CA2,  CB4_CA2,  CB5_CA2},  // TAB
+    {0, CB6_CA3,  CB4_CA3,  CB5_CA3},  // Q
+    {0, CB6_CA4,  CB4_CA4,  CB5_CA4},  // W
+    {0, CB6_CA5,  CB4_CA5,  CB5_CA5},  // E
+    {0, CB6_CA6,  CB4_CA6,  CB5_CA6},  // R
+    {0, CB6_CA7,  CB4_CA7,  CB5_CA7},  // T
+    {0, CB6_CA8,  CB4_CA8,  CB5_CA8},  // Y
+    {0, CB6_CA9,  CB4_CA9,  CB5_CA9},  // U
+    {0, CB6_CA10, CB4_CA10, CB5_CA10}, // I
+    {0, CB6_CA11, CB4_CA11, CB5_CA11}, // O
+    {0, CB6_CA12, CB4_CA12, CB5_CA12}, // P
+    {0, CB6_CA13, CB4_CA13, CB5_CA13}, // [
+    {0, CB6_CA14, CB4_CA14, CB5_CA14}, // ]
+    {0, CB6_CA15, CB4_CA15, CB5_CA15}, // |
+    {0, CB6_CA16, CB4_CA16, CB5_CA16}, // PgDn
 
-    {1, C_16, A_16, B_16}, // M3
-    {1, C_15, A_15, B_15}, // CapsLock
-    {1, C_14, A_14, B_14}, // A
-    {1, C_13, A_13, B_13}, // S
-    {1, C_12, A_12, B_12}, // D
-    {1, C_11, A_11, B_11}, // F
-    {1, C_10, A_10, B_10}, // G
-    {1, C_8,  A_8,  B_8},  // H
-    {1, C_7,  A_7,  B_7},  // J
-    {1, C_6,  A_6,  B_6},  // K
-    {1, C_5,  A_5,  B_5},  // L
-    {1, C_4,  A_4,  B_4},  // ;
-    {1, C_3,  A_3,  B_3},  // '
-    {1, C_2,  A_2,  B_2},  // Enter
-    {1, C_1,  A_1,  B_1},  // Home
+    {1, CB3_CA16, CB1_CA16, CB2_CA16}, // M3
+    {1, CB3_CA15, CB1_CA15, CB2_CA15}, // CapsLock
+    {1, CB3_CA14, CB1_CA14, CB2_CA14}, // A
+    {1, CB3_CA13, CB1_CA13, CB2_CA13}, // S
+    {1, CB3_CA12, CB1_CA12, CB2_CA12}, // D
+    {1, CB3_CA11, CB1_CA11, CB2_CA11}, // F
+    {1, CB3_CA10, CB1_CA10, CB2_CA10}, // G
+    {1, CB3_CA8,  CB1_CA8,  CB2_CA8},  // H
+    {1, CB3_CA7,  CB1_CA7,  CB2_CA7},  // J
+    {1, CB3_CA6,  CB1_CA6,  CB2_CA6},  // K
+    {1, CB3_CA5,  CB1_CA5,  CB2_CA5},  // L
+    {1, CB3_CA4,  CB1_CA4,  CB2_CA4},  // ;
+    {1, CB3_CA3,  CB1_CA3,  CB2_CA3},  // '
+    {1, CB3_CA2,  CB1_CA2,  CB2_CA2},  // Enter
+    {1, CB3_CA1,  CB1_CA1,  CB2_CA1},  // Home
 
-    {1, I_16, G_16, H_16}, // M4
-    {1, I_15, G_15, H_15}, // Shift_L
-    {1, I_13, G_13, H_13}, // Z
-    {1, I_12, G_12, H_12}, // X
-    {1, I_11, G_11, H_11}, // C
-    {1, I_10, G_10, H_10}, // V
-    {1, I_9,  G_9,  H_9},  // B
-    {1, I_8,  G_8,  H_8},  // B
-    {1, I_7,  G_7,  H_7},  // N
-    {1, I_6,  G_6,  H_6},  // M
-    {1, I_5,  G_5,  H_5},  // ,
-    {1, I_4,  G_4,  H_4},  // .
-    {1, I_3,  G_3,  H_3},  // ?
-    {1, I_2,  G_2,  H_2},  // Shift_R
-    {1, I_1,  G_1,  H_1},  // Up
+    {1, CB9_CA16, CB7_CA16, CB8_CA16}, // M4
+    {1, CB9_CA15, CB7_CA15, CB8_CA15}, // Shift_L
+    {1, CB9_CA13, CB7_CA13, CB8_CA13}, // Z
+    {1, CB9_CA12, CB7_CA12, CB8_CA12}, // X
+    {1, CB9_CA11, CB7_CA11, CB8_CA11}, // C
+    {1, CB9_CA10, CB7_CA10, CB8_CA10}, // V
+    {1, CB9_CA9,  CB7_CA9,  CB8_CA9},  // B
+    {1, CB9_CA8,  CB7_CA8,  CB8_CA8},  // B
+    {1, CB9_CA7,  CB7_CA7,  CB8_CA7},  // N
+    {1, CB9_CA6,  CB7_CA6,  CB8_CA6},  // M
+    {1, CB9_CA5,  CB7_CA5,  CB8_CA5},  // ,
+    {1, CB9_CA4,  CB7_CA4,  CB8_CA4},  // .
+    {1, CB9_CA3,  CB7_CA3,  CB8_CA3},  // ?
+    {1, CB9_CA2,  CB7_CA2,  CB8_CA2},  // Shift_R
+    {1, CB9_CA1,  CB7_CA1,  CB8_CA1},  // Up
 
-    {1, F_16, D_16, E_16}, // M5
-    {1, F_15, D_15, E_15}, // Ctrl_L
-    {1, F_14, D_14, E_14}, // Win_L
-    {1, F_13, D_13, E_13}, // Alt_L
-    {1, F_12, D_12, E_12}, // Space
-    {1, F_9,  D_9,  E_9},  // Fn
-    {1, F_8,  D_8,  E_8},  // Space
-    {1, F_7,  D_7,  E_7},  // Alt_R
-    {1, F_3,  D_3,  E_3},  // Left
-    {1, F_2,  D_2,  E_2},  // Down
-    {1, F_1,  D_1,  E_1},  // Right
+    {1, CB6_CA16, CB4_CA16, CB5_CA16}, // M5
+    {1, CB6_CA15, CB4_CA15, CB5_CA15}, // Ctrl_L
+    {1, CB6_CA14, CB4_CA14, CB5_CA14}, // Win_L
+    {1, CB6_CA13, CB4_CA13, CB5_CA13}, // Alt_L
+    {1, CB6_CA12, CB4_CA12, CB5_CA12}, // Space
+    {1, CB6_CA9,  CB4_CA9,  CB5_CA9},  // Fn
+    {1, CB6_CA8,  CB4_CA8,  CB5_CA8},  // Space
+    {1, CB6_CA7,  CB4_CA7,  CB5_CA7},  // Alt_R
+    {1, CB6_CA3,  CB4_CA3,  CB5_CA3},  // Left
+    {1, CB6_CA2,  CB4_CA2,  CB5_CA2},  // Down
+    {1, CB6_CA1,  CB4_CA1,  CB5_CA1},  // Right
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/v10/iso_encoder/iso_encoder.c b/keyboards/keychron/v10/iso_encoder/iso_encoder.c
index b4bfb692068..359646b5426 100644
--- a/keyboards/keychron/v10/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/v10/iso_encoder/iso_encoder.c
@@ -27,100 +27,100 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_2,  A_2,  B_2},  // ESC
-    {0, C_3,  A_3,  B_3},  // F1
-    {0, C_4,  A_4,  B_4},  // F2
-    {0, C_5,  A_5,  B_5},  // F3
-    {0, C_6,  A_6,  B_6},  // F4
-    {0, C_7,  A_7,  B_7},  // F5
-    {0, C_8,  A_8,  B_8},  // F6
-    {0, C_9,  A_9,  B_9},  // F7
-    {0, C_10, A_10, B_10}, // F8
-    {0, C_11, A_11, B_11}, // F9
-    {0, C_12, A_12, B_12}, // F10
-    {0, C_13, A_13, B_13}, // F11
-    {0, C_14, A_14, B_14}, // F12
-    {0, C_15, A_15, B_15}, // INS
-    {0, C_16, A_16, B_16}, // DEL
+    {0, CB3_CA2,  CB1_CA2,  CB2_CA2},  // ESC
+    {0, CB3_CA3,  CB1_CA3,  CB2_CA3},  // F1
+    {0, CB3_CA4,  CB1_CA4,  CB2_CA4},  // F2
+    {0, CB3_CA5,  CB1_CA5,  CB2_CA5},  // F3
+    {0, CB3_CA6,  CB1_CA6,  CB2_CA6},  // F4
+    {0, CB3_CA7,  CB1_CA7,  CB2_CA7},  // F5
+    {0, CB3_CA8,  CB1_CA8,  CB2_CA8},  // F6
+    {0, CB3_CA9,  CB1_CA9,  CB2_CA9},  // F7
+    {0, CB3_CA10, CB1_CA10, CB2_CA10}, // F8
+    {0, CB3_CA11, CB1_CA11, CB2_CA11}, // F9
+    {0, CB3_CA12, CB1_CA12, CB2_CA12}, // F10
+    {0, CB3_CA13, CB1_CA13, CB2_CA13}, // F11
+    {0, CB3_CA14, CB1_CA14, CB2_CA14}, // F12
+    {0, CB3_CA15, CB1_CA15, CB2_CA15}, // INS
+    {0, CB3_CA16, CB1_CA16, CB2_CA16}, // DEL
 
-    {0, I_1,  G_1,  H_1},  // M1
-    {0, I_2,  G_2,  H_2},  // `~
-    {0, I_3,  G_3,  H_3},  // 1!
-    {0, I_4,  G_4,  H_4},  // 2@
-    {0, I_5,  G_5,  H_5},  // 3#
-    {0, I_6,  G_6,  H_6},  // 4$
-    {0, I_7,  G_7,  H_7},  // 5%
-    {0, I_8,  G_8,  H_8},  // 6^
-    {0, I_9,  G_9,  H_9},  // 7&
-    {0, I_10, G_10, H_10}, // 8*
-    {0, I_11, G_11, H_11}, // 9(
-    {0, I_12, G_12, H_12}, // 0)
-    {0, I_13, G_13, H_13}, // -_
-    {0, I_14, G_14, H_14}, // =+
-    {0, I_15, G_15, H_15}, // BackSpace
-    {0, I_16, G_16, H_16}, // PgUp
+    {0, CB9_CA1,  CB7_CA1,  CB8_CA1},  // M1
+    {0, CB9_CA2,  CB7_CA2,  CB8_CA2},  // `~
+    {0, CB9_CA3,  CB7_CA3,  CB8_CA3},  // 1!
+    {0, CB9_CA4,  CB7_CA4,  CB8_CA4},  // 2@
+    {0, CB9_CA5,  CB7_CA5,  CB8_CA5},  // 3#
+    {0, CB9_CA6,  CB7_CA6,  CB8_CA6},  // 4$
+    {0, CB9_CA7,  CB7_CA7,  CB8_CA7},  // 5%
+    {0, CB9_CA8,  CB7_CA8,  CB8_CA8},  // 6^
+    {0, CB9_CA9,  CB7_CA9,  CB8_CA9},  // 7&
+    {0, CB9_CA10, CB7_CA10, CB8_CA10}, // 8*
+    {0, CB9_CA11, CB7_CA11, CB8_CA11}, // 9(
+    {0, CB9_CA12, CB7_CA12, CB8_CA12}, // 0)
+    {0, CB9_CA13, CB7_CA13, CB8_CA13}, // -_
+    {0, CB9_CA14, CB7_CA14, CB8_CA14}, // =+
+    {0, CB9_CA15, CB7_CA15, CB8_CA15}, // BackSpace
+    {0, CB9_CA16, CB7_CA16, CB8_CA16}, // PgUp
 
-    {0, F_1,  D_1,  E_1},  // M2
-    {0, F_2,  D_2,  E_2},  // TAB
-    {0, F_3,  D_3,  E_3},  // Q
-    {0, F_4,  D_4,  E_4},  // W
-    {0, F_5,  D_5,  E_5},  // E
-    {0, F_6,  D_6,  E_6},  // R
-    {0, F_7,  D_7,  E_7},  // T
-    {0, F_8,  D_8,  E_8},  // Y
-    {0, F_9,  D_9,  E_9},  // U
-    {0, F_10, D_10, E_10}, // I
-    {0, F_11, D_11, E_11}, // O
-    {0, F_12, D_12, E_12}, // P
-    {0, F_13, D_13, E_13}, // [
-    {0, F_14, D_14, E_14}, // ]
-    {0, F_16, D_16, E_16}, // PgDn
+    {0, CB6_CA1,  CB4_CA1,  CB5_CA1},  // M2
+    {0, CB6_CA2,  CB4_CA2,  CB5_CA2},  // TAB
+    {0, CB6_CA3,  CB4_CA3,  CB5_CA3},  // Q
+    {0, CB6_CA4,  CB4_CA4,  CB5_CA4},  // W
+    {0, CB6_CA5,  CB4_CA5,  CB5_CA5},  // E
+    {0, CB6_CA6,  CB4_CA6,  CB5_CA6},  // R
+    {0, CB6_CA7,  CB4_CA7,  CB5_CA7},  // T
+    {0, CB6_CA8,  CB4_CA8,  CB5_CA8},  // Y
+    {0, CB6_CA9,  CB4_CA9,  CB5_CA9},  // U
+    {0, CB6_CA10, CB4_CA10, CB5_CA10}, // I
+    {0, CB6_CA11, CB4_CA11, CB5_CA11}, // O
+    {0, CB6_CA12, CB4_CA12, CB5_CA12}, // P
+    {0, CB6_CA13, CB4_CA13, CB5_CA13}, // [
+    {0, CB6_CA14, CB4_CA14, CB5_CA14}, // ]
+    {0, CB6_CA16, CB4_CA16, CB5_CA16}, // PgDn
 
-    {1, C_16, A_16, B_16}, // M3
-    {1, C_15, A_15, B_15}, // CapsLock
-    {1, C_14, A_14, B_14}, // A
-    {1, C_13, A_13, B_13}, // S
-    {1, C_12, A_12, B_12}, // D
-    {1, C_11, A_11, B_11}, // F
-    {1, C_10, A_10, B_10}, // G
-    {1, C_8,  A_8,  B_8},  // H
-    {1, C_7,  A_7,  B_7},  // J
-    {1, C_6,  A_6,  B_6},  // K
-    {1, C_5,  A_5,  B_5},  // L
-    {1, C_4,  A_4,  B_4},  // ;
-    {1, C_3,  A_3,  B_3},  // '
-    {0, F_15, D_15, E_15}, // |
-    {1, C_2,  A_2,  B_2},  // Enter
-    {1, C_1,  A_1,  B_1},  // Home
+    {1, CB3_CA16, CB1_CA16, CB2_CA16}, // M3
+    {1, CB3_CA15, CB1_CA15, CB2_CA15}, // CapsLock
+    {1, CB3_CA14, CB1_CA14, CB2_CA14}, // A
+    {1, CB3_CA13, CB1_CA13, CB2_CA13}, // S
+    {1, CB3_CA12, CB1_CA12, CB2_CA12}, // D
+    {1, CB3_CA11, CB1_CA11, CB2_CA11}, // F
+    {1, CB3_CA10, CB1_CA10, CB2_CA10}, // G
+    {1, CB3_CA8,  CB1_CA8,  CB2_CA8},  // H
+    {1, CB3_CA7,  CB1_CA7,  CB2_CA7},  // J
+    {1, CB3_CA6,  CB1_CA6,  CB2_CA6},  // K
+    {1, CB3_CA5,  CB1_CA5,  CB2_CA5},  // L
+    {1, CB3_CA4,  CB1_CA4,  CB2_CA4},  // ;
+    {1, CB3_CA3,  CB1_CA3,  CB2_CA3},  // '
+    {0, CB6_CA15, CB4_CA15, CB5_CA15}, // |
+    {1, CB3_CA2,  CB1_CA2,  CB2_CA2},  // Enter
+    {1, CB3_CA1,  CB1_CA1,  CB2_CA1},  // Home
 
-    {1, I_16, G_16, H_16}, // M4
-    {1, I_15, G_15, H_15}, // Shift_L
-    {1, I_14, G_14, H_14},
-    {1, I_13, G_13, H_13}, // Z
-    {1, I_12, G_12, H_12}, // X
-    {1, I_11, G_11, H_11}, // C
-    {1, I_10, G_10, H_10}, // V
-    {1, I_9,  G_9,  H_9},  // B
-    {1, I_8,  G_8,  H_8},  // B
-    {1, I_7,  G_7,  H_7},  // N
-    {1, I_6,  G_6,  H_6},  // M
-    {1, I_5,  G_5,  H_5},  // ,
-    {1, I_4,  G_4,  H_4},  // .
-    {1, I_3,  G_3,  H_3},  // ?
-    {1, I_2,  G_2,  H_2},  // Shift_R
-    {1, I_1,  G_1,  H_1},  // Up
+    {1, CB9_CA16, CB7_CA16, CB8_CA16}, // M4
+    {1, CB9_CA15, CB7_CA15, CB8_CA15}, // Shift_L
+    {1, CB9_CA14, CB7_CA14, CB8_CA14},
+    {1, CB9_CA13, CB7_CA13, CB8_CA13}, // Z
+    {1, CB9_CA12, CB7_CA12, CB8_CA12}, // X
+    {1, CB9_CA11, CB7_CA11, CB8_CA11}, // C
+    {1, CB9_CA10, CB7_CA10, CB8_CA10}, // V
+    {1, CB9_CA9,  CB7_CA9,  CB8_CA9},  // B
+    {1, CB9_CA8,  CB7_CA8,  CB8_CA8},  // B
+    {1, CB9_CA7,  CB7_CA7,  CB8_CA7},  // N
+    {1, CB9_CA6,  CB7_CA6,  CB8_CA6},  // M
+    {1, CB9_CA5,  CB7_CA5,  CB8_CA5},  // ,
+    {1, CB9_CA4,  CB7_CA4,  CB8_CA4},  // .
+    {1, CB9_CA3,  CB7_CA3,  CB8_CA3},  // ?
+    {1, CB9_CA2,  CB7_CA2,  CB8_CA2},  // Shift_R
+    {1, CB9_CA1,  CB7_CA1,  CB8_CA1},  // Up
 
-    {1, F_16, D_16, E_16}, // M5
-    {1, F_15, D_15, E_15}, // Ctrl_L
-    {1, F_14, D_14, E_14}, // Win_L
-    {1, F_13, D_13, E_13}, // Alt_L
-    {1, F_12, D_12, E_12}, // Space
-    {1, F_9,  D_9,  E_9},  // Fn
-    {1, F_8,  D_8,  E_8},  // Space
-    {1, F_7,  D_7,  E_7},  // Alt_R
-    {1, F_3,  D_3,  E_3},  // Left
-    {1, F_2,  D_2,  E_2},  // Down
-    {1, F_1,  D_1,  E_1},  // Right
+    {1, CB6_CA16, CB4_CA16, CB5_CA16}, // M5
+    {1, CB6_CA15, CB4_CA15, CB5_CA15}, // Ctrl_L
+    {1, CB6_CA14, CB4_CA14, CB5_CA14}, // Win_L
+    {1, CB6_CA13, CB4_CA13, CB5_CA13}, // Alt_L
+    {1, CB6_CA12, CB4_CA12, CB5_CA12}, // Space
+    {1, CB6_CA9,  CB4_CA9,  CB5_CA9},  // Fn
+    {1, CB6_CA8,  CB4_CA8,  CB5_CA8},  // Space
+    {1, CB6_CA7,  CB4_CA7,  CB5_CA7},  // Alt_R
+    {1, CB6_CA3,  CB4_CA3,  CB5_CA3},  // Left
+    {1, CB6_CA2,  CB4_CA2,  CB5_CA2},  // Down
+    {1, CB6_CA1,  CB4_CA1,  CB5_CA1},  // Right
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/v2/ansi/ansi.c b/keyboards/keychron/v2/ansi/ansi.c
index 7e3214f1751..722aa27b470 100644
--- a/keyboards/keychron/v2/ansi/ansi.c
+++ b/keyboards/keychron/v2/ansi/ansi.c
@@ -27,77 +27,77 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_16,   A_16,   B_16},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_14,   D_14,   E_14},
-    {0, F_16,   D_16,   E_16},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
 
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {1, I_5,    G_5,    H_5},
-    {1, I_6,    G_6,    H_6},
-    {1, I_7,    G_7,    H_7},
-    {1, I_8,    G_8,    H_8},
-    {1, I_9,    G_9,    H_9},
-    {1, I_10,   G_10,   H_10},
-    {1, I_11,   G_11,   H_11},
-    {1, I_12,   G_12,   H_12},
-    {1, I_14,   G_14,   H_14},
-    {1, I_16,   G_16,   H_16},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {1, C_1,    A_1,    B_1},
-    {1, C_3,    A_3,    B_3},
-    {1, C_4,    A_4,    B_4},
-    {1, C_5,    A_5,    B_5},
-    {1, C_6,    A_6,    B_6},
-    {1, C_7,    A_7,    B_7},
-    {1, C_8,    A_8,    B_8},
-    {1, C_9,    A_9,    B_9},
-    {1, C_10,   A_10,   B_10},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_14,   A_14,   B_14},
-    {1, C_15,   A_15,   B_15},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_2,    D_2,    E_2},
-    {1, F_3,    D_3,    E_3},
-    {1, F_7,    D_7,    E_7},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_13,   D_13,   E_13},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
-    {1, F_16,   D_16,   E_16},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16},
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/v2/ansi_encoder/ansi_encoder.c b/keyboards/keychron/v2/ansi_encoder/ansi_encoder.c
index df33725b5e1..6203483285f 100644
--- a/keyboards/keychron/v2/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/v2/ansi_encoder/ansi_encoder.c
@@ -27,77 +27,77 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_16,   A_16,   B_16},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_14,   D_14,   E_14},
-    {0, F_16,   D_16,   E_16},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
 
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {1, I_5,    G_5,    H_5},
-    {1, I_6,    G_6,    H_6},
-    {1, I_7,    G_7,    H_7},
-    {1, I_8,    G_8,    H_8},
-    {1, I_9,    G_9,    H_9},
-    {1, I_10,   G_10,   H_10},
-    {1, I_11,   G_11,   H_11},
-    {1, I_12,   G_12,   H_12},
-    {1, I_14,   G_14,   H_14},
-    {1, I_16,   G_16,   H_16},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {1, C_1,    A_1,    B_1},
-    {1, C_3,    A_3,    B_3},
-    {1, C_4,    A_4,    B_4},
-    {1, C_5,    A_5,    B_5},
-    {1, C_6,    A_6,    B_6},
-    {1, C_7,    A_7,    B_7},
-    {1, C_8,    A_8,    B_8},
-    {1, C_9,    A_9,    B_9},
-    {1, C_10,   A_10,   B_10},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_14,   A_14,   B_14},
-    {1, C_15,   A_15,   B_15},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_2,    D_2,    E_2},
-    {1, F_3,    D_3,    E_3},
-    {1, F_7,    D_7,    E_7},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_13,   D_13,   E_13},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
-    {1, F_16,   D_16,   E_16},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16},
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/v2/iso/iso.c b/keyboards/keychron/v2/iso/iso.c
index ba9d47a2f14..aca0879838e 100644
--- a/keyboards/keychron/v2/iso/iso.c
+++ b/keyboards/keychron/v2/iso/iso.c
@@ -27,78 +27,78 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_16,   A_16,   B_16},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_16,   D_16,   E_16},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
 
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {1, I_5,    G_5,    H_5},
-    {1, I_6,    G_6,    H_6},
-    {1, I_7,    G_7,    H_7},
-    {1, I_8,    G_8,    H_8},
-    {1, I_9,    G_9,    H_9},
-    {1, I_10,   G_10,   H_10},
-    {1, I_11,   G_11,   H_11},
-    {1, I_12,   G_12,   H_12},
-    {1, I_14,   G_14,   H_14},
-    {0, F_14,   D_14,   E_14},
-    {1, I_16,   G_16,   H_16},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {1, C_1,    A_1,    B_1},
-	{1, C_2,    A_2,    B_2},
-    {1, C_3,    A_3,    B_3},
-    {1, C_4,    A_4,    B_4},
-    {1, C_5,    A_5,    B_5},
-    {1, C_6,    A_6,    B_6},
-    {1, C_7,    A_7,    B_7},
-    {1, C_8,    A_8,    B_8},
-    {1, C_9,    A_9,    B_9},
-    {1, C_10,   A_10,   B_10},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_14,   A_14,   B_14},
-    {1, C_15,   A_15,   B_15},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+	{1, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_2,    D_2,    E_2},
-    {1, F_3,    D_3,    E_3},
-    {1, F_7,    D_7,    E_7},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_13,   D_13,   E_13},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
-    {1, F_16,   D_16,   E_16}
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16}
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/v2/iso_encoder/iso_encoder.c b/keyboards/keychron/v2/iso_encoder/iso_encoder.c
index ba9d47a2f14..aca0879838e 100644
--- a/keyboards/keychron/v2/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/v2/iso_encoder/iso_encoder.c
@@ -27,78 +27,78 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_16,   A_16,   B_16},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_16,   D_16,   E_16},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
 
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {1, I_5,    G_5,    H_5},
-    {1, I_6,    G_6,    H_6},
-    {1, I_7,    G_7,    H_7},
-    {1, I_8,    G_8,    H_8},
-    {1, I_9,    G_9,    H_9},
-    {1, I_10,   G_10,   H_10},
-    {1, I_11,   G_11,   H_11},
-    {1, I_12,   G_12,   H_12},
-    {1, I_14,   G_14,   H_14},
-    {0, F_14,   D_14,   E_14},
-    {1, I_16,   G_16,   H_16},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {1, C_1,    A_1,    B_1},
-	{1, C_2,    A_2,    B_2},
-    {1, C_3,    A_3,    B_3},
-    {1, C_4,    A_4,    B_4},
-    {1, C_5,    A_5,    B_5},
-    {1, C_6,    A_6,    B_6},
-    {1, C_7,    A_7,    B_7},
-    {1, C_8,    A_8,    B_8},
-    {1, C_9,    A_9,    B_9},
-    {1, C_10,   A_10,   B_10},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_14,   A_14,   B_14},
-    {1, C_15,   A_15,   B_15},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+	{1, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_2,    D_2,    E_2},
-    {1, F_3,    D_3,    E_3},
-    {1, F_7,    D_7,    E_7},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_13,   D_13,   E_13},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
-    {1, F_16,   D_16,   E_16}
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16}
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/v2/jis/jis.c b/keyboards/keychron/v2/jis/jis.c
index 0d638b57538..1269d9b1e69 100644
--- a/keyboards/keychron/v2/jis/jis.c
+++ b/keyboards/keychron/v2/jis/jis.c
@@ -25,81 +25,81 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_15,   A_15,   B_15},
-    {0, C_16,   A_16,   B_16},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_16,   D_16,   E_16},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
 
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {1, I_5,    G_5,    H_5},
-    {1, I_6,    G_6,    H_6},
-    {1, I_7,    G_7,    H_7},
-    {1, I_8,    G_8,    H_8},
-    {1, I_9,    G_9,    H_9},
-    {1, I_10,   G_10,   H_10},
-    {1, I_11,   G_11,   H_11},
-    {1, I_12,   G_12,   H_12},
-    {1, I_14,   G_14,   H_14},
-    {0, F_14,   D_14,   E_14},
-    {1, I_16,   G_16,   H_16},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {1, C_1,    A_1,    B_1},
-    {1, C_3,    A_3,    B_3},
-    {1, C_4,    A_4,    B_4},
-    {1, C_5,    A_5,    B_5},
-    {1, C_6,    A_6,    B_6},
-    {1, C_7,    A_7,    B_7},
-    {1, C_8,    A_8,    B_8},
-    {1, C_9,    A_9,    B_9},
-    {1, C_10,   A_10,   B_10},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_13,   A_13,   B_13},
-    {1, C_14,   A_14,   B_14},
-    {1, C_15,   A_15,   B_15},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_2,    D_2,    E_2},
-    {1, F_3,    D_3,    E_3},
-    {1, F_4,    D_4,    E_4},
-    {1, F_7,    D_7,    E_7},
-    {1, F_10,   D_10,   E_10},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_13,   D_13,   E_13},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
-    {1, F_16,   D_16,   E_16}
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16}
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/v2/jis_encoder/jis_encoder.c b/keyboards/keychron/v2/jis_encoder/jis_encoder.c
index 10a3ca25a7f..85aaf165f69 100644
--- a/keyboards/keychron/v2/jis_encoder/jis_encoder.c
+++ b/keyboards/keychron/v2/jis_encoder/jis_encoder.c
@@ -25,81 +25,81 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_15,   A_15,   B_15},
-    {0, C_16,   A_16,   B_16},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_16,   D_16,   E_16},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
 
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {1, I_5,    G_5,    H_5},
-    {1, I_6,    G_6,    H_6},
-    {1, I_7,    G_7,    H_7},
-    {1, I_8,    G_8,    H_8},
-    {1, I_9,    G_9,    H_9},
-    {1, I_10,   G_10,   H_10},
-    {1, I_11,   G_11,   H_11},
-    {1, I_12,   G_12,   H_12},
-    {1, I_14,   G_14,   H_14},
-    {0, F_14,   D_14,   E_14},
-    {1, I_16,   G_16,   H_16},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {1, C_1,    A_1,    B_1},
-    {1, C_3,    A_3,    B_3},
-    {1, C_4,    A_4,    B_4},
-    {1, C_5,    A_5,    B_5},
-    {1, C_6,    A_6,    B_6},
-    {1, C_7,    A_7,    B_7},
-    {1, C_8,    A_8,    B_8},
-    {1, C_9,    A_9,    B_9},
-    {1, C_10,   A_10,   B_10},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_13,   A_13,   B_13},
-    {1, C_14,   A_14,   B_14},
-    {1, C_15,   A_15,   B_15},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_2,    D_2,    E_2},
-    {1, F_3,    D_3,    E_3},
-    {1, F_4,    D_4,    E_4},
-    {1, F_7,    D_7,    E_7},
-    {1, F_10,   D_10,   E_10},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_13,   D_13,   E_13},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
-    {1, F_16,   D_16,   E_16}
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16}
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/v3/ansi/ansi.c b/keyboards/keychron/v3/ansi/ansi.c
index 6205b0b01bf..7c476786193 100644
--- a/keyboards/keychron/v3/ansi/ansi.c
+++ b/keyboards/keychron/v3/ansi/ansi.c
@@ -25,98 +25,98 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_15,   G_15,   H_15},
-    {0, I_16,   G_16,   H_16},
-    {1, I_15,   G_15,   H_15},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {1, CB9_CA15,   CB7_CA15,   CB8_CA15},
 
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_15,   A_15,   B_15},
-    {0, C_16,   A_16,   B_16},
-    {1, I_16,   G_16,   H_16},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_14,   D_14,   E_14},
-    {0, F_15,   D_15,   E_15},
-    {0, F_16,   D_16,   E_16},
-    {1, I_13,   G_13,   H_13},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {1, CB9_CA13,   CB7_CA13,   CB8_CA13},
 
-    {1, I_1,    G_1,    H_1},
-    {1, I_2,    G_2,    H_2},
-    {1, I_3,    G_3,    H_3},
-    {1, I_4,    G_4,    H_4},
-    {1, I_5,    G_5,    H_5},
-    {1, I_6,    G_6,    H_6},
-    {1, I_7,    G_7,    H_7},
-    {1, I_8,    G_8,    H_8},
-    {1, I_9,    G_9,    H_9},
-    {1, I_10,   G_10,   H_10},
-    {1, I_11,   G_11,   H_11},
-    {1, I_12,   G_12,   H_12},
-    {1, I_14,   G_14,   H_14},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
 
-    {1, C_1,    A_1,    B_1},
-    {1, C_3,    A_3,    B_3},
-    {1, C_4,    A_4,    B_4},
-    {1, C_5,    A_5,    B_5},
-    {1, C_6,    A_6,    B_6},
-    {1, C_7,    A_7,    B_7},
-    {1, C_8,    A_8,    B_8},
-    {1, C_9,    A_9,    B_9},
-    {1, C_10,   A_10,   B_10},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_14,   A_14,   B_14},
-    {1, C_16,   A_16,   B_16},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_2,    D_2,    E_2},
-    {1, F_3,    D_3,    E_3},
-    {1, F_7,    D_7,    E_7},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_13,   D_13,   E_13},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
-    {1, F_16,   D_16,   E_16},
-    {1, C_15,   A_15,   B_15},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/v3/ansi_encoder/ansi_encoder.c b/keyboards/keychron/v3/ansi_encoder/ansi_encoder.c
index 27f1f1f8304..d85708937aa 100644
--- a/keyboards/keychron/v3/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/v3/ansi_encoder/ansi_encoder.c
@@ -25,99 +25,99 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    // {0, I_14,   G_14,   H_14}, // Encoder
-    {0, I_15,   G_15,   H_15},
-    {0, I_16,   G_16,   H_16},
-    {1, I_15,   G_15,   H_15},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    // {0, CB9_CA14,   CB7_CA14,   CB8_CA14}, // Encoder
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {1, CB9_CA15,   CB7_CA15,   CB8_CA15},
 
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_15,   A_15,   B_15},
-    {0, C_16,   A_16,   B_16},
-    {1, I_16,   G_16,   H_16},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_14,   D_14,   E_14},
-    {0, F_15,   D_15,   E_15},
-    {0, F_16,   D_16,   E_16},
-    {1, I_13,   G_13,   H_13},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {1, CB9_CA13,   CB7_CA13,   CB8_CA13},
 
-    {1, I_1,    G_1,    H_1},
-    {1, I_2,    G_2,    H_2},
-    {1, I_3,    G_3,    H_3},
-    {1, I_4,    G_4,    H_4},
-    {1, I_5,    G_5,    H_5},
-    {1, I_6,    G_6,    H_6},
-    {1, I_7,    G_7,    H_7},
-    {1, I_8,    G_8,    H_8},
-    {1, I_9,    G_9,    H_9},
-    {1, I_10,   G_10,   H_10},
-    {1, I_11,   G_11,   H_11},
-    {1, I_12,   G_12,   H_12},
-    {1, I_14,   G_14,   H_14},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
 
-    {1, C_1,    A_1,    B_1},
-    {1, C_3,    A_3,    B_3},
-    {1, C_4,    A_4,    B_4},
-    {1, C_5,    A_5,    B_5},
-    {1, C_6,    A_6,    B_6},
-    {1, C_7,    A_7,    B_7},
-    {1, C_8,    A_8,    B_8},
-    {1, C_9,    A_9,    B_9},
-    {1, C_10,   A_10,   B_10},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_14,   A_14,   B_14},
-    {1, C_16,   A_16,   B_16},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_2,    D_2,    E_2},
-    {1, F_3,    D_3,    E_3},
-    {1, F_7,    D_7,    E_7},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_13,   D_13,   E_13},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
-    {1, F_16,   D_16,   E_16},
-    {1, C_15,   A_15,   B_15},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/v3/iso/iso.c b/keyboards/keychron/v3/iso/iso.c
index be0934b4a0e..83798392c6b 100644
--- a/keyboards/keychron/v3/iso/iso.c
+++ b/keyboards/keychron/v3/iso/iso.c
@@ -25,99 +25,99 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_15,   G_15,   H_15},
-    {0, I_16,   G_16,   H_16},
-    {1, I_15,   G_15,   H_15},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {1, CB9_CA15,   CB7_CA15,   CB8_CA15},
 
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_15,   A_15,   B_15},
-    {0, C_16,   A_16,   B_16},
-    {1, I_16,   G_16,   H_16},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_15,   D_15,   E_15},
-    {0, F_16,   D_16,   E_16},
-    {1, I_13,   G_13,   H_13},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {1, CB9_CA13,   CB7_CA13,   CB8_CA13},
 
-    {1, I_1,    G_1,    H_1},
-    {1, I_2,    G_2,    H_2},
-    {1, I_3,    G_3,    H_3},
-    {1, I_4,    G_4,    H_4},
-    {1, I_5,    G_5,    H_5},
-    {1, I_6,    G_6,    H_6},
-    {1, I_7,    G_7,    H_7},
-    {1, I_8,    G_8,    H_8},
-    {1, I_9,    G_9,    H_9},
-    {1, I_10,   G_10,   H_10},
-    {1, I_11,   G_11,   H_11},
-    {1, I_12,   G_12,   H_12},
-    {1, I_14,   G_14,   H_14},
-    {0, F_14,   D_14,   E_14},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
 
-    {1, C_1,    A_1,    B_1},
-    {1, C_2,    A_2,    B_2},
-    {1, C_3,    A_3,    B_3},
-    {1, C_4,    A_4,    B_4},
-    {1, C_5,    A_5,    B_5},
-    {1, C_6,    A_6,    B_6},
-    {1, C_7,    A_7,    B_7},
-    {1, C_8,    A_8,    B_8},
-    {1, C_9,    A_9,    B_9},
-    {1, C_10,   A_10,   B_10},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_14,   A_14,   B_14},
-    {1, C_16,   A_16,   B_16},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_2,    D_2,    E_2},
-    {1, F_3,    D_3,    E_3},
-    {1, F_7,    D_7,    E_7},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_13,   D_13,   E_13},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
-    {1, F_16,   D_16,   E_16},
-    {1, C_15,   A_15,   B_15},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/v3/iso_encoder/iso_encoder.c b/keyboards/keychron/v3/iso_encoder/iso_encoder.c
index 0456fb99f9c..ef0567dbe14 100644
--- a/keyboards/keychron/v3/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/v3/iso_encoder/iso_encoder.c
@@ -25,99 +25,99 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_15,   G_15,   H_15},
-    {0, I_16,   G_16,   H_16},
-    {1, I_15,   G_15,   H_15},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {1, CB9_CA15,   CB7_CA15,   CB8_CA15},
 
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_15,   A_15,   B_15},
-    {0, C_16,   A_16,   B_16},
-    {1, I_16,   G_16,   H_16},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_15,   D_15,   E_15},
-    {0, F_16,   D_16,   E_16},
-    {1, I_13,   G_13,   H_13},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {1, CB9_CA13,   CB7_CA13,   CB8_CA13},
 
-    {1, I_1,    G_1,    H_1},
-    {1, I_2,    G_2,    H_2},
-    {1, I_3,    G_3,    H_3},
-    {1, I_4,    G_4,    H_4},
-    {1, I_5,    G_5,    H_5},
-    {1, I_6,    G_6,    H_6},
-    {1, I_7,    G_7,    H_7},
-    {1, I_8,    G_8,    H_8},
-    {1, I_9,    G_9,    H_9},
-    {1, I_10,   G_10,   H_10},
-    {1, I_11,   G_11,   H_11},
-    {1, I_12,   G_12,   H_12},
-    {1, I_14,   G_14,   H_14},
-    {0, F_14,   D_14,   E_14},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
 
-    {1, C_1,    A_1,    B_1},
-    {1, C_2,    A_2,    B_2},
-    {1, C_3,    A_3,    B_3},
-    {1, C_4,    A_4,    B_4},
-    {1, C_5,    A_5,    B_5},
-    {1, C_6,    A_6,    B_6},
-    {1, C_7,    A_7,    B_7},
-    {1, C_8,    A_8,    B_8},
-    {1, C_9,    A_9,    B_9},
-    {1, C_10,   A_10,   B_10},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_14,   A_14,   B_14},
-    {1, C_16,   A_16,   B_16},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_2,    D_2,    E_2},
-    {1, F_3,    D_3,    E_3},
-    {1, F_7,    D_7,    E_7},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_13,   D_13,   E_13},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
-    {1, F_16,   D_16,   E_16},
-    {1, C_15,   A_15,   B_15},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/v3/jis/jis.c b/keyboards/keychron/v3/jis/jis.c
index be93dbc6415..c04827dc5d9 100644
--- a/keyboards/keychron/v3/jis/jis.c
+++ b/keyboards/keychron/v3/jis/jis.c
@@ -25,102 +25,102 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |    G location
  *   |  |    |    B location
  *   |  |    |    | */
-    {0, I_1, G_1, H_1},    // ESC
-    {0, I_2, G_2, H_2},    // F1
-    {0, I_3, G_3, H_3},    // F2
-    {0, I_4, G_4, H_4},    // F3
-    {0, I_5, G_5, H_5},    // F4
-    {0, I_6, G_6, H_6},    // F5
-    {0, I_7, G_7, H_7},    // F6
-    {0, I_8, G_8, H_8},    // F7
-    {0, I_9, G_9, H_9},    // F8
-    {0, I_10, G_10, H_10}, // F9
-    {0, I_11, G_11, H_11}, // F10
-    {0, I_12, G_12, H_12}, // F11
-    {0, I_13, G_13, H_13}, // F12
-    {0, I_15, G_15, H_15}, // Print
-    {0, I_16, G_16, H_16}, // Cortana
-    {1, I_15, G_15, H_15}, // Light
+    {0, CB9_CA1, CB7_CA1, CB8_CA1},    // ESC
+    {0, CB9_CA2, CB7_CA2, CB8_CA2},    // F1
+    {0, CB9_CA3, CB7_CA3, CB8_CA3},    // F2
+    {0, CB9_CA4, CB7_CA4, CB8_CA4},    // F3
+    {0, CB9_CA5, CB7_CA5, CB8_CA5},    // F4
+    {0, CB9_CA6, CB7_CA6, CB8_CA6},    // F5
+    {0, CB9_CA7, CB7_CA7, CB8_CA7},    // F6
+    {0, CB9_CA8, CB7_CA8, CB8_CA8},    // F7
+    {0, CB9_CA9, CB7_CA9, CB8_CA9},    // F8
+    {0, CB9_CA10, CB7_CA10, CB8_CA10}, // F9
+    {0, CB9_CA11, CB7_CA11, CB8_CA11}, // F10
+    {0, CB9_CA12, CB7_CA12, CB8_CA12}, // F11
+    {0, CB9_CA13, CB7_CA13, CB8_CA13}, // F12
+    {0, CB9_CA15, CB7_CA15, CB8_CA15}, // Print
+    {0, CB9_CA16, CB7_CA16, CB8_CA16}, // Cortana
+    {1, CB9_CA15, CB7_CA15, CB8_CA15}, // Light
 
-    {0, C_1, A_1, B_1},    // `~
-    {0, C_2, A_2, B_2},    // 1!
-    {0, C_3, A_3, B_3},    // 2@
-    {0, C_4, A_4, B_4},    // 3#
-    {0, C_5, A_5, B_5},    // 4$
-    {0, C_6, A_6, B_6},    // 5%
-    {0, C_7, A_7, B_7},    // 6^
-    {0, C_8, A_8, B_8},    // 7&
-    {0, C_9, A_9, B_9},    // 8*
-    {0, C_10, A_10, B_10}, // 9()
-    {0, C_11, A_11, B_11}, // 0)
-    {0, C_12, A_12, B_12}, // -_
-    {0, C_13, A_13, B_13}, // =+
-    {0, C_14, A_14, B_14}, // /
-    {0, I_14, G_14, H_14}, // Backspace
-    {0, C_15, A_15, B_15}, // Ins
-    {0, C_16, A_16, B_16}, // Home
-    {1, I_16, G_16, H_16}, // Page Up
+    {0, CB3_CA1, CB1_CA1, CB2_CA1},    // `~
+    {0, CB3_CA2, CB1_CA2, CB2_CA2},    // 1!
+    {0, CB3_CA3, CB1_CA3, CB2_CA3},    // 2@
+    {0, CB3_CA4, CB1_CA4, CB2_CA4},    // 3#
+    {0, CB3_CA5, CB1_CA5, CB2_CA5},    // 4$
+    {0, CB3_CA6, CB1_CA6, CB2_CA6},    // 5%
+    {0, CB3_CA7, CB1_CA7, CB2_CA7},    // 6^
+    {0, CB3_CA8, CB1_CA8, CB2_CA8},    // 7&
+    {0, CB3_CA9, CB1_CA9, CB2_CA9},    // 8*
+    {0, CB3_CA10, CB1_CA10, CB2_CA10}, // 9()
+    {0, CB3_CA11, CB1_CA11, CB2_CA11}, // 0)
+    {0, CB3_CA12, CB1_CA12, CB2_CA12}, // -_
+    {0, CB3_CA13, CB1_CA13, CB2_CA13}, // =+
+    {0, CB3_CA14, CB1_CA14, CB2_CA14}, // /
+    {0, CB9_CA14, CB7_CA14, CB8_CA14}, // Backspace
+    {0, CB3_CA15, CB1_CA15, CB2_CA15}, // Ins
+    {0, CB3_CA16, CB1_CA16, CB2_CA16}, // Home
+    {1, CB9_CA16, CB7_CA16, CB8_CA16}, // Page Up
 
-    {0, F_1, D_1, E_1},    // tab
-    {0, F_2, D_2, E_2},    // Q
-    {0, F_3, D_3, E_3},    // W
-    {0, F_4, D_4, E_4},    // E
-    {0, F_5, D_5, E_5},    // R
-    {0, F_6, D_6, E_6},    // T
-    {0, F_7, D_7, E_7},    // Y
-    {0, F_8, D_8, E_8},    // U
-    {0, F_9, D_9, E_9},    // I
-    {0, F_10, D_10, E_10}, // O
-    {0, F_11, D_11, E_11}, // P
-    {0, F_12, D_12, E_12}, // [{
-    {0, F_13, D_13, E_13}, // }}
-    {0, F_15, D_15, E_15}, // Del
-    {0, F_16, D_16, E_16}, // End
-    {1, I_13, G_13, H_13}, // Page Down
+    {0, CB6_CA1, CB4_CA1, CB5_CA1},    // tab
+    {0, CB6_CA2, CB4_CA2, CB5_CA2},    // Q
+    {0, CB6_CA3, CB4_CA3, CB5_CA3},    // W
+    {0, CB6_CA4, CB4_CA4, CB5_CA4},    // E
+    {0, CB6_CA5, CB4_CA5, CB5_CA5},    // R
+    {0, CB6_CA6, CB4_CA6, CB5_CA6},    // T
+    {0, CB6_CA7, CB4_CA7, CB5_CA7},    // Y
+    {0, CB6_CA8, CB4_CA8, CB5_CA8},    // U
+    {0, CB6_CA9, CB4_CA9, CB5_CA9},    // I
+    {0, CB6_CA10, CB4_CA10, CB5_CA10}, // O
+    {0, CB6_CA11, CB4_CA11, CB5_CA11}, // P
+    {0, CB6_CA12, CB4_CA12, CB5_CA12}, // [{
+    {0, CB6_CA13, CB4_CA13, CB5_CA13}, // }}
+    {0, CB6_CA15, CB4_CA15, CB5_CA15}, // Del
+    {0, CB6_CA16, CB4_CA16, CB5_CA16}, // End
+    {1, CB9_CA13, CB7_CA13, CB8_CA13}, // Page Down
 
-    {1, I_1, G_1, H_1},    // Cpas
-    {1, I_2, G_2, H_2},    // A
-    {1, I_3, G_3, H_3},    // S
-    {1, I_4, G_4, H_4},    // D
-    {1, I_5, G_5, H_5},    // F
-    {1, I_6, G_6, H_6},    // G
-    {1, I_7, G_7, H_7},    // H
-    {1, I_8, G_8, H_8},    // J
-    {1, I_9, G_9, H_9},    // K
-    {1, I_10, G_10, H_10}, // L
-    {1, I_11, G_11, H_11}, // ;
-    {1, I_12, G_12, H_12}, // :
-    {1, I_14, G_14, H_14}, // #~
-    {0, F_14, D_14, E_14}, // Enter
+    {1, CB9_CA1, CB7_CA1, CB8_CA1},    // Cpas
+    {1, CB9_CA2, CB7_CA2, CB8_CA2},    // A
+    {1, CB9_CA3, CB7_CA3, CB8_CA3},    // S
+    {1, CB9_CA4, CB7_CA4, CB8_CA4},    // D
+    {1, CB9_CA5, CB7_CA5, CB8_CA5},    // F
+    {1, CB9_CA6, CB7_CA6, CB8_CA6},    // G
+    {1, CB9_CA7, CB7_CA7, CB8_CA7},    // H
+    {1, CB9_CA8, CB7_CA8, CB8_CA8},    // J
+    {1, CB9_CA9, CB7_CA9, CB8_CA9},    // K
+    {1, CB9_CA10, CB7_CA10, CB8_CA10}, // L
+    {1, CB9_CA11, CB7_CA11, CB8_CA11}, // ;
+    {1, CB9_CA12, CB7_CA12, CB8_CA12}, // :
+    {1, CB9_CA14, CB7_CA14, CB8_CA14}, // #~
+    {0, CB6_CA14, CB4_CA14, CB5_CA14}, // Enter
 
-    {1, C_1, A_1, B_1},    // LShift
-    {1, C_3, A_3, B_3},    // Z
-    {1, C_4, A_4, B_4},    // X
-    {1, C_5, A_5, B_5},    // C
-    {1, C_6, A_6, B_6},    // V
-    {1, C_7, A_7, B_7},    // B
-    {1, C_8, A_8, B_8},    // N
-    {1, C_9, A_9, B_9},    // M
-    {1, C_10, A_10, B_10}, // ,<
-    {1, C_11, A_11, B_11}, // .>
-    {1, C_12, A_12, B_12}, // /?
-    {1, C_13, A_13, B_13}, // |
-    {1, C_14, A_14, B_14}, // RShift
-    {1, C_16, A_16, B_16}, // Up
+    {1, CB3_CA1, CB1_CA1, CB2_CA1},    // LShift
+    {1, CB3_CA3, CB1_CA3, CB2_CA3},    // Z
+    {1, CB3_CA4, CB1_CA4, CB2_CA4},    // X
+    {1, CB3_CA5, CB1_CA5, CB2_CA5},    // C
+    {1, CB3_CA6, CB1_CA6, CB2_CA6},    // V
+    {1, CB3_CA7, CB1_CA7, CB2_CA7},    // B
+    {1, CB3_CA8, CB1_CA8, CB2_CA8},    // N
+    {1, CB3_CA9, CB1_CA9, CB2_CA9},    // M
+    {1, CB3_CA10, CB1_CA10, CB2_CA10}, // ,<
+    {1, CB3_CA11, CB1_CA11, CB2_CA11}, // .>
+    {1, CB3_CA12, CB1_CA12, CB2_CA12}, // /?
+    {1, CB3_CA13, CB1_CA13, CB2_CA13}, // |
+    {1, CB3_CA14, CB1_CA14, CB2_CA14}, // RShift
+    {1, CB3_CA16, CB1_CA16, CB2_CA16}, // Up
 
-    {1, F_1, D_1, E_1},    // LCtrl
-    {1, F_2, D_2, E_2},    // LWin
-    {1, F_3, D_3, E_3},    // LAlt
-    {1, F_4, D_4, E_4},    // NUm
-    {1, F_7, D_7, E_7},    // Space
-    {1, F_10, D_10, E_10}, // Jap
-    {1, F_11, D_11, E_11}, // RAlt
-    {1, F_12, D_12, E_12}, // RWin
-    {1, F_13, D_13, E_13}, // Fn
-    {1, F_14, D_14, E_14}, // RCtrl
-    {1, F_15, D_15, E_15}, // Left
-    {1, F_16, D_16, E_16}, // Down
-    {1, C_15, A_15, B_15}, // Right
+    {1, CB6_CA1, CB4_CA1, CB5_CA1},    // LCtrl
+    {1, CB6_CA2, CB4_CA2, CB5_CA2},    // LWin
+    {1, CB6_CA3, CB4_CA3, CB5_CA3},    // LAlt
+    {1, CB6_CA4, CB4_CA4, CB5_CA4},    // NUm
+    {1, CB6_CA7, CB4_CA7, CB5_CA7},    // Space
+    {1, CB6_CA10, CB4_CA10, CB5_CA10}, // Jap
+    {1, CB6_CA11, CB4_CA11, CB5_CA11}, // RAlt
+    {1, CB6_CA12, CB4_CA12, CB5_CA12}, // RWin
+    {1, CB6_CA13, CB4_CA13, CB5_CA13}, // Fn
+    {1, CB6_CA14, CB4_CA14, CB5_CA14}, // RCtrl
+    {1, CB6_CA15, CB4_CA15, CB5_CA15}, // Left
+    {1, CB6_CA16, CB4_CA16, CB5_CA16}, // Down
+    {1, CB3_CA15, CB1_CA15, CB2_CA15}, // Right
 };
 
 #    define __ NO_LED
diff --git a/keyboards/keychron/v3/jis_encoder/jis_encoder.c b/keyboards/keychron/v3/jis_encoder/jis_encoder.c
index 9eea7b3994e..bf2018d86f1 100644
--- a/keyboards/keychron/v3/jis_encoder/jis_encoder.c
+++ b/keyboards/keychron/v3/jis_encoder/jis_encoder.c
@@ -25,103 +25,103 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |    G location
  *   |  |    |    B location
  *   |  |    |    | */
-    {0, I_1, G_1, H_1},    // ESC
-    {0, I_2, G_2, H_2},    // F1
-    {0, I_3, G_3, H_3},    // F2
-    {0, I_4, G_4, H_4},    // F3
-    {0, I_5, G_5, H_5},    // F4
-    {0, I_6, G_6, H_6},    // F5
-    {0, I_7, G_7, H_7},    // F6
-    {0, I_8, G_8, H_8},    // F7
-    {0, I_9, G_9, H_9},    // F8
-    {0, I_10, G_10, H_10}, // F9
-    {0, I_11, G_11, H_11}, // F10
-    {0, I_12, G_12, H_12}, // F11
-    {0, I_13, G_13, H_13}, // F12
-    {0, I_14, G_14, H_14}, // Mute
-    {0, I_15, G_15, H_15}, // Print
-    {0, I_16, G_16, H_16}, // Cortana
-    {1, I_15, G_15, H_15}, // Light
+    {0, CB9_CA1, CB7_CA1, CB8_CA1},    // ESC
+    {0, CB9_CA2, CB7_CA2, CB8_CA2},    // F1
+    {0, CB9_CA3, CB7_CA3, CB8_CA3},    // F2
+    {0, CB9_CA4, CB7_CA4, CB8_CA4},    // F3
+    {0, CB9_CA5, CB7_CA5, CB8_CA5},    // F4
+    {0, CB9_CA6, CB7_CA6, CB8_CA6},    // F5
+    {0, CB9_CA7, CB7_CA7, CB8_CA7},    // F6
+    {0, CB9_CA8, CB7_CA8, CB8_CA8},    // F7
+    {0, CB9_CA9, CB7_CA9, CB8_CA9},    // F8
+    {0, CB9_CA10, CB7_CA10, CB8_CA10}, // F9
+    {0, CB9_CA11, CB7_CA11, CB8_CA11}, // F10
+    {0, CB9_CA12, CB7_CA12, CB8_CA12}, // F11
+    {0, CB9_CA13, CB7_CA13, CB8_CA13}, // F12
+    {0, CB9_CA14, CB7_CA14, CB8_CA14}, // Mute
+    {0, CB9_CA15, CB7_CA15, CB8_CA15}, // Print
+    {0, CB9_CA16, CB7_CA16, CB8_CA16}, // Cortana
+    {1, CB9_CA15, CB7_CA15, CB8_CA15}, // Light
 
-    {0, C_1, A_1, B_1},    // `~
-    {0, C_2, A_2, B_2},    // 1!
-    {0, C_3, A_3, B_3},    // 2@
-    {0, C_4, A_4, B_4},    // 3#
-    {0, C_5, A_5, B_5},    // 4$
-    {0, C_6, A_6, B_6},    // 5%
-    {0, C_7, A_7, B_7},    // 6^
-    {0, C_8, A_8, B_8},    // 7&
-    {0, C_9, A_9, B_9},    // 8*
-    {0, C_10, A_10, B_10}, // 9()
-    {0, C_11, A_11, B_11}, // 0)
-    {0, C_12, A_12, B_12}, // -_
-    {0, C_13, A_13, B_13}, // =+
-    {0, C_14, A_14, B_14}, // |
-    {1, F_6, D_6, E_6},    // Backspace
-    {0, C_15, A_15, B_15}, // Ins
-    {0, C_16, A_16, B_16}, // Home
-    {1, I_16, G_16, H_16}, // Page Up
+    {0, CB3_CA1, CB1_CA1, CB2_CA1},    // `~
+    {0, CB3_CA2, CB1_CA2, CB2_CA2},    // 1!
+    {0, CB3_CA3, CB1_CA3, CB2_CA3},    // 2@
+    {0, CB3_CA4, CB1_CA4, CB2_CA4},    // 3#
+    {0, CB3_CA5, CB1_CA5, CB2_CA5},    // 4$
+    {0, CB3_CA6, CB1_CA6, CB2_CA6},    // 5%
+    {0, CB3_CA7, CB1_CA7, CB2_CA7},    // 6^
+    {0, CB3_CA8, CB1_CA8, CB2_CA8},    // 7&
+    {0, CB3_CA9, CB1_CA9, CB2_CA9},    // 8*
+    {0, CB3_CA10, CB1_CA10, CB2_CA10}, // 9()
+    {0, CB3_CA11, CB1_CA11, CB2_CA11}, // 0)
+    {0, CB3_CA12, CB1_CA12, CB2_CA12}, // -_
+    {0, CB3_CA13, CB1_CA13, CB2_CA13}, // =+
+    {0, CB3_CA14, CB1_CA14, CB2_CA14}, // |
+    {1, CB6_CA6, CB4_CA6, CB5_CA6},    // Backspace
+    {0, CB3_CA15, CB1_CA15, CB2_CA15}, // Ins
+    {0, CB3_CA16, CB1_CA16, CB2_CA16}, // Home
+    {1, CB9_CA16, CB7_CA16, CB8_CA16}, // Page Up
 
-    {0, F_1, D_1, E_1},    // tab
-    {0, F_2, D_2, E_2},    // Q
-    {0, F_3, D_3, E_3},    // W
-    {0, F_4, D_4, E_4},    // E
-    {0, F_5, D_5, E_5},    // R
-    {0, F_6, D_6, E_6},    // T
-    {0, F_7, D_7, E_7},    // Y
-    {0, F_8, D_8, E_8},    // U
-    {0, F_9, D_9, E_9},    // I
-    {0, F_10, D_10, E_10}, // O
-    {0, F_11, D_11, E_11}, // P
-    {0, F_12, D_12, E_12}, // [{
-    {0, F_13, D_13, E_13}, // }}
-    {0, F_15, D_15, E_15}, // Del
-    {0, F_16, D_16, E_16}, // End
-    {1, I_13, G_13, H_13}, // Page Down
+    {0, CB6_CA1, CB4_CA1, CB5_CA1},    // tab
+    {0, CB6_CA2, CB4_CA2, CB5_CA2},    // Q
+    {0, CB6_CA3, CB4_CA3, CB5_CA3},    // W
+    {0, CB6_CA4, CB4_CA4, CB5_CA4},    // E
+    {0, CB6_CA5, CB4_CA5, CB5_CA5},    // R
+    {0, CB6_CA6, CB4_CA6, CB5_CA6},    // T
+    {0, CB6_CA7, CB4_CA7, CB5_CA7},    // Y
+    {0, CB6_CA8, CB4_CA8, CB5_CA8},    // U
+    {0, CB6_CA9, CB4_CA9, CB5_CA9},    // I
+    {0, CB6_CA10, CB4_CA10, CB5_CA10}, // O
+    {0, CB6_CA11, CB4_CA11, CB5_CA11}, // P
+    {0, CB6_CA12, CB4_CA12, CB5_CA12}, // [{
+    {0, CB6_CA13, CB4_CA13, CB5_CA13}, // }}
+    {0, CB6_CA15, CB4_CA15, CB5_CA15}, // Del
+    {0, CB6_CA16, CB4_CA16, CB5_CA16}, // End
+    {1, CB9_CA13, CB7_CA13, CB8_CA13}, // Page Down
 
-    {1, I_1, G_1, H_1},    // Cpas
-    {1, I_2, G_2, H_2},    // A
-    {1, I_3, G_3, H_3},    // S
-    {1, I_4, G_4, H_4},    // D
-    {1, I_5, G_5, H_5},    // F
-    {1, I_6, G_6, H_6},    // G
-    {1, I_7, G_7, H_7},    // H
-    {1, I_8, G_8, H_8},    // J
-    {1, I_9, G_9, H_9},    // K
-    {1, I_10, G_10, H_10}, // L
-    {1, I_11, G_11, H_11}, // ;
-    {1, I_12, G_12, H_12}, // :
-    {1, I_14, G_14, H_14}, // #~
-    {0, F_14, D_14, E_14}, // Enter
+    {1, CB9_CA1, CB7_CA1, CB8_CA1},    // Cpas
+    {1, CB9_CA2, CB7_CA2, CB8_CA2},    // A
+    {1, CB9_CA3, CB7_CA3, CB8_CA3},    // S
+    {1, CB9_CA4, CB7_CA4, CB8_CA4},    // D
+    {1, CB9_CA5, CB7_CA5, CB8_CA5},    // F
+    {1, CB9_CA6, CB7_CA6, CB8_CA6},    // G
+    {1, CB9_CA7, CB7_CA7, CB8_CA7},    // H
+    {1, CB9_CA8, CB7_CA8, CB8_CA8},    // J
+    {1, CB9_CA9, CB7_CA9, CB8_CA9},    // K
+    {1, CB9_CA10, CB7_CA10, CB8_CA10}, // L
+    {1, CB9_CA11, CB7_CA11, CB8_CA11}, // ;
+    {1, CB9_CA12, CB7_CA12, CB8_CA12}, // :
+    {1, CB9_CA14, CB7_CA14, CB8_CA14}, // #~
+    {0, CB6_CA14, CB4_CA14, CB5_CA14}, // Enter
 
-    {1, C_1, A_1, B_1},    // LShift
-    {1, C_3, A_3, B_3},    // Z
-    {1, C_4, A_4, B_4},    // X
-    {1, C_5, A_5, B_5},    // C
-    {1, C_6, A_6, B_6},    // V
-    {1, C_7, A_7, B_7},    // B
-    {1, C_8, A_8, B_8},    // N
-    {1, C_9, A_9, B_9},    // M
-    {1, C_10, A_10, B_10}, // ,<
-    {1, C_11, A_11, B_11}, // .>
-    {1, C_12, A_12, B_12}, // /?
-    {1, C_13, A_13, B_13}, // |
-    {1, C_14, A_14, B_14}, // RShift
-    {1, C_16, A_16, B_16}, // Up
+    {1, CB3_CA1, CB1_CA1, CB2_CA1},    // LShift
+    {1, CB3_CA3, CB1_CA3, CB2_CA3},    // Z
+    {1, CB3_CA4, CB1_CA4, CB2_CA4},    // X
+    {1, CB3_CA5, CB1_CA5, CB2_CA5},    // C
+    {1, CB3_CA6, CB1_CA6, CB2_CA6},    // V
+    {1, CB3_CA7, CB1_CA7, CB2_CA7},    // B
+    {1, CB3_CA8, CB1_CA8, CB2_CA8},    // N
+    {1, CB3_CA9, CB1_CA9, CB2_CA9},    // M
+    {1, CB3_CA10, CB1_CA10, CB2_CA10}, // ,<
+    {1, CB3_CA11, CB1_CA11, CB2_CA11}, // .>
+    {1, CB3_CA12, CB1_CA12, CB2_CA12}, // /?
+    {1, CB3_CA13, CB1_CA13, CB2_CA13}, // |
+    {1, CB3_CA14, CB1_CA14, CB2_CA14}, // RShift
+    {1, CB3_CA16, CB1_CA16, CB2_CA16}, // Up
 
-    {1, F_1, D_1, E_1},    // LCtrl
-    {1, F_2, D_2, E_2},    // LWin
-    {1, F_3, D_3, E_3},    // LAlt
-    {1, F_4, D_4, E_4},    // NUm
-    {1, F_7, D_7, E_7},    // Space
-    {1, F_10, D_10, E_10}, // Jap
-    {1, F_11, D_11, E_11}, // RAlt
-    {1, F_12, D_12, E_12}, // RWin
-    {1, F_13, D_13, E_13}, // Fn
-    {1, F_14, D_14, E_14}, // RCtrl
-    {1, F_15, D_15, E_15}, // Left
-    {1, F_16, D_16, E_16}, // Down
-    {1, C_15, A_15, B_15}, // Right
+    {1, CB6_CA1, CB4_CA1, CB5_CA1},    // LCtrl
+    {1, CB6_CA2, CB4_CA2, CB5_CA2},    // LWin
+    {1, CB6_CA3, CB4_CA3, CB5_CA3},    // LAlt
+    {1, CB6_CA4, CB4_CA4, CB5_CA4},    // NUm
+    {1, CB6_CA7, CB4_CA7, CB5_CA7},    // Space
+    {1, CB6_CA10, CB4_CA10, CB5_CA10}, // Jap
+    {1, CB6_CA11, CB4_CA11, CB5_CA11}, // RAlt
+    {1, CB6_CA12, CB4_CA12, CB5_CA12}, // RWin
+    {1, CB6_CA13, CB4_CA13, CB5_CA13}, // Fn
+    {1, CB6_CA14, CB4_CA14, CB5_CA14}, // RCtrl
+    {1, CB6_CA15, CB4_CA15, CB5_CA15}, // Left
+    {1, CB6_CA16, CB4_CA16, CB5_CA16}, // Down
+    {1, CB3_CA15, CB1_CA15, CB2_CA15}, // Right
 };
 
 #    define __ NO_LED
diff --git a/keyboards/keychron/v4/ansi/ansi.c b/keyboards/keychron/v4/ansi/ansi.c
index 24afdb65b76..7368144c8d8 100644
--- a/keyboards/keychron/v4/ansi/ansi.c
+++ b/keyboards/keychron/v4/ansi/ansi.c
@@ -27,71 +27,71 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_14,   D_14,   E_14},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
 
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_14,   G_14,   H_14},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14},
 
-    {0, L_1,    J_1,    K_1},
-    {0, L_3,    J_3,    K_3},
-    {0, L_4,    J_4,    K_4},
-    {0, L_5,    J_5,    K_5},
-    {0, L_6,    J_6,    K_6},
-    {0, L_7,    J_7,    K_7},
-    {0, L_8,    J_8,    K_8},
-    {0, L_9,    J_9,    K_9},
-    {0, L_10,   J_10,   K_10},
-    {0, L_11,   J_11,   K_11},
-    {0, L_12,   J_12,   K_12},
-    {0, L_14,   J_14,   K_14},
+    {0, CB12_CA1,    CB10_CA1,    CB11_CA1},
+    {0, CB12_CA3,    CB10_CA3,    CB11_CA3},
+    {0, CB12_CA4,    CB10_CA4,    CB11_CA4},
+    {0, CB12_CA5,    CB10_CA5,    CB11_CA5},
+    {0, CB12_CA6,    CB10_CA6,    CB11_CA6},
+    {0, CB12_CA7,    CB10_CA7,    CB11_CA7},
+    {0, CB12_CA8,    CB10_CA8,    CB11_CA8},
+    {0, CB12_CA9,    CB10_CA9,    CB11_CA9},
+    {0, CB12_CA10,   CB10_CA10,   CB11_CA10},
+    {0, CB12_CA11,   CB10_CA11,   CB11_CA11},
+    {0, CB12_CA12,   CB10_CA12,   CB11_CA12},
+    {0, CB12_CA14,   CB10_CA14,   CB11_CA14},
 
-    {0, L_15,   J_15,   K_15},
-    {0, L_16,   J_16,   K_16},
-    {0, I_15,   G_15,   H_15},
-    {0, I_16,   G_16,   H_16},
-    {0, F_15,   D_15,   E_15},
-    {0, F_16,   D_16,   E_16},
-    {0, C_15,   A_15,   B_15},
-    {0, C_16,   A_16,   B_16},
+    {0, CB12_CA15,   CB10_CA15,   CB11_CA15},
+    {0, CB12_CA16,   CB10_CA16,   CB11_CA16},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {0, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/v4/iso/iso.c b/keyboards/keychron/v4/iso/iso.c
index 0b59f04d527..dc6a0f44d0b 100644
--- a/keyboards/keychron/v4/iso/iso.c
+++ b/keyboards/keychron/v4/iso/iso.c
@@ -27,72 +27,72 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
 
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_14,   G_14,   H_14},
-    {0, F_14,   D_14,   E_14},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
 
-    {0, L_1,    J_1,    K_1},
-    {0, L_2,    J_2,    K_2},
-    {0, L_3,    J_3,    K_3},
-    {0, L_4,    J_4,    K_4},
-    {0, L_5,    J_5,    K_5},
-    {0, L_6,    J_6,    K_6},
-    {0, L_7,    J_7,    K_7},
-    {0, L_8,    J_8,    K_8},
-    {0, L_9,    J_9,    K_9},
-    {0, L_10,   J_10,   K_10},
-    {0, L_11,   J_11,   K_11},
-    {0, L_12,   J_12,   K_12},
-    {0, L_14,   J_14,   K_14},
+    {0, CB12_CA1,    CB10_CA1,    CB11_CA1},
+    {0, CB12_CA2,    CB10_CA2,    CB11_CA2},
+    {0, CB12_CA3,    CB10_CA3,    CB11_CA3},
+    {0, CB12_CA4,    CB10_CA4,    CB11_CA4},
+    {0, CB12_CA5,    CB10_CA5,    CB11_CA5},
+    {0, CB12_CA6,    CB10_CA6,    CB11_CA6},
+    {0, CB12_CA7,    CB10_CA7,    CB11_CA7},
+    {0, CB12_CA8,    CB10_CA8,    CB11_CA8},
+    {0, CB12_CA9,    CB10_CA9,    CB11_CA9},
+    {0, CB12_CA10,   CB10_CA10,   CB11_CA10},
+    {0, CB12_CA11,   CB10_CA11,   CB11_CA11},
+    {0, CB12_CA12,   CB10_CA12,   CB11_CA12},
+    {0, CB12_CA14,   CB10_CA14,   CB11_CA14},
 
-    {0, L_15,   J_15,   K_15},
-    {0, L_16,   J_16,   K_16},
-    {0, I_15,   G_15,   H_15},
-    {0, I_16,   G_16,   H_16},
-    {0, F_15,   D_15,   E_15},
-    {0, F_16,   D_16,   E_16},
-    {0, C_15,   A_15,   B_15},
-    {0, C_16,   A_16,   B_16},
+    {0, CB12_CA15,   CB10_CA15,   CB11_CA15},
+    {0, CB12_CA16,   CB10_CA16,   CB11_CA16},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {0, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/v5/ansi/ansi.c b/keyboards/keychron/v5/ansi/ansi.c
index 3f85b6b210a..b38d5f508f7 100644
--- a/keyboards/keychron/v5/ansi/ansi.c
+++ b/keyboards/keychron/v5/ansi/ansi.c
@@ -27,111 +27,111 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_14,   G_14,   H_14},
-    {0, I_15,   G_15,   H_15},
-    {0, I_16,   G_16,   H_16},
-    {0, L_12,   J_12,   K_12},
-    {0, L_13,   J_13,   K_13},
-    {0, L_14,   J_14,   K_14},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {0, CB12_CA12,   CB10_CA12,   CB11_CA12},
+    {0, CB12_CA13,   CB10_CA13,   CB11_CA13},
+    {0, CB12_CA14,   CB10_CA14,   CB11_CA14},
 
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_16,   A_16,   B_16},
-    {0, L_9,    J_9,    K_9},
-    {0, L_10,   J_10,   K_10},
-    {0, L_11,   J_11,   K_11},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {0, CB12_CA9,    CB10_CA9,    CB11_CA9},
+    {0, CB12_CA10,   CB10_CA10,   CB11_CA10},
+    {0, CB12_CA11,   CB10_CA11,   CB11_CA11},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_14,   D_14,   E_14},
-    {0, F_15,   D_15,   E_15},
-    {0, F_16,   D_16,   E_16},
-    {0, L_15,   J_15,   K_15},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {0, CB12_CA15,   CB10_CA15,   CB11_CA15},
 
-    {1, C_16,   A_16,   B_16},
-    {1, C_15,   A_15,   B_15},
-    {1, C_14,   A_14,   B_14},
-    {1, C_13,   A_13,   B_13},
-    {1, C_12,   A_12,   B_12},
-    {1, C_11,   A_11,   B_11},
-    {1, C_10,   A_10,   B_10},
-    {1, C_9,    A_9,    B_9},
-    {1, C_8,    A_8,    B_8},
-    {1, C_7,    A_7,    B_7},
-    {1, C_6,    A_6,    B_6},
-    {1, C_5,    A_5,    B_5},
-    {1, C_3,    A_3,    B_3},
-    {1, C_1,    A_1,    B_1},
-    {1, L_3,    J_3,    K_3},
-    {1, L_4,    J_4,    K_4},
-    {0, L_16,   J_16,   K_16},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB12_CA3,    CB10_CA3,    CB11_CA3},
+    {1, CB12_CA4,    CB10_CA4,    CB11_CA4},
+    {0, CB12_CA16,   CB10_CA16,   CB11_CA16},
 
-    {1, I_16,   G_16,   H_16},
-    {1, I_14,   G_14,   H_14},
-    {1, I_13,   G_13,   H_13},
-    {1, I_12,   G_12,   H_12},
-    {1, I_11,   G_11,   H_11},
-    {1, I_10,   G_10,   H_10},
-    {1, I_9,    G_9,    H_9},
-    {1, I_8,    G_8,    H_8},
-    {1, I_7,    G_7,    H_7},
-    {1, I_6,    G_6,    H_6},
-    {1, I_5,    G_5,    H_5},
-    {1, I_3,    G_3,    H_3},
-    {1, I_2,    G_2,    H_2},
-    {1, I_1,    G_1,    H_1},
-    {1, L_5,    J_5,    K_5},
-    {1, L_6,    J_6,    K_6},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {1, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {1, CB12_CA5,    CB10_CA5,    CB11_CA5},
+    {1, CB12_CA6,    CB10_CA6,    CB11_CA6},
 
-    {1, F_16,   D_16,   E_16},
-    {1, F_15,   D_15,   E_15},
-    {1, F_14,   D_14,   E_14},
-    {1, F_10,   D_10,   E_10},
-    {1, F_6,    D_6,    E_6},
-    {1, F_5,    D_5,    E_5},
-    {1, F_4,    D_4,    E_4},
-    {1, F_3,    D_3,    E_3},
-    {1, F_2,    D_2,    E_2},
-    {1, F_1,    D_1,    E_1},
-    {1, L_1,    J_1,    K_1},
-    {1, L_2,    J_2,    K_2},
-    {1, L_7,    J_7,    K_7}
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {1, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {1, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB12_CA1,    CB10_CA1,    CB11_CA1},
+    {1, CB12_CA2,    CB10_CA2,    CB11_CA2},
+    {1, CB12_CA7,    CB10_CA7,    CB11_CA7}
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/v5/ansi_encoder/ansi_encoder.c b/keyboards/keychron/v5/ansi_encoder/ansi_encoder.c
index 06c7ae6d92f..bc68731d7de 100644
--- a/keyboards/keychron/v5/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/v5/ansi_encoder/ansi_encoder.c
@@ -27,111 +27,111 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, I_1,    G_1,    H_1},
-    // {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    // {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_14,   G_14,   H_14},
-    {0, I_15,   G_15,   H_15},
-    {0, I_16,   G_16,   H_16},
-    {0, L_12,   J_12,   K_12},
-    {0, L_13,   J_13,   K_13},
-    {0, L_14,   J_14,   K_14},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    // {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    // {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {0, CB12_CA12,   CB10_CA12,   CB11_CA12},
+    {0, CB12_CA13,   CB10_CA13,   CB11_CA13},
+    {0, CB12_CA14,   CB10_CA14,   CB11_CA14},
 
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_16,   A_16,   B_16},
-    {0, L_9,    J_9,    K_9},
-    {0, L_10,   J_10,   K_10},
-    {0, L_11,   J_11,   K_11},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {0, CB12_CA9,    CB10_CA9,    CB11_CA9},
+    {0, CB12_CA10,   CB10_CA10,   CB11_CA10},
+    {0, CB12_CA11,   CB10_CA11,   CB11_CA11},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_14,   D_14,   E_14},
-    {0, F_15,   D_15,   E_15},
-    {0, F_16,   D_16,   E_16},
-    {0, L_15,   J_15,   K_15},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {0, CB12_CA15,   CB10_CA15,   CB11_CA15},
 
-    {1, C_16,   A_16,   B_16},
-    {1, C_15,   A_15,   B_15},
-    {1, C_14,   A_14,   B_14},
-    {1, C_13,   A_13,   B_13},
-    {1, C_12,   A_12,   B_12},
-    {1, C_11,   A_11,   B_11},
-    {1, C_10,   A_10,   B_10},
-    {1, C_9,    A_9,    B_9},
-    {1, C_8,    A_8,    B_8},
-    {1, C_7,    A_7,    B_7},
-    {1, C_6,    A_6,    B_6},
-    {1, C_5,    A_5,    B_5},
-    {1, C_3,    A_3,    B_3},
-    {1, C_1,    A_1,    B_1},
-    {1, L_3,    J_3,    K_3},
-    {1, L_4,    J_4,    K_4},
-    {0, L_16,   J_16,   K_16},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB12_CA3,    CB10_CA3,    CB11_CA3},
+    {1, CB12_CA4,    CB10_CA4,    CB11_CA4},
+    {0, CB12_CA16,   CB10_CA16,   CB11_CA16},
 
-    {1, I_16,   G_16,   H_16},
-    {1, I_14,   G_14,   H_14},
-    {1, I_13,   G_13,   H_13},
-    {1, I_12,   G_12,   H_12},
-    {1, I_11,   G_11,   H_11},
-    {1, I_10,   G_10,   H_10},
-    {1, I_9,    G_9,    H_9},
-    {1, I_8,    G_8,    H_8},
-    {1, I_7,    G_7,    H_7},
-    {1, I_6,    G_6,    H_6},
-    {1, I_5,    G_5,    H_5},
-    {1, I_3,    G_3,    H_3},
-    {1, I_2,    G_2,    H_2},
-    {1, I_1,    G_1,    H_1},
-    {1, L_5,    J_5,    K_5},
-    {1, L_6,    J_6,    K_6},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {1, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {1, CB12_CA5,    CB10_CA5,    CB11_CA5},
+    {1, CB12_CA6,    CB10_CA6,    CB11_CA6},
 
-    {1, F_16,   D_16,   E_16},
-    {1, F_15,   D_15,   E_15},
-    {1, F_14,   D_14,   E_14},
-    {1, F_10,   D_10,   E_10},
-    {1, F_6,    D_6,    E_6},
-    {1, F_5,    D_5,    E_5},
-    {1, F_4,    D_4,    E_4},
-    {1, F_3,    D_3,    E_3},
-    {1, F_2,    D_2,    E_2},
-    {1, F_1,    D_1,    E_1},
-    {1, L_1,    J_1,    K_1},
-    {1, L_2,    J_2,    K_2},
-    {1, L_7,    J_7,    K_7}
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {1, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {1, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB12_CA1,    CB10_CA1,    CB11_CA1},
+    {1, CB12_CA2,    CB10_CA2,    CB11_CA2},
+    {1, CB12_CA7,    CB10_CA7,    CB11_CA7}
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/v5/iso/iso.c b/keyboards/keychron/v5/iso/iso.c
index 7b2739d53e2..d8f5ae329cd 100644
--- a/keyboards/keychron/v5/iso/iso.c
+++ b/keyboards/keychron/v5/iso/iso.c
@@ -27,112 +27,112 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_14,   G_14,   H_14},
-    {0, I_15,   G_15,   H_15},
-    {0, I_16,   G_16,   H_16},
-    {0, L_12,   J_12,   K_12},
-    {0, L_13,   J_13,   K_13},
-    {0, L_14,   J_14,   K_14},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {0, CB12_CA12,   CB10_CA12,   CB11_CA12},
+    {0, CB12_CA13,   CB10_CA13,   CB11_CA13},
+    {0, CB12_CA14,   CB10_CA14,   CB11_CA14},
 
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_16,   A_16,   B_16},
-    {0, L_9,    J_9,    K_9},
-    {0, L_10,   J_10,   K_10},
-    {0, L_11,   J_11,   K_11},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {0, CB12_CA9,    CB10_CA9,    CB11_CA9},
+    {0, CB12_CA10,   CB10_CA10,   CB11_CA10},
+    {0, CB12_CA11,   CB10_CA11,   CB11_CA11},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_15,   D_15,   E_15},
-    {0, F_16,   D_16,   E_16},
-    {0, L_15,   J_15,   K_15},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {0, CB12_CA15,   CB10_CA15,   CB11_CA15},
 
-    {1, C_16,   A_16,   B_16},
-    {1, C_15,   A_15,   B_15},
-    {1, C_14,   A_14,   B_14},
-    {1, C_13,   A_13,   B_13},
-    {1, C_12,   A_12,   B_12},
-    {1, C_11,   A_11,   B_11},
-    {1, C_10,   A_10,   B_10},
-    {1, C_9,    A_9,    B_9},
-    {1, C_8,    A_8,    B_8},
-    {1, C_7,    A_7,    B_7},
-    {1, C_6,    A_6,    B_6},
-    {1, C_5,    A_5,    B_5},
-    {1, C_3,    A_3,    B_3},
-    {0, F_14,   D_14,   E_14},
-    {1, C_1,    A_1,    B_1},
-    {1, L_3,    J_3,    K_3},
-    {1, L_4,    J_4,    K_4},
-    {0, L_16,   J_16,   K_16},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB12_CA3,    CB10_CA3,    CB11_CA3},
+    {1, CB12_CA4,    CB10_CA4,    CB11_CA4},
+    {0, CB12_CA16,   CB10_CA16,   CB11_CA16},
 
-    {1, I_16,   G_16,   H_16},
-    {1, I_15,   G_15,   H_15},
-    {1, I_14,   G_14,   H_14},
-    {1, I_13,   G_13,   H_13},
-    {1, I_12,   G_12,   H_12},
-    {1, I_11,   G_11,   H_11},
-    {1, I_10,   G_10,   H_10},
-    {1, I_9,    G_9,    H_9},
-    {1, I_8,    G_8,    H_8},
-    {1, I_7,    G_7,    H_7},
-    {1, I_6,    G_6,    H_6},
-    {1, I_5,    G_5,    H_5},
-    {1, I_3,    G_3,    H_3},
-    {1, I_2,    G_2,    H_2},
-    {1, I_1,    G_1,    H_1},
-    {1, L_5,    J_5,    K_5},
-    {1, L_6,    J_6,    K_6},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {1, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {1, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {1, CB12_CA5,    CB10_CA5,    CB11_CA5},
+    {1, CB12_CA6,    CB10_CA6,    CB11_CA6},
 
-    {1, F_16,   D_16,   E_16},
-    {1, F_15,   D_15,   E_15},
-    {1, F_14,   D_14,   E_14},
-    {1, F_10,   D_10,   E_10},
-    {1, F_6,    D_6,    E_6},
-    {1, F_5,    D_5,    E_5},
-    {1, F_4,    D_4,    E_4},
-    {1, F_3,    D_3,    E_3},
-    {1, F_2,    D_2,    E_2},
-    {1, F_1,    D_1,    E_1},
-    {1, L_1,    J_1,    K_1},
-    {1, L_2,    J_2,    K_2},
-    {1, L_7,    J_7,    K_7}
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {1, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {1, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB12_CA1,    CB10_CA1,    CB11_CA1},
+    {1, CB12_CA2,    CB10_CA2,    CB11_CA2},
+    {1, CB12_CA7,    CB10_CA7,    CB11_CA7}
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/v5/iso_encoder/iso_encoder.c b/keyboards/keychron/v5/iso_encoder/iso_encoder.c
index 9a13422d2c0..2d2a458577e 100644
--- a/keyboards/keychron/v5/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/v5/iso_encoder/iso_encoder.c
@@ -27,110 +27,110 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, I_1,    G_1,    H_1},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_14,   G_14,   H_14},
-    {0, I_15,   G_15,   H_15},
-    {0, I_16,   G_16,   H_16},
-    {0, L_12,   J_12,   K_12},
-    {0, L_13,   J_13,   K_13},
-    {0, L_14,   J_14,   K_14},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {0, CB12_CA12,   CB10_CA12,   CB11_CA12},
+    {0, CB12_CA13,   CB10_CA13,   CB11_CA13},
+    {0, CB12_CA14,   CB10_CA14,   CB11_CA14},
 
-    {0, C_1,    A_1,    B_1},  // `~
-    {0, C_2,    A_2,    B_2},  // 1!
-    {0, C_3,    A_3,    B_3},  // 2@
-    {0, C_4,    A_4,    B_4},  // 3#
-    {0, C_5,    A_5,    B_5},  // 4$
-    {0, C_6,    A_6,    B_6},  // 5%
-    {0, C_7,    A_7,    B_7},  // 6^
-    {0, C_8,    A_8,    B_8},  // 7&
-    {0, C_9,    A_9,    B_9},  // 8*
-    {0, C_10,   A_10,   B_10}, // 9(
-    {0, C_11,   A_11,   B_11}, // 0)
-    {0, C_12,   A_12,   B_12}, // -_
-    {0, C_13,   A_13,   B_13}, // =+
-    {0, C_14,   A_14,   B_14}, // BackSpace
-    {0, C_16,   A_16,   B_16}, // Numlock
-    {0, L_9,    J_9,    K_9},  // /
-    {0, L_10,   J_10,   K_10}, // *
-    {0, L_11,   J_11,   K_11}, // -
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},  // `~
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},  // 1!
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},  // 2@
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},  // 3#
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},  // 4$
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},  // 5%
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},  // 6^
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},  // 7&
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},  // 8*
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10}, // 9(
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11}, // 0)
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12}, // -_
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13}, // =+
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14}, // BackSpace
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16}, // Numlock
+    {0, CB12_CA9,    CB10_CA9,    CB11_CA9},  // /
+    {0, CB12_CA10,   CB10_CA10,   CB11_CA10}, // *
+    {0, CB12_CA11,   CB10_CA11,   CB11_CA11}, // -
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_15,   D_15,   E_15},
-    {0, F_16,   D_16,   E_16},
-    {0, L_15,   J_15,   K_15},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {0, CB12_CA15,   CB10_CA15,   CB11_CA15},
 
-    {1, C_16,   A_16,   B_16},
-    {1, C_15,   A_15,   B_15},
-    {1, C_14,   A_14,   B_14},
-    {1, C_13,   A_13,   B_13},
-    {1, C_12,   A_12,   B_12},
-    {1, C_11,   A_11,   B_11},
-    {1, C_10,   A_10,   B_10},
-    {1, C_9,    A_9,    B_9},
-    {1, C_8,    A_8,    B_8},
-    {1, C_7,    A_7,    B_7},
-    {1, C_6,    A_6,    B_6},
-    {1, C_5,    A_5,    B_5},
-    {1, C_3,    A_3,    B_3},
-    {0, F_14,   D_14,   E_14},
-    {1, C_1,    A_1,    B_1},
-    {1, L_3,    J_3,    K_3},
-    {1, L_4,    J_4,    K_4},
-    {0, L_16,   J_16,   K_16},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB12_CA3,    CB10_CA3,    CB11_CA3},
+    {1, CB12_CA4,    CB10_CA4,    CB11_CA4},
+    {0, CB12_CA16,   CB10_CA16,   CB11_CA16},
 
-    {1, I_16,   G_16,   H_16},
-    {1, I_15,   G_15,   H_15},
-    {1, I_14,   G_14,   H_14},
-    {1, I_13,   G_13,   H_13},
-    {1, I_12,   G_12,   H_12},
-    {1, I_11,   G_11,   H_11},
-    {1, I_10,   G_10,   H_10},
-    {1, I_9,    G_9,    H_9},
-    {1, I_8,    G_8,    H_8},
-    {1, I_7,    G_7,    H_7},
-    {1, I_6,    G_6,    H_6},
-    {1, I_5,    G_5,    H_5},
-    {1, I_3,    G_3,    H_3},
-    {1, I_2,    G_2,    H_2},
-    {1, I_1,    G_1,    H_1},
-    {1, L_5,    J_5,    K_5},
-    {1, L_6,    J_6,    K_6},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {1, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {1, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {1, CB12_CA5,    CB10_CA5,    CB11_CA5},
+    {1, CB12_CA6,    CB10_CA6,    CB11_CA6},
 
-    {1, F_16,   D_16,   E_16},
-    {1, F_15,   D_15,   E_15},
-    {1, F_14,   D_14,   E_14},
-    {1, F_10,   D_10,   E_10},
-    {1, F_6,    D_6,    E_6},
-    {1, F_5,    D_5,    E_5},
-    {1, F_4,    D_4,    E_4},
-    {1, F_3,    D_3,    E_3},
-    {1, F_2,    D_2,    E_2},
-    {1, F_1,    D_1,    E_1},
-    {1, L_1,    J_1,    K_1},
-    {1, L_2,    J_2,    K_2},
-    {1, L_7,    J_7,    K_7}
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {1, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {1, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB12_CA1,    CB10_CA1,    CB11_CA1},
+    {1, CB12_CA2,    CB10_CA2,    CB11_CA2},
+    {1, CB12_CA7,    CB10_CA7,    CB11_CA7}
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/v6/ansi/ansi.c b/keyboards/keychron/v6/ansi/ansi.c
index be5bad84ff2..2e055e57af8 100644
--- a/keyboards/keychron/v6/ansi/ansi.c
+++ b/keyboards/keychron/v6/ansi/ansi.c
@@ -25,119 +25,119 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_15,   G_15,   H_15},
-    {0, I_16,   G_16,   H_16},
-    {0, L_5,    J_5,    K_5},
-    {0, L_6,    J_6,    K_6},
-    {0, L_7,    J_7,    K_7},
-    {0, L_8,    J_8,    K_8},
-    {0, L_4,    J_4,    K_4},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {0, CB12_CA5,    CB10_CA5,    CB11_CA5},
+    {0, CB12_CA6,    CB10_CA6,    CB11_CA6},
+    {0, CB12_CA7,    CB10_CA7,    CB11_CA7},
+    {0, CB12_CA8,    CB10_CA8,    CB11_CA8},
+    {0, CB12_CA4,    CB10_CA4,    CB11_CA4},
 
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_15,   A_15,   B_15},
-    {0, C_16,   A_16,   B_16},
-    {0, L_9,    J_9,    K_9},
-    {0, L_10,   J_10,   K_10},
-    {0, L_11,   J_11,   K_11},
-    {0, L_12,   J_12,   K_12},
-    {0, L_13,   J_13,   K_13},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {0, CB12_CA9,    CB10_CA9,    CB11_CA9},
+    {0, CB12_CA10,   CB10_CA10,   CB11_CA10},
+    {0, CB12_CA11,   CB10_CA11,   CB11_CA11},
+    {0, CB12_CA12,   CB10_CA12,   CB11_CA12},
+    {0, CB12_CA13,   CB10_CA13,   CB11_CA13},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_14,   D_14,   E_14},
-    {0, F_15,   D_15,   E_15},
-    {0, F_16,   D_16,   E_16},
-    {0, L_14,   J_14,   K_14},
-    {0, L_15,   J_15,   K_15},
-    {0, L_16,   J_16,   K_16},
-    {1, L_1,    J_1,    K_1},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {0, CB12_CA14,   CB10_CA14,   CB11_CA14},
+    {0, CB12_CA15,   CB10_CA15,   CB11_CA15},
+    {0, CB12_CA16,   CB10_CA16,   CB11_CA16},
+    {1, CB12_CA1,    CB10_CA1,    CB11_CA1},
 
-    {1, C_16,   A_16,   B_16},
-    {1, C_15,   A_15,   B_15},
-    {1, C_14,   A_14,   B_14},
-    {1, C_13,   A_13,   B_13},
-    {1, C_12,   A_12,   B_12},
-    {1, C_11,   A_11,   B_11},
-    {1, C_10,   A_10,   B_10},
-    {1, C_9,    A_9,    B_9},
-    {1, C_8,    A_8,    B_8},
-    {1, C_7,    A_7,    B_7},
-    {1, C_6,    A_6,    B_6},
-    {1, C_5,    A_5,    B_5},
-    {1, C_3,    A_3,    B_3},
-    {1, L_3,    J_3,    K_3},
-    {1, L_4,    J_4,    K_4},
-    {1, L_5,    J_5,    K_5},
-    {1, L_2,    J_2,    K_2},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB12_CA3,    CB10_CA3,    CB11_CA3},
+    {1, CB12_CA4,    CB10_CA4,    CB11_CA4},
+    {1, CB12_CA5,    CB10_CA5,    CB11_CA5},
+    {1, CB12_CA2,    CB10_CA2,    CB11_CA2},
 
-    {1, I_16,   G_16,   H_16},
-    {1, I_14,   G_14,   H_14},
-    {1, I_13,   G_13,   H_13},
-    {1, I_12,   G_12,   H_12},
-    {1, I_11,   G_11,   H_11},
-    {1, I_10,   G_10,   H_10},
-    {1, I_9,    G_9,    H_9},
-    {1, I_8,    G_8,    H_8},
-    {1, I_7,    G_7,    H_7},
-    {1, I_6,    G_6,    H_6},
-    {1, I_5,    G_5,    H_5},
-    {1, I_3,    G_3,    H_3},
-    {1, I_1,    G_1,    H_1},
-    {1, L_6,    J_6,    K_6},
-    {1, L_7,    J_7,    K_7},
-    {1, L_8,    J_8,    K_8},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {1, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {1, CB12_CA6,    CB10_CA6,    CB11_CA6},
+    {1, CB12_CA7,    CB10_CA7,    CB11_CA7},
+    {1, CB12_CA8,    CB10_CA8,    CB11_CA8},
 
-    {1, F_16,   D_16,   E_16},
-    {1, F_15,   D_15,   E_15},
-    {1, F_14,   D_14,   E_14},
-    {1, F_10,   D_10,   E_10},
-    {1, F_6,    D_6,    E_6},
-    {1, F_5,    D_5,    E_5},
-    {1, F_4,    D_4,    E_4},
-    {1, F_3,    D_3,    E_3},
-    {1, F_2,    D_2,    E_2},
-    {1, F_1,    D_1,    E_1},
-    {1, L_10,   J_10,   K_10},
-    {1, L_11,   J_11,   K_11},
-    {1, L_12,   J_12,   K_12},
-    {1, L_9,    J_9,    K_9},
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {1, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {1, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB12_CA10,   CB10_CA10,   CB11_CA10},
+    {1, CB12_CA11,   CB10_CA11,   CB11_CA11},
+    {1, CB12_CA12,   CB10_CA12,   CB11_CA12},
+    {1, CB12_CA9,    CB10_CA9,    CB11_CA9},
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/v6/ansi_encoder/ansi_encoder.c b/keyboards/keychron/v6/ansi_encoder/ansi_encoder.c
index b83a5b0fb09..1ebf9479124 100644
--- a/keyboards/keychron/v6/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/v6/ansi_encoder/ansi_encoder.c
@@ -27,119 +27,119 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_15,   G_15,   H_15},
-    {0, I_16,   G_16,   H_16},
-    {0, L_5,    J_5,    K_5},
-    {0, L_6,    J_6,    K_6},
-    {0, L_7,    J_7,    K_7},
-    {0, L_8,    J_8,    K_8},
-    {0, L_4,    J_4,    K_4},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {0, CB12_CA5,    CB10_CA5,    CB11_CA5},
+    {0, CB12_CA6,    CB10_CA6,    CB11_CA6},
+    {0, CB12_CA7,    CB10_CA7,    CB11_CA7},
+    {0, CB12_CA8,    CB10_CA8,    CB11_CA8},
+    {0, CB12_CA4,    CB10_CA4,    CB11_CA4},
 
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_15,   A_15,   B_15},
-    {0, C_16,   A_16,   B_16},
-    {0, L_9,    J_9,    K_9},
-    {0, L_10,   J_10,   K_10},
-    {0, L_11,   J_11,   K_11},
-    {0, L_12,   J_12,   K_12},
-    {0, L_13,   J_13,   K_13},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {0, CB12_CA9,    CB10_CA9,    CB11_CA9},
+    {0, CB12_CA10,   CB10_CA10,   CB11_CA10},
+    {0, CB12_CA11,   CB10_CA11,   CB11_CA11},
+    {0, CB12_CA12,   CB10_CA12,   CB11_CA12},
+    {0, CB12_CA13,   CB10_CA13,   CB11_CA13},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_14,   D_14,   E_14},
-    {0, F_15,   D_15,   E_15},
-    {0, F_16,   D_16,   E_16},
-    {0, L_14,   J_14,   K_14},
-    {0, L_15,   J_15,   K_15},
-    {0, L_16,   J_16,   K_16},
-    {1, L_1,    J_1,    K_1},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {0, CB12_CA14,   CB10_CA14,   CB11_CA14},
+    {0, CB12_CA15,   CB10_CA15,   CB11_CA15},
+    {0, CB12_CA16,   CB10_CA16,   CB11_CA16},
+    {1, CB12_CA1,    CB10_CA1,    CB11_CA1},
 
-    {1, C_16,   A_16,   B_16},
-    {1, C_15,   A_15,   B_15},
-    {1, C_14,   A_14,   B_14},
-    {1, C_13,   A_13,   B_13},
-    {1, C_12,   A_12,   B_12},
-    {1, C_11,   A_11,   B_11},
-    {1, C_10,   A_10,   B_10},
-    {1, C_9,    A_9,    B_9},
-    {1, C_8,    A_8,    B_8},
-    {1, C_7,    A_7,    B_7},
-    {1, C_6,    A_6,    B_6},
-    {1, C_5,    A_5,    B_5},
-    {1, C_3,    A_3,    B_3},
-    {1, L_3,    J_3,    K_3},
-    {1, L_4,    J_4,    K_4},
-    {1, L_5,    J_5,    K_5},
-    {1, L_2,    J_2,    K_2},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB12_CA3,    CB10_CA3,    CB11_CA3},
+    {1, CB12_CA4,    CB10_CA4,    CB11_CA4},
+    {1, CB12_CA5,    CB10_CA5,    CB11_CA5},
+    {1, CB12_CA2,    CB10_CA2,    CB11_CA2},
 
-    {1, I_16,   G_16,   H_16},
-    {1, I_14,   G_14,   H_14},
-    {1, I_13,   G_13,   H_13},
-    {1, I_12,   G_12,   H_12},
-    {1, I_11,   G_11,   H_11},
-    {1, I_10,   G_10,   H_10},
-    {1, I_9,    G_9,    H_9},
-    {1, I_8,    G_8,    H_8},
-    {1, I_7,    G_7,    H_7},
-    {1, I_6,    G_6,    H_6},
-    {1, I_5,    G_5,    H_5},
-    {1, I_3,    G_3,    H_3},
-    {1, I_1,    G_1,    H_1},
-    {1, L_6,    J_6,    K_6},
-    {1, L_7,    J_7,    K_7},
-    {1, L_8,    J_8,    K_8},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {1, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {1, CB12_CA6,    CB10_CA6,    CB11_CA6},
+    {1, CB12_CA7,    CB10_CA7,    CB11_CA7},
+    {1, CB12_CA8,    CB10_CA8,    CB11_CA8},
 
-    {1, F_16,   D_16,   E_16},
-    {1, F_15,   D_15,   E_15},
-    {1, F_14,   D_14,   E_14},
-    {1, F_10,   D_10,   E_10},
-    {1, F_6,    D_6,    E_6},
-    {1, F_5,    D_5,    E_5},
-    {1, F_4,    D_4,    E_4},
-    {1, F_3,    D_3,    E_3},
-    {1, F_2,    D_2,    E_2},
-    {1, F_1,    D_1,    E_1},
-    {1, L_10,   J_10,   K_10},
-    {1, L_11,   J_11,   K_11},
-    {1, L_12,   J_12,   K_12},
-    {1, L_9,    J_9,    K_9},
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {1, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {1, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB12_CA10,   CB10_CA10,   CB11_CA10},
+    {1, CB12_CA11,   CB10_CA11,   CB11_CA11},
+    {1, CB12_CA12,   CB10_CA12,   CB11_CA12},
+    {1, CB12_CA9,    CB10_CA9,    CB11_CA9},
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/v6/iso/iso.c b/keyboards/keychron/v6/iso/iso.c
index 1138cb07d78..cc9dbd8c231 100644
--- a/keyboards/keychron/v6/iso/iso.c
+++ b/keyboards/keychron/v6/iso/iso.c
@@ -27,120 +27,120 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_15,   G_15,   H_15},
-    {0, I_16,   G_16,   H_16},
-    {0, L_5,    J_5,    K_5},
-    {0, L_6,    J_6,    K_6},
-    {0, L_7,    J_7,    K_7},
-    {0, L_8,    J_8,    K_8},
-    {0, L_4,    J_4,    K_4},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {0, CB12_CA5,    CB10_CA5,    CB11_CA5},
+    {0, CB12_CA6,    CB10_CA6,    CB11_CA6},
+    {0, CB12_CA7,    CB10_CA7,    CB11_CA7},
+    {0, CB12_CA8,    CB10_CA8,    CB11_CA8},
+    {0, CB12_CA4,    CB10_CA4,    CB11_CA4},
 
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_15,   A_15,   B_15},
-    {0, C_16,   A_16,   B_16},
-    {0, L_9,    J_9,    K_9},
-    {0, L_10,   J_10,   K_10},
-    {0, L_11,   J_11,   K_11},
-    {0, L_12,   J_12,   K_12},
-    {0, L_13,   J_13,   K_13},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {0, CB12_CA9,    CB10_CA9,    CB11_CA9},
+    {0, CB12_CA10,   CB10_CA10,   CB11_CA10},
+    {0, CB12_CA11,   CB10_CA11,   CB11_CA11},
+    {0, CB12_CA12,   CB10_CA12,   CB11_CA12},
+    {0, CB12_CA13,   CB10_CA13,   CB11_CA13},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_15,   D_15,   E_15},
-    {0, F_16,   D_16,   E_16},
-    {0, L_14,   J_14,   K_14},
-    {0, L_15,   J_15,   K_15},
-    {0, L_16,   J_16,   K_16},
-    {1, L_1,    J_1,    K_1},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {0, CB12_CA14,   CB10_CA14,   CB11_CA14},
+    {0, CB12_CA15,   CB10_CA15,   CB11_CA15},
+    {0, CB12_CA16,   CB10_CA16,   CB11_CA16},
+    {1, CB12_CA1,    CB10_CA1,    CB11_CA1},
 
-    {1, C_16,   A_16,   B_16},
-    {1, C_15,   A_15,   B_15},
-    {1, C_14,   A_14,   B_14},
-    {1, C_13,   A_13,   B_13},
-    {1, C_12,   A_12,   B_12},
-    {1, C_11,   A_11,   B_11},
-    {1, C_10,   A_10,   B_10},
-    {1, C_9,    A_9,    B_9},
-    {1, C_8,    A_8,    B_8},
-    {1, C_7,    A_7,    B_7},
-    {1, C_6,    A_6,    B_6},
-    {1, C_5,    A_5,    B_5},
-    {1, C_3,    A_3,    B_3},
-    {0, F_14,   D_14,   E_14},
-    {1, L_3,    J_3,    K_3},
-    {1, L_4,    J_4,    K_4},
-    {1, L_5,    J_5,    K_5},
-    {1, L_2,    J_2,    K_2},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB12_CA3,    CB10_CA3,    CB11_CA3},
+    {1, CB12_CA4,    CB10_CA4,    CB11_CA4},
+    {1, CB12_CA5,    CB10_CA5,    CB11_CA5},
+    {1, CB12_CA2,    CB10_CA2,    CB11_CA2},
 
-    {1, I_16,   G_16,   H_16},
-    {1, I_15,   G_15,   H_15},
-    {1, I_14,   G_14,   H_14},
-    {1, I_13,   G_13,   H_13},
-    {1, I_12,   G_12,   H_12},
-    {1, I_11,   G_11,   H_11},
-    {1, I_10,   G_10,   H_10},
-    {1, I_9,    G_9,    H_9},
-    {1, I_8,    G_8,    H_8},
-    {1, I_7,    G_7,    H_7},
-    {1, I_6,    G_6,    H_6},
-    {1, I_5,    G_5,    H_5},
-    {1, I_3,    G_3,    H_3},
-    {1, I_1,    G_1,    H_1},
-    {1, L_6,    J_6,    K_6},
-    {1, L_7,    J_7,    K_7},
-    {1, L_8,    J_8,    K_8},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {1, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {1, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {1, CB12_CA6,    CB10_CA6,    CB11_CA6},
+    {1, CB12_CA7,    CB10_CA7,    CB11_CA7},
+    {1, CB12_CA8,    CB10_CA8,    CB11_CA8},
 
-    {1, F_16,   D_16,   E_16},
-    {1, F_15,   D_15,   E_15},
-    {1, F_14,   D_14,   E_14},
-    {1, F_10,   D_10,   E_10},
-    {1, F_6,    D_6,    E_6},
-    {1, F_5,    D_5,    E_5},
-    {1, F_4,    D_4,    E_4},
-    {1, F_3,    D_3,    E_3},
-    {1, F_2,    D_2,    E_2},
-    {1, F_1,    D_1,    E_1},
-    {1, L_10,   J_10,   K_10},
-    {1, L_11,   J_11,   K_11},
-    {1, L_12,   J_12,   K_12},
-    {1, L_9,    J_9,    K_9},
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {1, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {1, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB12_CA10,   CB10_CA10,   CB11_CA10},
+    {1, CB12_CA11,   CB10_CA11,   CB11_CA11},
+    {1, CB12_CA12,   CB10_CA12,   CB11_CA12},
+    {1, CB12_CA9,    CB10_CA9,    CB11_CA9},
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/v6/iso_encoder/iso_encoder.c b/keyboards/keychron/v6/iso_encoder/iso_encoder.c
index 47f609d8178..f1a8e18acf5 100644
--- a/keyboards/keychron/v6/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/v6/iso_encoder/iso_encoder.c
@@ -27,120 +27,120 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_15,   G_15,   H_15},
-    {0, I_16,   G_16,   H_16},
-    {0, L_5,    J_5,    K_5},
-    {0, L_6,    J_6,    K_6},
-    {0, L_7,    J_7,    K_7},
-    {0, L_8,    J_8,    K_8},
-    {0, L_4,    J_4,    K_4},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {0, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {0, CB12_CA5,    CB10_CA5,    CB11_CA5},
+    {0, CB12_CA6,    CB10_CA6,    CB11_CA6},
+    {0, CB12_CA7,    CB10_CA7,    CB11_CA7},
+    {0, CB12_CA8,    CB10_CA8,    CB11_CA8},
+    {0, CB12_CA4,    CB10_CA4,    CB11_CA4},
 
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_15,   A_15,   B_15},
-    {0, C_16,   A_16,   B_16},
-    {0, L_9,    J_9,    K_9},
-    {0, L_10,   J_10,   K_10},
-    {0, L_11,   J_11,   K_11},
-    {0, L_12,   J_12,   K_12},
-    {0, L_13,   J_13,   K_13},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {0, CB12_CA9,    CB10_CA9,    CB11_CA9},
+    {0, CB12_CA10,   CB10_CA10,   CB11_CA10},
+    {0, CB12_CA11,   CB10_CA11,   CB11_CA11},
+    {0, CB12_CA12,   CB10_CA12,   CB11_CA12},
+    {0, CB12_CA13,   CB10_CA13,   CB11_CA13},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_15,   D_15,   E_15},
-    {0, F_16,   D_16,   E_16},
-    {0, L_14,   J_14,   K_14},
-    {0, L_15,   J_15,   K_15},
-    {0, L_16,   J_16,   K_16},
-    {1, L_1,    J_1,    K_1},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {0, CB12_CA14,   CB10_CA14,   CB11_CA14},
+    {0, CB12_CA15,   CB10_CA15,   CB11_CA15},
+    {0, CB12_CA16,   CB10_CA16,   CB11_CA16},
+    {1, CB12_CA1,    CB10_CA1,    CB11_CA1},
 
-    {1, C_16,   A_16,   B_16},
-    {1, C_15,   A_15,   B_15},
-    {1, C_14,   A_14,   B_14},
-    {1, C_13,   A_13,   B_13},
-    {1, C_12,   A_12,   B_12},
-    {1, C_11,   A_11,   B_11},
-    {1, C_10,   A_10,   B_10},
-    {1, C_9,    A_9,    B_9},
-    {1, C_8,    A_8,    B_8},
-    {1, C_7,    A_7,    B_7},
-    {1, C_6,    A_6,    B_6},
-    {1, C_5,    A_5,    B_5},
-    {1, C_3,    A_3,    B_3},
-    {0, F_14,   D_14,   E_14},
-    {1, L_3,    J_3,    K_3},
-    {1, L_4,    J_4,    K_4},
-    {1, L_5,    J_5,    K_5},
-    {1, L_2,    J_2,    K_2},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB12_CA3,    CB10_CA3,    CB11_CA3},
+    {1, CB12_CA4,    CB10_CA4,    CB11_CA4},
+    {1, CB12_CA5,    CB10_CA5,    CB11_CA5},
+    {1, CB12_CA2,    CB10_CA2,    CB11_CA2},
 
-    {1, I_16,   G_16,   H_16},
-    {1, I_15,   G_15,   H_15},
-    {1, I_14,   G_14,   H_14},
-    {1, I_13,   G_13,   H_13},
-    {1, I_12,   G_12,   H_12},
-    {1, I_11,   G_11,   H_11},
-    {1, I_10,   G_10,   H_10},
-    {1, I_9,    G_9,    H_9},
-    {1, I_8,    G_8,    H_8},
-    {1, I_7,    G_7,    H_7},
-    {1, I_6,    G_6,    H_6},
-    {1, I_5,    G_5,    H_5},
-    {1, I_3,    G_3,    H_3},
-    {1, I_1,    G_1,    H_1},
-    {1, L_6,    J_6,    K_6},
-    {1, L_7,    J_7,    K_7},
-    {1, L_8,    J_8,    K_8},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
+    {1, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {1, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {1, CB12_CA6,    CB10_CA6,    CB11_CA6},
+    {1, CB12_CA7,    CB10_CA7,    CB11_CA7},
+    {1, CB12_CA8,    CB10_CA8,    CB11_CA8},
 
-    {1, F_16,   D_16,   E_16},
-    {1, F_15,   D_15,   E_15},
-    {1, F_14,   D_14,   E_14},
-    {1, F_10,   D_10,   E_10},
-    {1, F_6,    D_6,    E_6},
-    {1, F_5,    D_5,    E_5},
-    {1, F_4,    D_4,    E_4},
-    {1, F_3,    D_3,    E_3},
-    {1, F_2,    D_2,    E_2},
-    {1, F_1,    D_1,    E_1},
-    {1, L_10,   J_10,   K_10},
-    {1, L_11,   J_11,   K_11},
-    {1, L_12,   J_12,   K_12},
-    {1, L_9,    J_9,    K_9},
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {1, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {1, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB12_CA10,   CB10_CA10,   CB11_CA10},
+    {1, CB12_CA11,   CB10_CA11,   CB11_CA11},
+    {1, CB12_CA12,   CB10_CA12,   CB11_CA12},
+    {1, CB12_CA9,    CB10_CA9,    CB11_CA9},
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/v7/ansi/ansi.c b/keyboards/keychron/v7/ansi/ansi.c
index 132f5685191..4d0bedff097 100644
--- a/keyboards/keychron/v7/ansi/ansi.c
+++ b/keyboards/keychron/v7/ansi/ansi.c
@@ -27,82 +27,82 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_15,   A_15,   B_15},
-    {0, C_16,   A_16,   B_16},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_14,   D_14,   E_14},
-    {0, F_15,   D_15,   E_15},
-    {0, F_16,   D_16,   E_16},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
 
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {1, I_6,    G_6,    H_6},
-    {1, I_7,    G_7,    H_7},
-    {1, I_8,    G_8,    H_8},
-    {1, I_9,    G_9,    H_9},
-    {1, I_10,   G_10,   H_10},
-    {1, I_11,   G_11,   H_11},
-    {1, I_12,   G_12,   H_12},
-    {1, I_14,   G_14,   H_14},
-    {1, I_15,   G_15,   H_15},
-    {1, I_16,   G_16,   H_16},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {1, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {1, C_1,    A_1,    B_1},
-    {1, C_3,    A_3,    B_3},
-    {1, C_4,    A_4,    B_4},
-    {1, C_5,    A_5,    B_5},
-    {1, C_6,    A_6,    B_6},
-    {1, C_7,    A_7,    B_7},
-    {1, C_8,    A_8,    B_8},
-    {1, C_9,    A_9,    B_9},
-    {1, C_10,   A_10,   B_10},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_14,   A_14,   B_14},
-    {1, C_15,   A_15,   B_15},
-    {1, C_16,   A_16,   B_16},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_2,    D_2,    E_2},
-    {1, F_3,    D_3,    E_3},
-    {1, F_7,    D_7,    E_7},
-    {1, F_10,   D_10,   E_10},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_13,   D_13,   E_13},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
-    {1, F_16,   D_16,   E_16},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16},
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/v7/iso/iso.c b/keyboards/keychron/v7/iso/iso.c
index 7aaeafe65e2..cdd2d97209a 100644
--- a/keyboards/keychron/v7/iso/iso.c
+++ b/keyboards/keychron/v7/iso/iso.c
@@ -27,83 +27,83 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_15,   A_15,   B_15},
-    {0, C_16,   A_16,   B_16},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {0, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {0, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {0, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {0, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {0, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {0, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {0, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {0, CB3_CA13,   CB1_CA13,   CB2_CA13},
+    {0, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {0, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {0, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_15,   D_15,   E_15},
-    {0, F_16,   D_16,   E_16},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {0, CB6_CA16,   CB4_CA16,   CB5_CA16},
 
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {1, I_6,    G_6,    H_6},
-    {1, I_7,    G_7,    H_7},
-    {1, I_8,    G_8,    H_8},
-    {1, I_9,    G_9,    H_9},
-    {1, I_10,   G_10,   H_10},
-    {1, I_11,   G_11,   H_11},
-    {1, I_12,   G_12,   H_12},
-    {1, I_14,   G_14,   H_14},
-    {0, F_14,   D_14,   E_14},
-    {1, I_15,   G_15,   H_15},
-    {1, I_16,   G_16,   H_16},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {1, CB9_CA16,   CB7_CA16,   CB8_CA16},
 
-    {1, C_1,    A_1,    B_1},
-    {1, C_2,    A_2,    B_2},
-    {1, C_3,    A_3,    B_3},
-    {1, C_4,    A_4,    B_4},
-    {1, C_5,    A_5,    B_5},
-    {1, C_6,    A_6,    B_6},
-    {1, C_7,    A_7,    B_7},
-    {1, C_8,    A_8,    B_8},
-    {1, C_9,    A_9,    B_9},
-    {1, C_10,   A_10,   B_10},
-    {1, C_11,   A_11,   B_11},
-    {1, C_12,   A_12,   B_12},
-    {1, C_14,   A_14,   B_14},
-    {1, C_15,   A_15,   B_15},
-    {1, C_16,   A_16,   B_16},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {1, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA11,   CB1_CA11,   CB2_CA11},
+    {1, CB3_CA12,   CB1_CA12,   CB2_CA12},
+    {1, CB3_CA14,   CB1_CA14,   CB2_CA14},
+    {1, CB3_CA15,   CB1_CA15,   CB2_CA15},
+    {1, CB3_CA16,   CB1_CA16,   CB2_CA16},
 
-    {1, F_1,    D_1,    E_1},
-    {1, F_2,    D_2,    E_2},
-    {1, F_3,    D_3,    E_3},
-    {1, F_7,    D_7,    E_7},
-    {1, F_10,   D_10,   E_10},
-    {1, F_11,   D_11,   E_11},
-    {1, F_12,   D_12,   E_12},
-    {1, F_13,   D_13,   E_13},
-    {1, F_14,   D_14,   E_14},
-    {1, F_15,   D_15,   E_15},
-    {1, F_16,   D_16,   E_16},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {1, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA16,   CB4_CA16,   CB5_CA16},
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/v8/ansi/ansi.c b/keyboards/keychron/v8/ansi/ansi.c
index e5840fe966f..fcc232511fa 100644
--- a/keyboards/keychron/v8/ansi/ansi.c
+++ b/keyboards/keychron/v8/ansi/ansi.c
@@ -27,80 +27,80 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_14,   G_14,   H_14},
-    {0, I_15,   G_15,   H_15},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_14,   D_14,   E_14},
-    {0, F_15,   D_15,   E_15},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
 
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {1, C_10,   A_10,   B_10},
-    // {1, C_9,    A_9,    B_9},
-    {1, C_8,    A_8,    B_8},
-    {1, C_7,    A_7,    B_7},
-    {1, C_6,    A_6,    B_6},
-    {1, C_5,    A_5,    B_5},
-    {1, C_4,    A_4,    B_4},
-    {1, C_3,    A_3,    B_3},
-    {1, C_2,    A_2,    B_2},
-    {1, C_1,    A_1,    B_1},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    // {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
 
-    {1, I_15,   G_15,   H_15},
-    {1, I_13,   G_13,   H_13},
-    {1, I_12,   G_12,   H_12},
-    {1, I_11,   G_11,   H_11},
-    {1, I_10,   G_10,   H_10},
-    {1, I_9,    G_9,    H_9},
-    {1, I_8,    G_8,    H_8},
-    {1, I_7,    G_7,    H_7},
-    {1, I_6,    G_6,    H_6},
-    {1, I_5,    G_5,    H_5},
-    {1, I_4,    G_4,    H_4},
-    {1, I_3,    G_3,    H_3},
-    {1, I_2,    G_2,    H_2},
-    {1, I_1,    G_1,    H_1},
+    {1, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {1, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
 
-    {1, F_15,   D_15,   E_15},
-    {1, F_14,   D_14,   E_14},
-    {1, F_13,   D_13,   E_13},
-    {1, F_12,   D_12,   E_12},
-    {1, F_9,    D_9,    E_9},
-    {1, F_8,    D_8,    E_8},
-    {1, F_7,    D_7,    E_7},
-    {1, F_6,    D_6,    E_6},
-    {1, F_3,    D_3,    E_3},
-    {1, F_2,    D_2,    E_2},
-    {1, F_1,    D_1,    E_1}
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {1, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1}
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/v8/ansi_encoder/ansi_encoder.c b/keyboards/keychron/v8/ansi_encoder/ansi_encoder.c
index e5840fe966f..fcc232511fa 100644
--- a/keyboards/keychron/v8/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/v8/ansi_encoder/ansi_encoder.c
@@ -27,80 +27,80 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_14,   G_14,   H_14},
-    {0, I_15,   G_15,   H_15},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_14,   D_14,   E_14},
-    {0, F_15,   D_15,   E_15},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
 
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {1, C_10,   A_10,   B_10},
-    // {1, C_9,    A_9,    B_9},
-    {1, C_8,    A_8,    B_8},
-    {1, C_7,    A_7,    B_7},
-    {1, C_6,    A_6,    B_6},
-    {1, C_5,    A_5,    B_5},
-    {1, C_4,    A_4,    B_4},
-    {1, C_3,    A_3,    B_3},
-    {1, C_2,    A_2,    B_2},
-    {1, C_1,    A_1,    B_1},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    // {1, CB3_CA9,    CB1_CA9,    CB2_CA9},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
 
-    {1, I_15,   G_15,   H_15},
-    {1, I_13,   G_13,   H_13},
-    {1, I_12,   G_12,   H_12},
-    {1, I_11,   G_11,   H_11},
-    {1, I_10,   G_10,   H_10},
-    {1, I_9,    G_9,    H_9},
-    {1, I_8,    G_8,    H_8},
-    {1, I_7,    G_7,    H_7},
-    {1, I_6,    G_6,    H_6},
-    {1, I_5,    G_5,    H_5},
-    {1, I_4,    G_4,    H_4},
-    {1, I_3,    G_3,    H_3},
-    {1, I_2,    G_2,    H_2},
-    {1, I_1,    G_1,    H_1},
+    {1, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {1, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
 
-    {1, F_15,   D_15,   E_15},
-    {1, F_14,   D_14,   E_14},
-    {1, F_13,   D_13,   E_13},
-    {1, F_12,   D_12,   E_12},
-    {1, F_9,    D_9,    E_9},
-    {1, F_8,    D_8,    E_8},
-    {1, F_7,    D_7,    E_7},
-    {1, F_6,    D_6,    E_6},
-    {1, F_3,    D_3,    E_3},
-    {1, F_2,    D_2,    E_2},
-    {1, F_1,    D_1,    E_1}
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {1, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1}
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/v8/iso/iso.c b/keyboards/keychron/v8/iso/iso.c
index 07b350209d0..4658969a105 100644
--- a/keyboards/keychron/v8/iso/iso.c
+++ b/keyboards/keychron/v8/iso/iso.c
@@ -27,80 +27,80 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_14,   G_14,   H_14},
-    {0, I_15,   G_15,   H_15},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_15,   D_15,   E_15},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
 
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {1, C_10,   A_10,   B_10},
-    {1, C_8,    A_8,    B_8},
-    {1, C_7,    A_7,    B_7},
-    {1, C_6,    A_6,    B_6},
-    {1, C_5,    A_5,    B_5},
-    {1, C_4,    A_4,    B_4},
-    {1, C_3,    A_3,    B_3},
-    {1, C_2,    A_2,    B_2},
-    {0, F_14,   D_14,   E_14},
-    {1, C_1,    A_1,    B_1},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
 
-    {1, I_15,   G_15,   H_15},
-    {1, I_14,   G_14,   H_14},
-    {1, I_13,   G_13,   H_13},
-    {1, I_12,   G_12,   H_12},
-    {1, I_11,   G_11,   H_11},
-    {1, I_10,   G_10,   H_10},
-    {1, I_9,    G_9,    H_9},
-    {1, I_8,    G_8,    H_8},
-    {1, I_7,    G_7,    H_7},
-    {1, I_6,    G_6,    H_6},
-    {1, I_5,    G_5,    H_5},
-    {1, I_4,    G_4,    H_4},
-    {1, I_3,    G_3,    H_3},
-    {1, I_2,    G_2,    H_2},
-    {1, I_1,    G_1,    H_1},
+    {1, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {1, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
 
-    {1, F_15,   D_15,   E_15},
-    {1, F_14,   D_14,   E_14},
-    {1, F_13,   D_13,   E_13},
-    {1, F_12,   D_12,   E_12},
-    {1, F_9,    D_9,    E_9},
-    {1, F_8,    D_8,    E_8},
-    {1, F_7,    D_7,    E_7},
-    {1, F_6,    D_6,    E_6},
-    {1, F_3,    D_3,    E_3},
-    {1, F_2,    D_2,    E_2},
-    {1, F_1,    D_1,    E_1}
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {1, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1}
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/v8/iso_encoder/iso_encoder.c b/keyboards/keychron/v8/iso_encoder/iso_encoder.c
index 07b350209d0..4658969a105 100644
--- a/keyboards/keychron/v8/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/v8/iso_encoder/iso_encoder.c
@@ -27,80 +27,80 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, I_1,    G_1,    H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_14,   G_14,   H_14},
-    {0, I_15,   G_15,   H_15},
+    {0, CB9_CA1,    CB7_CA1,    CB8_CA1},
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {0, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {0, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {0, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {0, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {0, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {0, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {0, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {0, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {0, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {0, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {0, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {0, CB9_CA15,   CB7_CA15,   CB8_CA15},
 
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_15,   D_15,   E_15},
+    {0, CB6_CA1,    CB4_CA1,    CB5_CA1},
+    {0, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {0, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {0, CB6_CA4,    CB4_CA4,    CB5_CA4},
+    {0, CB6_CA5,    CB4_CA5,    CB5_CA5},
+    {0, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {0, CB6_CA10,   CB4_CA10,   CB5_CA10},
+    {0, CB6_CA11,   CB4_CA11,   CB5_CA11},
+    {0, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {0, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {0, CB6_CA15,   CB4_CA15,   CB5_CA15},
 
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {1, C_10,   A_10,   B_10},
-    {1, C_8,    A_8,    B_8},
-    {1, C_7,    A_7,    B_7},
-    {1, C_6,    A_6,    B_6},
-    {1, C_5,    A_5,    B_5},
-    {1, C_4,    A_4,    B_4},
-    {1, C_3,    A_3,    B_3},
-    {1, C_2,    A_2,    B_2},
-    {0, F_14,   D_14,   E_14},
-    {1, C_1,    A_1,    B_1},
+    {0, CB3_CA1,    CB1_CA1,    CB2_CA1},
+    {0, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {0, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {0, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA10,   CB1_CA10,   CB2_CA10},
+    {1, CB3_CA8,    CB1_CA8,    CB2_CA8},
+    {1, CB3_CA7,    CB1_CA7,    CB2_CA7},
+    {1, CB3_CA6,    CB1_CA6,    CB2_CA6},
+    {1, CB3_CA5,    CB1_CA5,    CB2_CA5},
+    {1, CB3_CA4,    CB1_CA4,    CB2_CA4},
+    {1, CB3_CA3,    CB1_CA3,    CB2_CA3},
+    {1, CB3_CA2,    CB1_CA2,    CB2_CA2},
+    {0, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB3_CA1,    CB1_CA1,    CB2_CA1},
 
-    {1, I_15,   G_15,   H_15},
-    {1, I_14,   G_14,   H_14},
-    {1, I_13,   G_13,   H_13},
-    {1, I_12,   G_12,   H_12},
-    {1, I_11,   G_11,   H_11},
-    {1, I_10,   G_10,   H_10},
-    {1, I_9,    G_9,    H_9},
-    {1, I_8,    G_8,    H_8},
-    {1, I_7,    G_7,    H_7},
-    {1, I_6,    G_6,    H_6},
-    {1, I_5,    G_5,    H_5},
-    {1, I_4,    G_4,    H_4},
-    {1, I_3,    G_3,    H_3},
-    {1, I_2,    G_2,    H_2},
-    {1, I_1,    G_1,    H_1},
+    {1, CB9_CA15,   CB7_CA15,   CB8_CA15},
+    {1, CB9_CA14,   CB7_CA14,   CB8_CA14},
+    {1, CB9_CA13,   CB7_CA13,   CB8_CA13},
+    {1, CB9_CA12,   CB7_CA12,   CB8_CA12},
+    {1, CB9_CA11,   CB7_CA11,   CB8_CA11},
+    {1, CB9_CA10,   CB7_CA10,   CB8_CA10},
+    {1, CB9_CA9,    CB7_CA9,    CB8_CA9},
+    {1, CB9_CA8,    CB7_CA8,    CB8_CA8},
+    {1, CB9_CA7,    CB7_CA7,    CB8_CA7},
+    {1, CB9_CA6,    CB7_CA6,    CB8_CA6},
+    {1, CB9_CA5,    CB7_CA5,    CB8_CA5},
+    {1, CB9_CA4,    CB7_CA4,    CB8_CA4},
+    {1, CB9_CA3,    CB7_CA3,    CB8_CA3},
+    {1, CB9_CA2,    CB7_CA2,    CB8_CA2},
+    {1, CB9_CA1,    CB7_CA1,    CB8_CA1},
 
-    {1, F_15,   D_15,   E_15},
-    {1, F_14,   D_14,   E_14},
-    {1, F_13,   D_13,   E_13},
-    {1, F_12,   D_12,   E_12},
-    {1, F_9,    D_9,    E_9},
-    {1, F_8,    D_8,    E_8},
-    {1, F_7,    D_7,    E_7},
-    {1, F_6,    D_6,    E_6},
-    {1, F_3,    D_3,    E_3},
-    {1, F_2,    D_2,    E_2},
-    {1, F_1,    D_1,    E_1}
+    {1, CB6_CA15,   CB4_CA15,   CB5_CA15},
+    {1, CB6_CA14,   CB4_CA14,   CB5_CA14},
+    {1, CB6_CA13,   CB4_CA13,   CB5_CA13},
+    {1, CB6_CA12,   CB4_CA12,   CB5_CA12},
+    {1, CB6_CA9,    CB4_CA9,    CB5_CA9},
+    {1, CB6_CA8,    CB4_CA8,    CB5_CA8},
+    {1, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {1, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {1, CB6_CA3,    CB4_CA3,    CB5_CA3},
+    {1, CB6_CA2,    CB4_CA2,    CB5_CA2},
+    {1, CB6_CA1,    CB4_CA1,    CB5_CA1}
 };
 
 #define __ NO_LED
diff --git a/keyboards/keyhive/opus/keymaps/thefoxcodes/config.h b/keyboards/keyhive/opus/keymaps/thefoxcodes/config.h
deleted file mode 100644
index 824ec5bd18e..00000000000
--- a/keyboards/keyhive/opus/keymaps/thefoxcodes/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright 2020 rtwayland
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-// place overrides here
-#define USB_MAX_POWER_CONSUMPTION 100
-#define TAPPING_TERM 200
\ No newline at end of file
diff --git a/keyboards/keyhive/opus/keymaps/thefoxcodes/keymap.c b/keyboards/keyhive/opus/keymaps/thefoxcodes/keymap.c
deleted file mode 100644
index 28eda8e6b6d..00000000000
--- a/keyboards/keyhive/opus/keymaps/thefoxcodes/keymap.c
+++ /dev/null
@@ -1,94 +0,0 @@
-/* Copyright 2020 rtwayland
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-enum layer_names {
-  _BASE,
-  _SYMBOL,
-  _NUM,
-  _NAV,
-  _MEDIA,
-  _WORD,
-  _FKEYS,
-  _NUMPAD,
-  _MOUSE
-};
-
-enum {
-  TD_PLAY_DO_NOT_DISTURB
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_BASE] = LAYOUT(
-      LT(4, KC_TAB), KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, TD(TD_PLAY_DO_NOT_DISTURB),
-      LCTL_T(KC_ESC), KC_A, KC_S, KC_D, LT(2, KC_F), KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, LT(4, KC_QUOT),
-      MO(5), LGUI_T(KC_Z), KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, LGUI_T(KC_SLSH), MO(5),
-      MO(3), KC_LSFT, LALT_T(KC_TAB), LT(3, KC_ENT), LT(1, KC_SPC), KC_BSPC
-     ),
-  [_SYMBOL] = LAYOUT(
-      LCTL(KC_C), KC_TILD, KC_AT, KC_LCBR, KC_RCBR, KC_HASH, KC_ASTR, KC_CIRC, KC_AMPR, KC_PIPE, KC_BSLS, LCTL(KC_GRV),
-      KC_LCTL, KC_GRV, KC_MINS, KC_LPRN, KC_RPRN, KC_EXLM, KC_QUES, KC_DLR, KC_LT, KC_GT, KC_SLSH, KC_DQUO,
-      KC_LALT, KC_LGUI, KC_UNDS, KC_LBRC, KC_RBRC, KC_PLUS, KC_P0, KC_EQL, KC_PERC, KC_COLN, KC_NO, KC_NO,
-      KC_NO, KC_LSFT, LALT_T(KC_TAB), KC_NO, KC_TRNS, KC_NO
-     ),
-  [_NUM] = LAYOUT(
-      KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_ASTR, KC_7, KC_8, KC_9, KC_SLSH, KC_EQL,
-      KC_LCTL, KC_NO, MO(7), MO(6), KC_TRNS, KC_NO, KC_PLUS, KC_4, KC_5, KC_6, KC_MINS, KC_PERC,
-      KC_LALT, KC_LGUI, KC_NO, KC_NO, KC_NO, KC_NO,  KC_0, KC_1, KC_2, KC_3, KC_DOT, KC_PENT,
-      KC_NO, KC_LSFT, LALT_T(KC_TAB), KC_NO, KC_SPC, KC_BSPC
-     ),
-  [_NAV] = LAYOUT(
-      KC_NO, KC_NO, LALT(KC_RGHT), SGUI(KC_LBRC), SGUI(KC_RBRC), KC_NO, KC_HOME, KC_PGDN, KC_PGUP, KC_NO, KC_NO, KC_NO,
-      KC_NO, KC_LCTL, KC_LALT, KC_LSFT, KC_LGUI, KC_NO, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_NO, KC_NO,
-      KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, LALT(KC_LEFT), KC_END, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-      KC_TRNS, KC_NO, KC_NO, KC_NO, KC_SPC, KC_BSPC
-     ),
-  [_MEDIA] = LAYOUT(
-      KC_TRNS, SGUI(KC_5), SGUI(KC_3), SGUI(KC_4), MEH(KC_4), KC_VOLU, LCA(KC_U), LCAG(KC_LEFT), LCAG(KC_RGHT), LCA(KC_I), LCA(KC_EQL), LALT(LGUI(KC_PWR)),
-      KC_CAPS, KC_F11, KC_MPRV, KC_MNXT, KC_MPLY, KC_VOLD, LCA(KC_LEFT), LCA(KC_DOWN), LCA(KC_UP), LCA(KC_RIGHT), LCA(KC_MINS), KC_TRNS,
-      KC_BRID, KC_BRIU, LGUI(KC_MINS), LGUI(KC_PLUS), LGUI(KC_GRV), KC_MUTE, LCA(KC_J), LCA(KC_ENT), LCA(KC_C), LCA(KC_K), MEH(KC_UP), QK_BOOT,
-      LCTL(LSFT(KC_TAB)), LCTL(KC_TAB), KC_NO, KC_NO, MEH(KC_RGHT), MEH(KC_LEFT)
-     ),
-  [_WORD] = LAYOUT(
-      KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-      KC_NO, KC_NO, LALT(LSFT(KC_MINS)), KC_NO, LALT(LGUI(KC_F)), KC_NO,  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-      KC_TRNS, KC_NO, LALT(KC_MINS), KC_NO, SGUI(LALT(KC_V)),  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-      KC_NO, KC_NO, KC_NO,  KC_NO, KC_NO, KC_DEL
-     ),
-  [_FKEYS] = LAYOUT(
-      KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_F12, KC_F7, KC_F8, KC_F9, KC_F17, KC_F20,
-      KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_F11, KC_F4, KC_F5, KC_F6, KC_F16, KC_F19,
-      KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_F10, KC_F1, KC_F2, KC_F3, KC_F13, KC_F18,
-      KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO
-     ),
-  [_NUMPAD] = LAYOUT(
-      KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,  KC_PAST, KC_P7, KC_P8, KC_P9, KC_PSLS, KC_PEQL,
-      KC_LCTL, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_PPLS, KC_P4, KC_P5, KC_P6, KC_PMNS, KC_PERC,
-      KC_LALT, KC_LGUI, KC_NO, KC_NO, KC_NO, KC_NO,  KC_P0, KC_P1, KC_P2, KC_P3, KC_PDOT, KC_PENT,
-      KC_NO, KC_TRNS, KC_NO, KC_NO, KC_LPRN, KC_RPRN
-     ),
-  [_MOUSE] = LAYOUT(
-      KC_NO, KC_NO, KC_NO, SGUI(KC_LBRC), SGUI(KC_RBRC), KC_NO,  KC_HOME, KC_WH_U, KC_WH_D, KC_NO, KC_NO, KC_NO,
-      KC_NO, KC_NO, KC_ACL2, KC_WWW_BACK, KC_ACL0, KC_WWW_FORWARD, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_NO, KC_NO,
-      KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_END, KC_WH_R, KC_WH_L, KC_NO, KC_NO, KC_NO,
-      KC_NO, KC_NO, KC_NO, KC_NO, KC_BTN1, KC_BTN2
-     ),
-};
-
-tap_dance_action_t tap_dance_actions[] = {
-  [TD_PLAY_DO_NOT_DISTURB] = ACTION_TAP_DANCE_DOUBLE(KC_MPLY, KC_F6)
-};
\ No newline at end of file
diff --git a/keyboards/keyhive/opus/keymaps/thefoxcodes/readme.md b/keyboards/keyhive/opus/keymaps/thefoxcodes/readme.md
deleted file mode 100644
index c1d2a0b9ec1..00000000000
--- a/keyboards/keyhive/opus/keymaps/thefoxcodes/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# thefoxcodes keymap
diff --git a/keyboards/keyhive/opus/keymaps/thefoxcodes/rules.mk b/keyboards/keyhive/opus/keymaps/thefoxcodes/rules.mk
deleted file mode 100644
index 1ba2fa8fbef..00000000000
--- a/keyboards/keyhive/opus/keymaps/thefoxcodes/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-TAP_DANCE_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/keyhive/southpole/keymaps/foobeard/keymap.c b/keyboards/keyhive/southpole/keymaps/foobeard/keymap.c
deleted file mode 100644
index 3d8fda20a3e..00000000000
--- a/keyboards/keyhive/southpole/keymaps/foobeard/keymap.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
-Base Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
-Modified 2017 Andrew Novak <ndrw.nvk@gmail.com>
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public LicensezZZ
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include QMK_KEYBOARD_H
-
-enum layers {
-  _QWERTY,
-  _RAISE
-};
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-};
-
-#define RAISE MO(_RAISE)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	/* Layer 0, default layer
-	*  ,--------------------------------------------------------------------------------------------------------------------------------------------.
-	*  |NumLck|   /  |   *  |   -  | | Esc |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |    0 |   -  |   =  |   \  |Delete| Ins  |
-	*  |------+------+------+------+-+-------------------------------------------------------------------------------------------------------+------|
-	*  |  7   |   8  |   9  |   +  | | Tab   |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |    P |   {  |   }  |   BkSpc   | Vol+ |
-	*  |------+------+------+------+-+-------------------------------------------------------------------------------------------------------+------|
-	*  |  4   |   5  |   6  |   +  | | Caps   |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |    ; |   '  |      Return     | Vol- |
-	*  |------+------+------+------+-+-------------------------------------------------------------------------------------------------------+------|
-	*  |  1   |   2  |   3  |  En  | | LShft     |   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |    RShft   |   Up   | Mute |
-	*  |------+------+------+------+-+----------------------------------------------------------------------------------------------+--------+------|
-	*  |      0      |   .  |  En  | | Ctrl  |  Win  |  Alt  |                  Space                            |  Fn  |    | Left |  Down  | Right|
-	*  `------+------+------+------+-+-------------------------------------------------------------------------------------------------------+------'
-	*/
-    [_QWERTY] = LAYOUT( 
-		KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_DELETE, KC_INS,
-		KC_P7, KC_P8, KC_P9, KC_PPLS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, KC_VOLU,
-		KC_P4, KC_P5, KC_P6, KC_PENT, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_VOLD,
-		KC_P1, KC_P2, KC_P3, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_MUTE,
-		KC_P0, KC_PDOT,      KC_LCTL, KC_LGUI, KC_LALT,                              KC_SPC,              RAISE, KC_LEFT, KC_DOWN, KC_RGHT
-	),
-
-	/*layer 1, function layer
-	*  ,--------------------------------------------------------------------------------------------------------------------------------------------.
-	*  |Reset |      |      |      | |  `  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |      |      |Calc  |
-	*  |------+------+------+------+-+-------------------------------------------------------------------------------------------------------+------|
-	*  |      |      |      |      | |       |      |      |      |      |      |      |      |      |      |      |      |      |           |      |
-	*  |------+------+------+------+-+-------------------------------------------------------------------------------------------------------+------|
-	*  |      |      |      |      | |        |      |      |      |      |      |      |      |      |      |      |      |                 |      |
-	*  |------+------+------+------+-+-------------------------------------------------------------------------------------------------------+------|
-	*  |      |      |      |      | |           |      |      |      |      |      |      |      |      |      |      |            |        |      |
-	*  |------+------+------+------+-+----------------------------------------------------------------------------------------------+--------+------|
-	*  |             |      |      | |       |       |       |                                                   |      |    |      |        |      |
-	*  `------+------+------+------+-+-------------------------------------------------------------------------------------------------------+------'
-	*/
-
-	[_RAISE] = LAYOUT( 
-		QK_BOOT, _______, _______, _______, KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, KC_CALC,
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-	)
-};
\ No newline at end of file
diff --git a/keyboards/keyhive/ut472/keymaps/annihilator6000/UT472_Annihilator6000_Configurator_file.json b/keyboards/keyhive/ut472/keymaps/annihilator6000/UT472_Annihilator6000_Configurator_file.json
deleted file mode 100755
index 8dea44e33c6..00000000000
--- a/keyboards/keyhive/ut472/keymaps/annihilator6000/UT472_Annihilator6000_Configurator_file.json
+++ /dev/null
@@ -1 +0,0 @@
-{"keyboard":"ut472","keymap":"ut472_layout_switching","layout":"LAYOUT","layers":[["KC_ESC","KC_Q","KC_W","KC_E","KC_R","KC_T","KC_Y","KC_U","KC_I","KC_O","KC_P","KC_BSPC","LT(3,KC_TAB)","KC_A","KC_S","KC_D","KC_F","KC_G","KC_H","KC_J","KC_K","KC_L","KC_SCLN","KC_QUOT","KC_LSFT","KC_Z","KC_X","KC_C","KC_V","KC_B","KC_N","KC_M","KC_COMM","KC_DOT","KC_SLSH","SC_SENT","KC_LCTL","KC_LALT","KC_LGUI","KC_APP","MO(2)","KC_SPC","MO(1)","KC_LEFT","KC_DOWN","KC_UP","KC_RGHT"],["KC_ESC","KC_Q","KC_D","KC_R","KC_W","KC_B","KC_J","KC_F","KC_U","KC_P","KC_SCLN","KC_BSPC","LT(3,KC_TAB)","KC_A","KC_S","KC_H","KC_T","KC_G","KC_Y","KC_N","KC_E","KC_O","KC_I","KC_QUOT","KC_LSFT","KC_Z","KC_X","KC_M","KC_C","KC_V","KC_K","KC_L","KC_COMM","KC_DOT","KC_SLSH","SC_SENT","KC_LCTL","KC_LALT","KC_LGUI","KC_APP","MO(2)","KC_SPC","MO(1)","KC_LEFT","KC_DOWN","KC_UP","KC_RGHT"],["KC_ESC","KC_Q","KC_W","KC_F","KC_P","KC_G","KC_J","KC_L","KC_U","KC_Y","KC_SCLN","KC_BSPC","LT(3,KC_TAB)","KC_A","KC_R","KC_S","KC_T","KC_D","KC_H","KC_N","KC_E","KC_I","KC_O","KC_QUOT","KC_LSFT","KC_Z","KC_X","KC_C","KC_V","KC_B","KC_K","KC_M","KC_COMM","KC_DOT","KC_SLSH","SC_SENT","KC_LCTL","KC_LALT","KC_LGUI","KC_APP","MO(2)","KC_SPC","MO(1)","KC_LEFT","KC_DOWN","KC_UP","KC_RGHT"],["KC_ESC","KC_Q","KC_W","KC_F","KC_P","KC_B","KC_J","KC_L","KC_U","KC_Y","KC_SCLN","KC_BSPC","LT(3,KC_TAB)","KC_A","KC_R","KC_S","KC_T","KC_G","KC_K","KC_N","KC_E","KC_I","KC_O","KC_QUOT","KC_LSFT","KC_X","KC_C","KC_D","KC_V","KC_Z","KC_M","KC_H","KC_COMM","KC_DOT","KC_SLSH","SC_SENT","KC_LCTL","KC_LALT","KC_LGUI","KC_APP","MO(2)","KC_SPC","MO(1)","KC_LEFT","KC_DOWN","KC_UP","KC_RGHT"],["KC_ESC","KC_QUOT","KC_COMM","KC_DOT","KC_P","KC_Y","KC_F","KC_G","KC_C","KC_R","KC_L","KC_BSPC","LT(3,KC_TAB)","KC_A","KC_O","KC_E","KC_U","KC_I","KC_D","KC_H","KC_T","KC_N","KC_S","KC_SLSH","KC_LSFT","KC_SCLN","KC_Q","KC_J","KC_K","KC_X","KC_B","KC_M","KC_W","KC_V","KC_Z","SC_SENT","KC_LCTL","KC_LALT","KC_LGUI","KC_APP","MO(2)","KC_SPC","MO(1)","KC_LEFT","KC_DOWN","KC_UP","KC_RGHT"],["KC_GRV","KC_1","KC_2","KC_3","KC_4","KC_5","KC_6","KC_7","KC_8","KC_9","KC_0","KC_DEL","KC_NO","RGB_TOG","RGB_MOD","RGB_VAI","RGB_VAD","KC_NO","KC_NO","KC_MINS","KC_EQL","KC_LBRC","KC_RBRC","KC_BSLS","KC_NO","KC_F11","KC_F12","KC_F13","KC_F14","KC_F15","KC_F16","KC_F17","KC_F18","KC_F19","KC_F20","KC_NO","KC_NO","KC_NO","KC_NO","KC_CAPS","KC_NO","KC_NO","KC_TRNS","KC_HOME","KC_PGDN","KC_PGUP","KC_END"],["KC_TILD","KC_EXLM","KC_AT","KC_HASH","KC_DLR","KC_PERC","KC_CIRC","KC_AMPR","KC_ASTR","KC_LPRN","KC_RPRN","KC_DEL","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_UNDS","KC_PLUS","KC_LCBR","KC_RCBR","KC_PIPE","KC_NO","KC_F1","KC_F2","KC_F3","KC_F4","KC_F5","KC_F6","KC_F7","KC_F8","KC_F9","KC_F10","KC_NO","KC_NO","KC_NO","KC_NO","KC_CAPS","KC_TRNS","KC_NO","KC_NO","KC_HOME","KC_PGDN","KC_PGUP","KC_END"],["KC_ESC","KC_CALC","KC_WHOM","KC_MAIL","KC_MYCM","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_PSCR","KC_NO","KC_TRNS","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_WH_L","KC_WH_D","KC_WH_U","KC_WH_R"],["QK_BOOT","KC_NO","KC_NO","RGB_TOG","RGB_MOD","RGB_HUI","RGB_HUD","RGB_SAI","RGB_SAD","RGB_VAI","RGB_VAD","KC_DEL","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","ANY(Qwerty)","ANY(Workman)","ANY(Colemak)","ANY(Colemak Mod-DH)","ANY(Dvorak)","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","KC_NO","DB_TOGG","KC_NO","KC_NO","KC_NO","KC_TRNS","KC_NO","KC_TRNS","KC_NO","KC_NO","KC_NO","KC_NO"]],"author":"Annihilator6000","notes":"Layer 0 = Qwerty\nLayer 1 = Workman\nLayer 2 = Colemak\nLayer 3 = Colemak Mod-DH\nLayer 4 = Dvorak\nLayer 5 = Function Layer 1 (MO 1)\nLayer 6 = Function Layer 2 (MO 2)\nLayer 7 = Function Layer 3 (LT 3: Hold Tab)\nLayer 8 = Planck-style Adjust Layer (Hold MO 1 and MO 2 at the same time)"}
\ No newline at end of file
diff --git a/keyboards/keyhive/ut472/keymaps/annihilator6000/keymap.c b/keyboards/keyhive/ut472/keymaps/annihilator6000/keymap.c
deleted file mode 100644
index 2235c07bb5b..00000000000
--- a/keyboards/keyhive/ut472/keymaps/annihilator6000/keymap.c
+++ /dev/null
@@ -1,256 +0,0 @@
-/* Copyright 2018 Carlos Filoteo
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-
-#define LT3_TAB LT(3, KC_TAB)
-
-enum ut472_layers {
-  _QWERTY,
-  _WORKMAN,
-  _COLEMAK,
-  _COLEMAK_MOD_DH,
-  _DVORAK,
-  _LOWER,
-  _RAISE,
-  _TAB,
-  _ADJUST
-};
-
-enum ut472_keycodes {
-  QWERTY = SAFE_RANGE,
-  WORKMAN,
-  COLEMAK,
-  COLEMAK_MOD_DH,
-  DVORAK
-};
-
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /* Base Layer - QWERTY
-   * ,-------------------------------------------------------------------------.
-   * | Esc |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |Bspace |
-   * |-------------------------------------------------------------------------+
-   * |Tab/L3|  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |   '  |
-   * |-------------------------------------------------------------------------+
-   * | Shift |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  |Sh/En|
-   * |-------------------------------------------------------------------------+
-   * | Ctrl| Alt | Gui | App |  L2  |   Space   |  L1  | Left| Down|  Up |Right|
-   * `-------------------------------------------------------------------------'
-   */
-[_QWERTY] = LAYOUT(
-  KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-  LT3_TAB, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SC_SENT,
-  KC_LCTL, KC_LALT, KC_LGUI, KC_APP,  LOWER,      KC_SPC,        RAISE,  KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-  /* Workman
-   * ,-------------------------------------------------------------------------.
-   * | Esc |  Q  |  D  |  R  |  W  |  B  |  J  |  F  |  U  |  P  |  ;  |Bspace |
-   * |-------------------------------------------------------------------------+
-   * |Tab/L3|  A  |  S  |  H  |  T  |  G  |  Y  |  N  |  E  |  O  |  I  |   '  |
-   * |-------------------------------------------------------------------------+
-   * | Shift |  Z  |  X  |  M  |  C  |  V  |  K  |  L  |  ,  |  .  |  /  |Sh/En|
-   * |-------------------------------------------------------------------------+
-   * | Ctrl| Alt | Gui | App |  L2  |   Space   |  L1  | Left| Down|  Up |Right|
-   * `-------------------------------------------------------------------------'
-   */
-[_WORKMAN] = LAYOUT(
-  KC_ESC,  KC_Q,    KC_D,    KC_R,    KC_W,    KC_B,    KC_J,    KC_F,    KC_U,    KC_P,    KC_SCLN,    KC_BSPC,
-  LT3_TAB, KC_A,    KC_S,    KC_H,    KC_T,    KC_G,    KC_Y,    KC_N,    KC_E,    KC_O,    KC_I, KC_QUOT,
-  KC_LSFT, KC_Z,    KC_X,    KC_M,    KC_C,    KC_V,    KC_K,    KC_L,    KC_COMM, KC_DOT,  KC_SLSH, SC_SENT,
-  KC_LCTL, KC_LALT, KC_LGUI, KC_APP,  LOWER,      KC_SPC,        RAISE,  KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-),
-
-  /* Colemak
-   * ,---------------------------------------------------------------------------.
-   * | Esc |  Q  |  W  |  F  |  P  |  G  |  J  |  L  |  U  |  Y  |  ;  |   Bksp  |
-   * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+---------|
-   * |Tab/L3|  A  |  R  |  S  |  T  |  D  |  H  |  N  |  E  |  I  |  O  |    "   |
-   * |------+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+--------|
-   * | Shift |  Z  |  X  |  C  |  V  |  B  |  K  |  M  |  ,  |  .  |  /  | Sh/En |
-   * |-------+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-------|
-   * | Ctrl| Alt | GUI | App |  L2  |   Space   | L1 | Left | Down |  Up  |Right |
-   * `---------------------------------------------------------------------------'
-   */
-[_COLEMAK] = LAYOUT(
-  KC_ESC,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-  LT3_TAB, KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
-  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT ,
-  KC_LCTL, KC_LALT, KC_LGUI, KC_APP,  LOWER,      KC_SPC,        RAISE,  KC_LEFT,   KC_DOWN, KC_UP,   KC_RGHT
-),
-
-  /* Colemak Mod-DH
-   * https://colemakmods.github.io/mod-dh/keyboards.html
-   * ,---------------------------------------------------------------------------.
-   * | Esc |  Q  |  W  |  F  |  P  |  B  |  J  |  L  |  U  |  Y  |  ;  |   Bksp  |
-   * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+---------|
-   * |Tab/L3|  A  |  R  |  S  |  T  |  G  |  K  |  N  |  E  |  I  |  O  |    '   |
-   * |------+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+--------|
-   * | Shift |  X  |  C  |  D  |  V  |  Z  |  M  |  H  |  ,  |  .  |  /  | Sh/En |
-   * |-------+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-------|
-   * | Ctrl| Alt | GUI | App |  L2  |   Space   | L1 | Left | Down |  Up  |Right |
-   * `---------------------------------------------------------------------------'
-   */
-[_COLEMAK_MOD_DH] = LAYOUT(
-  KC_ESC,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_B,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-  LT3_TAB, KC_A,    KC_R,    KC_S,    KC_T,    KC_G,    KC_K,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
-  KC_LSFT, KC_X,    KC_C,    KC_D,    KC_V,    KC_Z,    KC_M,    KC_H,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,
-  KC_LCTL, KC_LALT, KC_LGUI, KC_APP,  LOWER,      KC_SPC,        RAISE,  KC_LEFT,   KC_DOWN, KC_UP,  KC_RGHT
-),
-
-  /* Dvorak
-   * ,--------------------------------------------------------------------------.
-   * | Esc |  "  |  ,  |  .  |  P  |  Y  |  F  |  G  |  C  |  R  |  L  |   Bksp |
-   * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+--------|
-   * |Tab/L3|  A  |  O  |  E  |  U  |  I  |  D  |  H  |  T  |  N  |  S  |   /   |
-   * |------+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-------|
-   * | Shift |  ;  |  Q  |  J  |  K  |  X  |  B  |  M  |  W  |  V  |  Z  |Sh/En |
-   * |-------+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+------|
-   * | Ctrl| Alt | GUI | App |  L2  |   Space   | L1 | Left | Down |  Up |Right |
-   * `--------------------------------------------------------------------------'
-   */
-[_DVORAK] = LAYOUT(
-  KC_ESC,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC,
-  LT3_TAB, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
-  KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_ENT ,
-  KC_LCTL, KC_LALT, KC_LGUI, KC_APP,  LOWER,      KC_SPC,        RAISE,  KC_LEFT,  KC_DOWN, KC_UP,   KC_RGHT
-),
-
-  /* FN Layer 1 - LOWER
-   * ,-------------------------------------------------------------------------.
-   * | ` ~ |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  | Delete|
-   * |-------------------------------------------------------------------------+
-   * |      |     |     |     |     |     |     |  -  |  =  |  [  |  ]  |  \   |
-   * |-------------------------------------------------------------------------+
-   * |       | F11 | F12 | F13 | F14 | F15 | F16 | F17 | F18 | F19 | F20 |     |
-   * |-------------------------------------------------------------------------+
-   * |     |     |     |Capsl|      |          |       | Home| PgDn| PgUp| End |
-   * `-------------------------------------------------------------------------'
-   */
-[_LOWER] = LAYOUT(
-  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DELETE,
-  _______, RGB_TOG, RGB_MOD, RGB_VAI, RGB_VAD, _______, _______, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
-  _______, KC_F11,  KC_F12,  KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  _______,
-  _______, _______, _______, KC_CAPS, _______,     _______,      _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END
-),
-
-  /* FN Layer 2 - RAISE
-   * ,-------------------------------------------------------------------------.
-   * |   ~  |  !  |  @  |  #  |  $  |  %  |  ^  |  &  |  *  |  (  |  )  |Delete|
-   * |-------------------------------------------------------------------------+
-   * |      |     |     |     |     |     |     |  _  |  +  |  { |  }  |   |   |
-   * |-------------------------------------------------------------------------+
-   * |       | F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9  | F10 |     |
-   * |-------------------------------------------------------------------------+
-   * |     |     |     |Capsl|      |          |       | Home| PgDn| PgUp| End |
-   * `-------------------------------------------------------------------------'
-   */
-[_RAISE] = LAYOUT(
-  KC_TILDE, KC_EXCLAIM, KC_AT, KC_HASH, KC_DOLLAR, KC_PERCENT, KC_CIRCUMFLEX, KC_AMPERSAND, KC_ASTERISK, KC_LEFT_PAREN, KC_RIGHT_PAREN, KC_DELETE,
-  _______, _______, _______, _______, _______, _______, _______, KC_UNDERSCORE, KC_PLUS, KC_LEFT_CURLY_BRACE, KC_RIGHT_CURLY_BRACE, KC_PIPE,
-  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______,
-  _______, _______, _______, KC_CAPS, _______,     _______,      _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END
-),
-
-  /* FN Layer 3 - Hold Tab
-   * ,-------------------------------------------------------------------------.
-   * | Esc | Calc|Webhm| Mail| Comp|     |     |     |     |     |PrtSc|       |
-   * |-------------------------------------------------------------------------+
-   * |      |     |     |     |     |     |     |     |     |     |     |      |
-   * |-------------------------------------------------------------------------+
-   * |       |    |     |     |     |     |     |     |     |     |      |     |
-   * |-------------------------------------------------------------------------+
-   * |     |     |     |     |      |          |       |MousL|MousD|MousU|MousR|
-   * `-------------------------------------------------------------------------'
-   */
-[_TAB] = LAYOUT(
-  KC_ESC,  KC_CALC, KC_WHOM, KC_MAIL, KC_MYCM, _______, _______, _______, _______, _______, KC_PSCR, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______,     _______,      _______, KC_WH_L, KC_WH_D, KC_WH_U, KC_WH_R
-),
-
-  /* Adjust (L1 + L2)
-   *                   v-----------------------RGB CONTROL---------------------v
-   * ,--------------------------------------------------------------------------
-   * |Reset|     |     | RGB |RGBMO|HUE+ |HUE- |SAT+ |SAT- |BRT+ |BRT- |   Del |
-   * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-------|
-   * |      |     |     |     |     |     |Qwert|Wrkmn|ModDH|Colmk|Dvork|      |
-   * |------+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+------|
-   * |       |     |     |     |     |     |     |     |     |     |     |     |
-   * |-------+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
-   * | Dbg |     |     |     |      |           |      |     |     |     |     |
-   * `-------------------------------------------------------------------------'
-   */
-[_ADJUST] = LAYOUT(
-  QK_BOOT, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL,
-  _______, _______, _______, _______, _______, _______, QWERTY,  WORKMAN, COLEMAK, COLEMAK_MOD_DH,   DVORAK,  _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  DB_TOGG, _______, _______, _______, _______,     _______,      _______, _______, _______, _______, _______
-)
-/* QWERTY    = H
-   WORKMAN   = J
-   COLEMAK   = K
-     -MOD-DH = L
-   DVORAK    = ; */
-};
-
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        print("mode just switched to qwerty and this is a huge string\n");
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case WORKMAN:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_WORKMAN);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_COLEMAK);
-      }
-      return false;
-      break;
-    case COLEMAK_MOD_DH:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_COLEMAK_MOD_DH);
-      }
-      return false;
-      break;
-    case DVORAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_DVORAK);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/keyhive/ut472/keymaps/annihilator6000/readme.md b/keyboards/keyhive/ut472/keymaps/annihilator6000/readme.md
deleted file mode 100644
index 59469b7b553..00000000000
--- a/keyboards/keyhive/ut472/keymaps/annihilator6000/readme.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# UT47.2 Planck-style layout switching
-
-Has layouts for Qwerty, Workman, Colemak, Colemak-Mod-DH, and Dvorak. Qwerty is the default layout. Layouts are switched Planck-style using momentary layer keys 1 and 2 (MO(1) and MO(2)) at the same time and pressing one of the H, J, K, L, or ; keys (this is while on the Qwerty layout - adjust if on another layout). See Layer 8 below for layout keys.
-
-You can load the UT472_Annihilator6000_Configurator_file.json file in the [QMK Configurator](https://config.qmk.fm/#/ut472/LAYOUT) if you want to check out the configuration there or easily modify it.
-
-Make example for this keyboard (after setting up your build environment):
-
-    make ut472:Annihilator6000
-
-See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
-
-![UT47.2 layout image](https://i.imgur.com/lICX4uz.png)
-
-[KLE](http://www.keyboard-layout-editor.com/##@@_y:0%3B&=Esc&=Q&=W&=E&=R&=T&=Y&=U&=I&=O&=P&_w:1.5%3B&=Back%20Space&_x:0.25&a:4&f:4&w:4&h:4&d:true%3B&=%3Cb%3EGNAP!%3C%2F%2Fb%3E%3Cp%3E%3Cp%3EMinimum%20stagger%3Cp%3E47%20key%20layout%3B&@_a:7&f:3&w:1.25%3B&=Tab&=A&=S&=D&=F&=G&=H&=J&=K&=L&=%2F%3B&_w:1.25%3B&=%27%3B&@_w:1.5%3B&=Shift&=Z&=X&=C&=V&=B&=N&=M&=,&=.&=%2F%2F&=Return%3B&@=Ctrl&=Alt&=Super&=Menu&_w:1.25%3B&=%2F&dArr%2F%3B&_w:2%3B&=&_w:1.25%3B&=%2F&uArr%2F%3B&=%2F&larr%2F%3B&=%2F&darr%2F%3B&=%2F&uarr%2F%3B&=%2F&rarr%2F%3B%3B&=undefined)
diff --git a/keyboards/keyhive/ut472/keymaps/gardego5/keymap.c b/keyboards/keyhive/ut472/keymaps/gardego5/keymap.c
deleted file mode 100644
index f629766b280..00000000000
--- a/keyboards/keyhive/ut472/keymaps/gardego5/keymap.c
+++ /dev/null
@@ -1,116 +0,0 @@
-/* Copyright 2022 Garrett Davis (@Gardego5)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-
-/* This controls special press and hold keys.
- * Maps right arrow to F15 when held, to be used for push to talk.
- */
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case LT(0, KC_RIGHT):
-            if (!record->tap.count) {
-                if (record->event.pressed) {
-                    register_code16(KC_F15);
-                } else {
-                    unregister_code16(KC_F15);
-                }
-            return false;
-        }
-        return true;
-    }
-
-  return true;
-}
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /* Base Layer
-   * ,-------------------------------------------------------------------------.
-   * | Esc |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |Bspace |
-   * |-------------------------------------------------------------------------+
-   * | Tab  |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |Sh/Ent|
-   * |-------------------------------------------------------------------------+
-   * | Shift |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  |  '  |
-   * |-------------------------------------------------------------------------+
-   * | Ctrl| Alt |  L3 | Gui |  L2  |   Space   |  L1  | Left| Down|  Up|Rt/F15|
-   * `-------------------------------------------------------------------------'
-   */
-
-LAYOUT(
-KC_ESC , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_BSPC,
-KC_TAB , KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, SC_SENT,
-KC_LSFT, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_QUOT,
-KC_LCTL, KC_LALT, MO(3)  , KC_LGUI, MO(2)  ,     KC_SPC      , MO(1)  , KC_LEFT, KC_DOWN, KC_UP  , LT(0, KC_RIGHT)
-),
-
-  /* FN Layer 1
-   * ,-------------------------------------------------------------------------.
-   * | ` ~ |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  | Delete|
-   * |-------------------------------------------------------------------------+
-   * | Tab  |  <  |  >  |  (  |  )  |     |     |  -  |  =  |  [  |  ]  |Sh/Ent|
-   * |-------------------------------------------------------------------------+
-   * | Shift |     |     |     |     |     |     |     |  ,  |  .  |  \  |Caps |
-   * |-------------------------------------------------------------------------+
-   * | Ctrl| Alt |  L3 | Gui |  L2  |   Space   |  L1  | Home| PgDn| PgUp| End |
-   * `-------------------------------------------------------------------------'
-   */
-
-LAYOUT( /* Right */
-KC_GRV , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_DEL ,
-KC_TRNS, KC_LT  , KC_GT  , KC_LPRN, KC_RPRN, KC_NO  , KC_NO  , KC_MINS, KC_EQL , KC_LBRC, KC_RBRC, KC_TRNS,
-KC_TRNS, KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_TRNS, KC_TRNS, KC_BSLS, KC_CAPS,
-KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS     , KC_TRNS, KC_HOME, KC_PGDN, KC_PGUP, KC_END
-),
-
-  /* FN Layer 2
-   * ,-------------------------------------------------------------------------.
-   * |  F1 |  F2 |  F3 |  F4 |  F5 |  F6 |  F7 |  F8 |  F9 | F10 | F11 |  F12  |
-   * |-------------------------------------------------------------------------+
-   * | Tab  |     | Mute| Vol-| Vol+|     |     | Left| Down|  Up |Right|Sh/Ent|
-   * |-------------------------------------------------------------------------+
-   * | Shift |     |Med<<|Pause|Med>>|     |     |     |LMous|RMous|     |     |
-   * |-------------------------------------------------------------------------+
-   * | Ctrl| Alt |  L3 | Gui |  L2  |   Space   |  L1  |<Mous|vMous|^Mous|>Mous|
-   * `-------------------------------------------------------------------------'
-   */
-
-LAYOUT( /* Left */
-KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 ,
-KC_TRNS, KC_NO  , KC_MUTE, KC_VOLD, KC_VOLU, KC_NO  , KC_NO  , KC_LEFT, KC_DOWN, KC_UP  , KC_RGHT, KC_TRNS,
-KC_TRNS, KC_NO  , KC_MPRV, KC_MPLY, KC_MNXT, KC_NO  , KC_NO  , KC_NO  , KC_BTN1, KC_BTN2, KC_NO  , KC_NO  ,
-KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS     , KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R
-),
-
-  /* FN Layer 3
-   * ,-------------------------------------------------------------------------.
-   * | Esc | RGB | RGB |     |     |     |#Lock|  7  |  8  |  9  |     |Bspace |
-   * |-------------------------------------------------------------------------+
-   * | Tab  |  /  |  *  |  -  |  +  |  =  |     |  4  |  5  |  6  |     |Sh/Ent|
-   * |-------------------------------------------------------------------------+
-   * | Shift |     |     |     |     |     |     |  1  |  2  |  3  |  Up |     |
-   * |-------------------------------------------------------------------------+
-   * | Ctrl| Alt |  L3 | Gui |  L2  |   Space   |   0  |  .  | Left| Down|Right|
-   * `-------------------------------------------------------------------------'
-   */
-
-LAYOUT( /* 3 */
-KC_ESC , RGB_TOG, RGB_MOD, KC_NO  , KC_NO  , KC_NO  , KC_NUM , KC_P7  , KC_P8  , KC_P9  , KC_NO  , KC_BSPC,
-KC_TRNS, KC_PSLS, KC_PAST, KC_PMNS, KC_PPLS, KC_PEQL, KC_NO  , KC_P4  , KC_P5  , KC_P6  , KC_NO  , KC_TRNS,
-KC_TRNS, KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_NO  , KC_P1  , KC_P2  , KC_P3  , KC_UP  , KC_NO  ,
-KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS     , KC_P0  , KC_PDOT, KC_LEFT, KC_DOWN, KC_RGHT
-),
-};
diff --git a/keyboards/keyhive/ut472/keymaps/gardego5/readme.md b/keyboards/keyhive/ut472/keymaps/gardego5/readme.md
deleted file mode 100644
index 44655ba3465..00000000000
--- a/keyboards/keyhive/ut472/keymaps/gardego5/readme.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Gardego5's modified layout
-
-![layout image](https://i.imgur.com/eM6YHcY.jpeg)
-
-This layout is designed to be familiar coming from a full-sized keyboard, if you like vim movement keys. Has (hopefully) friendly media keys, and F15 in the bottom right when held, so that you can bind F15 to push to talk.
diff --git a/keyboards/keyhive/ut472/keymaps/stefanopace/config.h b/keyboards/keyhive/ut472/keymaps/stefanopace/config.h
deleted file mode 100644
index d16927d3c9c..00000000000
--- a/keyboards/keyhive/ut472/keymaps/stefanopace/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright 2021 Stefano Pace
- * 
- * This program is free software: you can redistribute it and/or modify 
- * it under the terms of the GNU General Public License as published by 
- * the Free Software Foundation, either version 2 of the License, or 
- * (at your option) any later version. 
- * 
- * This program is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
- * GNU General Public License for more details. 
- * 
- * You should have received a copy of the GNU General Public License 
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
- */
-
-#pragma once
-
-#define TAPPING_TOGGLE 3
-#define TAPPING_TERM 175
-#define PERMISSIVE_HOLD
diff --git a/keyboards/keyhive/ut472/keymaps/stefanopace/keymap.c b/keyboards/keyhive/ut472/keymaps/stefanopace/keymap.c
deleted file mode 100644
index 9d1780b1616..00000000000
--- a/keyboards/keyhive/ut472/keymaps/stefanopace/keymap.c
+++ /dev/null
@@ -1,185 +0,0 @@
-/* Copyright 2021 Stefano Pace
- * 
- * This program is free software: you can redistribute it and/or modify 
- * it under the terms of the GNU General Public License as published by 
- * the Free Software Foundation, either version 2 of the License, or 
- * (at your option) any later version. 
- * 
- * This program is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
- * GNU General Public License for more details. 
- * 
- * You should have received a copy of the GNU General Public License 
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
- */ 
-
-#include QMK_KEYBOARD_H
-
-enum layers {
-    _QWE,
-    _SYM,
-    _NUM,
-    _NAV,
-    _NV2,
-    _FN,
-};
-
-enum tapdance {
-    TD_SINGLE_QUOTE_DOUBLE_QUOTES,
-    TD_APP_CAPS_LOCK,
-};
-
-tap_dance_action_t tap_dance_actions[] = {
-    [TD_SINGLE_QUOTE_DOUBLE_QUOTES] = ACTION_TAP_DANCE_DOUBLE(KC_QUOT, KC_DQUO),
-    [TD_APP_CAPS_LOCK]              = ACTION_TAP_DANCE_DOUBLE(KC_APP, KC_CAPS),
-};
-
-#define LTFN_ESC LT(_FN, KC_ESC)
-#define LTSYM_F LT(_SYM, KC_F)
-#define LTSYM_J LT(_SYM, KC_J)
-#define TD_QUOT TD(TD_SINGLE_QUOTE_DOUBLE_QUOTES)
-#define TD_APP_CAPS TD(TD_APP_CAPS_LOCK)
-#define SFT_SLSH RSFT_T(KC_SLSH)
-
-#define UNDO LCTL(KC_Z)
-#define REDO LCTL(KC_Y)
-#define CUT LCTL(KC_X)
-#define COPY LCTL(KC_C)
-#define PASTE LCTL(KC_V)
-
-#define CUSTOM1 LCA(KC_EQL)
-#define CUSTOM2 MEH(KC_PLUS)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-       /* Base qwerty Layer
-        * 
-        * Holding Esc activates the Fn layer
-        * Holding F or J activates Symbols layer
-        * Holding / acts as Shift
-        * Double tap on ' acts as "
-        * Double tap on Menu activates CapsLock
-        * 
-        * Nav and Num layers are togglable with triple tapping on relative keys while holding them will activate layers momentarily.
-        * 
-        * I personally use Pause to mute/unmute microphone
-        * I personally use Menu to act as compose key to input accented letters
-        * 
-        * ,----------------------------------------------------------------------------.
-        * |Esc-Fn|  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  | Bspace  |
-        * |----------------------------------------------------------------------------+
-        * | Tab   |  A  |  S  |  D  |F-Sym|  G  |  H  |J-Sym|  K  |  L  |  '*  | Enter |
-        * |----------------------------------------------------------------------------+
-        * | Shift  |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |/-Shift|Menu*|
-        * |----------------------------------------------------------------------------+
-        * | Ctrl | Gui | Alt |Pause|(Nav) |   Space   |(Num) |Left |Down | Up   |Right |
-        * `----------------------------------------------------------------------------'
-        */
-    [_QWE] = LAYOUT(
-        LTFN_ESC,  KC_Q,     KC_W,     KC_E,     KC_R,      KC_T,    KC_Y,    KC_U,      KC_I,     KC_O,     KC_P,      KC_BSPC,
-        KC_TAB,    KC_A,     KC_S,     KC_D,     LTSYM_F,   KC_G,    KC_H,    LTSYM_J,   KC_K,     KC_L,     TD_QUOT,   KC_ENT,
-        KC_LSFT,   KC_Z,     KC_X,     KC_C,     KC_V,      KC_B,    KC_N,    KC_M,      KC_COMM,  KC_DOT,   SFT_SLSH,  TD_APP_CAPS,
-        KC_LCTL,   KC_LGUI,  KC_LALT,  KC_PAUS,  TT(_NAV),       KC_SPC,      TT(_NUM),  KC_LEFT,  KC_DOWN,  KC_UP,     KC_RGHT
-    ),
-
-       /* Symbols Layer (Sym)
-        * ,----------------------------------------------------------------------------.
-        * |      |  `  |  @  |  #  |  $  |  %  |     |  &  |  *  |  ^  |     |  Del    |
-        * |----------------------------------------------------------------------------+
-        * |       |  ~  |  {  |  -  |  (  |  +  |  =  |  )  |  |  |  }  |   ;  |       |
-        * |----------------------------------------------------------------------------+
-        * |        |  !  |  <  |  _  |  [  |     |  :  |  ]  |  \  |  >  |  ?   |      |
-        * |----------------------------------------------------------------------------+
-        * |      |     |     |     |     |            |      |     |     |      |      |
-        * `----------------------------------------------------------------------------'
-        */
-    [_SYM] = LAYOUT(
-        _______,  KC_GRV,   KC_AT,    KC_HASH,  KC_DLR,   KC_PERC,  XXXXXXX,  KC_AMPR,  KC_ASTR,  KC_CIRC,  XXXXXXX,  KC_DEL,
-        _______,  KC_TILD,  KC_LCBR,  KC_MINS,  KC_LPRN,  KC_PLUS,  KC_EQL,   KC_RPRN,  KC_PIPE,  KC_RCBR,  KC_SCLN,  _______,
-        _______,  KC_EXLM,  KC_LT,    KC_UNDS,  KC_LBRC,  XXXXXXX,  KC_COLN,  KC_RBRC,  KC_BSLS,  KC_GT,    KC_QUES,  _______,
-        _______,  _______,  _______,  _______,  XXXXXXX,       _______,       XXXXXXX,  _______,  _______,  _______,  _______
-    ),
-
-       /* Numbers Layer (Num)
-        *
-        * Custom2 will act as Ctrl+Shift+Alt+"+" that can be used for example to spawn new terminal instances
-        * ,----------------------------------------------------------------------------.
-        * |      |     |     |     |     |    |Ctrl-y|     |     |     |     |         |
-        * |----------------------------------------------------------------------------+
-        * |       |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0   |       |
-        * |----------------------------------------------------------------------------+
-        * |        |Ctr-z|Ctr-x|Ctr-c|Ctr-v|     |     |     |  ,  |  .  |      |      |
-        * |----------------------------------------------------------------------------+
-        * |      |     |     |    |Custom2|           |      |     |     |      |      |
-        * `----------------------------------------------------------------------------'
-        */
-    [_NUM] = LAYOUT(
-        _______,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,   XXXXXXX,  REDO,     XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  _______,
-        _______,  KC_1,     KC_2,     KC_3,     KC_4,      KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     _______,
-        _______,  UNDO,     CUT,      COPY,     PASTE,     XXXXXXX,  XXXXXXX,  XXXXXXX,  KC_COMM,  KC_DOT,   _______,  _______,
-        _______,  _______,  _______,  _______,  CUSTOM2,        _______,       _______,  _______,  _______,  _______,  _______
-    ),
-
-       /* Navigation Layer (Nav)
-        * 
-        * This layer is optimized for gui handling and code navigation
-        * It makes easier to reach common key combinations as: Ctrl+Shift, Gui+Shift, Ctrl+Alt, Alt+Tab, Ctrl+F, Ctrl+S
-        * 
-        * Holding (Nav2) replaces arrow keys with Home PgDown PgUp End
-        * 
-        * 
-        * Custom1 will act as Ctrl+Alt+"=" that can be used for example to focus last spawned terminal
-        * 
-        * ,----------------------------------------------------------------------------.
-        * |      |Shift|Shift|Shift|     |     |     |     |     |     |     |         |
-        * |----------------------------------------------------------------------------+
-        * |(Nav2) |Ctrl | Gui | Alt | Tab |     |Left |Down | Up  |Right|   F  |       |
-        * |----------------------------------------------------------------------------+
-        * |        |Ctr-z|Ctr-x|Ctr-c|Ctr-v|     |     |     |  L  |     |  A   |  S   |
-        * |----------------------------------------------------------------------------+
-        * |      |     |     |     |     |            |Custom1|    |     |      |      |
-        * `----------------------------------------------------------------------------'
-        */
-    [_NAV] = LAYOUT(
-        _______,   KC_LSFT,  KC_LSFT,  KC_LSFT,  _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______,
-        MO(_NV2),  KC_LCTL,  KC_LGUI,  KC_LALT,  KC_TAB,   _______,  KC_LEFT,  KC_DOWN,   KC_UP,    KC_RGHT,  KC_F,     _______,
-        _______,   UNDO,     CUT,      COPY,     PASTE,    _______,  _______,  _______,   KC_L,     KC_DOT,   KC_A,     KC_S,
-        _______,   _______,  _______,  _______,  _______,       _______,       CUSTOM1,   _______,  _______,  _______,  _______
-    ),
-
-       /* Speed Navigation Layer (Nav2)
-        * ,----------------------------------------------------------------------------.
-        * |      |     |     |     |     |     |     |     |     |     |     |         |
-        * |----------------------------------------------------------------------------+
-        * |       |     |     |     |     |     |Home |PgUp |PgDown|End |      |       |
-        * |----------------------------------------------------------------------------+
-        * |        |     |     |     |     |     |     |     |     |     |      |      |
-        * |----------------------------------------------------------------------------+
-        * |      |     |     |     |     |            |      |     |     |      |Reset |
-        * `----------------------------------------------------------------------------'
-        */
-    [_NV2] = LAYOUT(
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  KC_HOME,  KC_PGDN,  KC_PGUP,  KC_END,   _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,       _______,       _______,  _______,  _______,  _______,  QK_BOOT
-    ),
-
-       /* Fn Layer (Fn)
-        * ,----------------------------------------------------------------------------.
-        * |      |     |     |     |     |     |     | F1  | F2  | F3  | F10 |         |
-        * |----------------------------------------------------------------------------+
-        * | Print |     |     |     |     |     |     | F4  | F5  | F6  | F11  |       |
-        * |----------------------------------------------------------------------------+
-        * |ScrLock |     |     |     |     |     |     | F7  | F8  | F9  | F12  |      |
-        * |----------------------------------------------------------------------------+
-        * | Ins  |     |     |     |     |            |      |     |     |      |      |
-        * `----------------------------------------------------------------------------'
-        */
-    [_FN] = LAYOUT(
-        _______,  RGB_TOG, RGB_RMOD, RGB_MOD, RGB_HUD,  RGB_HUI,  XXXXXXX,  KC_F1,    KC_F2,    KC_F3,    KC_F10,  XXXXXXX,
-        KC_PSCR,  RGB_SAD, RGB_SAI,  RGB_VAD, RGB_VAI,  RGB_SPD,  RGB_SPI,  KC_F4,    KC_F5,    KC_F6,    KC_F11,  XXXXXXX,
-        KC_SCRL,  RGB_M_P, RGB_M_B,  RGB_M_R, RGB_M_SW, RGB_M_SN, RGB_M_K,  KC_F7,    KC_F8,    KC_F9,    KC_F12,  XXXXXXX,
-        KC_INS,   XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX,       XXXXXXX,       XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX, XXXXXXX
-    ),
-};
diff --git a/keyboards/keyhive/ut472/keymaps/stefanopace/readme.md b/keyboards/keyhive/ut472/keymaps/stefanopace/readme.md
deleted file mode 100644
index 63cef0934c2..00000000000
--- a/keyboards/keyhive/ut472/keymaps/stefanopace/readme.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# Stefanopace's layout
-
-This layout is optimized for developers workflow.
-It includes layouts for symbols, numbers and text/gui navigation, all activables
-and usable without leaving the homerow position.
-More details are explained in the keymap.c file.
diff --git a/keyboards/keyhive/ut472/keymaps/stefanopace/rules.mk b/keyboards/keyhive/ut472/keymaps/stefanopace/rules.mk
deleted file mode 100644
index d941780558b..00000000000
--- a/keyboards/keyhive/ut472/keymaps/stefanopace/rules.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-TAP_DANCE_ENABLE = yes
-
-MOUSEKEY_ENABLE = no 
-EXTRAKEY_ENABLE = no
-
-BACKLIGHT_ENABLE = no
-RGBLIGHT_ENABLE = yes
diff --git a/keyboards/keyprez/unicorn/keymaps/jorge/keymap.c b/keyboards/keyprez/unicorn/keymaps/jorge/keymap.c
deleted file mode 100644
index 6c21a3874cd..00000000000
--- a/keyboards/keyprez/unicorn/keymaps/jorge/keymap.c
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2022 Keyprez (https://github.com/keyprez)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-
-// Defines names for use in layer keycodes and the keymap
-enum layer_names {
-    _BASE,
-    _FN,
-    _CMD
-};
-
-#define FN   MO(_FN)
-#define CMD   MO(_CMD)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_BASE] = LAYOUT(
-        KC_GRV, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_HOME, KC_MUTE,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,            KC_END, KC_DEL,
-        KC_ESC, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_PGUP, KC_INSERT,
-        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, KC_COPY,
-        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,  FN,                             KC_SPC,  KC_RALT, FN,      KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_PASTE
-    ),
-
-    [_FN] = LAYOUT(
-        _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, KC_BRIU, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_BRID, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_CALC
-    ),
-};
-
diff --git a/keyboards/keyprez/unicorn/keymaps/jorge/readme.md b/keyboards/keyprez/unicorn/keymaps/jorge/readme.md
deleted file mode 100644
index f3e626cc76d..00000000000
--- a/keyboards/keyprez/unicorn/keymaps/jorge/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The default keymap for unicorn
diff --git a/keyboards/keyspensory/kp60/info.json b/keyboards/keyspensory/kp60/info.json
index 469faa2cd26..1172e14d455 100644
--- a/keyboards/keyspensory/kp60/info.json
+++ b/keyboards/keyspensory/kp60/info.json
@@ -22,9 +22,7 @@
         "extrakey": true,
         "mousekey": true,
         "nkro": true,
-        "rgblight": true,
-        "backlight": false,
-        "audio": false
+        "rgblight": true
     },
     "rgblight": {
         "led_count": 8,
diff --git a/keyboards/kin80/keymaps/andrew/keymap.c b/keyboards/kin80/keymaps/andrew/keymap.c
deleted file mode 100644
index 1031396880e..00000000000
--- a/keyboards/kin80/keymaps/andrew/keymap.c
+++ /dev/null
@@ -1,127 +0,0 @@
-/* Copyright 2022 DmNosachev
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
- 
-#include QMK_KEYBOARD_H
-#include "version.h"
-
-enum layer_names {
-    _BASE, // default layer
-    _L2   // macros
-};
-
-enum custom_keycodes {
-  PLACEHOLDER = SAFE_RANGE, // can always be here
-  VRSN,
-  EMAIL1				// Macro example (type email address)
-};
-
-/*
-*
-*
-* ,-------------------------------------------,                           ,-------------------------------------------,
-* |  Esc   |  F2  |  F3  |  F4  |  F5  |  F6  |                           |  F7  |  F8  |  F9  |  F10 |  F11 |   F12  |
-* |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
-* |   +=   |   1  |   2  |   3  |   4  |   5  |                           |   6  |   7  |   8  |   9  |   0  |   -    |
-* |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
-* |  Tab   |   Q  |   W  |   E  |   R  |   T  |                           |   Y  |   U  |   I  |   O  |   P  |   \|   |
-* |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
-* |  Caps  |   A  |   S  |   D  |   F  |   G  |                           |   H  |   J  |   K  |   L  |  ;:  | '"/L2  |
-* |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
-* | Shift  |   Z  |   X  |   C  |   V  |   B  |                           |   N  |   M  |  <,  |  >.  |  /?  | Shift  |
-* `--------+------+------+------+------+-------                           `------+------+------+------+------+--------'
-*          |`~/L2 |  <,  | Left | Right|                                         |  Up  | Down |  [   |   ]  |
-*          `---------------------------'                                         `---------------------------'
-*                                        ,-------------.         ,-------------.
-*                                        | Cmd  | Opt  |         | Ctrl | Cmd  |
-*                                 ,------|------|------|         |------+------+------.
-*                                 |      |      | Home |         | PgUp |      |      |
-*                                 |Backsp|Delete|------|         |------|Enter | Space|
-*                                 |      |      | End  |         | PgDn |      |      |
-*                                 `--------------------'         `--------------------'
-*/
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[_BASE] = LAYOUT(
-    KC_ESC,     KC_F2,  KC_F3,   KC_F4,    KC_F5,   KC_F6,     KC_F7,  KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-    KC_EQL,     KC_1,   KC_2,    KC_3,     KC_4,    KC_5,      KC_6,   KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
-    KC_TAB,     KC_Q,   KC_W,    KC_E,     KC_R,    KC_T,      KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
-    KC_CAPS,    KC_A,   KC_S,    KC_D,     KC_F,    KC_G,      KC_H,   KC_J,    KC_K,    KC_L,    KC_SCLN, LT(_L2, KC_QUOT),
-    KC_LSFT,    KC_Z,   KC_X,    KC_C,     KC_V,    KC_B,      KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-       LT(_L2, KC_GRV), KC_COMM, KC_LEFT,  KC_RIGHT,                   KC_UP,   KC_DOWN, KC_LBRC, KC_RBRC,
-			                           KC_LCMD,  KC_LOPT,                    KC_RCTL,  KC_RCMD,
-                                           KC_HOME,                    KC_PGUP,
-                        KC_BSPC, KC_DEL,   KC_END,                     KC_PGDN, KC_ENTER, KC_SPC
-    ),
-/*
-*
-*
-* ,-------------------------------------------,                           ,-------------------------------------------,
-* |   F1   |      |      |      |      |      |                           |EMAIL1|      |      |PrnSc | ScrLk| Pause  |
-* |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
-* |        |      |      |      |      |      |                           | VRSN |      |      |      |      |        |
-* |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
-* |        |      |  MbL |  MUp |  MbR |      |                           |QK_BOOT |      |      |      |      |        |
-* |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
-* |        |      |  ML  |  MDn |  MR  |      |                           |      |      |      |      |      |        |
-* |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
-* |        |      |      |      |      |      |                           |      |      |      |      |      |        |
-* `--------+------+------+------+------+------'                           `------+------+------+------+------+--------'
-*          |      |Insert|      |      |                                         |      |      |      |      |
-*          `---------------------------'                                         `---------------------------'
-*                                        ,-------------.         ,-------------.
-*                                        |      |      |         |      |      |
-*                                 ,------|------|------|         |------+------+------.
-*                                 |      |      | MWh+ |         |      |      |      |
-*                                 |      |      |------|         |------|      |      |
-*                                 |      |      | MWh- |         |      |      |      |
-*                                 `--------------------'         `--------------------'
-*/
-[_L2] = LAYOUT(
-    KC_F1,   _______, _______, _______, _______, _______,   EMAIL1,  _______, _______, KC_PSCR, KC_SCRL, KC_PAUS,
-    _______, _______, _______, _______, _______, _______,   VRSN,    _______, _______, _______, _______, _______,
-    _______, _______, KC_BTN1, KC_MS_U, KC_BTN2, _______, QK_BOOT, _______, _______, _______, _______, _______,
-    _______, _______, KC_MS_L, KC_MS_D, KC_MS_R, _______,   _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______,   _______, _______, _______, _______, _______, _______,
-             _______, KC_INS,  _______, _______,                     _______, _______, _______, _______,
-			                                  _______, _______,   _______, _______,
-                                                 KC_WH_U,   _______,
-                               _______, _______, KC_WH_D,   _______, _______, _______
-    )
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-	  case VRSN:
-      if (record->event.pressed) {
-        SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
-      }
-      return false;
-      break;
-	  
-	  case EMAIL1:
-      if (record->event.pressed) {
-        SEND_STRING("MyEmail@gmail.com");
-      }
-      return false;
-      break;
-  }
-  return true;
-}
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    writePin(LED4_PIN, layer_state_cmp(state, _L2));
-  return state;
-}
diff --git a/keyboards/kin80/keymaps/maxim/keymap.c b/keyboards/kin80/keymaps/maxim/keymap.c
deleted file mode 100644
index 1e1897f3998..00000000000
--- a/keyboards/kin80/keymaps/maxim/keymap.c
+++ /dev/null
@@ -1,215 +0,0 @@
-/* Copyright 2022 DmNosachev
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
- 
-#include QMK_KEYBOARD_H
-#include "version.h"
-
-enum layer_names {
-    _BASE, // default layer
-    _NM,  // numpad on right, mouse on left
-    _MC   // macros
-};
-
-#define MC1 COMP_FR_QUOTES
-#define MC2 COMP_NBSP_EM_DASH
-#define MC3 COMP_NBSP
-
-enum custom_keycodes {
-  PLACEHOLDER = SAFE_RANGE, // can always be here
-  VRSN,
-  COMP_FR_QUOTES,		// Compose: french quotes
-  COMP_NBSP_EM_DASH,	// Compose: nbsp followed by em dash
-  COMP_NBSP,			// Compose: nbsp
-  PWD1,					// Windows password
-  PWD2,					// Stand root password
-  PWD3,					// KP password
-  EMAIL1				// Gmail address
-};
-
-/*
-*
-*
-* ,--------------------------------------------                           --------------------------------------------.
-* |  Esc   |  F2  |  F3  |  F4  |  F5  |  F6  |                           |  F7  |  F8  |  F9  |  F10 | PrSc |  RAlt  |
-* |--------+------+------+------+------+------+                           +------+------+------+------+------+--------|
-* | +=/Alt |   1  |   2  |   3  |   4  |   5  |                           |   6  |   7  |   8  |   9  |   0  |   -    |
-* |--------+------+------+------+------+------|                           +------+------+------+------+------+--------|
-* |  Tab   |   Q  |   W  |   E  |   R  |   T  |                           |   Y  |   U  |   I  |   O  |   P  | \|     |
-* |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
-* |`~/NM   |   A  |   S  |   D  |   F  |   G  |                           |   H  |   J  |   K  |   L  |  ;:  | '"/NM  |
-* |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
-* | Shift  |   Z  |   X  |   C  |   V  |   B  |                           |   N  |   M  |  ,.  |  .>  |  /?  | Shift  |
-* `--------+------+------+------+------+-------                           `------+------+------+------+------+--------'
-*          |  MC  |C+Shft|   [  |   ]  |                                         | Left | Down |  Up  | Right|
-*          `---------------------------'                                         `---------------------------'
-*                                        ,-------------.         ,-------------.
-*                                        |  Ctl |Enter |         | Gui  | Ctrl |
-*                                 ,------|------|------|         |------+------+------.
-*                                 |      |      | Home |         | PgUp |      |      |
-*                                 |Space |Backsp|------|         |------|  Del | Enter|
-*                                 |      |      | End  |         | PgDn |      |      |
-*                                 `--------------------'         `--------------------'
-*/
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[_BASE] = LAYOUT(
-    KC_ESC,           KC_F2,  KC_F3,  KC_F4,         KC_F5,   KC_F6,   KC_F7,  KC_F8,  KC_F9,   KC_F10, KC_PSCR, KC_RALT,
-    LALT_T(KC_EQL),   KC_1,   KC_2,   KC_3,          KC_4,    KC_5,    KC_6,   KC_7,   KC_8,    KC_9,   KC_0,    KC_MINS,
-    KC_TAB,           KC_Q,   KC_W,   KC_E,          KC_R,    KC_T,    KC_Y,   KC_U,   KC_I,    KC_O,   KC_P,    KC_BSLS,
-    LCTL_T(KC_GRV),   KC_A,   KC_S,   KC_D,          KC_F,    KC_G,    KC_H,   KC_J,   KC_K,    KC_L,   KC_SCLN, LT(_NM, KC_QUOT),
-    KC_LSFT,          KC_Z,   KC_X,   KC_C,          KC_V,    KC_B,    KC_N,   KC_M,   KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
-                      MO(_MC), LCTL(KC_LSFT), KC_LBRC, KC_RBRC, KC_LEFT,KC_DOWN, KC_UP,  KC_RGHT,
-			                              MO(_NM),  KC_ENTER,                KC_RGUI,KC_RCTL,
-                                              KC_HOME,                 KC_PGUP,
-                             KC_SPC, KC_BSPC, KC_END,                  KC_PGDN,KC_DEL, KC_ENTER
-    ),
-/*
-*
-*
-* ,--------------------------------------------                           --------------------------------------------.
-* |   F1   |      |      |      |      |      |                           |      |      |      |      | F11  |  F12   |
-* |--------+------+------+------+------+------+                           +------+------+------+------+------+--------|
-* |        |      |      |      |      |      |                           |ScrLk |Numlck|  =   |  /   |  *   |        |
-* |--------+------+------+------+------+------|                           +------+------+------+------+------+--------|
-* |        |      |  MbL |  MUp |  MbR | Ins  |                           |CapsLk|  7   |  8   |  9   |  -   |        |
-* |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
-* |        |      |  ML  |  MDn |  MR  |      |                           |      |  4   |  5   |  6   |  +   |  L1    |
-* |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
-* |        |      |      |      |      |      |                           |  .   |  1   |  2   |  3   |Enter |        |
-* `--------+------+------+------+------+-------                           `------+------+------+------+------+--------'
-*          |      |      |      |      |                                         |      |      |      |      |
-*          `---------------------------'                                         `---------------------------'
-*                                        ,-------------.         ,-------------.
-*                                        |      |      |         |      |      |
-*                                 ,------|------|------|         |------+------+------.
-*                                 |      |      |MWhUp |         |      |      |      |
-*                                 |      |      |------|         |------|      |  0   |
-*                                 |      |      |MWhDn |         |      |      |      |
-*                                 `--------------------'         `--------------------'
-*/
-[_NM] = LAYOUT(
-    KC_F1,   _______, _______,  _______, _______, _______,  _______, _______, _______, _______,  KC_F11,  KC_F12,
-    _______, _______, _______, _______, _______, _______,   KC_SCRL, KC_NUM,  KC_PEQL, KC_PSLS, KC_PAST, _______,
-    _______, _______, KC_BTN1, KC_MS_U, KC_BTN2, KC_INS,    KC_CAPS, KC_P7,   KC_P8,   KC_P9,   KC_PMNS, _______,
-    _______, _______, KC_MS_L, KC_MS_D, KC_MS_R, _______,   _______, KC_P4,   KC_P5,   KC_P6,   KC_PPLS, _______,
-    _______, _______, _______, _______, _______, _______,   KC_PDOT, KC_P1,   KC_P2,   KC_P3,   KC_PENT, _______,
-             _______, _______, _______, _______,                     _______, _______, _______, _______,
-			                                  _______, _______,   _______, _______,
-                                                 KC_WH_U,   _______,
-                               _______, _______, KC_WH_D,   _______, _______, KC_P0
-    ),
-/*
-*
-*
-* ,--------------------------------------------                           --------------------------------------------.
-* | version|      |      |      |      |      |                           |email |      |      |      |      |        |
-* |--------+------+------+------+------+------+                           +------+------+------+------+------+--------|
-* |        |      |      |      |      |      |                           |      |      |      |      |      |   MC2  |
-* |--------+------+------+------+------+------|                           +------+------+------+------+------+--------|
-* |        |      |      |      |reset |      |                           |      |      |      |      |      |        |
-* |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
-* |        |      |      |      |      |      |                           |      |      |      |      |      |        |
-* |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
-* |        |      |      |      |      |      |                           |      |      |  MC1 |      |      |        |
-* `--------+------+------+------+------+-------                           `------+------+------+------+------+--------'
-*          |      |      |      |      |                                         |      |      |      |      |
-*          `---------------------------'                                         `---------------------------'
-*                                        ,-------------.         ,-------------.
-*                                        |      |      |         |      |      |
-*                                 ,------|------|------|         |------+------+------.
-*                                 |      |      |      |         |      |      |      |
-*                                 |  MC3 |      |------|         |------|      |      |
-*                                 |      |      |      |         |      |      |      |
-*                                 `--------------------'         `--------------------'
-*/
-[_MC] = LAYOUT(
-    VRSN,    _______, _______, _______, _______, _______,   EMAIL1,  _______, _______, PWD3,    PWD2,    PWD1,
-    _______, _______, _______, _______, _______, _______,   _______, _______, _______, _______, _______, MC2,
-    _______, _______, _______, _______, QK_BOOT, _______,   _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______,   _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______,   _______, _______, MC1,     _______, _______, _______,
-             _______, _______, _______, _______,                     _______, _______, _______, _______,
-			                                  _______, _______,   _______, _______,
-                                                 _______,   _______,
-                               MC3,     _______, _______,   _______, _______, _______
-    )
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-	  case VRSN:
-      if (record->event.pressed) {
-        SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
-      }
-      return false;
-      break;
-	  
-	  case COMP_FR_QUOTES:
-      if (record->event.pressed) {
-        SEND_STRING(SS_TAP(X_RALT)"<<"SS_TAP(X_RALT)">>"SS_TAP(X_LEFT));
-      }
-      return false;
-      break;
-	  
-	  case COMP_NBSP_EM_DASH:
-      if (record->event.pressed) {
-        SEND_STRING(SS_TAP(X_RALT)"  "SS_TAP(X_RALT)"--- ");
-      }
-      return false;
-      break;
-	  
-	  case COMP_NBSP:
-      if (record->event.pressed) {
-        SEND_STRING(SS_TAP(X_RALT)"  ");
-      }
-      return false;
-      break;
-	  
-    case PWD1:
-      if (record->event.pressed) {
-        SEND_STRING("password1"SS_TAP(X_ENTER));
-      }
-      return false;
-      break;
-	  
-	  case PWD2:
-      if (record->event.pressed) {
-        SEND_STRING("password2"SS_TAP(X_ENTER));
-      }
-      return false;
-      break;
-	  
-	  case PWD3:
-      if (record->event.pressed) {
-        SEND_STRING("password3"SS_TAP(X_ENTER));
-      }
-      return false;
-      break;
-	  
-	  case EMAIL1:
-      if (record->event.pressed) {
-        SEND_STRING("email@example.com");
-      }
-      return false;
-      break;
-  }
-  return true;
-}
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    writePin(LED4_PIN, layer_state_cmp(state, _MC));
-  return state;
-}
diff --git a/keyboards/kin80/keymaps/roman/keymap.c b/keyboards/kin80/keymaps/roman/keymap.c
deleted file mode 100644
index 34620da97a8..00000000000
--- a/keyboards/kin80/keymaps/roman/keymap.c
+++ /dev/null
@@ -1,134 +0,0 @@
-/* Copyright 2022 DmNosachev
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-#include "version.h"
-
-enum layer_names {
-    _BASE, // default layer
-    _L2   // macros
-};
-
-enum custom_keycodes {
-  PLACEHOLDER = SAFE_RANGE, // can always be here
-  VRSN,
-  EMAIL1				// Macro example (type email address)
-};
-
-/*
-*
-*
-* ,-------------------------------------------,                           ,-------------------------------------------,
-* |  Esc   |  F2  |  F3  |  F4  |  F5  |  F6  |                           |  F7  |  F8  |  F9  |  F10 |  F11 |   F12  |
-* |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
-* |   +=   |   1  |   2  |   3  |   4  |   5  |                           |   6  |   7  |   8  |   9  |   0  |   -    |
-* |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
-* |  Tab   |   Q  |   W  |   E  |   R  |   T  |                           |   Y  |   U  |   I  |   O  |   P  |   \|   |
-* |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
-* |  Caps  |   A  |   S  |   D  |   F  |   G  |                           |   H  |   J  |   K  |   L  |  ;:  | '"/L2  |
-* |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
-* | Shift  |   Z  |   X  |   C  |   V  |   B  |                           |   N  |   M  |  <,  |  >.  |  /?  | Shift  |
-* `--------+------+------+------+------+-------                           `------+------+------+------+------+--------'
-*          |`~/L2 |  <,  | Left | Right|                                         |  Up  | Down |  [   |   ]  |
-*          `---------------------------'                                         `---------------------------'
-*                                        ,-------------.         ,-------------.
-*                                        |LCtrl |  Alt |         | GUI  |Shift |
-*                                 ,------|------|------|         |------+------+------.
-*                                 |      |      | Home |         | PgUp |      |      |
-*                                 |Backsp|Delete|------|         |------|Enter | Space|
-*                                 |      |      | End  |         | PgDn |      |      |
-*                                 `--------------------'         `--------------------'
-*/
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[_BASE] = LAYOUT(
-    KC_ESC,     KC_F2,  KC_F3,   KC_F4,    KC_F5,   KC_F6,     KC_F7,  KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-    KC_EQL,     KC_1,   KC_2,    KC_3,     KC_4,    KC_5,      KC_6,   KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
-    KC_TAB,     KC_Q,   KC_W,    KC_E,     KC_R,    KC_T,      KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
-    KC_CAPS,    KC_A,   KC_S,    KC_D,     KC_F,    KC_G,      KC_H,   KC_J,    KC_K,    KC_L,    KC_SCLN, LT(_L2, KC_QUOT),
-    KC_LSFT,    KC_Z,   KC_X,    KC_C,     KC_V,    KC_B,      KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-       LT(_L2, KC_GRV), KC_COMM, KC_LEFT,  KC_RIGHT,                   KC_UP,   KC_DOWN, KC_LBRC, KC_RBRC,
-			                           KC_LCTL,  KC_LALT,                    KC_RGUI, KC_RSFT,
-                                           KC_HOME,                    KC_PGUP,
-                        KC_BSPC, KC_DEL,   KC_END,                     KC_PGDN, KC_ENTER, KC_SPC
-    ),
-/*
-*
-*
-* ,-------------------------------------------,                           ,-------------------------------------------,
-* |   F1   |      |      |      |      |      |                           |EMAIL1|      |      |PrnSc | ScrLk| Pause  |
-* |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
-* |        |      |      |      |      |      |                           | VRSN |      |      |      |      |        |
-* |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
-* |        |      |  MbL |  MUp |  MbR |      |                           |      |      |      |      |      |        |
-* |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
-* |        |      |  ML  |  MDn |  MR  |      |                           |      |      |      |      |      |        |
-* |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
-* |        |      |      |      |      |      |                           |      |      |      |      |      |        |
-* `--------+------+------+------+------+------'                           `------+------+------+------+------+--------'
-*          |      |Insert|      |      |                                         |      |      |      |      |
-*          `---------------------------'                                         `---------------------------'
-*                                        ,-------------.         ,-------------.
-*                                        |      |      |         | Ralt |RCtrl |
-*                                 ,------|------|------|         |------+------+------.
-*                                 |      |      | MWh+ |         |      |      |      |
-*                                 |      |      |------|         |------|      |      |
-*                                 |      |      | MWh- |         |      |      |      |
-*                                 `--------------------'         `--------------------'
-*/
-[_L2] = LAYOUT(
-    KC_F1,   _______, _______, _______, _______, _______,   EMAIL1,  _______, _______, KC_PSCR, KC_SCRL, KC_PAUS,
-    _______, _______, _______, _______, _______, _______,   VRSN,    _______, _______, _______, _______, _______,
-    _______, _______, KC_BTN1, KC_MS_U, KC_BTN2, _______,   _______, _______, _______, _______, _______, _______,
-    _______, _______, KC_MS_L, KC_MS_D, KC_MS_R, _______,   _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______,   _______, _______, _______, _______, _______, _______,
-             _______, KC_INS,  _______, _______,                     _______, _______, _______, _______,
-			                                  _______, _______,   _______, _______,
-                                                 KC_WH_U,   _______,
-                               _______, _______, KC_WH_D,   _______, _______, _______
-    )
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-	  case VRSN:
-      if (record->event.pressed) {
-        SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
-      }
-      return false;
-      break;
-	  
-	  case EMAIL1:
-      if (record->event.pressed) {
-        SEND_STRING("MyEmail@gmail.com");
-      }
-      return false;
-      break;
-  }
-  return true;
-}
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    switch (get_highest_layer(state)) {
-    case _L2:
-        writePinHigh(LED4_PIN);
-        break;
-    default: //  for any other layers, or the default layer
-        writePinLow(LED4_PIN);
-        break;
-    }
-  return state;
-}
diff --git a/keyboards/kinesis/alvicstep/info.json b/keyboards/kinesis/alvicstep/info.json
index 293b0168a40..951f01203ca 100644
--- a/keyboards/kinesis/alvicstep/info.json
+++ b/keyboards/kinesis/alvicstep/info.json
@@ -12,9 +12,7 @@
         "command": false,
         "mousekey": true,
         "extrakey": true,
-        "nkro": true,
-        "audio": false,
-        "backlight": false
+        "nkro": true
     },
     "processor": "at90usb1286",
     "bootloader": "halfkay",
diff --git a/keyboards/kinesis/kint2pp/info.json b/keyboards/kinesis/kint2pp/info.json
index ecf86658a84..48d77942db0 100644
--- a/keyboards/kinesis/kint2pp/info.json
+++ b/keyboards/kinesis/kint2pp/info.json
@@ -13,9 +13,7 @@
         "command": false,
         "mousekey": true,
         "extrakey": true,
-        "nkro": true,
-        "audio": false,
-        "backlight": false
+        "nkro": true
     },
     "build": {
         "debounce_type": "sym_eager_pk"
diff --git a/keyboards/kinesis/kint36/info.json b/keyboards/kinesis/kint36/info.json
index 969f819f80e..592fade4cb4 100644
--- a/keyboards/kinesis/kint36/info.json
+++ b/keyboards/kinesis/kint36/info.json
@@ -13,9 +13,7 @@
         "command": false,
         "mousekey": true,
         "extrakey": true,
-        "nkro": true,
-        "audio": false,
-        "backlight": false
+        "nkro": true
     },
     "build": {
         "debounce_type": "sym_eager_pk"
diff --git a/keyboards/kinesis/kint36/keymaps/kzar/config.h b/keyboards/kinesis/kint36/keymaps/kzar/config.h
deleted file mode 100644
index 6b03aa6a70e..00000000000
--- a/keyboards/kinesis/kint36/keymaps/kzar/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2021 Dave Vandyke <kzar@kzar.co.uk>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#undef LED_COMPOSE_PIN
diff --git a/keyboards/kinesis/kint36/keymaps/kzar/keymap.c b/keyboards/kinesis/kint36/keymaps/kzar/keymap.c
deleted file mode 100644
index 3685e0fe57a..00000000000
--- a/keyboards/kinesis/kint36/keymaps/kzar/keymap.c
+++ /dev/null
@@ -1,405 +0,0 @@
-/* Copyright 2021 Dave Vandyke <kzar@kzar.co.uk>,
- *   Based upon Xyverz's Kinesis keymap Copyright 2017-2020.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-#include "version.h"
-
-enum layer_names {_QWERTY, _DVORAK, _MAC, _PC, _KEYPAD, _PROGRAM};
-enum my_keycodes {QWERTY = SAFE_RANGE, DVORAK, WIN, MAC, PC, STATUS, PROGRAM};
-
-#define LED_KEYPAD E26
-
-// clang-format off
-
-/*
-        QWERTY layer:
-        ,---------------------------------------------------------------------------.
-        |    ESC   |  F1  |  F2  |  F3  |  F4  |    F5    |   F6   |   F7   |  F8   |
-        `---------------------------------------------------------------------------'
-        ,---------------------------------------------------------------------------.
-        |    F9    |  F10 |  F11 |  F12 | PScr |   SLck   |  Pause | Keypad | Prgrm |
-        `---------------------------------------------------------------------------'
-        ,-------------------------------------------.,-------------------------------------------.
-        |   =    |   1  |   2  |   3  |   4  |   5  ||   6  |   7  |   8  |   9  |   0  |   -    |
-        |--------+------+------+------+------+------||------+------+------+------+------+--------|
-        | Tab    |   Q  |   W  |   E  |   R  |   T  ||   Y  |   U  |   I  |   O  |   P  |   \    |
-        |--------+------+------+------+------+------||------+------+------+------+------+--------|
-        | CapsLk |   A  |   S  |   D  |   F  |   G  ||   H  |   J  |   K  |   L  |   ;  |   '    |
-        |--------+------+------+------+------+------||------+------+------+------+------+--------|
-        | LShift |   Z  |   X  |   C  |   V  |   B  ||   N  |   M  |   ,  |   .  |   /  | RShift |
-        `--------+------+------+------+------+------'`------+------+------+------+------+--------'
-                 |   `  |   \  | Left | Rght |              |  Up  |  Dn  |   [  |   ]  |
-                 `---------------------------'              `---------------------------'
-                                     ,--------------.,--------------.
-                                     | LCtl  | LAlt || LGUI | RCtl  |
-                              ,------|-------|------||------+-------+-------.
-                              |      |       | Home || PgUp | Enter |       |
-                              | BkSp |  Del  |------||------|   /   | Space |
-                              |      |       | End  || PgDn | KeyPd |       |
-                              `---------------------'`----------------------'
-
-        Dvorak layer:
-        ,---------------------------------------------------------------------------.
-        |          |      |      |      |      |          |        |        |       |
-        `---------------------------------------------------------------------------'
-        ,---------------------------------------------------------------------------.
-        |          |      |      |      |      |          |        |        |       |
-        `---------------------------------------------------------------------------'
-        ,-------------------------------------------.,-------------------------------------------.
-        |        |      |      |      |      |      ||      |      |      |      |      |        |
-        |--------+------+------+------+------+------||------+------+------+------+------+--------|
-        |        |   '  |   ,  |   .  |   P  |   Y  ||   F  |   G  |   C  |   R  |   L  |   /    |
-        |--------+------+------+------+------+------||------+------+------+------+------+--------|
-        |        |   A  |   O  |   E  |   U  |   I  ||   D  |   H  |   T  |   N  |   S  |   \    |
-        |--------+------+------+------+------+------||------+------+------+------+------+--------|
-        |        |   ;  |   Q  |   J  |   K  |   X  ||   B  |   M  |   W  |   V  |   Z  |        |
-        `--------+------+------+------+------+------'`------+------+------+------+------+--------'
-                 |      |      |      |      |              |      |      |      |      |
-                 `---------------------------'              `---------------------------'
-                                     ,--------------.,--------------.
-                                     |       |      ||      |       |
-                              ,------|-------|------||------+-------+-------.
-                              |      |       |      ||      |       |       |
-                              |      |       |------||------|       |       |
-                              |      |       |      ||      |       |       |
-                              `---------------------'`----------------------'
-
-        Mac layer:
-        ,-------------------------------------------------------------------------------.
-        |          |      |      |        |        |          |        |        |       |
-        `-------------------------------------------------------------------------------'
-        ,-------------------------------------------------------------------------------.
-        |          |      |      |        |        |   Power  |        |        |       |
-        `-------------------------------------------------------------------------------'
-        ,-------------------------------------------.,-------------------------------------------.
-        |        |      |      |      |      |      ||      |      |      |      |      |        |
-        |--------+------+------+------+------+------||------+------+------+------+------+--------|
-        |        |      |      |      |      |      ||      |      |      |      |      |        |
-        |--------+------+------+------+------+------||------+------+------+------+------+--------|
-        |        |      |      |      |      |      ||      |      |      |      |      |        |
-        |--------+------+------+------+------+------||------+------+------+------+------+--------|
-        |        |      |      |      |      |      ||      |      |      |      |      |        |
-        `--------+------+------+------+------+------'`------+------+------+------+------+--------'
-                 |      |      |      |      |              |      |      |      |      |
-                 `---------------------------'              `---------------------------'
-                                      ,-------------.,-------------.
-                                      | LGUI | LAlt || RCtl | RGUI |
-                               ,------|------|------||------+------+------.
-                               |      |      |      ||      |      |      |
-                               |      |      |------||------|      |      |
-                               |      |      |      ||      |      |      |
-                               `--------------------'`--------------------'
-
-        PC layer:
-        ,-------------------------------------------------------------------------------.
-        |          |      |      |        |        |          |        |        |       |
-        `-------------------------------------------------------------------------------'
-        ,-------------------------------------------------------------------------------.
-        |          |      |      |        |        |          |        |        |       |
-        `-------------------------------------------------------------------------------'
-        ,-------------------------------------------.,-------------------------------------------.
-        |        |      |      |      |      |      ||      |      |      |      |      |        |
-        |--------+------+------+------+------+------||------+------+------+------+------+--------|
-        |        |      |      |      |      |      ||      |      |      |      |      |        |
-        |--------+------+------+------+------+------||------+------+------+------+------+--------|
-        |        |      |      |      |      |      ||      |      |      |      |      |        |
-        |--------+------+------+------+------+------||------+------+------+------+------+--------|
-        |        |      |      |      |      |      ||      |      |      |      |      |        |
-        `--------+------+------+------+------+------'`------+------+------+------+------+--------'
-                 |      |      |      |      |              |      |      |      |      |
-                 `---------------------------'              `---------------------------'
-                                      ,-------------.,-------------.
-                                      |      |      || RAlt |      |
-                               ,------|------|------||------+------+------.
-                               |      |      |      ||      |      |      |
-                               |      |      |------||------|      |      |
-                               |      |      |      ||      |      |      |
-                               `--------------------'`--------------------'
-
-        Keypad layer:
-        ,---------------------------------------------------------------------------.
-        |          |      |      |      |      |          |        |        |       |
-        `---------------------------------------------------------------------------'
-        ,---------------------------------------------------------------------------.
-        |          |      |      |      | Mute | Vol Down | Vol Up | Keypad |       |
-        `---------------------------------------------------------------------------'
-        ,-------------------------------------------.,-------------------------------------------.
-        |        |      |      |      |      |      ||      | NmLk | KP = | KP / | KP * |        |
-        |--------+------+------+------+------+------||------+------+------+------+------+--------|
-        |        |      |      |      |      |      ||      | KP 7 | KP 8 | KP 9 | KP - |        |
-        |--------+------+------+------+------+------||------+------+------+------+------+--------|
-        |        |      |      |      |      |      ||      | KP 4 | KP 5 | KP 6 | KP + |        |
-        |--------+------+------+------+------+------||------+------+------+------+------+--------|
-        |        |      |      |      |      |      ||      | KP 1 | KP 2 | KP 3 |KP Ent|        |
-        `--------+------+------+------+------+------'`------+------+------+------+------+--------'
-                 |      |  INS |      |      |              |      |      | KP . |KP Ent|
-                 `---------------------------'              `---------------------------'
-                                      ,-------------.,-------------.
-                                      |      |      ||      |      |
-                               ,------|------|------||------+------+------.
-                               |      |      |      ||      |      |      |
-                               |      |      |------||------|      | KP 0 |
-                               |      |      |      ||      |      |      |
-                               `--------------------'`--------------------'
-
-        Program layer:
-        ,-------------------------------------------------------------------------------.
-        |  STATUS  |      |      | QWERTY | DVORAK |          |        |        |       |
-        `-------------------------------------------------------------------------------'
-        ,-------------------------------------------------------------------------------.
-        |   QK_BOOT  |      |      |        |        |          |        |        |       |
-        `-------------------------------------------------------------------------------'
-        ,-------------------------------------------.,-------------------------------------------.
-        |        |      |      |      |      |      ||      |      |      |      |      |        |
-        |--------+------+------+------+------+------||------+------+------+------+------+--------|
-        |        |      |      |      |      |      ||      |      |      |      |      |        |
-        |--------+------+------+------+------+------||------+------+------+------+------+--------|
-        |        |      |      |      |      |      ||      |      |      |      |      |        |
-        |--------+------+------+------+------+------||------+------+------+------+------+--------|
-        |        |      |      |      |      |      ||      |      |      |      |      |        |
-        `--------+------+------+------+------+------'`------+------+------+------+------+--------'
-                 |      |      |      |      |              |      |      |      |      |
-                 `---------------------------'              `---------------------------'
-                                      ,-------------.,-------------.
-                                      |      |      ||      |      |
-                               ,------|------|------||------+------+------.
-                               |      |      |      ||      |      |      |
-                               |      |      |------||------|      |      |
-                               |      |      |      ||      |      |      |
-                               `--------------------'`--------------------'
-
-*/
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-[_QWERTY] = LAYOUT (
-           // Left Hand
-           KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,        KC_F8,
-           KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,
-           KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,
-           KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,
-           KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,
-                    KC_GRV,  KC_NUBS, KC_LEFT, KC_RGHT,
-           // Left Thumb
-                    KC_LCTL, KC_LALT,
-                             KC_HOME,
-           KC_BSPC, KC_DEL,  KC_END,
-
-           // Right Hand
-           KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SCRL, KC_PAUS, TG(_KEYPAD),  MO(_PROGRAM),
-           KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
-           KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
-           KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-           KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-                    KC_UP,   KC_DOWN, KC_LBRC, KC_RBRC,
-           // Right Thumb
-           KC_LGUI, KC_RCTL,
-           KC_PGUP,
-           KC_PGDN, KC_ENT, KC_SPC
-    ),
-
-[_DVORAK] = LAYOUT (
-           // Left Hand
-           _______, _______, _______, _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,
-           _______, KC_QUOT, KC_COMM,  KC_DOT,    KC_P,    KC_Y,
-           _______,    KC_A,    KC_O,    KC_E,    KC_U,    KC_I,
-           _______, KC_SCLN,    KC_Q,    KC_J,    KC_K,    KC_X,
-                    _______, _______, _______, _______,
-           // Left Thumb
-                    _______, _______,
-                             _______,
-           _______, _______, _______,
-
-           // Right Hand
-           _______, _______, _______, _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,
-           KC_F,       KC_G,    KC_C,    KC_R,    KC_L, KC_SLSH,
-           KC_D,       KC_H,    KC_T,    KC_N,    KC_S, KC_BSLS,
-           KC_B,       KC_M,    KC_W,    KC_V,    KC_Z, _______,
-                    _______, _______, _______, _______,
-           // Right Thumb
-           _______, _______,
-           _______,
-           _______, _______, _______
-    ),
-
-[_MAC] = LAYOUT (
-           // Left Hand
-           _______, _______, _______, _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,
-                    _______, _______, _______, _______,
-           // Left Thumb
-                    KC_LGUI, KC_LALT,
-                             _______,
-           _______, _______, _______,
-
-           // Right Hand
-           _______, _______, _______, _______, _______, KC_PWR, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,
-                    _______, _______, _______, _______,
-           // Right Thumb
-           KC_RCTL, KC_RGUI,
-           _______,
-           _______, _______, _______
-    ),
-
-[_PC] = LAYOUT (
-           // Left Hand
-           _______, _______, _______, _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,
-                    _______, _______, _______, _______,
-           // Left Thumb
-                    _______, _______,
-                             _______,
-           _______, _______, _______,
-
-           // Right Hand
-           _______, _______, _______, _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,
-                    _______, _______, _______, _______,
-           // Right Thumb
-           KC_RALT, _______,
-           _______,
-           _______, _______, _______
-    ),
-
-[_KEYPAD] = LAYOUT (
-           // Left Hand
-           _______, _______, _______, _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,
-                    _______, KC_INS,  _______, _______,
-           // Left Thumb
-                    _______, _______,
-                             _______,
-           _______, _______, _______,
-
-           // Right Hand
-           _______,    _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,
-           _______, KC_NUM,  KC_PEQL, KC_PSLS, KC_PAST,  _______,
-           _______, KC_P7,   KC_P8,   KC_P9,   KC_PMNS,  _______,
-           _______, KC_P4,   KC_P5,   KC_P6,   KC_PPLS,  _______,
-           _______, KC_P1,   KC_P2,   KC_P3,   KC_PENT,  _______,
-                    _______, _______, KC_PDOT, KC_PENT,
-           // Right Thumb
-           _______, _______,
-           _______,
-           _______, _______, KC_P0
-    ),
-
-[_PROGRAM] = LAYOUT (
-           // Left Hand
-           STATUS,  _______, _______, QWERTY,   DVORAK,  MAC,     PC,     WIN,     _______,
-           _______, _______, _______, _______ , _______, _______,
-           _______, _______, _______, _______ , _______, _______,
-           _______, _______, _______, _______ , _______, _______,
-           _______, _______, _______, _______ , _______, _______,
-                    _______, _______, _______ , _______,
-           // Left Thumb
-                    _______, _______,
-                             _______,
-           _______, _______, _______,
-
-           // Right Hand
-           QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,
-                    _______, _______, _______, _______,
-           // Right Thumb
-           _______, _______,
-           _______,
-           _______, _______, _______
-    )
-
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    writePin(LED_KEYPAD, !layer_state_cmp(state, _KEYPAD));
-    return state;
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    if (record->event.pressed) {
-        switch (keycode) {
-            case QWERTY:
-                set_single_persistent_default_layer(_QWERTY);
-                return false;
-            case DVORAK:
-                set_single_persistent_default_layer(_DVORAK);
-                return false;
-            case MAC:
-                layer_on(_MAC);
-                layer_off(_PC);
-                return false;
-            case PC:
-                layer_off(_MAC);
-                layer_on(_PC);
-                return false;
-            case WIN:
-                layer_off(_MAC);
-                layer_off(_PC);
-                return false;
-            case STATUS:
-                SEND_STRING("Firmware> QMK " QMK_VERSION ", " QMK_BUILDDATE "\n");
-                SEND_STRING("Keyboard> " QMK_KEYBOARD "\n");
-                SEND_STRING("Keymap> " QMK_KEYMAP "\n");
-
-                if (layer_state_cmp(default_layer_state, _QWERTY))
-                    SEND_STRING("Layout> QWERTY\n");
-                else
-                    SEND_STRING("Layout> DVORAK\n");
-
-                if (layer_state_is(_MAC))
-                    SEND_STRING("Thumb keys mode> MAC\n");
-                else if (layer_state_is(_PC))
-                    SEND_STRING("Thumb keys mode> PC\n");
-                else
-                    SEND_STRING("Thumb keys mode> WIN\n");
-
-                if (keymap_config.nkro)
-                    SEND_STRING("NKRO> Enabled\n");
-                else
-                    SEND_STRING("NKRO> Disabled\n");
-
-                if (debug_enable)
-                    SEND_STRING("Debug> Enabled\n");
-                else
-                    SEND_STRING("Debug> Disabled\n");
-
-                return false;
-        }
-    }
-
-    return true;
-}
diff --git a/keyboards/kinesis/kint36/keymaps/kzar/readme.md b/keyboards/kinesis/kint36/keymaps/kzar/readme.md
deleted file mode 100644
index b45808892e0..00000000000
--- a/keyboards/kinesis/kint36/keymaps/kzar/readme.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Dave's Kinesis Advantage keymap
-
-Kinesis Advantage keymap aiming to emulate the stock controller. QWERTY, DVORAK,
-WIN, MAC, PC, program and keypad layers are all supported, along with the
-keypad LED and RESET + STATUS keys.
-
-Tested with a Kinesis Advantage2, kinT (stapelberg) keyboard controller built
-with a Teensy 3.6 microcontroller and a UK system layout. Originally based upon
-the xyvers keymap.
diff --git a/keyboards/kinesis/kint36/keymaps/kzar/rules.mk b/keyboards/kinesis/kint36/keymaps/kzar/rules.mk
deleted file mode 100644
index a8817651285..00000000000
--- a/keyboards/kinesis/kint36/keymaps/kzar/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-COMMAND_ENABLE = yes
-MOUSEKEY_ENABLE = no
-NKRO_ENABLE = yes
-RGBLIGHT_ENABLE = no
diff --git a/keyboards/kinesis/kint41/info.json b/keyboards/kinesis/kint41/info.json
index eec726cf51e..c1eb7b84652 100644
--- a/keyboards/kinesis/kint41/info.json
+++ b/keyboards/kinesis/kint41/info.json
@@ -13,9 +13,7 @@
         "command": false,
         "mousekey": true,
         "extrakey": true,
-        "nkro": true,
-        "audio": false,
-        "backlight": false
+        "nkro": true
     },
     "build": {
         "debounce_type": "sym_eager_pk"
diff --git a/keyboards/kinesis/kintlc/info.json b/keyboards/kinesis/kintlc/info.json
index 13c2f9a55c5..07c81e1c896 100644
--- a/keyboards/kinesis/kintlc/info.json
+++ b/keyboards/kinesis/kintlc/info.json
@@ -13,9 +13,7 @@
         "command": false,
         "mousekey": true,
         "extrakey": true,
-        "nkro": true,
-        "audio": false,
-        "backlight": false
+        "nkro": true
     },
     "build": {
         "debounce_type": "sym_eager_pk"
diff --git a/keyboards/kinesis/kintwin/info.json b/keyboards/kinesis/kintwin/info.json
index ed67c36af39..92727e9ecb9 100644
--- a/keyboards/kinesis/kintwin/info.json
+++ b/keyboards/kinesis/kintwin/info.json
@@ -18,9 +18,7 @@
         "command": false,
         "mousekey": true,
         "extrakey": true,
-        "nkro": true,
-        "audio": false,
-        "backlight": false
+        "nkro": true
     },
     "matrix_pins": {
         "rows": ["A0", "A1", "A2", "A3", "A4", "A5", "A6"],
diff --git a/keyboards/kinesis/nguyenvietyen/info.json b/keyboards/kinesis/nguyenvietyen/info.json
index 123b42e9bfc..2a99a4e6003 100644
--- a/keyboards/kinesis/nguyenvietyen/info.json
+++ b/keyboards/kinesis/nguyenvietyen/info.json
@@ -12,9 +12,7 @@
         "command": true,
         "mousekey": true,
         "extrakey": true,
-        "nkro": true,
-        "audio": false,
-        "backlight": false
+        "nkro": true
     },
     "indicators": {
         "caps_lock": "E6",
diff --git a/keyboards/kinesis/stapelberg/info.json b/keyboards/kinesis/stapelberg/info.json
index 44e2a331575..6ad972d2472 100644
--- a/keyboards/kinesis/stapelberg/info.json
+++ b/keyboards/kinesis/stapelberg/info.json
@@ -12,9 +12,7 @@
         "command": false,
         "mousekey": true,
         "extrakey": true,
-        "nkro": true,
-        "audio": false,
-        "backlight": false
+        "nkro": true
     },
     "matrix_pins": {
         "cols": ["B0", "B1", "B2", "B3", "B4", "B5", "B6"],
diff --git a/keyboards/kingly_keys/romac/keymaps/boss566y/keymap.c b/keyboards/kingly_keys/romac/keymaps/boss566y/keymap.c
deleted file mode 100755
index 6acb55dd53c..00000000000
--- a/keyboards/kingly_keys/romac/keymaps/boss566y/keymap.c
+++ /dev/null
@@ -1,91 +0,0 @@
-/* Copyright 2018 Jack Humbert
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-char oled_layer[20];
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT(
-        KC_KP_7, KC_KP_8, KC_KP_9,
-        KC_KP_4, KC_KP_5, KC_KP_6,
-        KC_KP_1, KC_KP_2, KC_KP_3,
-        MO(1),   KC_KP_0, KC_KP_DOT
-    ),
-    [1] = LAYOUT(
-        KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS
-    ),
-    [2] = LAYOUT(
-        KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS
-    ),
-    [3] = LAYOUT(
-        KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS
-    ),
-    [4] = LAYOUT(
-        KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS
-    ),
-    [5] = LAYOUT(
-        KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS
-    ),
-    [6] = LAYOUT(
-        KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS
-    ),
-    [7] = LAYOUT(
-        KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS
-    )
-};
-
-
-
-#ifdef OLED_ENABLE
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-    return OLED_ROTATION_270;
-}
-
-bool oled_task_user(void) {
-  // Host Keyboard Layer Status
-    sprintf(oled_layer,"Layer\nL: %d\n",get_highest_layer(layer_state));
-    oled_write(oled_layer,false);
-
-    // Host Keyboard LED Status
-    led_t led_state = host_keyboard_led_state();
-    oled_write_P(led_state.num_lock ? PSTR("NLCK ") : PSTR("     "), false);
-    oled_write_P(led_state.caps_lock ? PSTR("CAPS ") : PSTR("       "), false);
-    oled_write_P(led_state.scroll_lock ? PSTR("SCRLK") : PSTR("       "), false);
-    return false;
-}
-#endif
diff --git a/keyboards/kingly_keys/romac/keymaps/boss566y/rules.mk b/keyboards/kingly_keys/romac/keymaps/boss566y/rules.mk
deleted file mode 100755
index 68d31978961..00000000000
--- a/keyboards/kingly_keys/romac/keymaps/boss566y/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-VIA_ENABLE = yes
-BOOTLOADER = qmk-dfu
-OLED_ENABLE = yes
diff --git a/keyboards/kingly_keys/ropro/keymaps/jdayton3/README.md b/keyboards/kingly_keys/ropro/keymaps/jdayton3/README.md
deleted file mode 100644
index b62ea79e10d..00000000000
--- a/keyboards/kingly_keys/ropro/keymaps/jdayton3/README.md
+++ /dev/null
@@ -1,19 +0,0 @@
-```
-        ,-----------------------------------------------------------------------------------.
-        |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
-        |------+------+------+------+------+------+------+------+------+------+------+------|
-        | Esc  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |   -  |
-        |------+------+------+------+------+------+------+------+------+------+------+------|
-  RotEn | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- ,------+------+------+------+------+------+------+------+------+------+------+------+------|
- | PgUp | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- |------+------+------+------+------+------+-------------+------+------+------+------+------|
- | Home | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
- |------+------+------+------+------+------+------+------+------+------+------+------+------|
- | PgDn | Brite| Ctrl | ALT  | GUI  |Lower |SPACE |SPACE |Raise | Left | Down |  Up  |Right |
- `------------------------------------------------------------------------------------------'
-```
-
-# A Planck-based RoPro layout
-
-Basically all the layers from the default Planck layout, plus a number row, a function row, 3 extra keys, and a rotary encoder.
diff --git a/keyboards/kingly_keys/ropro/keymaps/jdayton3/keymap.c b/keyboards/kingly_keys/ropro/keymaps/jdayton3/keymap.c
deleted file mode 100644
index 22e037b6f7a..00000000000
--- a/keyboards/kingly_keys/ropro/keymaps/jdayton3/keymap.c
+++ /dev/null
@@ -1,287 +0,0 @@
-/* Copyright 2019 Jonathan Dayton (jdayton3)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-enum layer_names {
-    _QWERTY,
-    _COLEMAK,
-    _DVORAK,
-    _LOWER,
-    _RAISE,
-    _PLOVER,
-    _ADJUST
-};
-
-enum keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  DVORAK,
-  PLOVER,
-  BACKLIT,
-  EXT_PLV
-};
-
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /* QWERTY
-   *        ,-----------------------------------------------------------------------------------.
-   *        |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
-   *        |------+------+------+------+------+------+------+------+------+------+------+------|
-   *        | Esc  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |   -  |
-   *        |------+------+------+------+------+------+------+------+------+------+------+------|
-   *  RotEn | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
-   * ,------+------+------+------+------+------+------+------+------+------+------+------+------|
-   * | PgUp | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
-   * |------+------+------+------+------+------+-------------+------+------+------+------+------|
-   * | Home | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
-   * |------+------+------+------+------+------+------+------+------+------+------+------+------|
-   * | PgDn | Brite| Ctrl | ALT  | GUI  |Lower |SPACE |SPACE |Raise | Left | Down |  Up  |Right |
-   * `------------------------------------------------------------------------------------------'
-   */
-  	[_QWERTY] = LAYOUT(
-              KC_F1,     KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,    KC_F11,    KC_F12,
-              KC_ESC,    KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,      KC_0,    KC_MINUS,
-    KC_NO,    KC_TAB,    KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,      KC_P,     KC_BSPC,
-    KC_PGUP,  KC_ESC,    KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,      KC_SCLN,  KC_QUOT,
-    KC_HOME,  KC_LSFT,   KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,    KC_SLSH,   KC_ENT,
-    KC_PGDN,  RGB_TOG,   KC_RCTL,  KC_LALT,  KC_LGUI,  LOWER,    KC_SPC,   KC_SPC,   RAISE,    KC_LEFT,  KC_DOWN,   KC_UP,    KC_RGHT
-  ),
-
-  /* Colemak
-   *        ,-----------------------------------------------------------------------------------.
-   *        |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
-   *        |------+------+------+------+------+------+------+------+------+------+------+------|
-   *        | Esc  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |   -  |
-   *        |-----------------------------------------------------------------------------------|
-   *  RotEn | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
-   * ,------|------+------+------+------+------+------+------+------+------+------+------+------|
-   * | PgUp | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
-   * |------|------+------+------+------+------+------+------+------+------+------+------+------|
-   * | Home | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
-   * |------|------+------+------+------+------+------+------+------+------+------+------+------|
-   * | PgDn | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
-   * `------------------------------------------------------------------------------------------'
-   */
-  	[_COLEMAK] = LAYOUT(
-              KC_F1,     KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,    KC_F11,    KC_F12,
-              KC_ESC,    KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,      KC_0,    KC_MINUS,
-    KC_NO,    KC_TAB,    KC_Q,     KC_W,     KC_F,     KC_P,     KC_G,     KC_J,     KC_L,     KC_U,     KC_Y,      KC_SCLN,   KC_ESC,
-    KC_PGUP,  KC_BSPC,   KC_A,     KC_R,     KC_S,     KC_T,     KC_D,     KC_H,     KC_N,     KC_E,     KC_I,      KC_O,     KC_QUOT,
-    KC_HOME,  KC_LSFT,   KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_K,     KC_M,     KC_COMM,  KC_DOT,    KC_SLSH,   KC_ENT,
-    KC_PGDN,  RGB_TOG,   KC_RCTL,  KC_LALT,  KC_LGUI,  LOWER,    KC_SPC,   KC_SPC,   RAISE,    KC_LEFT,  KC_DOWN,   KC_UP,    KC_RGHT
-  ),
-
-  /* Dvorak
-   *        ,-----------------------------------------------------------------------------------.
-   *        |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
-   *        |------+------+------+------+------+------+------+------+------+------+------+------|
-   *        | Esc  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |   -  |
-   *        |-----------------------------------------------------------------------------------.
-   *  RotEn | Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Bksp |
-   * ,------|------+------+------+------+------+------+------+------+------+------+------+------|
-   * | PgUp | Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
-   * |------|------+------+------+------+------+------+------+------+------+------+------+------|
-   * | Home | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
-   * |------|------+------+------+------+------+------+------+------+------+------+------+------|
-   * | PgDn | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
-   * `------------------------------------------------------------------------------------------'
-   */
-  	[_DVORAK] = LAYOUT(
-              KC_F1,     KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,    KC_F11,    KC_F12,
-              KC_ESC,    KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,      KC_0,    KC_MINUS,
-    KC_NO,    KC_TAB,    KC_QUOT,  KC_COMM,  KC_DOT,   KC_P,     KC_Y,     KC_F,     KC_G,     KC_C,     KC_R,      KC_L,     KC_BSPC,
-    KC_PGUP,  KC_ESC,    KC_A,     KC_O,     KC_E,     KC_U,     KC_I,     KC_D,     KC_H,     KC_T,     KC_N,      KC_S,     KC_SLSH,
-    KC_HOME,  KC_LSFT,   KC_SCLN,  KC_Q,     KC_J,     KC_K,     KC_X,     KC_B,     KC_M,     KC_W,     KC_V,      KC_Z,      KC_ENT,
-    KC_PGDN,  RGB_TOG,   KC_RCTL,  KC_LALT,  KC_LGUI,  LOWER,    KC_SPC,   KC_SPC,   RAISE,    KC_LEFT,  KC_DOWN,   KC_UP,    KC_RGHT
-  ),
-
-  /* LOWER
-   *        ,-----------------------------------------------------------------------------------.
-   *        |TOGRGB|      |      |      |Sat(-)|Hue(-)|Hue(+)|Sat(+)|      |      |Brght-|Brght+|
-   *        |------+------+------+------+------+-------------+------+------+------+------+------|
-   *        |  `   |      |      |      |      |      |      |      |      |      |      |   =  |
-   *        |-----------------------------------------------------------------------------------.
-   *  RotEn |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
-   * ,------+------+------+------+------+------+------+------+------+------+------+------+------|
-   * | Home | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
-   * |------+------+------+------+------+------+------+------+------+------+------+------+------|
-   * |      |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | | Home | End  |      |
-   * |------+------+------+------+------+------+------+------+------+------+------+------+------|
-   * | End  |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
-   * `------------------------------------------------------------------------------------------'
-   */
-    [_LOWER] = LAYOUT(
-              RGB_TOG,  KC_TRNS,  KC_TRNS,  KC_TRNS,  RGB_SAD,  RGB_HUD,  RGB_HUI,  RGB_SAI,    KC_TRNS,    KC_TRNS,  RGB_VAD,  RGB_VAI,
-              KC_GRAVE, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS, KC_EQUAL,
-    KC_NUM,   KC_TILD,  KC_EXLM,  KC_AT,    KC_HASH,  KC_DLR,   KC_PERC,  KC_CIRC,  KC_AMPR,    KC_ASTR,    KC_LPRN,  KC_RPRN,  KC_BSPC,
-    KC_HOME,  KC_DEL,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_UNDS,    KC_PLUS,    KC_LCBR,  KC_RCBR,  KC_PIPE,
-    KC_TRNS,  _______,  KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   S(KC_NUHS), S(KC_NUBS), KC_HOME,  KC_END,   _______,
-    KC_END,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    KC_MNXT,    KC_VOLD,  KC_VOLU,  KC_MPLY
-  ),
-
-  /* RAISE
-   *        ,-----------------------------------------------------------------------------------.
-   *        |TOGRGB|      |      |      |Sat(-)|Hue(-)|Hue(+)|Sat(+)|      |      |Brght-|Brght+|
-   *        |------+------+------+------+------+-------------+------+------+------+------+------|
-   *        |  `   |      |      |      |      |      |      |      |      |      |      |   =  |
-   *        |-----------------------------------------------------------------------------------.
-   *  RotEn |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
-   * ,------+------+------+------+------+------+------+------+------+------+------+------+------|
-   * | Home | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
-   * |------+------+------+------+------+------+------+------+------+------+------+------+------|
-   * |      |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |Pg Up |Pg Dn |      |
-   * |------+------+------+------+------+------+------+------+------+------+------+------+------|
-   * | End  |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
-   * `------------------------------------------------------------------------------------------'
-   */
-    [_RAISE] = LAYOUT(
-              RGB_TOG,  KC_TRNS,  KC_TRNS,  KC_TRNS,  RGB_SAD,  RGB_HUD,  RGB_HUI,  RGB_SAI,  KC_TRNS,  KC_TRNS,  RGB_VAD,  RGB_VAI,
-              KC_GRAVE, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS, KC_EQUAL,
-    KC_NUM,   KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_BSPC,
-    KC_HOME,  KC_DEL,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_MINS,  KC_EQL,   KC_LBRC,  KC_RBRC,  KC_BSLS,
-    KC_TRNS,  _______,  KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_NUHS,  KC_NUBS,  KC_PGUP,  KC_PGDN,  _______,
-    KC_END,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_MNXT,  KC_VOLD,  KC_VOLU,  KC_MPLY
-  ),
-
-  /* Plover layer (http://opensteno.org)
-   *        ,-----------------------------------------------------------------------------------.
-   *        |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
-   *        |------+------+------+------+------+------+------+------+------+------+------+------|
-   *        | Esc  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |   -  |
-   *        |-----------------------------------------------------------------------------------.
-   *  RotEn |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |
-   * ,------|------+------+------+------+------+------+------+------+------+------+------+------|
-   * | PgUp |      |   S  |   T  |   P  |   H  |   *  |   *  |   F  |   P  |   L  |   T  |   D  |
-   * |------|------+------+------+------+------+------+------+------+------+------+------+------|
-   * | Home |      |   S  |   K  |   W  |   R  |   *  |   *  |   R  |   B  |   G  |   S  |   Z  |
-   * |------|------+------+------+------+------+------+------+------+------+------+------+------|
-   * | PgDn | Exit |      |      |   A  |   O  |             |   E  |   U  |      |      |      |
-   * `------------------------------------------------------------------------------------------'
-   */
-  	[_PLOVER] = LAYOUT(
-              KC_F1,     KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,    KC_F11,    KC_F12,
-              KC_ESC,    KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,      KC_0,    KC_MINUS,
-    KC_NO,    KC_1,      KC_1,     KC_1,     KC_1,     KC_1,     KC_1,     KC_1,     KC_1,     KC_1,     KC_1,      KC_1,     KC_1   ,
-    KC_PGUP,  XXXXXXX,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,      KC_P,     KC_LBRC,
-    KC_HOME,  XXXXXXX,   KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,      KC_SCLN,  KC_QUOT,
-    KC_PGDN,  EXT_PLV,   XXXXXXX,  XXXXXXX,  KC_C,     KC_V,     XXXXXXX,  XXXXXXX,  KC_N,     KC_M,     XXXXXXX,   XXXXXXX,  XXXXXXX
-  ),
-
-  /* Adjust (Lower + Raise)
-   *        ,-----------------------------------------------------------------------------------.
-   *        |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
-   *        |------+------+------+------+------+------+------+------+------+------+------+------|
-   *        | Esc  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |   -  |
-   *        |-----------------------------------------------------------------------------------.
-   *  RotEn |      | Reset|Debug | RGB  |RGBMOD| HUE+ | HUE- | SAT+ | SAT- |BRGTH+|BRGTH-|  Del |
-   * ,------|------+------+------+------+------+------+------+------+------+------+------+------|
-   * | PgUp |      |      |MUSmod|Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|Plover|      |
-   * |------|------+------+------+------+------+------+------+------+------+------+------+------|
-   * | Home |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
-   * |------|------+------+------+------+------+------+------+------+------+------+------+------|
-   * | PgDn |      |      |      |      |      |             |      |      |      |      |      |
-   * `------------------------------------------------------------------------------------------'
-   */
-  	[_ADJUST] = LAYOUT(
-              KC_F1,     KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,    KC_F11,    KC_F12,
-              KC_ESC,    KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,      KC_0,    KC_MINUS,
-    KC_NO,    _______,   QK_BOOT,  DB_TOGG,  RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,   RGB_VAD,  KC_DEL ,
-    KC_PGUP,  _______,   _______,  MU_NEXT,  AU_ON,    AU_OFF,   AG_NORM,  AG_SWAP,  QWERTY,   COLEMAK,  DVORAK,    PLOVER,   _______,
-    KC_HOME,  _______,   AU_PREV,  AU_NEXT,  MU_ON,    MU_OFF,   MI_ON,    MI_OFF,   _______,  _______,  _______,   _______,  _______,
-    KC_PGDN,  _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______
-  )
-};
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (index == 0) {
-        if (clockwise) {
-            tap_code(KC_WH_L);
-        } else {
-            tap_code(KC_WH_R);
-        }
-    }
-    return true;
-}
-
-
-#define LOWER MO(_LOWER)
-#define RAISE MO(_RAISE)
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_COLEMAK);
-      }
-      return false;
-      break;
-    case DVORAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_DVORAK);
-      }
-      return false;
-      break;
-    case BACKLIT:
-      if (record->event.pressed) {
-        register_code(KC_RSFT);
-        #ifdef BACKLIGHT_ENABLE
-          backlight_step();
-        #endif
-      } else {
-        unregister_code(KC_RSFT);
-      }
-      return false;
-      break;
-    case PLOVER:
-      if (record->event.pressed) {
-        layer_off(_RAISE);
-        layer_off(_LOWER);
-        layer_off(_ADJUST);
-        layer_on(_PLOVER);
-        if (!eeconfig_is_enabled()) {
-            eeconfig_init();
-        }
-        keymap_config.raw = eeconfig_read_keymap();
-        keymap_config.nkro = 1;
-        eeconfig_update_keymap(keymap_config.raw);
-      }
-      return false;
-      break;
-    case EXT_PLV:
-      if (record->event.pressed) {
-        layer_off(_PLOVER);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/kprepublic/bm16a/v1/info.json b/keyboards/kprepublic/bm16a/v1/info.json
index 9e99832b3e6..85173a89ccb 100644
--- a/keyboards/kprepublic/bm16a/v1/info.json
+++ b/keyboards/kprepublic/bm16a/v1/info.json
@@ -18,8 +18,7 @@
         "command": false,
         "nkro": true,
         "backlight": true,
-        "rgblight": true,
-        "audio": false
+        "rgblight": true
     },
     "matrix_pins": {
         "rows": ["D3", "D5", "D1", "D2"],
diff --git a/keyboards/kprepublic/bm16a/v2/config.h b/keyboards/kprepublic/bm16a/v2/config.h
index 3ef55f3d42e..8014b69a98c 100644
--- a/keyboards/kprepublic/bm16a/v2/config.h
+++ b/keyboards/kprepublic/bm16a/v2/config.h
@@ -5,5 +5,5 @@
 
 #define WS2812_PWM_DRIVER PWMD4
 #define WS2812_PWM_CHANNEL 4
-#define WS2812_DMA_STREAM STM32_DMA1_STREAM7
-#define WS2812_DMA_CHANNEL 7
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM7
+#define WS2812_PWM_DMA_CHANNEL 7
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/34keys/config.h b/keyboards/kprepublic/bm40hsrgb/keymaps/34keys/config.h
deleted file mode 100644
index 72377c27017..00000000000
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/34keys/config.h
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright 2021 Taeyoon Kim (@partrita)
-// SPDX-License-Identifier: GPL-2.0-or-later
-// /*
-//   Set any config.h overrides for your specific keymap here.
-//   See config.h options at https://docs.qmk.fm/#/config_options?id=the-configh-file
-// */
-#pragma once
-
-#define TAPPING_TERM 200 // time of holding key, milliseconds
-
-// Enable rapid switch from tap to hold, disables double tap hold auto-repeat.
-#define QUICK_TAP_TERM 0
-
-// Mouse key speed and acceleration.
-#undef MOUSEKEY_DELAY
-#define MOUSEKEY_DELAY          0
-#undef MOUSEKEY_INTERVAL
-#define MOUSEKEY_INTERVAL       16
-#undef MOUSEKEY_WHEEL_DELAY
-#define MOUSEKEY_WHEEL_DELAY    0
-#undef MOUSEKEY_MAX_SPEED
-#define MOUSEKEY_MAX_SPEED      6
-#undef MOUSEKEY_TIME_TO_MAX
-#define MOUSEKEY_TIME_TO_MAX    64
-
-//  The firmware is too large!
-#define COMBO_TERM 80 // timeout period for combos to 40ms.
-
-//disable broken animations
-#ifdef RGB_MATRIX_ENABLE
-#    undef ENABLE_RGB_MATRIX_ALPHAS_MODS
-#    undef ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-#    undef ENABLE_RGB_MATRIX_BREATHING
-#    undef ENABLE_RGB_MATRIX_BAND_SAT
-#    undef ENABLE_RGB_MATRIX_BAND_VAL
-#    undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-#    undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-#    undef ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-#    undef ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-#    undef ENABLE_RGB_MATRIX_CYCLE_ALL
-#    undef ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#    undef ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-#    undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-#    undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-#    undef ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-#    undef ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-#    undef ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-#    undef ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#    undef ENABLE_RGB_MATRIX_DIGITAL_RAIN
-#    undef RGB_MATRIX_DEFAULT_MODE
-// #    define RGBLIGHT_HUE_STEP 20
-#endif
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/34keys/keymap.c b/keyboards/kprepublic/bm40hsrgb/keymaps/34keys/keymap.c
deleted file mode 100644
index 09490aa940a..00000000000
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/34keys/keymap.c
+++ /dev/null
@@ -1,89 +0,0 @@
-// Copyright 2021 Taeyoon Kim (@partrita)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-#include "keymap_korean.h"
-
-enum layers {
-  _Base,
-  _Navi,
-  _Numb,
-  _Func,
-};
-
-// Left-hand home row mods - Base Layer
-#define HOME_A LGUI_T(KC_A)
-#define HOME_S LALT_T(KC_S)
-#define HOME_D LCTL_T(KC_D)
-#define HOME_F LSFT_T(KC_F)
-#define HOME_J RSFT_T(KC_J)
-#define HOME_K LCTL_T(KC_K)
-#define HOME_L LALT_T(KC_L)
-#define HOME_QU LGUI_T(KC_QUOT)
-
-// layer keys
-#define Lay_SPC LT(_Func,KC_SPC)
-#define NAVI MO(_Navi)
-#define NUMB MO(_Numb)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [_Base] = LAYOUT_planck_mit(
-        KC_Q,        KC_W,      KC_E,           KC_R,          KC_T,    KC_NO, KC_NO,       KC_Y,       KC_U,      KC_I,      KC_O,         KC_P,
-      HOME_A,      HOME_S,    HOME_D,         HOME_F,          KC_G,    KC_NO, KC_NO,       KC_H,     HOME_J,    HOME_K,    HOME_L,      HOME_QU,
-        KC_Z,        KC_X,      KC_C,           KC_V,          KC_B,    KC_NO, KC_NO,       KC_N,       KC_M,   KC_COMM,    KC_DOT,      KC_SLSH,
-       KC_NO,       KC_NO,     KC_NO,           NAVI,       Lay_SPC,        KC_NO,       KC_BSPC,       NUMB,     KC_NO,     KC_NO,        KC_NO
-      ),
-  [_Navi] = LAYOUT_planck_mit(
-      KC_WH_L,    KC_WH_D,   KC_WH_U,        KC_WH_R,        KC_ESC,    KC_NO, KC_NO,       KC_DEL,   KC_HOME,  KC_PGDN,   KC_PGUP,      KC_END,
-      KC_LSFT,     HOME_S,    HOME_D,         HOME_F,        KC_TAB,    KC_NO, KC_NO,       KC_ENT,    KC_RSFT,   HOME_K,    HOME_L,     HOME_QU,
-      KC_MS_L,    KC_MS_D,   KC_MS_U,        KC_MS_R,       KC_BTN1,    KC_NO, KC_NO,      KC_BTN2,   KC_LEFT,  KC_DOWN,     KC_UP,     KC_RGHT,
-        KC_NO,      KC_NO,     KC_NO,          KC_NO,       Lay_SPC,        KC_NO,         KC_BSPC,     KC_NO,    KC_NO,     KC_NO,       KC_NO
-      ),
-  [_Numb] = LAYOUT_planck_mit(
-      KC_LBRC,        KC_7,     KC_8,          KC_9,        KC_RBRC,    KC_NO, KC_NO,      KC_DEL,      KC_NO,     KC_NO,     KC_NO,       KC_NO,
-      KC_SCLN,        KC_4,     KC_5,          KC_6,         KC_EQL,    KC_NO, KC_NO,      KC_ENT,     KC_RSFT,    HOME_K,    HOME_L,     HOME_QU,
-       KC_GRV,        KC_1,     KC_2,          KC_3,        KC_BSLS,    KC_NO, KC_NO,       KC_NO,      KC_NO,     KC_NO,   KR_HAEN,       KC_NO,
-        KC_NO,       KC_NO,     KC_NO,         KC_0,        KC_MINS,        KC_NO,        KC_BSPC,      KC_NO,     KC_NO,     KC_NO,       KC_NO
-      ),
-  [_Func] = LAYOUT_planck_mit(
-      KC_F12,     KC_F7,     KC_F8,           KC_F9,       KC_PSCR,    KC_NO, KC_NO,        QK_BOOT,    KC_NO,     KC_NO,     KC_NO,     KC_NO,
-      KC_F11,     KC_F4,     KC_F5,           KC_F6,       KC_SCRL,    KC_NO, KC_NO,      KC_CAPS,     KC_RSFT,    HOME_K,    HOME_L,   HOME_QU,
-      KC_F10,     KC_F1,     KC_F2,           KC_F3,       KC_PAUS,    KC_NO, KC_NO,       KC_INS,      KC_NO,     KC_NO,   KR_HAEN,     KC_NO,
-      KC_NO,       KC_NO,     KC_NO,          KC_NO,       Lay_SPC,         KC_NO,        KC_BSPC,      KC_NO,     KC_NO,     KC_NO,     KC_NO
-      ),
-};
-
-
-// color by layer
-layer_state_t layer_state_set_user(layer_state_t state) {
-    uint8_t layer = get_highest_layer(state);
-    switch (layer) {
-        case _Navi:
-            rgblight_mode_noeeprom(RGB_MATRIX_RAINBOW_BEACON);
-            break;
-        case _Numb:
-            rgblight_mode_noeeprom(RGB_MATRIX_HUE_PENDULUM);
-            break;
-        case _Func:
-            rgblight_mode_noeeprom(RGB_MATRIX_GRADIENT_LEFT_RIGHT);
-            break;
-        default:
-            rgblight_mode_noeeprom(RGB_MATRIX_SOLID_REACTIVE_WIDE);
-    }
-    return state;
-}
-
-// COMBO key for HOME ROW modifier
-// modify `rules.mk` file
-// by adding # COMBO_ENABLE = yes
-
-enum combos {
-  SFT_HAN,
-};
-
-const uint16_t PROGMEM sft_han_combo[] = {LSFT_T(KC_F), LT(_Func,KC_SPC), COMBO_END};
-
-combo_t key_combos[] = {
-  [SFT_HAN] = COMBO(sft_han_combo, KC_LNG1),
-};
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/34keys/readme.md b/keyboards/kprepublic/bm40hsrgb/keymaps/34keys/readme.md
deleted file mode 100644
index 31ac2602b6e..00000000000
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/34keys/readme.md
+++ /dev/null
@@ -1,63 +0,0 @@
-# The 35 keymap for bm40hsrgb
-
-This layout is made almost entirely from [miryoku](https://github.com/manna-harbour/miryoku). However, I used fewer layers and reduced 36 keys to 34.
-
-> As little as possible, as simple as possible, as easy as possible to memorize
-
-Replaced the Ctrl, GUI, Alt, and Shift keys with home mod row. A combo function was added by removing some RGB animations of the bm40's keyboard to free up memory. If animation is not removed, it is because there is not enough memory to compile. Added code that uses RGB matrix animation so that you can see at a glance which layer is being used, and you can move faster by increasing the speed of the mouse key. 
-
-And because I'm Korean, a combo for Korean and English keyboard conversion has been added, but if you don't need it, you can delete it.
-
-
-- Flash:
-
-  `qmk flash -kb kprepublic/bm40hsrgb -km 34keys`
-
-# Layout
-
-Press and hold to activate the keys in parentheses.
-
-
-https://imgur.com/a/UkKfCYm
-
-
-## _BASE(QWERTY)
-
-![](https://i.imgur.com/PuHFVXT.png)
-
-
-| Q | W | E | R | T | | | Y | U | I | O | P | 
-|---|---|---|---|---|---|---|---|---|---|---|---|
-| A(GUI) | S(Alt) | D(Ctrl) | F(Shift) |  G | |  | H | J(Shift) | K(Ctrl)  | L(Alt) | '(GUI) |
-| Z | X| C| V| B| | | N | M | , | . | /|
-| | | | NaviLayer| Space(_Func) | | | Backspace | NumberLayer | | | |  
-
-## _Navi
-
-![](https://i.imgur.com/BwDHx64.png)
-
-| Mousewheel left | Mousewheel down | Mousewheel up | Mousewheel right | ESC | | | DEL | HOME | PageDown | PageUP | END | 
-|---|---|---|---|---|---|---|---|---|---|---|---|
-| A(GUI) | S(Alt) | D(Ctrl) | F(Shift) |  TAB | |  | ENTER | J(Shift) | K(Ctrl)  | L(Alt) | '(GUI) |
-| Mouse left | Mouse down | Mouse up| Mouse right | left click | | | left click | Left | Down | Up | Right |
-| | | |  | Space | | | Backspace | NumberLayer | | | |  
-
-## _Numb
-
-![](https://i.imgur.com/lPPyUsk.png)
-
-| [ | 7 | 8 | 9 | ] | | | DEL |  |  |  |  | 
-|---|---|---|---|---|---|---|---|---|---|---|---|
-| ; | 4 | 5 | 6 | = | |  | ENTER | J(Shift) | K(Ctrl)  | L(Alt) | '(GUI) |
-| ` |  1 | 2 | 3 | \ | | |  |  |  |  | |
-| | | | 0|  - | | | Backspace | | | | |  
-
-## _Func
-
-![](https://i.imgur.com/rz0jaoe.png)
-
-| F12 | F7 | F8 | F9 | PrintScreen | | | RESET |  |  |  |  | 
-|---|---|---|---|---|---|---|---|---|---|---|---|
-| F11 | F4 | F5 | F6 | ScrollLock | |  | CapsLock | J(Shift) | K(Ctrl)  | L(Alt) | '(GUI) |
-| F10 |  F1 | F2 | F3 | PauseBreak | | | Insert |  |  |  | |
-| | | | NaviLayer | Space | | | Backspace | NumberLayer | | | |  
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/34keys/rules.mk b/keyboards/kprepublic/bm40hsrgb/keymaps/34keys/rules.mk
deleted file mode 100644
index 96655e7b5a9..00000000000
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/34keys/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-BOOTMAGIC_ENABLE = yes
-MOUSEKEY_ENABLE = yes
-COMBO_ENABLE = yes
-EXTRAKEY_ENABLE = yes
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/coffee/config.h b/keyboards/kprepublic/bm40hsrgb/keymaps/coffee/config.h
deleted file mode 100644
index ca8a4c6ab4e..00000000000
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/coffee/config.h
+++ /dev/null
@@ -1,88 +0,0 @@
-// Copyright 2022 Fae Fankhauser (@CoffeeIsLife87)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#define LAYER_STATE_8BIT
-
-#define TURBO_ENABLE
-#define HOLD_ON_OTHER_KEY_PRESS
-
-// RGB Matrix effects disable
-#ifdef RGB_MATRIX_ENABLE
-#    define UNDERGLOW_DISABLE
-
-#    define RGB_TRIGGER_ON_KEYDOWN
-
-#    define RGB_MATRIX_LED_FLUSH_LIMIT 10
-
-#    undef ENABLE_RGB_MATRIX_SOLID_COLOR
-#    undef ENABLE_RGB_MATRIX_ALPHAS_MODS
-#    undef ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-#    undef ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
-#    undef ENABLE_RGB_MATRIX_BREATHING
-#    undef ENABLE_RGB_MATRIX_BAND_SAT
-#    undef ENABLE_RGB_MATRIX_BAND_VAL
-#    undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-#    undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-#    undef ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-#    undef ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-
-#    undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-#    undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-#    undef ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-#    undef ENABLE_RGB_MATRIX_DUAL_BEACON
-#    undef ENABLE_RGB_MATRIX_RAINBOW_BEACON
-#    undef ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-#    undef ENABLE_RGB_MATRIX_RAINDROPS
-#    undef ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-#    undef ENABLE_RGB_MATRIX_HUE_BREATHING
-#    undef ENABLE_RGB_MATRIX_HUE_PENDULUM
-#    undef ENABLE_RGB_MATRIX_HUE_WAVE
-#    undef ENABLE_RGB_MATRIX_PIXEL_RAIN
-#    undef ENABLE_RGB_MATRIX_PIXEL_FLOW
-#    undef ENABLE_RGB_MATRIX_PIXEL_FRACTAL
-
-#    undef ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#    undef ENABLE_RGB_MATRIX_DIGITAL_RAIN
-
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-#    undef ENABLE_RGB_MATRIX_SPLASH
-#    undef ENABLE_RGB_MATRIX_SOLID_SPLASH
-#    undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-#endif
-
-// Feature disable
-#ifndef NO_PRINT
-#    define NO_PRINT
-#endif
-
-#ifndef NO_DEBUG
-#    define NO_DEBUG
-#endif
-
-#ifndef NO_ACTION_ONESHOT
-#    define NO_ACTION_ONESHOT
-#endif
-
-// Configure features
-#ifdef DYNAMIC_MACRO_ENABLE
-#    define DYNAMIC_MACRO_USER_CALL
-#    define DYNAMIC_MACRO_NO_NESTING
-#endif
-
-#ifdef MOUSEKEY_ENABLE
-#    define MOUSEKEY_INTERVAL 16 // 60 FPS
-
-// Speed up the slowest preset
-#    define MK_C_OFFSET_0 4
-#    define MK_C_INTERVAL_0 16
-
-// Speed up the medium preset
-#    define MK_C_OFFSET_1 16
-
-#    define MK_3_SPEED
-#endif
\ No newline at end of file
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/coffee/keymap.c b/keyboards/kprepublic/bm40hsrgb/keymaps/coffee/keymap.c
deleted file mode 100644
index 3d5bcade20f..00000000000
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/coffee/keymap.c
+++ /dev/null
@@ -1,301 +0,0 @@
-// Copyright 2022 Fae Fankhauser (@CoffeeIsLife87)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-
-enum custom_keycodes {
-    MCR_PLY = QK_USER, // Macro play
-    MCR_REC,           // Macro record
-    MCR_SWT,           // Swap active macro
-    MS_ACL_U,          // Mouse speed up
-    MS_ACL_D,          // Mouse speed down
-};
-
-enum layout_names {
-    _MAIN = 0,       // Keys Layout: The main keyboard layout that has all the characters
-    _SUB,            // Extension to Main
-    _CTR,            // Macros, RGB, Audio controls, layer access. More or less the control center of my keyboard
-    #ifdef MOUSEKEY_ENABLE
-    _MSE,
-    #endif // MOUSEKEY_ENABLE
-    _END,
-};
-
-#ifdef MOUSEKEY_ENABLE
-#include "action.h"
-#define TOG_MSE TG(_MSE)
-static int current_accel = 0;
-#else
-#define TOG_MSE XXXXXXX
-#endif // MOUSEKEY_ENABLE
-
-#ifdef DYNAMIC_MACRO_ENABLE
-// Macro 1 is = 1, Macro 2 = -1, No macro = 0
-static bool MACRO1 = true; // Determines whether or not we're using 1 or 2
-static bool RECORDING = false;
-static uint16_t REC = DM_REC1; // Record either macro 1 or 2. Or stop recording
-static uint16_t PLY = DM_PLY1; // Play either macro 1 or macro 2
-
-void dynamic_macro_record_start_user(int8_t direction) {
-    REC = DM_RSTP;
-    RECORDING = true;
-}
-
-void dynamic_macro_record_end_user(int8_t direction) {
-    RECORDING = false;
-}
-#else
-#define MCR_PLY KC_NO
-#define MCR_REC KC_NO
-#define MCR_SWT KC_NO
-#endif // DYNAMIC_MACRO_ENABLE
-
-#ifdef TURBO_ENABLE
-static bool turbo_active = false; // Only changed by TRBO_ST
-static uint16_t turbo_keycode = KC_NO; // turbo_active can't be true if this is KC_NO
-static bool turbo_key_pressed = false;
-static bool turbo_keycode_selecting = false; // Determine new keycode or delay mode switch
-static bool turbo_ms_delay_direction = true; // True is raise the delay, false is lower it
-static uint16_t turbo_ms_delay_direction_indicator = 0;
-static uint16_t turbo_ms_delay = 100; // Start at sending keycodes 10 times a second
-static uint16_t turbo_timer; // Changed semi automatically
-/*
- * Because the KC's are wrapped in `LT()` they won't be interpreted as KC_NO or KC_TRNS
- * Instead they'll just be like any other custom KC which will let me use them how I want 
-*/
-#define TRBO_ST LT(_CTR, KC_NO  )
-#define TRBO_TI LT(_CTR, KC_TRNS)
-#else
-#define TRBO_ST KC_NO
-#define TRBO_TI KC_NO
-#endif
-
-const uint16_t PROGMEM keymaps[_END][MATRIX_ROWS][MATRIX_COLS] = {
-    [_MAIN] = LAYOUT_planck_mit(
-        KC_ESC , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_BSPC,
-        KC_TAB , KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT,
-        KC_LSFT, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_ENT ,
-        KC_LCTL, KC_LGUI, XXXXXXX,KC_LALT ,MO(_SUB),      KC_SPC     ,MO(_CTR), KC_LEFT, KC_DOWN, KC_UP  , KC_RGHT
-    ),
-    [_SUB] = LAYOUT_planck_mit(
-        KC_GRV , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_DEL,
-        XXXXXXX, KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_MINS, KC_EQL , KC_LBRC, KC_RBRC, KC_PGUP,
-        _______, KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 , XXXXXXX, KC_HOME, KC_END , KC_BSLS, KC_PGDN,
-        _______, _______, XXXXXXX, _______, _______,      _______    , _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-    ),
-    [_CTR] = LAYOUT_planck_mit(
-        XXXXXXX, RGB_SPD, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, XXXXXXX, XXXXXXX, KC_VOLU, XXXXXXX, XXXXXXX, MCR_REC,
-        XXXXXXX, RGB_RMOD,RGB_VAD, RGB_MOD, RGB_HUD, RGB_SAD, XXXXXXX, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, MCR_PLY,
-        XXXXXXX, XXXXXXX, RGB_TOG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLD, XXXXXXX, XXXXXXX, MCR_SWT,
-        XXXXXXX, XXXXXXX, XXXXXXX, TRBO_TI, TRBO_ST,      TOG_MSE,     _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-    )
-    #ifdef MOUSEKEY_ENABLE
-    ,[_MSE] = LAYOUT_planck_mit(
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, XXXXXXX, XXXXXXX, KC_BTN1, KC_WH_D, KC_WH_U, KC_BTN2, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MS_ACL_D,      TOG_MSE,    MS_ACL_U,XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-    )
-    #endif // MOUSEKEY_ENABLE
-};
-
-#ifdef RGB_MATRIX_ENABLE
-
-#define LAYER (get_highest_layer(layer_state))
-#define LAYER_SIZE (MATRIX_ROWS * MATRIX_COLS)
-#define BRIGHTNESS rgb_matrix_get_val()
-
-#ifdef UNDERGLOW_DISABLE
-void keyboard_pre_init_user(void) {
-    for (int key_id = 0; key_id < RGB_MATRIX_LED_COUNT; key_id++ ) {
-        if (g_led_config.flags[key_id] == LED_FLAG_UNDERGLOW) {
-            g_led_config.flags[key_id] = LED_FLAG_NONE;
-        }
-    }
-}
-#endif // UNDERGLOW_DISABLE
-
-bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
-    if (LAYER == _MAIN) {return false;}
-
-    for (uint8_t i = led_min; i <= led_max; i++) {
-        uint8_t pos = ((uint8_t*)g_led_config.matrix_co)[i];
-        if (!HAS_ANY_FLAGS(g_led_config.flags[pos], (LED_FLAG_MODIFIER | LED_FLAG_KEYLIGHT))) {continue;}
-        uint16_t KC = pgm_read_word(&((uint16_t*)keymaps)[(LAYER_SIZE * LAYER) + i]);
-
-        switch (KC) {
-            case KC_NO:
-                RGB_MATRIX_INDICATOR_SET_COLOR(pos, 0, 0, 0 );
-                break;
-
-            #ifdef DYNAMIC_MACRO_ENABLE
-            case MCR_SWT:
-                if (!MACRO1) { RGB_MATRIX_INDICATOR_SET_COLOR(pos, 0, BRIGHTNESS, BRIGHTNESS); }
-                break;
-
-            case MCR_REC:
-                if (RECORDING) { RGB_MATRIX_INDICATOR_SET_COLOR(pos, BRIGHTNESS, 0, 0); }
-                break;
-            #endif // DYNAMIC_MACRO_ENABLE
-
-            #ifdef TURBO_ENABLE
-            case TRBO_ST:
-                if (turbo_keycode_selecting) {
-                    RGB_MATRIX_INDICATOR_SET_COLOR(pos, BRIGHTNESS, BRIGHTNESS, BRIGHTNESS);
-                } else {
-                    if (turbo_active) {
-                        if (turbo_key_pressed) {
-                            RGB_MATRIX_INDICATOR_SET_COLOR(pos, BRIGHTNESS, BRIGHTNESS, BRIGHTNESS);
-                        } else {
-                            RGB_MATRIX_INDICATOR_SET_COLOR(pos, 0, 0, 0);
-                        }
-                    }
-                }
-                break;
-
-            case TRBO_TI:
-                if (turbo_ms_delay_direction_indicator != 0) {
-                    uint8_t time = timer_elapsed(turbo_ms_delay_direction_indicator) / 200;
-                    if (time > 0) {
-                        if ((time % 2) == 1) {
-                            if (turbo_ms_delay_direction) {
-                                RGB_MATRIX_INDICATOR_SET_COLOR(pos, 0, BRIGHTNESS, 0);
-                            } else {
-                                RGB_MATRIX_INDICATOR_SET_COLOR(pos, BRIGHTNESS, 0, 0);
-                            }
-                        } else {
-                            RGB_MATRIX_INDICATOR_SET_COLOR(pos, 0, 0, 0);
-                        }
-                        if (time >= 6) {
-                            turbo_ms_delay_direction_indicator = 0;
-                        }
-                    }
-                }
-                break;
-            #endif
-
-        }
-    }
-    return false;
-}
-#endif
-
-#ifdef TURBO_ENABLE
-void housekeeping_task_user(void) {
-    if (turbo_active) {
-        if (turbo_key_pressed) {
-            if (timer_elapsed(turbo_timer) > turbo_ms_delay) {
-                unregister_code(turbo_keycode);
-                turbo_key_pressed = false;
-                turbo_timer = timer_read();
-            }
-        } else {
-            if (timer_elapsed(turbo_timer) > (turbo_ms_delay / 2)) {
-                register_code(turbo_keycode);
-                turbo_key_pressed = true;
-            }
-        }
-    }
-}
-#endif
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    #ifdef DYNAMIC_MACRO_ENABLE
-    if (keycode == MCR_REC) {keycode = REC;}
-    if (keycode == MCR_PLY) {keycode = PLY;}
-    if (!process_dynamic_macro(keycode, record)) {
-        REC = (MACRO1 ? DM_REC1 : DM_REC2);
-        return false;
-    }
-    #endif // DYNAMIC_MACRO_ENABLE
-
-    #ifdef MOUSEKEY_ENABLE
-    if ((keycode == MS_ACL_U) || (keycode == MS_ACL_D)) {
-        if (record->event.pressed) {
-            if ( (keycode == MS_ACL_U) && (current_accel < 2) ) { current_accel += 1; }
-            if ( (keycode == MS_ACL_D) && (current_accel > 0) ) { current_accel -= 1; }
-        }
-        keycode = KC_ACL0 + current_accel;
-        action_t mousekey_action = action_for_keycode(keycode);
-        process_action(record, mousekey_action);
-    }
-    #endif // MOUSEKEY_ENABLE
-
-    #ifdef TURBO_ENABLE
-    if (record->event.pressed) {
-        if (turbo_keycode_selecting) {
-            if (IS_BASIC_KEYCODE(keycode)    || 
-                IS_MODIFIER_KEYCODE(keycode) ||
-                IS_JOYSTICK_KEYCODE(keycode) ||
-                IS_MOUSE_KEYCODE(keycode))
-            {
-                unregister_code(turbo_keycode);
-                turbo_key_pressed = false;
-                turbo_keycode = keycode;
-                turbo_keycode_selecting = false;
-            }
-        }
-    }
-    #endif
-
-    switch (keycode) {
-        #ifdef DYNAMIC_MACRO_ENABLE
-        case MCR_SWT:
-            if (!RECORDING && record->event.pressed) {
-                // if the button is pressed and we're not recording
-                MACRO1 = !MACRO1;
-                if (MACRO1) {
-                    REC = DM_REC1;
-                    PLY = DM_PLY1;
-                } else {
-                    REC = DM_REC2;
-                    PLY = DM_PLY2;
-                }
-            }
-            return false;
-        #endif // DYNAMIC_MACRO_ENABLE
-
-        #ifdef TURBO_ENABLE
-        case TRBO_ST:
-            if (record->event.pressed) {
-                if (!record->tap.count) {
-                    turbo_keycode_selecting = !turbo_keycode_selecting;
-                } else {
-                    if (turbo_keycode != KC_NO) {
-                        if (!turbo_active) {
-                            turbo_keycode_selecting = false;
-                            turbo_active = true;
-                        } else {
-                            unregister_code(turbo_keycode);
-                            turbo_key_pressed = false;
-                            turbo_active = false;
-                        }
-                    }
-                }
-            }
-            return false;
-
-        case TRBO_TI:
-            if (record->event.pressed) {
-                if (!record->tap.count) {
-                    turbo_ms_delay_direction = !turbo_ms_delay_direction;
-                    turbo_ms_delay_direction_indicator = timer_read();
-                } else {
-                    if (turbo_ms_delay_direction)
-                        turbo_ms_delay += 20;
-                    else
-                        turbo_ms_delay -= 20;
-
-                    if (turbo_ms_delay > 500) // half a second
-                        turbo_ms_delay = 500;
-                    if (turbo_ms_delay < 60) // Around 16 times a second
-                        turbo_ms_delay = 60;
-                }
-            }
-            return false;
-        #endif
-
-        default:
-            return true; //Process all other keycodes normally
-    }
-}
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/coffee/readme.md b/keyboards/kprepublic/bm40hsrgb/keymaps/coffee/readme.md
deleted file mode 100644
index 980f559d71f..00000000000
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/coffee/readme.md
+++ /dev/null
@@ -1,77 +0,0 @@
-# Kprepublic BM40HSRGB Coffee
-
-A layout that aims to be familiar to people that have used larger boards
-
-## The layout
-
-The primary layer ( `_MAIN` ) is as close to standard qwerty as I could get.
-| row | 1    | 2    | 3 | 4   | 5   | 6   | 7   | 8   | 9   | 10  | 11 | 12   |
-|-----|------|------|---|-----|-----|-----|-----|-----|-----|-----|----|------|
-| 1   | esc  |  q   | w |  e  |  r  |  t  | y   | u   | i   | o   | p  | bksp |
-| 2   | tab  |  a   | s |  d  |  f  |  g  | h   | j   | k   | l   | ;  | '    |
-| 3   | shft |  z   | x |  c  |  v  |  b  | n   | m   | ,   | .   | /  | rtrn |
-| 4   | ctrl | win  |   | alt | SUB | spc | <- | CTR | lft | dwn | up | rght |
-
-The secondary layer ( `_SUB` ) is for syntax, F keys, and number keys
-| row | 1   | 2  | 3  | 4  | 5   | 6   | 7   | 8  | 9    | 10  | 11 | 12   |
-|-----|-----|----|----|----|-----|-----|-----|----|------|-----|----|------|
-| 1   | grv | 1  | 2  | 3  | 4   | 5   | 6   | 7  | 8    | 9   | 0  | del  |
-| 2   |     | F1 | F2 | F3 | F4  | F5  | F6  | -  | =    | [   | ]  | pgup |
-| 3   | _   | F7 | F8 | F9 | F10 | F11 | F12 |    | home | end | \  | pgdn |
-| 4   | _   | _  |    | _  | _   | _   | <-  | _  |      |     |    |      |
-
-The control layer ( `_CTR` ) is for lighting, media, and macros
-| row | 1 | 2     | 3    |  4      |  5      | 6       | 7   | 8    | 9    | 10   | 11 | 12      |
-|-----|---|-------|------|---------|---------|---------|-----|------|------|------|----|---------|
-| 1   |   | SPD-  | BRI+ |  SPD+   |  HUE+   | SAT+    |     |      | VOL+ |      |    | MCR_REC |
-| 2   |   | EFCT- | BRI- |  EFCT+  |  HUE-   | SAT-    |     | PREV | PLAY | NEXT |    | MCR_PLY |
-| 3   |   |       | TOG  |         |         |         |     |      | VOL- |      |    | MCR_SWT |
-| 4   |   |       |      | TRBO_TI | TRBO_ST | MSE_TOG | <-  |      |      |      |    |         |
-
-The mouse layer ( `_MSE` ) is for making the keyboard function as a mouse as well
-| row | 1 | 2    | 3    | 4    | 5     | 6       | 7   | 8     | 9     | 10    | 11    | 12 |
-|-----|---|------|------|------|-------|---------|-----|-------|-------|-------|-------|----|
-| 1   |   |      |      |      |       |         |     |       |       |       |       |    |
-| 2   |   | MS_L | MS_D | MS_U | MS_R  |         |     | L_CLC | SCR_D | SCR_U | R_CLC |    |
-| 3   |   |      |      |      |       |         |     |       |       |       |       |    |
-| 4   |   |      |      |      | ACL_D | MSE_TOG | <-  | ACL_U |       |       |       |    |
-
-| Key name | Explanation                                  |
-|----------|----------------------------------------------|
-| \_       | Passthrough the key on the layer below       |
-| <-       | Same key as imediate left. Used for spacebar |
-| SUB      | Goes to _SUB layer while held down           |
-| CTR      | Goes to _CTR layer while held down           |
-| MSE_TOG  | Toggles the mouse layer on or off            |
-| SPD +/-  | Changes speed for the RGB effect             |
-| BRI +/-  | Changes the brightness of the lighting       |
-| EFCT +/- | Moves to the next/previous effect            |
-| TOG      | Toggles the lighting on or off               |
-| HUE +/-  | Changes the hue for RGB effects              |
-| SAT +/-  | Changes the saturation for RGB effects       |
-| MSE      | Toggles the Mouse layer                      |
-| VOL +/-  | Raises or lowers media volume                |
-| PREV     | Goes to previous media                       |
-| PLAY     | Play/Pause media                             |
-| NEXT     | Goes to next media                           |
-| MCR_REC  | Record macro ( Press again to stop )         |
-| MCR_PLY  | Play recorded macro                          |
-| MCR_SWT  | Switch active macro                          |
-| MS_L     | Move mouse cursor left                       |
-| MS_U     | Move mouse cursor up                         |
-| MS_D     | Move mouse cursor down                       |
-| MD_R     | Move mouse cursor right                      |
-| L_CLC    | Mouse left click                             |
-| R_CLC    | Mouse right click                            |
-| SCR_U    | Mouse scroll up                              |
-| SCR_D    | Mouse scroll down                            |
-| ACL_U    | Raise mouse/scroll speed                     |
-| ACL_D    | Lower mouse/scroll speed                     |
-| TRBO_ST  | Set turbo key (Hold), start/stop turbo (Tap) |
-| TRBO_TI  | Turbo speed +/- (Hold to switch direction)   |
-
-## Compiling
-
-Compiling: `make kprepublic/bm40hsrgb:coffee`
-
-Flashing: `make kprepublic/bm40hsrgb:coffee:flash`
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/coffee/rules.mk b/keyboards/kprepublic/bm40hsrgb/keymaps/coffee/rules.mk
deleted file mode 100644
index 1f143e60267..00000000000
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/coffee/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-MOUSEKEY_ENABLE = yes
-NKRO_ENABLE = yes
-DYNAMIC_MACRO_ENABLE = yes
-LTO_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/dan/config.h b/keyboards/kprepublic/bm40hsrgb/keymaps/dan/config.h
deleted file mode 100644
index 67e81609ae0..00000000000
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/dan/config.h
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2021 Dan Kim (@syntax-magic)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#define TAPPING_TERM 136
-#define TAPPING_TERM_PER_KEY
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/dan/features/custom_shift_keys.c b/keyboards/kprepublic/bm40hsrgb/keymaps/dan/features/custom_shift_keys.c
deleted file mode 100644
index 5576612f9ad..00000000000
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/dan/features/custom_shift_keys.c
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright 2021-2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-/**
- * @file custom_shift_keys.c
- * @brief Custom Shift Keys implementation
- *
- * For full documentation, see
- * <https://getreuer.info/posts/keyboards/custom-shift-keys>
- */
-
-#include "custom_shift_keys.h"
-
-bool process_custom_shift_keys(uint16_t keycode, keyrecord_t *record) {
-    static uint16_t registered_keycode = KC_NO;
-
-    // If a custom shift key is registered, then this event is either releasing
-    // it or manipulating another key at the same time. Either way, we release
-    // the currently registered key.
-    if (registered_keycode != KC_NO)
-        {
-         unregister_code16(registered_keycode);
-         registered_keycode = KC_NO;
-        }
-
-    if (record->event.pressed)
-    {  // Press event.
-        const uint8_t mods = get_mods();
-
-#ifndef NO_ACTION_ONESHOT
-    if ((mods | get_weak_mods() | get_oneshot_mods()) & MOD_MASK_SHIFT)
-    {
-#else
-    if ((mods | get_weak_mods()) & MOD_MASK_SHIFT)
-        {  // Shift is held.
-#endif  // NO_ACTION_ONESHOT
-            // Search for a custom key with keycode equal to `keycode`.
-            for (int i = 0; i < NUM_CUSTOM_SHIFT_KEYS; ++i)
-            {
-
-                if (keycode == custom_shift_keys[i].keycode)
-                {
-                    // Continue default handling if this is a tap-hold key being held.
-                    if (((QK_MOD_TAP <= keycode && keycode <= QK_MOD_TAP_MAX) || (QK_LAYER_TAP <= keycode && keycode <= QK_LAYER_TAP_MAX)) && record->tap.count == 0)
-                    {
-                        return true;
-                    }
-
-#ifndef NO_ACTION_ONESHOT
-                del_oneshot_mods(MOD_MASK_SHIFT);
-#endif  // NO_ACTION_ONESHOT
-                del_mods(MOD_MASK_SHIFT);
-                del_weak_mods(MOD_MASK_SHIFT);
-                send_keyboard_report();
-                registered_keycode = custom_shift_keys[i].shifted_keycode;
-                register_code16(registered_keycode);
-                set_mods(mods);  // Restore the mods.
-                return false;
-                }
-            }
-        }
-    }
-
-  return true;  // Continue with default handling.
-}
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/dan/features/custom_shift_keys.h b/keyboards/kprepublic/bm40hsrgb/keymaps/dan/features/custom_shift_keys.h
deleted file mode 100644
index d6cb7a9fdd6..00000000000
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/dan/features/custom_shift_keys.h
+++ /dev/null
@@ -1,99 +0,0 @@
-// Copyright 2021-2022 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-/**
- * @file custom_shift_keys.h
- * @brief Custom shift keys: customize what keycode is produced when shifted.
- *
- * Overview
- * --------
- *
- * This library implements custom shift keys, keys where you can customize
- * what keycode is produced when shifted.
- *
- * Step 1: In your keymap.c, define a table of custom shift keys like
- *
- *     #include "features/custom_shift_keys.h"
- *
- *     const custom_shift_key_t custom_shift_keys[] = {
- *       {KC_DOT , KC_QUES}, // Shift . is ?
- *       {KC_COMM, KC_EXLM}, // Shift , is !
- *       {KC_MINS, KC_EQL }, // Shift - is =
- *       {KC_COLN, KC_SCLN}, // Shift : is ;
- *     };
- *
- * Each row defines one key. The first field is the keycode as it appears in
- * your layout and determines what is typed normally. The second entry is what
- * you want the key to type when shifted.
- *
- * Step 2: Handle custom shift keys from your `process_record_user` function as
- *
- *     bool process_record_user(uint16_t keycode, keyrecord_t* record) {
- *       if (!process_custom_shift_keys(keycode, record)) { return false; }
- *       // Your macros ...
- *
- *       return true;
- *     }
- *
- * Step 3: add `features/custom_shift_keys.c` to your rules.mk as
- *
- *     SRC += features/custom_shift_keys.c
- *
- *
- * For full documentation, see
- * <https://getreuer.info/posts/keyboards/custom-shift-keys>
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * Custom shift key entry. The `keycode` field is the keycode as it appears in
- * your layout and determines what is typed normally. The `shifted_keycode` is
- * what you want the key to type when shifted.
- */
-typedef struct {
-  uint16_t keycode;
-  uint16_t shifted_keycode;
-} custom_shift_key_t;
-
-/** Table of custom shift keys. */
-extern const custom_shift_key_t custom_shift_keys[];
-/** Number of entries in the `custom_shift_keys` table. */
-extern uint8_t NUM_CUSTOM_SHIFT_KEYS;
-
-/**
- * Handler function for custom shift keys.
- *
- * In keymap.c, call this function from your `process_record_user` function as
- *
- *     #include "features/custom_shift_keys.h"
- *
- *     bool process_record_user(uint16_t keycode, keyrecord_t* record) {
- *       if (!process_custom_shift_keys(keycode, record)) { return false; }
- *       // Your macros ...
- *
- *       return true;
- *     }
- */
-bool process_custom_shift_keys(uint16_t keycode, keyrecord_t *record);
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/dan/keymap.c b/keyboards/kprepublic/bm40hsrgb/keymaps/dan/keymap.c
deleted file mode 100644
index 54b4652fdf9..00000000000
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/dan/keymap.c
+++ /dev/null
@@ -1,349 +0,0 @@
-/* Copyright 2020 tominabox1
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-#include "features/custom_shift_keys.h"
-
-enum layers {
-    _ALPHA,
-    _LEFTFN,
-    _NUMPAD,
-    _RIGHTFN,
-    _MOBA,
-    _FPS1,
-    _FPS2,
-    _STRAT,
-    _ARROWS,
-    _CLEAN,
-    _RGB
-};
-
-#define ALPHA TO(_ALPHA)
-#define LEFTFN MO(_LEFTFN)
-#define NUMPAD MO(_NUMPAD)
-#define RIGHTFN MO(_RIGHTFN)
-#define MOBA TG(_MOBA)
-#define FPS1 TG(_FPS1)
-#define FPS2 TG(_FPS2)
-#define STRAT TG(_STRAT)
-#define ARROWS TG(_ARROWS)
-#define CLEAN TG(_CLEAN)
-#define RGB MO(_RGB)
-
-// Tap dance declarations
-enum {
-    TD_PAST_PSLS,
-    TD_PASTE_COPY
-};
-
-tap_dance_action_t tap_dance_actions[] = {
-    [TD_PAST_PSLS]  = ACTION_TAP_DANCE_DOUBLE(KC_PAST,    KC_PSLS),
-    [TD_PASTE_COPY] = ACTION_TAP_DANCE_DOUBLE(LCTL(KC_V), LCTL(KC_C))
-};
-
-// Custom shift implementation
-const custom_shift_key_t custom_shift_keys[] = {
-    {KC_LNG1, KC_LNG2},
-    {KC_LT, KC_COMM},
-    {KC_GT, KC_DOT},
-    {KC_LCBR, KC_LBRC},
-    {KC_RCBR, KC_RBRC}
-};
-
-uint8_t NUM_CUSTOM_SHIFT_KEYS = sizeof(custom_shift_keys) / sizeof(custom_shift_key_t);
-
-bool process_record_user(uint16_t keycode, keyrecord_t* record)
-{
-    if ( !process_custom_shift_keys(keycode, record)) { return false; }
-
-    return true;
-}
-
-// Keymaps
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* ALPHA
- * ,-----------------------------------------------------------------------------------.
- * |  Tab |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  '   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Return|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |  Esc |KOR/HN|  Win |  Alt |LEFTFN|    Space    |RFN/- |   =  |Delete|   \  | Enter|
- * `-----------------------------------------------------------------------------------'
- */
-[_ALPHA] = LAYOUT_planck_mit(
-    KC_TAB,              KC_Q,    KC_W,    KC_E,    KC_R,   KC_T, KC_Y, KC_U,                 KC_I,    KC_O,    KC_P,    KC_BSPC,
-    KC_LCTL,             KC_A,    KC_S,    KC_D,    KC_F,   KC_G, KC_H, KC_J,                 KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-    KC_LSFT,             KC_Z,    KC_X,    KC_C,    KC_V,   KC_B, KC_N, KC_M,                 KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,
-    LT(NUMPAD, KC_ESC),  KC_LNG1, KC_LGUI, KC_LALT, LEFTFN,   KC_SPC,   LT(RIGHTFN, KC_MINS), KC_EQL,  KC_DEL,  KC_BSLS, KC_PENT
-),
-
-/* LEFTFN
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | Left | Down | Up   |Right |Ctrl+/|PrntSc|   {  |   }  |   )  |   :  |  "   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift|   [  |  ]   | Home | End  | PGUP | PGDN |   (  |   <  |   >  |   /  |Return|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |  RGB | Caps | Ins  | Alt  | Trns |    Space    |   _  |   +  |Delete|   |  | Enter|
- * `-----------------------------------------------------------------------------------'
- */
-[_LEFTFN] = LAYOUT_planck_mit(
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,     KC_5,          KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
-    KC_LCTL, KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT, LCTL(KC_SLSH), KC_PSCR, KC_LCBR, KC_RCBR, KC_RPRN, KC_COLN, KC_DQUO,
-    KC_LSFT, KC_LBRC, KC_RBRC, KC_HOME, KC_END,   KC_PGUP,       KC_PGDN, KC_LPRN, KC_LT,   KC_GT,   KC_SLSH, KC_ENT,
-    RGB,     KC_CAPS, KC_INS,  KC_LALT, KC_TRNS,        KC_SPC,           KC_UNDS, KC_PLUS, KC_DEL,  KC_PIPE, KC_PENT
-),
-
-/* NUMPAD
- * ,-----------------------------------------------------------------------------------.
- * | *or/ |   7  |   8  |   9  | NumLk|      |      |      |      |      |      | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |  Alt |   4  |   5  |   6  |Return|      |      |      |      |      | Shift|      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |   -  |   1  |   2  |   3  | Bksp |      |      |      |   ,  |   .  | Ctrl |Return|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Trns |   ,  |   +  |   .  |   0  |    Space    | MOBA | FPS1 | FPS2 | STRAT|ARROWS|
- * `-----------------------------------------------------------------------------------'
- */
-[_NUMPAD] = LAYOUT_planck_mit(
-    TD(TD_PAST_PSLS), KC_P7,   KC_P8,   KC_P9,   KC_NUM,  KC_NO,     KC_NO, KC_NO,  KC_NO,   KC_NO,     KC_NO,     KC_BSPC,
-    KC_LALT,          KC_P4,   KC_P5,   KC_P6,   KC_ENT,  KC_NO,     KC_NO, KC_NO,  KC_NO,   KC_NO,     KC_LSFT,   KC_NO,
-    KC_PMNS,          KC_P1,   KC_P2,   KC_P3,   KC_BSPC, KC_NO,     KC_NO, KC_NO,  KC_COMM, KC_DOT,    KC_LCTL,   KC_ENT,
-    KC_TRNS,          KC_COMM, KC_PPLS, KC_PDOT, KC_P0,       KC_SPC,       MOBA, FPS1,    FPS2, STRAT, ARROWS
-),
-
-/* RIGHTFN
- * ,-----------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |  F12 |  F11 |  F10 |  F9  | Pause|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl |      |      |      |      |      |      |  F8  |  F7  |  F6  |  F5  |Scllck|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift|      |      |      |      |      |      |  F4  |  F3  |  F2  |  F1  |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |  Alt |      |    Space    | Trns |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_RIGHTFN] = LAYOUT_planck_mit(
-    KC_NO,   KC_NO, KC_NO, KC_NO,   KC_NO, KC_NO, KC_NO, KC_F12,  KC_F11, KC_F10, KC_F9, KC_PAUS,
-    KC_LCTL, KC_NO, KC_NO, KC_NO,   KC_NO, KC_NO, KC_NO, KC_F8,   KC_F7,  KC_F6,  KC_F5, KC_SCRL,
-    KC_LSFT, KC_NO, KC_NO, KC_NO,   KC_NO, KC_NO, KC_NO, KC_F4,   KC_F3,  KC_F2,  KC_F1, KC_NO,
-    KC_NO,   KC_NO, KC_NO, KC_LALT, KC_NO,    KC_SPC,    KC_TRNS, KC_NO,  KC_NO,  KC_NO, KC_NO
-),
-
-/* MOBA
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   5  |   Y  |      |      |   O  |   P  | ESC  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl |   A  |   S  |   D  |   F  |      |      |      |      |   L  |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift|   Z  |   6  |   4  |   1  |   B  |      |      |      |      |      |Return|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |   3  |   X  |   C  |  Alt |   2  |    Space    |      |      |      |      | ALPHA|
- * `-----------------------------------------------------------------------------------'
- */
-[_MOBA] = LAYOUT_planck_mit(
-    KC_TAB,  KC_Q, KC_W, KC_E,    KC_R, KC_5,  KC_Y,  KC_NO, KC_NO, KC_O,  KC_P,  KC_ESC,
-    KC_LCTL, KC_A, KC_S, KC_D,    KC_F, KC_NO, KC_NO, KC_NO, KC_NO, KC_L,  KC_NO, KC_NO,
-    KC_LSFT, KC_Z, KC_6, KC_4,    KC_1, KC_B,  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_ENT,
-    KC_3,    KC_X, KC_C, KC_LALT, KC_2,    KC_SPC,    KC_NO, KC_NO, KC_NO, KC_NO, ALPHA
-),
-
-/* FPS1
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | ESC  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |   1  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |      |  F7  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift|   Z  |   3  |   X  |   C  |   V  |   B  |   M  |   ,  |   .  |      |  F9  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl |   5  |   4  |  Alt |   2  |    Space    |   6  |   8  |  7   |  9   | ALPHA|
- * `-----------------------------------------------------------------------------------'
- */
-[_FPS1] = LAYOUT_planck_mit(
-    KC_TAB,  KC_Q, KC_W, KC_E,    KC_R, KC_T, KC_Y, KC_U, KC_I,    KC_O,   KC_P,  KC_ESC,
-    KC_1,    KC_A, KC_S, KC_D,    KC_F, KC_G, KC_H, KC_J, KC_K,    KC_L,   KC_NO, KC_F7,
-    KC_LSFT, KC_Z, KC_3, KC_X,    KC_C, KC_V, KC_B, KC_M, KC_COMM, KC_DOT, KC_NO, KC_F9,
-    KC_LCTL, KC_5, KC_4, KC_LALT, KC_2,   KC_SPC,   KC_6, KC_8,    KC_7,   KC_9,  ALPHA
-),
-
-/* FPS2
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | ESC  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |   1  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Return|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl |      |      | Alt  |   2  |    Space    | Bksp |      |      |      | ALPHA|
- * `-----------------------------------------------------------------------------------'
- */
-[_FPS2] = LAYOUT_planck_mit(
-    KC_TAB,  KC_Q,  KC_W,  KC_E,    KC_R, KC_T, KC_Y, KC_U,    KC_I,    KC_O,   KC_P,    KC_ESC,
-    KC_1,    KC_A,  KC_S,  KC_D,    KC_F, KC_G, KC_H, KC_J,    KC_K,    KC_L,   KC_SCLN, KC_QUOT,
-    KC_LSFT, KC_Z,  KC_X,  KC_C,    KC_V, KC_B, KC_N, KC_M,    KC_COMM, KC_DOT, KC_SLSH, KC_ENT,
-    KC_LCTL, KC_NO, KC_NO, KC_LALT, KC_2,   KC_SPC,   KC_BSPC, KC_NO,   KC_NO,  KC_NO,   ALPHA
-),
-
-/* STRAT
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  '   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Return|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Esc  |      |      | Alt  |   F1 |    Space    |  F10 | Pause|Delete|      | ALPHA|
- * `-----------------------------------------------------------------------------------'
- */
-[_STRAT] = LAYOUT_planck_mit(
-    KC_TAB,  KC_Q,   KC_W,  KC_E,    KC_R,  KC_T, KC_Y, KC_U,   KC_I,    KC_O,   KC_P,    KC_BSPC,
-    KC_LCTL, KC_A,   KC_S,  KC_D,    KC_F,  KC_G, KC_H, KC_J,   KC_K,    KC_L,   KC_SCLN, KC_QUOT,
-    KC_LSFT, KC_Z,   KC_X,  KC_C,    KC_V,  KC_B, KC_N, KC_M,   KC_COMM, KC_DOT, KC_SLSH, KC_ENT,
-    KC_ESC,  KC_NO,  KC_NO, KC_LALT, KC_F1,   KC_SPC,   KC_F10, KC_PAUS, KC_DEL, KC_NO,   ALPHA
-),
-
-/* ARROWS
- * ,-----------------------------------------------------------------------------------.
- * | Tab  |   Q  |  Up  |   E  |   R  |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |   A  | Left | Down | Right|   F  |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl |      |      |  Alt |   S  |    Space    |      |      |      |      | ALPHA|
- * `-----------------------------------------------------------------------------------'
- */
-[_ARROWS] = LAYOUT_planck_mit(
-    KC_TAB,  KC_Q,    KC_UP,   KC_E,     KC_R, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-    KC_A,    KC_LEFT, KC_DOWN, KC_RIGHT, KC_F, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-    KC_LSFT, KC_Z,    KC_X,    KC_C,     KC_V, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-    KC_LCTL, KC_NO,   KC_NO,   KC_LALT,  KC_S,    KC_SPC,    KC_NO, KC_NO, KC_NO, KC_NO, ALPHA
-),
-
-/* CLEAN
- * ,-----------------------------------------------------------------------------------.
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      | ALPHA|
- * `-----------------------------------------------------------------------------------'
- */
-[_CLEAN] = LAYOUT_planck_mit(
-    KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-    KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-    KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-    KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,     KC_NO,    KC_NO, KC_NO, KC_NO, KC_NO, ALPHA
-),
-
-/* RGB (LEFTFN + RGB)
- *                      v------------------------RGB CONTROL--------------------v
- * ,-----------------------------------------------------------------------------------.
- * | Mute | Reset| MS_U | BR B | BR F |      |      | MOD R| MOD B| FX+  |      |CLEAN |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | MS_L | MS_D | MS_R |Return|PST/CO|      | MOD P| MOD S| FX-  |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift| MCK  | RCK  | LCK  | Bksp |      |      | BRT+ | MOD+ | SAT+ | HUE+ | MS 0 |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Trns | VOL- | VOL+ | WL U | WL D |    Space    | BRT- | MOD- | SAT- | HUE- |RGBTGL|
- * `-----------------------------------------------------------------------------------'
- */
-[_RGB] = LAYOUT_planck_mit(
-    KC_MUTE, QK_BOOT, KC_MS_U, KC_WBAK, KC_WFWD, KC_NO,             KC_NO, RGB_M_R, RGB_M_B,  RGB_SPI, KC_NO,   CLEAN,
-    KC_LCTL, KC_MS_L, KC_MS_D, KC_MS_R, KC_ENT,  TD(TD_PASTE_COPY), KC_NO, RGB_M_P, RGB_M_SW, RGB_SPD, KC_NO,   KC_NO,
-    KC_LSFT, KC_BTN3, KC_BTN2, KC_BTN1, KC_BSPC, KC_NO,             KC_NO, RGB_VAI, RGB_MOD,  RGB_SAI, RGB_HUI, KC_ACL0,
-    KC_TRNS, KC_VOLD, KC_VOLU, KC_WH_U, KC_WH_D,           KC_SPC,         RGB_VAD, RGB_RMOD, RGB_SAD, RGB_HUD, RGB_TOG
-)
-
-};
-
-/*
-// Key Matrix to LED Index
-{ 0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11},
-{12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23},
-{24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35},
-{36, 37, 38, 39, 40,   41,   42, 43, 44, 45, 46}
-*/
-bool rgb_matrix_indicators_user(void) {
-    uint8_t red[3] = {22, 2, 0};
-    uint8_t yellow[3] = {20, 22, 0};
-    uint8_t blue[3] = {0, 6, 20};
-    uint8_t green[3] = {14, 22, 0};
-    uint8_t purple[3] = {6, 0, 22};
-    uint8_t white[3] = {255, 255, 255};
-
-    switch (get_highest_layer(layer_state)) {
-        case _ALPHA:
-            break;
-        case _LEFTFN:
-            break;
-        case _RIGHTFN:
-            break;
-        case _NUMPAD:
-            break;
-        case _MOBA:
-            rgb_matrix_set_color(16, red[0],    red[1],    red[2]);
-            rgb_matrix_set_color(15, yellow[0], yellow[1], yellow[2]);
-            rgb_matrix_set_color(29, blue[0],   blue[1],   blue[2]);
-            rgb_matrix_set_color(10, purple[0], purple[1], purple[2]);
-            break;
-        case _FPS1:
-            rgb_matrix_set_color(43, green[0],  green[1],  green[2]);
-            break;
-        case _FPS2:
-            rgb_matrix_set_color(44, green[0],  green[1],  green[2]);
-            break;
-        case _STRAT:
-            rgb_matrix_set_color(45, green[0],  green[1],  green[2]);
-            break;
-        case _ARROWS:
-            rgb_matrix_set_color(46, green[0],  green[1],  green[2]);
-            break;
-        case _CLEAN:
-            rgb_matrix_set_color_all(white[0],  white[1],  white[2]);
-            break;
-        case _RGB:
-            rgb_matrix_set_color(1, blue[0], blue[1], blue[2]);
-            break;
-    }
-
-    led_t led_state = host_keyboard_led_state();
-    //Capslock led
-    if (led_state.caps_lock) {
-        rgb_matrix_set_color(0,  green[0], green[1], green[2]);
-    }
-    //Numlock led
-    if (led_state.num_lock) {
-    } else {
-        rgb_matrix_set_color(11, green[0], green[1], green[2]);
-    }
-    //Scroll lock led
-    if (led_state.scroll_lock) {
-        rgb_matrix_set_color(23, green[0], green[1], green[2]);
-    }
-    return false;
-}
-
-// Turn of RGB Matrix Effect
-void keyboard_post_init_user(void) {
-    rgb_matrix_mode_noeeprom(RGB_MATRIX_SOLID_COLOR);
-    rgb_matrix_sethsv_noeeprom(HSV_OFF);
-}
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/dan/readme.md b/keyboards/kprepublic/bm40hsrgb/keymaps/dan/readme.md
deleted file mode 100644
index 72764d14086..00000000000
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/dan/readme.md
+++ /dev/null
@@ -1,105 +0,0 @@
-# Dan's KPrepublic BM40 Keymap
-
->This is my personal keymap with an LED indicator support for num lock, caps lock and scroll lock.
-
-![](https://i.imgur.com/2yclc1B.jpg)
-> * Case: Poseidon PSD40 Case
-> * Plate: Brass
-> * Keycaps: WOB ABS Cherry Profile
-> * Switches: Gazzew Boba U4t (62g 2 stage long spring)
-
-<br />
-
-### BM40 LED INDEX
-**_Numlock ( 11 ) Capslock ( 0 or 12 ) Scroll lock ( 23 )_**
-
-|         |  _A_ |  _B_ |  _C_ |  _D_ |  _E_ |  _F_ |  _G_ |  _H_ |  _I_ |  _J_ |  _K_ |  _L_ |
-|---------|---:|---:|---:|---:|---:|---:|---:|---:|---:|---:|---:|---:|
-| **_1_** |  0 |  1 |  2 |  3 |  4 |  5 |  6 |  7 |  8 |  9 | 10 | 11 |
-| **_2_** | 12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 20 | 21 | 22 | 23 |
-| **_3_** | 24 | 25 | 26 | 27 | 28 | 29 | 30 | 31 | 32 | 33 | 34 | 35 |
-| **_4_** | &nbsp;&nbsp;&nbsp;36 | &nbsp;&nbsp;&nbsp;37 | &nbsp;&nbsp;&nbsp;38 | &nbsp;&nbsp;&nbsp;&nbsp;39 | &nbsp;&nbsp;&nbsp;&nbsp;40 | &nbsp;&nbsp;&nbsp;41 | &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;| &nbsp;&nbsp;&nbsp;42 | &nbsp;&nbsp;&nbsp;43 | &nbsp;&nbsp;&nbsp;44 | &nbsp;&nbsp;&nbsp;45 | &nbsp;&nbsp;&nbsp;46 |
-
-<br />
-
-## LED INDICATOR EXAMPLES
-![](https://i.imgur.com/qpkRNio.jpg)
-![](https://i.imgur.com/GfG252J.jpg)
-> * Case: SM Keyboards Planck/Niu Mini Acrylic Case
-> * Plate: Acrylic
-> * Keycaps: Drop + biip MT3 Extended 2048 Katakana
-> * Switches: Everglide Aqua King (62g 2 stage long spring)
-
-<br />
-
-## KEYMAP LAYOUT EXAMPLES
-### ALPHA
-
-|         | _A_ | _B_ | _C_ | _D_ | _E_ | _F_ | _G_ | _H_ | _I_ | _J_ | _K_ | _L_ |
-|---------|----:|----:|----:|----:|----:|----:|----:|----:|----:|----:|----:|----:|
-| **_1_** | TAB |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  | BSP |
-| **_2_** | CTL |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |
-| **_3_** | SFT |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  | RET |
-| **_4_** | &nbsp;Esc | KOR | WIN | &nbsp;&nbsp;ALT | &nbsp;&nbsp;&nbsp;FN | &nbsp;SPC | &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; | &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;- | &nbsp;&nbsp;&nbsp;&nbsp;= | DEL | &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;\\ | ENT |
->This is a base layer for typing.
-
-<br />
-
-### LEFTFN MO(FN)
-
-|         | _A_ | _B_ | _C_ | _D_ | _E_ | _F_ | _G_ | _H_ | _I_ | _J_ | _K_ | _L_ |
-|---------|----:|----:|----:|----:|----:|----:|----:|----:|----:|----:|----:|----:|
-| **_1_** |  \` |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  | BSP |
-| **_2_** | CTL | LFT | DN  | UP  | RHT | C+/ | PRN |  [  |  ]  |  )  |  :  |  "  |
-| **_3_** | SFT |  [  | ]&nbsp; | HOM | END | PGU | PGD |  (  |  ,  |  .  |  /  | RET |
-| **_4_** | RGB | CAP | INS | ALT | TRN | &nbsp;SPC || &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;_ | &nbsp;&nbsp;&nbsp;&nbsp;+ | &nbsp;DEL | &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;\| | ENT |
->This is the layer dedicated to number, symbol and navigation keys. ie) arrow keys
-
-<br />
-
-### RIGHTFN MO(-)
-
-|         | _A_ | _B_ | _C_ | _D_ | _E_ | _F_ | _G_ | _H_ | _I_ | _J_ | _K_ | _L_ |
-|---------|----:|----:|----:|----:|----:|----:|----:|----:|----:|----:|----:|----:|
-| **_1_** |     |     |     |     |     |     |     | F12 | F11 | F10 |  F9 | PAU |
-| **_2_** | CTL |     |     |     |     |     |     | F8  | F7  | F6  |  F5 | SCL |
-| **_3_** | SFT |     |     |     |     |     |     | F4  | F3  | F2  |  F1 |     |
-| **_4_** | &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; | &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; | &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; | &nbsp;&nbsp;ALT&nbsp; | &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; | &nbsp;SPC | &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; | &nbsp;TRN | &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; | &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;| &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;| &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;|
->This layer contains function rows.
-
-<br />
-
-### NUMPAD MO(Esc)
-
-|         | _A_ | _B_ | _C_ | _D_ | _E_ | _F_ | _G_ | _H_ | _I_ | _J_ | _K_ | _L_ |
-|---------|----:|----:|----:|----:|----:|----:|----:|----:|----:|----:|----:|----:|
-| **_1_** | *or/|  7  |  8  |  9  | NUM |     |     |     |     |     |     | BSP |
-| **_2_** | ALT |  4  |  5  |  6  | RET |     |     |     |     |     |     |     |
-| **_3_** |  -  |  1  |  2  |  3  | BSP |     |     |     |     |     |     | RET |
-| **_4_** | TRN | &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;, | &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;+ | &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;. | &nbsp;&nbsp;&nbsp;0 | SPC | &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; | &nbsp;&nbsp;LY1 | &nbsp;LY2 | &nbsp;LY3 | &nbsp;LY4 | &nbsp;LY5 |
->This layer is the numpad.
-<br />
-
-There are other dedicated layers for gaming that are not included here.  
-If you are interested, check out keymap.c!  
-
-<br />
-
-## PHOTOS
-
-![](https://imgur.com/ABblRwp.jpg)
-> * Case: SM Keyboards Planck/Niu Mini Acrylic Case
-> * Plate: Acrylic
-> * Keycaps: Rama Works GRID Set A Keycaps ( Kuros )
-> * Switches: Thic Thock Marshmallow Linear Switch ( 55g )
-
-<br />
-
-![](https://i.imgur.com/imqhjZW.jpg)
-> * Case: JJ40 Aluminium Acclive Case with Acrylic Diffuser
-> * Keycaps: YMDK DSA Keycaps
-> * Artisan: Rodríguez Cap by Polykeys
-
-<br />
-
-<div style="text-align: right">- END -</div>
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/dan/rules.mk b/keyboards/kprepublic/bm40hsrgb/keymaps/dan/rules.mk
deleted file mode 100644
index 4b8ec33fa00..00000000000
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/dan/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-TAP_DANCE_ENABLE = yes
-SRC += features/custom_shift_keys.c
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/simchee/config.h b/keyboards/kprepublic/bm40hsrgb/keymaps/simchee/config.h
deleted file mode 100644
index 051ee8a8d14..00000000000
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/simchee/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2022 Sinan Okman (@simchee)
- *
- *  This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#define NO_MUSIC_MODE
-#define AUDIO_CLICKY
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/simchee/keymap.c b/keyboards/kprepublic/bm40hsrgb/keymaps/simchee/keymap.c
deleted file mode 100755
index 04f166cff6e..00000000000
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/simchee/keymap.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/* Copyright 2022 Sinan Okman (@simchee)
- *
- *  This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-enum layers {
-	QWERTZ,
-	LOWER,
-	RAISE,
-	FN1,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	[QWERTZ] = LAYOUT_planck_mit
-	(
-	 KC_TAB,		KC_Q,				KC_W,				KC_E,				KC_R,				KC_T,				KC_Z,				KC_U,				KC_I,				KC_O,				KC_P,				KC_BSPC,
-	 MO(FN1),		KC_A,				KC_S,				KC_D,				KC_F,				KC_G,				KC_H,				KC_J,				KC_K,				KC_L,				KC_SCLN,		KC_SLSH,
-	 KC_LSFT,		KC_Y,				KC_X,				KC_C,				KC_V,				KC_B,				KC_N,				KC_M,				KC_COMM,		KC_DOT,			KC_UP,			KC_ENT,
-	 KC_ESC,		KC_LGUI,		KC_LCTL,		KC_LALT,		MO(LOWER),				KC_SPC,						MO(RAISE),	KC_ALGR,		KC_LEFT,		KC_DOWN,		KC_RIGHT
-	 ),
-
-	[LOWER] = LAYOUT_planck_mit
-	(
-	 KC_TAB,		KC_PGUP,		KC_UP,			KC_PGDN,		KC_HOME,		_______,		_______,		KC_7,				KC_8,				KC_9,				KC_EQL,			KC_BSPC,
-	 MO(FN1),		KC_LEFT,		KC_DOWN,		KC_RIGHT,		KC_END,			_______,		KC_NUHS,		KC_4,				KC_5,				KC_6,				KC_ASTR,		KC_SLSH,
-	 KC_LSFT,		KC_MUTE,		KC_VOLD,		KC_VOLU,		KC_MPLY,		KC_MPRV,		KC_MNXT,		KC_1,				KC_2,				KC_3,				KC_PLUS,		KC_ENTER,
-	 KC_ESC,		RGB_TOG,		KC_LCTL,		KC_LALT,		MO(LOWER),				KC_SPC,						KC_COMM,		KC_0,				KC_DOT,			KC_MINS,		_______
-	 ),
-
-	[RAISE] = LAYOUT_planck_mit
-	(
-	 KC_CIRC,		KC_EXLM,		KC_AT,			_______,		KC_DLR,			KC_PERC,		KC_AMPR,		KC_ASTR,		KC_LPRN,		KC_RPRN,		KC_QUES,		KC_TILD,
-	 MO(FN1),		_______,		_______,		_______,		_______,		_______,		_______,		KC_GRV,			KC_LBRC,		KC_RBRC,		KC_QUOT,		KC_BSLS,
-	 KC_LSFT,		KC_MINS,		_______,		_______,		_______,		_______,		_______,		_______,		KC_LABK,		KC_RABK,		KC_EQL,			KC_HASH,
-	 _______,		_______,		_______,		_______,		MO(LOWER),				KC_SPC, 					MO(RAISE),	KC_ALGR,		_______,		_______,		_______
-	 ),
-	
-	[FN1] = LAYOUT_planck_mit
-	(
-	 KC_F12,		KC_F1,			KC_F2,			KC_F3,			KC_F4,			KC_F5,			KC_F6,			KC_F7,			KC_F8,			KC_F9,			KC_F10,			KC_DEL,
-	 MO(FN1),		KC_F11,			_______,		_______,		_______,		_______,		KC_HOME,		KC_PGDN,		KC_PGUP,		KC_END,			_______,		_______,
-	 KC_LSFT,		KC_CAPS,		_______,		_______,		_______,		_______,		KC_LEFT,		KC_DOWN,		KC_UP,			KC_RIGHT,		_______,		KC_APP,
-	 QK_BOOT,		_______,		_______,		_______,		MO(LOWER),				KC_SPC,							KC_BSPC,	_______,		_______,		KC_PSCR,		KC_INS
-	 )
-
-};
-
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/simchee/readme.md b/keyboards/kprepublic/bm40hsrgb/keymaps/simchee/readme.md
deleted file mode 100644
index 1aaedbda524..00000000000
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/simchee/readme.md
+++ /dev/null
@@ -1,75 +0,0 @@
-# Simchee's BM40HSRGB
-
-Simple Design for US ANSI international, German and Turkish letters are written using dead keys on Linux. Keyboard hasn't been tested on Windows. 
-
-# Flashing
-
-```bash
-qmk flash -kb kprepublic/bm40hsrgb -km simchee -bl dfu
-```
-
-# Layout
-## QWERTZ
-
-Changes from standard ANSI keyboard for better ergonomic: switch ctrl and GUI (Windows) keys, escape at left bottom, tab on left top. 
-
-```
-  .-----------------------------------------------------------------------------------------------.
-  |  Tab  |   Q   |   W   |   E   |   R   |   T   |   Z   |   U   |   I   |   O   |   P   | Bkspc |
-  |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+
-  |  Fn1  |   A   |   S   |   D   |   F   |   G   |   H   |   J   |   K   |   L   |   ;   |   /   |
-  |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+
-  | LShift|   Y   |   X   |   C   |   V   |   B   |   N   |   M   |   ,   |   .   |  AUp  | Enter |
-  |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+
-  |  Esc  |  GUI  | LCtrl | LAlt  | Lower |     Space     | Raise | AltGr | ALeft | ADown | ARight|
-  °-----------------------------------------------------------------------------------------------°
-```
-
-## Lower
-
-Lower layout is mainly for numpad on the right side with navigation keys for lazy left handed navigation. Left side of Lower also provides media and RGB control.
-
-```
-  .-----------------------------------------------------------------------------------------------.
-  |  TAB  |  PUp  |  Up   | PDow  | Home  |  F5   |   ^   |  7(/) |  8(() |  9()) |  0(=) | Bkspc |
-  |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+
-  |  Fn1  |  Left |  Down | Right |  End  |       |   #   |  4($) |  5(%) |  6(&) |   *   |   /   |
-  |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+
-  | Shift |  Mute |  VUp  |  VDo  |  PP   |  Prev | Next  |  1(!) |  2(") |  3(§) |   +   | Enter |
-  |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+
-  |  ESC  |  RGB  | LCtrl | LAlt  | Lower |     Space     |   ,   |  0(=) |   .   |  -(_) |       |
-  °-----------------------------------------------------------------------------------------------°
-```
-
-## Raise
-
-Raise is used for non-alphanumerical chars.
-
-```
-  .-----------------------------------------------------------------------------------------------.
-  |   ^   |   !   |   @   |       |   $   |   %   |   &   |   *   |   (   |    )  |   ?   |   ~   |
-  |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+
-  |  Fn1  |       |       |       |       |       |       |   ´   |  [({) |  ](}) |   '   |  /(|) |
-  |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+
-  |       |   -   |       |       |       |       |       |       |   <   |   >   |  =(+) |   #   |
-  |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+
-  |       |       |       |       | Lower |     Space     | Raise | AltGr |       |       |       |
-  °-----------------------------------------------------------------------------------------------°
-```
-
-## Fn1
-
-Fn1 provides function keys, as well as Vim-style navigation on the right side for when using the keyboard with both hands. 
-
-```
-  .-----------------------------------------------------------------------------------------------.
-  |  F12  |  F1   |  F2   |  F3   |  F4   |  F5   |  F6   |  F7   |  F8   |  F9   |  F10  |  Del  |
-  |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+
-  |  Fn1  |  F11  |       |       |       |       | Home  | PDown |  PUp  |  End  |       |       |
-  |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+
-  | LShift|  Caps |       |       |       |       | ALeft | ADown |  AUp  | ARight|       | MRight|
-  |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+
-  |QC_MAKE|       |       |       | Lower |     Space     | Bkspc |       |       | PrScr |  Ins  |
-  °-----------------------------------------------------------------------------------------------°
-```
-
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/simchee/rules.mk b/keyboards/kprepublic/bm40hsrgb/keymaps/simchee/rules.mk
deleted file mode 100644
index 039f07c8e35..00000000000
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/simchee/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-UNICODE_ENABLE = yes
diff --git a/keyboards/kprepublic/bm40hsrgb/rev2/info.json b/keyboards/kprepublic/bm40hsrgb/rev2/info.json
index 64b35fc25c2..cfaabd5c9ef 100644
--- a/keyboards/kprepublic/bm40hsrgb/rev2/info.json
+++ b/keyboards/kprepublic/bm40hsrgb/rev2/info.json
@@ -12,9 +12,7 @@
         "tri_layer": true,
         "console": false,
         "command": false,
-        "nkro": false,
-        "backlight": false,
-        "audio": false
+        "nkro": false
     },
     "usb": {
         "vid": "0x4B50",
diff --git a/keyboards/kprepublic/bm40hsrgb/rev2/rev2.c b/keyboards/kprepublic/bm40hsrgb/rev2/rev2.c
index 8dd4cc2af1c..a867cb0f20d 100755
--- a/keyboards/kprepublic/bm40hsrgb/rev2/rev2.c
+++ b/keyboards/kprepublic/bm40hsrgb/rev2/rev2.c
@@ -18,56 +18,56 @@
 #if defined(RGB_MATRIX_ENABLE)
 
 const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
-    { 0, B_1,  A_1,  C_1 },
-    { 0, B_2,  A_2,  C_2 },
-    { 0, B_3,  A_3,  C_3 },
-    { 0, B_4,  A_4,  C_4 },
-    { 0, B_5,  A_5,  C_5 },
-    { 0, B_6,  A_6,  C_6 },
-    { 0, B_7,  A_7,  C_7 },
-    { 0, B_8,  A_8,  C_8 },
-    { 0, B_9,  A_9,  C_9 },
-    { 0, B_10, A_10, C_10 },
-    { 0, B_11, A_11, C_11 },
-    { 0, B_12, A_12, C_12 },
+    { 0, SW2_CS1,  SW1_CS1,  SW3_CS1 },
+    { 0, SW2_CS2,  SW1_CS2,  SW3_CS2 },
+    { 0, SW2_CS3,  SW1_CS3,  SW3_CS3 },
+    { 0, SW2_CS4,  SW1_CS4,  SW3_CS4 },
+    { 0, SW2_CS5,  SW1_CS5,  SW3_CS5 },
+    { 0, SW2_CS6,  SW1_CS6,  SW3_CS6 },
+    { 0, SW2_CS7,  SW1_CS7,  SW3_CS7 },
+    { 0, SW2_CS8,  SW1_CS8,  SW3_CS8 },
+    { 0, SW2_CS9,  SW1_CS9,  SW3_CS9 },
+    { 0, SW2_CS10, SW1_CS10, SW3_CS10 },
+    { 0, SW2_CS11, SW1_CS11, SW3_CS11 },
+    { 0, SW2_CS12, SW1_CS12, SW3_CS12 },
 
-    { 0, E_1,  D_1,  F_1 },
-    { 0, E_2,  D_2,  F_2 },
-    { 0, E_3,  D_3,  F_3 },
-    { 0, E_4,  D_4,  F_4 },
-    { 0, E_5,  D_5,  F_5 },
-    { 0, E_6,  D_6,  F_6 },
-    { 0, E_7,  D_7,  F_7 },
-    { 0, E_8,  D_8,  F_8 },
-    { 0, E_9,  D_9,  F_9 },
-    { 0, E_10, D_10, F_10 },
-    { 0, E_11, D_11, F_11 },
-    { 0, E_12, D_12, F_12 },
+    { 0, SW5_CS1,  SW4_CS1,  SW6_CS1 },
+    { 0, SW5_CS2,  SW4_CS2,  SW6_CS2 },
+    { 0, SW5_CS3,  SW4_CS3,  SW6_CS3 },
+    { 0, SW5_CS4,  SW4_CS4,  SW6_CS4 },
+    { 0, SW5_CS5,  SW4_CS5,  SW6_CS5 },
+    { 0, SW5_CS6,  SW4_CS6,  SW6_CS6 },
+    { 0, SW5_CS7,  SW4_CS7,  SW6_CS7 },
+    { 0, SW5_CS8,  SW4_CS8,  SW6_CS8 },
+    { 0, SW5_CS9,  SW4_CS9,  SW6_CS9 },
+    { 0, SW5_CS10, SW4_CS10, SW6_CS10 },
+    { 0, SW5_CS11, SW4_CS11, SW6_CS11 },
+    { 0, SW5_CS12, SW4_CS12, SW6_CS12 },
 
-    { 0, H_1,  G_1,  I_1 },
-    { 0, H_2,  G_2,  I_2 },
-    { 0, H_3,  G_3,  I_3 },
-    { 0, H_4,  G_4,  I_4 },
-    { 0, H_5,  G_5,  I_5 },
-    { 0, H_6,  G_6,  I_6 },
-    { 0, H_7,  G_7,  I_7 },
-    { 0, H_8,  G_8,  I_8 },
-    { 0, H_9,  G_9,  I_9 },
-    { 0, H_10, G_10, I_10 },
-    { 0, H_11, G_11, I_11 },
-    { 0, H_12, G_12, I_12 },
+    { 0, SW8_CS1,  SW7_CS1,  SW9_CS1 },
+    { 0, SW8_CS2,  SW7_CS2,  SW9_CS2 },
+    { 0, SW8_CS3,  SW7_CS3,  SW9_CS3 },
+    { 0, SW8_CS4,  SW7_CS4,  SW9_CS4 },
+    { 0, SW8_CS5,  SW7_CS5,  SW9_CS5 },
+    { 0, SW8_CS6,  SW7_CS6,  SW9_CS6 },
+    { 0, SW8_CS7,  SW7_CS7,  SW9_CS7 },
+    { 0, SW8_CS8,  SW7_CS8,  SW9_CS8 },
+    { 0, SW8_CS9,  SW7_CS9,  SW9_CS9 },
+    { 0, SW8_CS10, SW7_CS10, SW9_CS10 },
+    { 0, SW8_CS11, SW7_CS11, SW9_CS11 },
+    { 0, SW8_CS12, SW7_CS12, SW9_CS12 },
 
-    { 0, K_1,  J_1,  L_1 },
-    { 0, K_2,  J_2,  L_2 },
-    { 0, K_3,  J_3,  L_3 },
-    { 0, K_4,  J_4,  L_4 },
-    { 0, K_5,  J_5,  L_5 },
-    { 0, K_6,  J_6,  L_6 },
-    { 0, K_8,  J_8,  L_8 },
-    { 0, K_9,  J_9,  L_9 },
-    { 0, K_10, J_10, L_10 },
-    { 0, K_11, J_11, L_11 },
-    { 0, K_12, J_12, L_12 }
+    { 0, SW11_CS1,  SW10_CS1,  SW12_CS1 },
+    { 0, SW11_CS2,  SW10_CS2,  SW12_CS2 },
+    { 0, SW11_CS3,  SW10_CS3,  SW12_CS3 },
+    { 0, SW11_CS4,  SW10_CS4,  SW12_CS4 },
+    { 0, SW11_CS5,  SW10_CS5,  SW12_CS5 },
+    { 0, SW11_CS6,  SW10_CS6,  SW12_CS6 },
+    { 0, SW11_CS8,  SW10_CS8,  SW12_CS8 },
+    { 0, SW11_CS9,  SW10_CS9,  SW12_CS9 },
+    { 0, SW11_CS10, SW10_CS10, SW12_CS10 },
+    { 0, SW11_CS11, SW10_CS11, SW12_CS11 },
+    { 0, SW11_CS12, SW10_CS12, SW12_CS12 }
 };
 
 #endif /* RGB_MATRIX_ENABLE */
diff --git a/keyboards/kprepublic/bm43hsrgb/keymaps/bitstarr/config.h b/keyboards/kprepublic/bm43hsrgb/keymaps/bitstarr/config.h
deleted file mode 100755
index 6f98093e33a..00000000000
--- a/keyboards/kprepublic/bm43hsrgb/keymaps/bitstarr/config.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
-Copyright 2021 bitstarr
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#pragma once
-
-#define UNICODE_SELECTED_MODES UNICODE_MODE_WINCOMPOSE, UNICODE_MODE_WINDOWS, UNICODE_MODE_LINUX, UNICODE_MODE_MACOS
-#define UNICODE_CYCLE_PERSIST false
-
-#undef RGBLIGHT_EFFECT_BREATHING
-#undef RGBLIGHT_EFFECT_RAINBOW_MOOD
-#undef RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#undef RGBLIGHT_EFFECT_SNAKE
-#undef RGBLIGHT_EFFECT_KNIGHT
-#undef RGBLIGHT_EFFECT_CHRISTMAS
-#undef RGBLIGHT_EFFECT_STATIC_GRADIENT
-#undef RGBLIGHT_EFFECT_RGB_TEST
-#undef RGBLIGHT_EFFECT_ALTERNATING
-#undef RGBLIGHT_EFFECT_TWINKLE
diff --git a/keyboards/kprepublic/bm43hsrgb/keymaps/bitstarr/keymap.c b/keyboards/kprepublic/bm43hsrgb/keymaps/bitstarr/keymap.c
deleted file mode 100755
index 6a4ca7550db..00000000000
--- a/keyboards/kprepublic/bm43hsrgb/keymaps/bitstarr/keymap.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/* Copyright 2021 bitstarr
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-
-#define WORD_BACK C(KC_LEFT)
-#define WORD_FORWARD C(KC_RIGHT)
-
-enum layers {
-	_BASE,
-    _EXT,
-	_ADV,
-	_FN,
-	_UNI,
-	_UNI2
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_BASE] = LAYOUT(
-        KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
-        KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT,
-        KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,
-        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, LT(_EXT,KC_SPC), MO(_UNI), MO(_ADV), MO(_FN), KC_RCTL
-    ),
-    [_EXT] = LAYOUT(
-        KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL,
-        KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_TRNS,
-        KC_TRNS, KC_F11, KC_F12, KC_NO, KC_NO, KC_GRV, KC_SCLN, KC_QUOT, KC_LBRC, KC_RBRC, KC_BSLS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS
-    ),
-    [_ADV] = LAYOUT(
-        KC_GRV, WORD_BACK, KC_UP, WORD_FORWARD, KC_NO, KC_NO, KC_NO, KC_NO, KC_PGUP, KC_NO, KC_PSCR, KC_DEL,
-        KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_NO, KC_NO, KC_NO, KC_HOME, KC_PGDN, KC_END, KC_NO,
-        KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_VOLD, KC_MUTE, KC_VOLU, KC_NO, KC_NO, KC_NO, KC_INS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS
-    ),
-    [_FN] = LAYOUT(
-        KC_NO, KC_NO, KC_NO, KC_NO, QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-        KC_NO, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_NO, KC_NO,
-        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO
-    ),
-    [_UNI] = LAYOUT(
-        KC_NO, KC_NO, KC_NO, UC(L'€'), UC(L'§'), UC(L'°'), KC_NO, UC(L'ü'), KC_NO, UC(L'ö'), UC(L'–'), KC_NO,
-        KC_NO, UC(L'ä'), UC(L'ß'), KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-        MO(_UNI2), UC(L'„'), UC(L'“'), UC(L'”'), KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, UC(L'…'), KC_NO,
-        KC_NO, KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_NO, KC_NO, KC_NO, UC_NEXT
-    ),
-    [_UNI2] = LAYOUT(
-        KC_NO, KC_NO, KC_NO, UC(L'é'), KC_NO, KC_NO, KC_NO, UC(L'Ü'), KC_NO, UC(L'Ö'), UC(L'—'), KC_NO,
-        KC_NO, UC(L'Ä'), KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-        KC_NO, KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO
-    ),
-};
-
diff --git a/keyboards/kprepublic/bm43hsrgb/keymaps/bitstarr/readme.md b/keyboards/kprepublic/bm43hsrgb/keymaps/bitstarr/readme.md
deleted file mode 100755
index 704be0e4167..00000000000
--- a/keyboards/kprepublic/bm43hsrgb/keymaps/bitstarr/readme.md
+++ /dev/null
@@ -1,107 +0,0 @@
-# Personal Layout of [bitstarr](https://github.com/bitstarr)
-
-I use an US ANSI Layout and set the OS to the US Keyboard. Since I'm german, I need to use some special characters once in a while - that's what the UNI and UNI2 Layers are for. Under Windows we have to rely on [WinCompose](https://github.com/samhocevar/wincompose) to work as intended.
-
-    qmk compile -kb kprepublic/bm43hsrgb -km bitstarr
-
-## 0 Qwerty
-```
-,----------------------------------------------------------------------------.
-|  ESC  |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  Bscp  |
-|----------------------------------------------------------------------------+
-|  Tab    |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  Enter     |
-|----------------------------------------------------------------------------+
-|  Shift         |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  |
-|----------------------------------------------------------------------------+
-| Ctrl | Win | Alt |  Space         |  Space/EXT     | UNI | ADV | FN | Ctrl |
-`----------------------------------------------------------------------------'
-```
-
-## 1 EXT Layer
-```
-EXT Layer
-,----------------------------------------------------------------------------.
-|   1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  O  |   -   |   +   |
-|----------------------------------------------------------------------------+
-|  F1 |  F2 |  F3 |  F4 |  F5 |  F6 |  F7 |  F8 |  F9 |  F10 |  Enter        |
-|----------------------------------------------------------------------------+
-|  Shift         |  F11 |  F12 |    |    |  `  |  ;  |  '  |  [  |  ]  |  \  |
-|----------------------------------------------------------------------------+
-| Ctrl | Win | Alt |  Space         |                |     |     |    | Ctrl |
-`----------------------------------------------------------------------------'
-```
-
-* Numbers
-* F-Keys
-* Brackets, Punctuation, Special Characters
-
-## 2 ADV Layer
-```
-ADV Layer
-,----------------------------------------------------------------------------.
-|  `  |  W→  |  ↑  |  W←  |     |     |     |     |  ⇞  |     |  PS  |  Del  |
-|----------------------------------------------------------------------------+
-|  Tab    |  ←  |  ↓  |   →  |     |     |     |  ↖  |  ⇟  |  ↘︎  |           |
-|----------------------------------------------------------------------------+
-|  Shift    |  ⏮  |  ⏯  |  ⏭  |  🔉  |  🔇  |  🔊  |   |   |   |  Ins  |
-|----------------------------------------------------------------------------+
-| Ctrl | Win | Alt |  Space         |                |     |     |    | Ctrl |
-`----------------------------------------------------------------------------'
-```
-
-* Arrows, Word skips
-* Print Screen, Page Up, Page Down
-* Home, End, Ins, Del
-* Media
-
-## 3 FN Layer
-```
-FN Layer
-,----------------------------------------------------------------------------.
-|      |     |     |     |  RESET  |     |     |     |     |     |     |     |
-|----------------------------------------------------------------------------+
-|        |     |     |     |     |     |     |     |     |     |             |
-|----------------------------------------------------------------------------+
-|          | RGB_T | RGB_M |  H+  |  H-  |  S+  |  S-  |  B+  |  B-  |   |   |
-|----------------------------------------------------------------------------+
-|      |     |     |                |                |     |     |     |     |
-`----------------------------------------------------------------------------'
-```
-
-* RGB, Toggle, Mode, Hue, Saturation, Brightness
-* Reset
-
-## 4 UNI Layer
-```
-UNI Layer
-,----------------------------------------------------------------------------.
-|       |     |     |  €  |  §  |  °  |     |  ü  |     |  ö  |   –   |      |
-|----------------------------------------------------------------------------+
-|         |  ä  |  ß  |     |     |     |     |     |     |     |            |
-|----------------------------------------------------------------------------+
-|  UNI2       |  „  |  “  |  ”  |     |     |     |     |     |   …   |      |
-|----------------------------------------------------------------------------+
-|      |     |     |  Space        |  Space        |     |     |     | Mode  |
-`----------------------------------------------------------------------------'
-```
-
-* Umlauts
-* Punctuation
-* Special Characters
-* Switching [Input Modes](https://beta.docs.qmk.fm/using-qmk/software-features/feature_unicode#2-input-modes-id-input-modes) (UNICODE_MODE_WINCOMPOSE, UNICODE_MODE_WINDOWS, UNICODE_MODE_LINUX, UNICODE_MODE_MACOS)
-
-## 5 UNI2 Layer
-```
-UNI2 Layer
-,----------------------------------------------------------------------------.
-|       |     |     |  é  |     |     |     |  Ü  |     |  Ü  |   —   |      |
-|----------------------------------------------------------------------------+
-|         |  Ä  |     |     |     |     |     |     |     |     |            |
-|----------------------------------------------------------------------------+
-|  UNI2       |     |     |     |     |     |     |     |     |       |      |
-|----------------------------------------------------------------------------+
-|      |     |     |  Space        |  Space        |     |     |     |       |
-`----------------------------------------------------------------------------'
-```
-
-* Capital Umlauts
\ No newline at end of file
diff --git a/keyboards/kprepublic/bm43hsrgb/keymaps/bitstarr/rules.mk b/keyboards/kprepublic/bm43hsrgb/keymaps/bitstarr/rules.mk
deleted file mode 100755
index e7b2d0a65eb..00000000000
--- a/keyboards/kprepublic/bm43hsrgb/keymaps/bitstarr/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-UNICODE_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/kprepublic/bm60hsrgb/rev1/keymaps/jbradforddillon/keymap.c b/keyboards/kprepublic/bm60hsrgb/rev1/keymaps/jbradforddillon/keymap.c
deleted file mode 100644
index da5aa92901c..00000000000
--- a/keyboards/kprepublic/bm60hsrgb/rev1/keymaps/jbradforddillon/keymap.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Copyright 2020 jbradforddillon
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT(
-        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
-        KC_TAB,      KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
-        KC_GRV,       KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
-        KC_LSFT,            KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  RSFT_T(KC_SLSH),        KC_UP,   LT(1,KC_DEL),
-        KC_LCTL,   KC_LALT,   KC_LGUI,                       KC_SPC,                              KC_RGUI, MO(2),   KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-    [1] = LAYOUT(
-        QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,
-        _______,     RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD, _______, _______, _______,
-        _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,        _______, _______,
-        _______,   _______,   _______,                      _______,                              _______, _______, _______, _______, _______
-    ),
-    [2] = LAYOUT(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______,    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______,        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, KC_MUTE,
-        _______, _______, _______,                          _______,                       _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
-    )
-
-};
diff --git a/keyboards/kprepublic/bm60hsrgb/rev1/keymaps/jbradforddillon/readme.md b/keyboards/kprepublic/bm60hsrgb/rev1/keymaps/jbradforddillon/readme.md
deleted file mode 100644
index aa2009e1e87..00000000000
--- a/keyboards/kprepublic/bm60hsrgb/rev1/keymaps/jbradforddillon/readme.md
+++ /dev/null
@@ -1,5 +0,0 @@
-I set this up the same way I set up my dz60 boards. 
-- Apple layout,  
-- Capslock replaced with grave/tilde,
-- RShift doubles as forward slash, and 
-- Delete doubles as a layer shift. 
diff --git a/keyboards/kprepublic/bm60hsrgb/rev2/rev2.c b/keyboards/kprepublic/bm60hsrgb/rev2/rev2.c
index ce12ad67fe9..3ee74755fad 100644
--- a/keyboards/kprepublic/bm60hsrgb/rev2/rev2.c
+++ b/keyboards/kprepublic/bm60hsrgb/rev2/rev2.c
@@ -23,73 +23,73 @@
 #    include "ws2812.h"
 
 const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
-    { 0, B_1, A_1, C_1 },
-    { 0, B_2, A_2, C_2 },
-    { 0, B_3, A_3, C_3 },
-    { 0, B_4, A_4, C_4 },
-    { 0, B_5, A_5, C_5 },
-    { 0, B_6, A_6, C_6 },
-    { 0, B_7, A_7, C_7 },
-    { 0, B_8, A_8, C_8 },
-    { 0, B_9, A_9, C_9 },
-    { 0, B_10, A_10, C_10 },
-    { 0, B_11, A_11, C_11 },
-    { 0, B_12, A_12, C_12 },
-    { 0, B_13, A_13, C_13 },
-    { 0, B_14, A_14, C_14 },
+    { 0, SW2_CS1, SW1_CS1, SW3_CS1 },
+    { 0, SW2_CS2, SW1_CS2, SW3_CS2 },
+    { 0, SW2_CS3, SW1_CS3, SW3_CS3 },
+    { 0, SW2_CS4, SW1_CS4, SW3_CS4 },
+    { 0, SW2_CS5, SW1_CS5, SW3_CS5 },
+    { 0, SW2_CS6, SW1_CS6, SW3_CS6 },
+    { 0, SW2_CS7, SW1_CS7, SW3_CS7 },
+    { 0, SW2_CS8, SW1_CS8, SW3_CS8 },
+    { 0, SW2_CS9, SW1_CS9, SW3_CS9 },
+    { 0, SW2_CS10, SW1_CS10, SW3_CS10 },
+    { 0, SW2_CS11, SW1_CS11, SW3_CS11 },
+    { 0, SW2_CS12, SW1_CS12, SW3_CS12 },
+    { 0, SW2_CS13, SW1_CS13, SW3_CS13 },
+    { 0, SW2_CS14, SW1_CS14, SW3_CS14 },
 
-    { 0, E_1,  D_1,  F_1 },
-    { 0, E_2,  D_2,  F_2 },
-    { 0, E_3,  D_3,  F_3 },
-    { 0, E_4,  D_4,  F_4 },
-    { 0, E_5,  D_5,  F_5 },
-    { 0, E_6,  D_6,  F_6 },
-    { 0, E_7,  D_7,  F_7 },
-    { 0, E_8,  D_8,  F_8 },
-    { 0, E_9,  D_9,  F_9 },
-    { 0, E_10, D_10, F_10 },
-    { 0, E_11, D_11, F_11 },
-    { 0, E_12, D_12, F_12 },
-    { 0, E_13, D_13, F_13 },
-    { 0, E_14, D_14, F_14 },
+    { 0, SW5_CS1,  SW4_CS1,  SW6_CS1 },
+    { 0, SW5_CS2,  SW4_CS2,  SW6_CS2 },
+    { 0, SW5_CS3,  SW4_CS3,  SW6_CS3 },
+    { 0, SW5_CS4,  SW4_CS4,  SW6_CS4 },
+    { 0, SW5_CS5,  SW4_CS5,  SW6_CS5 },
+    { 0, SW5_CS6,  SW4_CS6,  SW6_CS6 },
+    { 0, SW5_CS7,  SW4_CS7,  SW6_CS7 },
+    { 0, SW5_CS8,  SW4_CS8,  SW6_CS8 },
+    { 0, SW5_CS9,  SW4_CS9,  SW6_CS9 },
+    { 0, SW5_CS10, SW4_CS10, SW6_CS10 },
+    { 0, SW5_CS11, SW4_CS11, SW6_CS11 },
+    { 0, SW5_CS12, SW4_CS12, SW6_CS12 },
+    { 0, SW5_CS13, SW4_CS13, SW6_CS13 },
+    { 0, SW5_CS14, SW4_CS14, SW6_CS14 },
 
-    { 0, H_1,  G_1,  I_1 },
-    { 0, H_2,  G_2,  I_2 },
-    { 0, H_3,  G_3,  I_3 },
-    { 0, H_4,  G_4,  I_4 },
-    { 0, H_5,  G_5,  I_5 },
-    { 0, H_6,  G_6,  I_6 },
-    { 0, H_7,  G_7,  I_7 },
-    { 0, H_8,  G_8,  I_8 },
-    { 0, H_9,  G_9,  I_9 },
-    { 0, H_10, G_10, I_10 },
-    { 0, H_11, G_11, I_11 },
-    { 0, H_12, G_12, I_12 },
-    { 0, H_14, G_14, I_14 },
+    { 0, SW8_CS1,  SW7_CS1,  SW9_CS1 },
+    { 0, SW8_CS2,  SW7_CS2,  SW9_CS2 },
+    { 0, SW8_CS3,  SW7_CS3,  SW9_CS3 },
+    { 0, SW8_CS4,  SW7_CS4,  SW9_CS4 },
+    { 0, SW8_CS5,  SW7_CS5,  SW9_CS5 },
+    { 0, SW8_CS6,  SW7_CS6,  SW9_CS6 },
+    { 0, SW8_CS7,  SW7_CS7,  SW9_CS7 },
+    { 0, SW8_CS8,  SW7_CS8,  SW9_CS8 },
+    { 0, SW8_CS9,  SW7_CS9,  SW9_CS9 },
+    { 0, SW8_CS10, SW7_CS10, SW9_CS10 },
+    { 0, SW8_CS11, SW7_CS11, SW9_CS11 },
+    { 0, SW8_CS12, SW7_CS12, SW9_CS12 },
+    { 0, SW8_CS14, SW7_CS14, SW9_CS14 },
 
-    { 0, K_1,  J_1,  L_1 },
-    { 0, K_2,  J_2,  L_2 },
-    { 0, K_3,  J_3,  L_3 },
-    { 0, K_4,  J_4,  L_4 },
-    { 0, K_5,  J_5,  L_5 },
-    { 0, K_6,  J_6,  L_6 },
-    { 0, K_7,  J_7,  L_7 },
-    { 0, K_8,  J_8,  L_8 },
-    { 0, K_9,  J_9,  L_9 },
-    { 0, K_10, J_10, L_10 },
-    { 0, K_12, J_12, L_12 },
-    { 0, K_13, J_13, L_13 },
-    { 0, K_14, J_14, L_14 },
+    { 0, SW11_CS1,  SW10_CS1,  SW12_CS1 },
+    { 0, SW11_CS2,  SW10_CS2,  SW12_CS2 },
+    { 0, SW11_CS3,  SW10_CS3,  SW12_CS3 },
+    { 0, SW11_CS4,  SW10_CS4,  SW12_CS4 },
+    { 0, SW11_CS5,  SW10_CS5,  SW12_CS5 },
+    { 0, SW11_CS6,  SW10_CS6,  SW12_CS6 },
+    { 0, SW11_CS7,  SW10_CS7,  SW12_CS7 },
+    { 0, SW11_CS8,  SW10_CS8,  SW12_CS8 },
+    { 0, SW11_CS9,  SW10_CS9,  SW12_CS9 },
+    { 0, SW11_CS10, SW10_CS10, SW12_CS10 },
+    { 0, SW11_CS12, SW10_CS12, SW12_CS12 },
+    { 0, SW11_CS13, SW10_CS13, SW12_CS13 },
+    { 0, SW11_CS14, SW10_CS14, SW12_CS14 },
 
-    { 0, H_16, G_16, I_16 },
-    { 0, H_15, G_15, I_15 },
-    { 0, H_13, G_13, I_13 },
-    { 0, E_15, D_15, F_15 },
-    { 0, K_15, J_15, L_15 },
-    { 0, K_11, J_11, L_11 },
-    { 0, K_16, J_16, L_16 },
-    { 0, B_16, A_16, C_16 },
-    { 0, E_16, D_16, F_16 }
+    { 0, SW8_CS16, SW7_CS16, SW9_CS16 },
+    { 0, SW8_CS15, SW7_CS15, SW9_CS15 },
+    { 0, SW8_CS13, SW7_CS13, SW9_CS13 },
+    { 0, SW5_CS15, SW4_CS15, SW6_CS15 },
+    { 0, SW11_CS15, SW10_CS15, SW12_CS15 },
+    { 0, SW11_CS11, SW10_CS11, SW12_CS11 },
+    { 0, SW11_CS16, SW10_CS16, SW12_CS16 },
+    { 0, SW2_CS16, SW1_CS16, SW3_CS16 },
+    { 0, SW5_CS16, SW4_CS16, SW6_CS16 }
 };
 
 led_config_t g_led_config = {
diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev2/rev2.c b/keyboards/kprepublic/bm60hsrgb_ec/rev2/rev2.c
index 982bf39c52c..eca53e98934 100644
--- a/keyboards/kprepublic/bm60hsrgb_ec/rev2/rev2.c
+++ b/keyboards/kprepublic/bm60hsrgb_ec/rev2/rev2.c
@@ -16,73 +16,73 @@
 
 #ifdef RGB_MATRIX_ENABLE
 const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
-    { 0, B_1, A_1, C_1 },
-    { 0, B_2, A_2, C_2 },
-    { 0, B_3, A_3, C_3 },
-    { 0, B_4, A_4, C_4 },
-    { 0, B_5, A_5, C_5 },
-    { 0, B_6, A_6, C_6 },
-    { 0, B_7, A_7, C_7 },
-    { 0, B_8, A_8, C_8 },
-    { 0, B_9, A_9, C_9 },
-    { 0, B_10, A_10, C_10 },
-    { 0, B_11, A_11, C_11 },
-    { 0, B_12, A_12, C_12 },
-    { 0, B_13, A_13, C_13 },
-    { 0, B_14, A_14, C_14 },
+    { 0, SW2_CS1, SW1_CS1, SW3_CS1 },
+    { 0, SW2_CS2, SW1_CS2, SW3_CS2 },
+    { 0, SW2_CS3, SW1_CS3, SW3_CS3 },
+    { 0, SW2_CS4, SW1_CS4, SW3_CS4 },
+    { 0, SW2_CS5, SW1_CS5, SW3_CS5 },
+    { 0, SW2_CS6, SW1_CS6, SW3_CS6 },
+    { 0, SW2_CS7, SW1_CS7, SW3_CS7 },
+    { 0, SW2_CS8, SW1_CS8, SW3_CS8 },
+    { 0, SW2_CS9, SW1_CS9, SW3_CS9 },
+    { 0, SW2_CS10, SW1_CS10, SW3_CS10 },
+    { 0, SW2_CS11, SW1_CS11, SW3_CS11 },
+    { 0, SW2_CS12, SW1_CS12, SW3_CS12 },
+    { 0, SW2_CS13, SW1_CS13, SW3_CS13 },
+    { 0, SW2_CS14, SW1_CS14, SW3_CS14 },
 
-    { 0, E_1,  D_1,  F_1 },
-    { 0, E_2,  D_2,  F_2 },
-    { 0, E_3,  D_3,  F_3 },
-    { 0, E_4,  D_4,  F_4 },
-    { 0, E_5,  D_5,  F_5 },
-    { 0, E_6,  D_6,  F_6 },
-    { 0, E_7,  D_7,  F_7 },
-    { 0, E_8,  D_8,  F_8 },
-    { 0, E_9,  D_9,  F_9 },
-    { 0, E_10, D_10, F_10 },
-    { 0, E_11, D_11, F_11 },
-    { 0, E_12, D_12, F_12 },
-    { 0, E_13, D_13, F_13 },
-    { 0, E_14, D_14, F_14 },
+    { 0, SW5_CS1,  SW4_CS1,  SW6_CS1 },
+    { 0, SW5_CS2,  SW4_CS2,  SW6_CS2 },
+    { 0, SW5_CS3,  SW4_CS3,  SW6_CS3 },
+    { 0, SW5_CS4,  SW4_CS4,  SW6_CS4 },
+    { 0, SW5_CS5,  SW4_CS5,  SW6_CS5 },
+    { 0, SW5_CS6,  SW4_CS6,  SW6_CS6 },
+    { 0, SW5_CS7,  SW4_CS7,  SW6_CS7 },
+    { 0, SW5_CS8,  SW4_CS8,  SW6_CS8 },
+    { 0, SW5_CS9,  SW4_CS9,  SW6_CS9 },
+    { 0, SW5_CS10, SW4_CS10, SW6_CS10 },
+    { 0, SW5_CS11, SW4_CS11, SW6_CS11 },
+    { 0, SW5_CS12, SW4_CS12, SW6_CS12 },
+    { 0, SW5_CS13, SW4_CS13, SW6_CS13 },
+    { 0, SW5_CS14, SW4_CS14, SW6_CS14 },
 
-    { 0, H_1,  G_1,  I_1 },
-    { 0, H_2,  G_2,  I_2 },
-    { 0, H_3,  G_3,  I_3 },
-    { 0, H_4,  G_4,  I_4 },
-    { 0, H_5,  G_5,  I_5 },
-    { 0, H_6,  G_6,  I_6 },
-    { 0, H_7,  G_7,  I_7 },
-    { 0, H_8,  G_8,  I_8 },
-    { 0, H_9,  G_9,  I_9 },
-    { 0, H_10, G_10, I_10 },
-    { 0, H_11, G_11, I_11 },
-    { 0, H_12, G_12, I_12 },
-    { 0, H_14, G_14, I_14 },
+    { 0, SW8_CS1,  SW7_CS1,  SW9_CS1 },
+    { 0, SW8_CS2,  SW7_CS2,  SW9_CS2 },
+    { 0, SW8_CS3,  SW7_CS3,  SW9_CS3 },
+    { 0, SW8_CS4,  SW7_CS4,  SW9_CS4 },
+    { 0, SW8_CS5,  SW7_CS5,  SW9_CS5 },
+    { 0, SW8_CS6,  SW7_CS6,  SW9_CS6 },
+    { 0, SW8_CS7,  SW7_CS7,  SW9_CS7 },
+    { 0, SW8_CS8,  SW7_CS8,  SW9_CS8 },
+    { 0, SW8_CS9,  SW7_CS9,  SW9_CS9 },
+    { 0, SW8_CS10, SW7_CS10, SW9_CS10 },
+    { 0, SW8_CS11, SW7_CS11, SW9_CS11 },
+    { 0, SW8_CS12, SW7_CS12, SW9_CS12 },
+    { 0, SW8_CS14, SW7_CS14, SW9_CS14 },
 
-    { 0, K_1,  J_1,  L_1 },
-    { 0, K_2,  J_2,  L_2 },
-    { 0, K_3,  J_3,  L_3 },
-    { 0, K_4,  J_4,  L_4 },
-    { 0, K_5,  J_5,  L_5 },
-    { 0, K_6,  J_6,  L_6 },
-    { 0, K_7,  J_7,  L_7 },
-    { 0, K_8,  J_8,  L_8 },
-    { 0, K_9,  J_9,  L_9 },
-    { 0, K_10, J_10, L_10 },
-    { 0, K_12, J_12, L_12 },
-    { 0, K_13, J_13, L_13 },
-    { 0, K_14, J_14, L_14 },
+    { 0, SW11_CS1,  SW10_CS1,  SW12_CS1 },
+    { 0, SW11_CS2,  SW10_CS2,  SW12_CS2 },
+    { 0, SW11_CS3,  SW10_CS3,  SW12_CS3 },
+    { 0, SW11_CS4,  SW10_CS4,  SW12_CS4 },
+    { 0, SW11_CS5,  SW10_CS5,  SW12_CS5 },
+    { 0, SW11_CS6,  SW10_CS6,  SW12_CS6 },
+    { 0, SW11_CS7,  SW10_CS7,  SW12_CS7 },
+    { 0, SW11_CS8,  SW10_CS8,  SW12_CS8 },
+    { 0, SW11_CS9,  SW10_CS9,  SW12_CS9 },
+    { 0, SW11_CS10, SW10_CS10, SW12_CS10 },
+    { 0, SW11_CS12, SW10_CS12, SW12_CS12 },
+    { 0, SW11_CS13, SW10_CS13, SW12_CS13 },
+    { 0, SW11_CS14, SW10_CS14, SW12_CS14 },
 
-    { 0, H_16, G_16, I_16 },
-    { 0, H_15, G_15, I_15 },
-    { 0, H_13, G_13, I_13 },
-    { 0, E_15, D_15, F_15 },
-    { 0, K_15, J_15, L_15 },
-    { 0, K_11, J_11, L_11 },
-    { 0, K_16, J_16, L_16 },
-    { 0, B_16, A_16, C_16 },
-    { 0, E_16, D_16, F_16 }
+    { 0, SW8_CS16, SW7_CS16, SW9_CS16 },
+    { 0, SW8_CS15, SW7_CS15, SW9_CS15 },
+    { 0, SW8_CS13, SW7_CS13, SW9_CS13 },
+    { 0, SW5_CS15, SW4_CS15, SW6_CS15 },
+    { 0, SW11_CS15, SW10_CS15, SW12_CS15 },
+    { 0, SW11_CS11, SW10_CS11, SW12_CS11 },
+    { 0, SW11_CS16, SW10_CS16, SW12_CS16 },
+    { 0, SW2_CS16, SW1_CS16, SW3_CS16 },
+    { 0, SW5_CS16, SW4_CS16, SW6_CS16 }
 };
 
 led_config_t g_led_config = {
diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev2/rev2.c b/keyboards/kprepublic/bm60hsrgb_iso/rev2/rev2.c
index 24c785d28e2..e7641bf4e5e 100644
--- a/keyboards/kprepublic/bm60hsrgb_iso/rev2/rev2.c
+++ b/keyboards/kprepublic/bm60hsrgb_iso/rev2/rev2.c
@@ -25,74 +25,74 @@
 
 
 const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
-    { 0, B_1, A_1, C_1 },
-    { 0, B_2, A_2, C_2 },
-    { 0, B_3, A_3, C_3 },
-    { 0, B_4, A_4, C_4 },
-    { 0, B_5, A_5, C_5 },
-    { 0, B_6, A_6, C_6 },
-    { 0, B_7, A_7, C_7 },
-    { 0, B_8, A_8, C_8 },
-    { 0, B_9, A_9, C_9 },
-    { 0, B_10, A_10, C_10 },
-    { 0, B_11, A_11, C_11 },
-    { 0, B_12, A_12, C_12 },
-    { 0, B_13, A_13, C_13 },
-    { 0, B_14, A_14, C_14 },
+    { 0, SW2_CS1, SW1_CS1, SW3_CS1 },
+    { 0, SW2_CS2, SW1_CS2, SW3_CS2 },
+    { 0, SW2_CS3, SW1_CS3, SW3_CS3 },
+    { 0, SW2_CS4, SW1_CS4, SW3_CS4 },
+    { 0, SW2_CS5, SW1_CS5, SW3_CS5 },
+    { 0, SW2_CS6, SW1_CS6, SW3_CS6 },
+    { 0, SW2_CS7, SW1_CS7, SW3_CS7 },
+    { 0, SW2_CS8, SW1_CS8, SW3_CS8 },
+    { 0, SW2_CS9, SW1_CS9, SW3_CS9 },
+    { 0, SW2_CS10, SW1_CS10, SW3_CS10 },
+    { 0, SW2_CS11, SW1_CS11, SW3_CS11 },
+    { 0, SW2_CS12, SW1_CS12, SW3_CS12 },
+    { 0, SW2_CS13, SW1_CS13, SW3_CS13 },
+    { 0, SW2_CS14, SW1_CS14, SW3_CS14 },
 
-    { 0, E_1,  D_1,  F_1 },
-    { 0, E_2,  D_2,  F_2 },
-    { 0, E_3,  D_3,  F_3 },
-    { 0, E_4,  D_4,  F_4 },
-    { 0, E_5,  D_5,  F_5 },
-    { 0, E_6,  D_6,  F_6 },
-    { 0, E_7,  D_7,  F_7 },
-    { 0, E_8,  D_8,  F_8 },
-    { 0, E_9,  D_9,  F_9 },
-    { 0, E_10, D_10, F_10 },
-    { 0, E_11, D_11, F_11 },
-    { 0, E_12, D_12, F_12 },
-    { 0, E_13, D_13, F_13 },
-    { 0, E_14, D_14, F_14 },
+    { 0, SW5_CS1,  SW4_CS1,  SW6_CS1 },
+    { 0, SW5_CS2,  SW4_CS2,  SW6_CS2 },
+    { 0, SW5_CS3,  SW4_CS3,  SW6_CS3 },
+    { 0, SW5_CS4,  SW4_CS4,  SW6_CS4 },
+    { 0, SW5_CS5,  SW4_CS5,  SW6_CS5 },
+    { 0, SW5_CS6,  SW4_CS6,  SW6_CS6 },
+    { 0, SW5_CS7,  SW4_CS7,  SW6_CS7 },
+    { 0, SW5_CS8,  SW4_CS8,  SW6_CS8 },
+    { 0, SW5_CS9,  SW4_CS9,  SW6_CS9 },
+    { 0, SW5_CS10, SW4_CS10, SW6_CS10 },
+    { 0, SW5_CS11, SW4_CS11, SW6_CS11 },
+    { 0, SW5_CS12, SW4_CS12, SW6_CS12 },
+    { 0, SW5_CS13, SW4_CS13, SW6_CS13 },
+    { 0, SW5_CS14, SW4_CS14, SW6_CS14 },
 
-    { 0, H_1,  G_1,  I_1 },
-    { 0, H_2,  G_2,  I_2 },
-    { 0, H_3,  G_3,  I_3 },
-    { 0, H_4,  G_4,  I_4 },
-    { 0, H_5,  G_5,  I_5 },
-    { 0, H_6,  G_6,  I_6 },
-    { 0, H_7,  G_7,  I_7 },
-    { 0, H_8,  G_8,  I_8 },
-    { 0, H_9,  G_9,  I_9 },
-    { 0, H_10, G_10, I_10 },
-    { 0, H_11, G_11, I_11 },
-    { 0, H_12, G_12, I_12 },
-    { 0, H_13, G_13, I_13 },
+    { 0, SW8_CS1,  SW7_CS1,  SW9_CS1 },
+    { 0, SW8_CS2,  SW7_CS2,  SW9_CS2 },
+    { 0, SW8_CS3,  SW7_CS3,  SW9_CS3 },
+    { 0, SW8_CS4,  SW7_CS4,  SW9_CS4 },
+    { 0, SW8_CS5,  SW7_CS5,  SW9_CS5 },
+    { 0, SW8_CS6,  SW7_CS6,  SW9_CS6 },
+    { 0, SW8_CS7,  SW7_CS7,  SW9_CS7 },
+    { 0, SW8_CS8,  SW7_CS8,  SW9_CS8 },
+    { 0, SW8_CS9,  SW7_CS9,  SW9_CS9 },
+    { 0, SW8_CS10, SW7_CS10, SW9_CS10 },
+    { 0, SW8_CS11, SW7_CS11, SW9_CS11 },
+    { 0, SW8_CS12, SW7_CS12, SW9_CS12 },
+    { 0, SW8_CS13, SW7_CS13, SW9_CS13 },
 
-    { 0, K_1,  J_1,  L_1 },
-    { 0, K_11, J_11, L_11 },
-    { 0, K_2,  J_2,  L_2 },
-    { 0, K_3,  J_3,  L_3 },
-    { 0, K_4,  J_4,  L_4 },
-    { 0, K_5,  J_5,  L_5 },
-    { 0, K_6,  J_6,  L_6 },
-    { 0, K_7,  J_7,  L_7 },
-    { 0, K_8,  J_8,  L_8 },
-    { 0, K_9,  J_9,  L_9 },
-    { 0, K_10, J_10, L_10 },
-    { 0, K_12, J_12, L_12 },
-    { 0, K_13, J_13, L_13 },
-    { 0, K_14, J_14, L_14 },
+    { 0, SW11_CS1,  SW10_CS1,  SW12_CS1 },
+    { 0, SW11_CS11, SW10_CS11, SW12_CS11 },
+    { 0, SW11_CS2,  SW10_CS2,  SW12_CS2 },
+    { 0, SW11_CS3,  SW10_CS3,  SW12_CS3 },
+    { 0, SW11_CS4,  SW10_CS4,  SW12_CS4 },
+    { 0, SW11_CS5,  SW10_CS5,  SW12_CS5 },
+    { 0, SW11_CS6,  SW10_CS6,  SW12_CS6 },
+    { 0, SW11_CS7,  SW10_CS7,  SW12_CS7 },
+    { 0, SW11_CS8,  SW10_CS8,  SW12_CS8 },
+    { 0, SW11_CS9,  SW10_CS9,  SW12_CS9 },
+    { 0, SW11_CS10, SW10_CS10, SW12_CS10 },
+    { 0, SW11_CS12, SW10_CS12, SW12_CS12 },
+    { 0, SW11_CS13, SW10_CS13, SW12_CS13 },
+    { 0, SW11_CS14, SW10_CS14, SW12_CS14 },
 
-    { 0, H_16, G_16, I_16 },
-    { 0, H_14, G_14, I_14 },
-    { 0, H_15, G_15, I_15 },
-    { 0, E_15, D_15, F_15 },
-    { 0, K_15, J_15, L_15 },
-    { 0, K_16, J_16, L_16 },
-    { 0, B_16, A_16, C_16 },
-    { 0, B_15, A_15, C_15 },
-    { 0, E_16, D_16, F_16 }
+    { 0, SW8_CS16, SW7_CS16, SW9_CS16 },
+    { 0, SW8_CS14, SW7_CS14, SW9_CS14 },
+    { 0, SW8_CS15, SW7_CS15, SW9_CS15 },
+    { 0, SW5_CS15, SW4_CS15, SW6_CS15 },
+    { 0, SW11_CS15, SW10_CS15, SW12_CS15 },
+    { 0, SW11_CS16, SW10_CS16, SW12_CS16 },
+    { 0, SW2_CS16, SW1_CS16, SW3_CS16 },
+    { 0, SW2_CS15, SW1_CS15, SW3_CS15 },
+    { 0, SW5_CS16, SW4_CS16, SW6_CS16 }
 };
 
 led_config_t g_led_config = { {
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/carlosala/config.h b/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/carlosala/config.h
deleted file mode 100644
index 816e95d1c1a..00000000000
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/carlosala/config.h
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copiright 2021 Carlo Sala (@carlosala)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#define FORCE_NKRO
-#define TAPPING_FORCE_HOLD
-#define TAPPING_TERM 150
-#define UNICODE_SELECTED_MODES UNICODE_MODE_LINUX
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/carlosala/keymap.c b/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/carlosala/keymap.c
deleted file mode 100644
index c58517e8b60..00000000000
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/carlosala/keymap.c
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copiright 2021 Carlo Sala (@carlosala)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT_60_ansi(
-        KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,
-        LT(2, KC_TAB), KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
-        KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
-        KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, RSFT_T(KC_CAPS),
-        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_APP, KC_RCTL),
-    [1] = LAYOUT_60_ansi(
-        _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______,
-        _______, RGB_MOD, RGB_SPI, RGB_HUI, RGB_SAI, RGB_VAI, _______, KC_HOME, KC_END, _______, KC_PSCR, _______, _______, _______,
-        _______, RGB_RMOD, RGB_SPD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______,
-        _______, RGB_TOG, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_BRID, KC_BRIU, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______),
-    [2] = LAYOUT_60_ansi(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
-        _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, UC(0x00B7), _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, QK_BOOT)
-};
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/carlosala/rules.mk b/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/carlosala/rules.mk
deleted file mode 100644
index f5c69561fcd..00000000000
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/carlosala/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-LTO_ENABLE = yes
-MOUSEKEY_ENABLE = no
-NKRO_ENABLE = yes
-UNICODE_ENABLE = yes
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/ipetepete/keymap.c b/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/ipetepete/keymap.c
deleted file mode 100644
index b9a297c10ea..00000000000
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/ipetepete/keymap.c
+++ /dev/null
@@ -1,145 +0,0 @@
-/* Copyright 2020 ipetepete
-  *
-  * This program is free software: you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-  * the Free Software Foundation, either version 2 of the License, or
-  * (at your option) any later version.
-  *
-  * This program is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  * GNU General Public License for more details.
-  *
-  * You should have received a copy of the GNU General Public License
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */
-#include QMK_KEYBOARD_H
-
-enum layers {
-_qwerty,
-_gamer,
-_colemak,
-_fn,
-_rgb,
-_spcfn
-};
-
-
-enum keycodes {
-gamer = SAFE_RANGE,
-qwerty,
-colemak
-};
-
-#define KC_SPFN LT(_spcfn, KC_SPC) // press for space, hold for function layer (aka spacefn)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_qwerty] = LAYOUT_60_ansi(
-        KC_GRV,        KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
-        KC_TAB,         KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
-        CTL_T(KC_ESC), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
-        KC_LSFT,                 KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,
-        KC_LCTL,        KC_LGUI, KC_LALT,                            KC_SPFN,                             KC_RALT, KC_RCTL, MO(_fn),   MO(_rgb)
-    ),
-    // Gamer standard qwerty layout but with normal space for jumping etc
-    [_gamer] = LAYOUT_60_ansi(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______,                            KC_SPACE,                            _______, _______, _______, _______
-    ),
-    [_colemak] = LAYOUT_60_ansi(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______,
-        _______, KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN,  _______, _______, _______,
-        _______, KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,     KC_QUOT,          _______,
-        _______,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    _______, _______, _______,           _______,
-        _______, _______, _______,                            KC_SPFN,                            _______, _______, _______,  _______
-    ),
-    [_fn] = LAYOUT_60_ansi(
-        QK_GESC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
-        _______, _______, KC_UP,   _______, _______, _______, KC_CALC, _______, KC_INS,  _______, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
-        _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP,          _______,
-        KC_MPLY,          KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, NK_TOGG, _______, _______, KC_END,  KC_PGDN,          KC_MNXT,
-        qwerty, colemak, gamer,                            _______,                            _______, _______, _______, _______
-    ),
-    [_rgb] = LAYOUT_60_ansi(
-        _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
-        _______, RGB_TOG, _______, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, _______, _______, _______, QK_BOOT,
-        _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPI, RGB_SPD, _______, _______,          _______,
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______, _______
-    ),
-    [_spcfn] = LAYOUT_60_ansi(
-        _______, SGUI(1), SGUI(2), SGUI(3), SGUI(4), SGUI(5), SGUI(6), SGUI(7),  SGUI(8), SGUI(9), SGUI(0), _______,  _______, KC_DEL,
-        _______, _______, _______, KC_PGUP, _______, KC_LBRC, KC_RBRC,  _______, KC_UP,   _______, _______, _______,  _______, _______,
-        KC_CAPS, _______, _______, KC_PGDN, _______, KC_LCBR, KC_RCBR,  KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______,          _______,
-        _______,          _______, _______, _______, _______, KC_LPRN, KC_RPRN,  _______, _______, _______, _______,           _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______, _______
-    )
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-      case qwerty:
-        if (record->event.pressed) {
-            layer_clear();
-            layer_on(_qwerty);
-            set_single_persistent_default_layer(_qwerty);
-        }
-        return false;
-        break;
-      case colemak:
-        if (record->event.pressed) {
-            layer_clear();
-            layer_on(_colemak);
-        }
-        return false;
-        break;
-      case gamer:
-        if (record->event.pressed) {
-            layer_clear();
-            layer_on(_gamer);
-        }
-        return false;
-        break;
-
-  }
-  return true;
-}
-
-void rgb_matrix_layer_helper (uint8_t red, uint8_t green, uint8_t blue) {
-  for (int i = 0; i < RGB_MATRIX_LED_COUNT; i++) {
-    if (HAS_FLAGS(g_led_config.flags[i], LED_FLAG_MODIFIER)) {
-        rgb_matrix_set_color( i, red, green, blue );
-    }
-  }
-}
-
-
-bool rgb_matrix_indicators_user(void)
-{
-	if (!g_suspend_state && rgb_matrix_config.enable) {
-        switch (get_highest_layer(layer_state)) {
-            //case _qwerty:
-            //    rgb_matrix_set_color(26, 0xFF, 0x00, 0x00);
-            //    break;
-            case _colemak:
-                rgb_matrix_set_color(55, 0xFF, 0xFF, 0xFF);
-                break;
-            case _spcfn:
-                rgb_matrix_set_color(22, 0xFF, 0x00, 0x00);
-                rgb_matrix_set_color(35, 0xFF, 0x00, 0x00);
-                rgb_matrix_set_color(36, 0xFF, 0x00, 0x00);
-                rgb_matrix_set_color(37, 0xFF, 0x00, 0x00);
-                break;
-            case _gamer:
-                rgb_matrix_set_color(16, 0xFF, 0x00, 0xFF);
-                rgb_matrix_set_color(29, 0xFF, 0x00, 0xFF);
-                rgb_matrix_set_color(30, 0xFF, 0x00, 0xFF);
-                rgb_matrix_set_color(31, 0xFF, 0x00, 0xFF);
-                break;
-        }
-    }
-    return false;
-}
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/ipetepete/readme.md b/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/ipetepete/readme.md
deleted file mode 100644
index 7d381ff125b..00000000000
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/ipetepete/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# Simple 60% for coding
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/ipetepete/rules.mk b/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/ipetepete/rules.mk
deleted file mode 100644
index 3a025ba3a39..00000000000
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/ipetepete/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-NKRO_ENABLE = yes # USB Nkey Rollover
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.c b/keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.c
index f2f63375421..5cb6d850c9f 100644
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.c
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.c
@@ -22,71 +22,71 @@
 #    include "ws2812.h"
 
 const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
-    { 0, B_1, A_1, C_1 },
-    { 0, B_2, A_2, C_2 },
-    { 0, B_3, A_3, C_3 },
-    { 0, B_4, A_4, C_4 },
-    { 0, B_5, A_5, C_5 },
-    { 0, B_6, A_6, C_6 },
-    { 0, B_7, A_7, C_7 },
-    { 0, B_8, A_8, C_8 },
-    { 0, B_9, A_9, C_9 },
-    { 0, B_10, A_10, C_10 },
-    { 0, B_11, A_11, C_11 },
-    { 0, B_12, A_12, C_12 },
-    { 0, B_13, A_13, C_13 },
-    { 0, B_14, A_14, C_14 },
+    { 0, SW2_CS1, SW1_CS1, SW3_CS1 },
+    { 0, SW2_CS2, SW1_CS2, SW3_CS2 },
+    { 0, SW2_CS3, SW1_CS3, SW3_CS3 },
+    { 0, SW2_CS4, SW1_CS4, SW3_CS4 },
+    { 0, SW2_CS5, SW1_CS5, SW3_CS5 },
+    { 0, SW2_CS6, SW1_CS6, SW3_CS6 },
+    { 0, SW2_CS7, SW1_CS7, SW3_CS7 },
+    { 0, SW2_CS8, SW1_CS8, SW3_CS8 },
+    { 0, SW2_CS9, SW1_CS9, SW3_CS9 },
+    { 0, SW2_CS10, SW1_CS10, SW3_CS10 },
+    { 0, SW2_CS11, SW1_CS11, SW3_CS11 },
+    { 0, SW2_CS12, SW1_CS12, SW3_CS12 },
+    { 0, SW2_CS13, SW1_CS13, SW3_CS13 },
+    { 0, SW2_CS14, SW1_CS14, SW3_CS14 },
 
-    { 0, E_1,  D_1,  F_1 },
-    { 0, E_2,  D_2,  F_2 },
-    { 0, E_3,  D_3,  F_3 },
-    { 0, E_4,  D_4,  F_4 },
-    { 0, E_5,  D_5,  F_5 },
-    { 0, E_6,  D_6,  F_6 },
-    { 0, E_7,  D_7,  F_7 },
-    { 0, E_8,  D_8,  F_8 },
-    { 0, E_9,  D_9,  F_9 },
-    { 0, E_10, D_10, F_10 },
-    { 0, E_11, D_11, F_11 },
-    { 0, E_12, D_12, F_12 },
-    { 0, E_13, D_13, F_13 },
-    { 0, E_14, D_14, F_14 },
+    { 0, SW5_CS1,  SW4_CS1,  SW6_CS1 },
+    { 0, SW5_CS2,  SW4_CS2,  SW6_CS2 },
+    { 0, SW5_CS3,  SW4_CS3,  SW6_CS3 },
+    { 0, SW5_CS4,  SW4_CS4,  SW6_CS4 },
+    { 0, SW5_CS5,  SW4_CS5,  SW6_CS5 },
+    { 0, SW5_CS6,  SW4_CS6,  SW6_CS6 },
+    { 0, SW5_CS7,  SW4_CS7,  SW6_CS7 },
+    { 0, SW5_CS8,  SW4_CS8,  SW6_CS8 },
+    { 0, SW5_CS9,  SW4_CS9,  SW6_CS9 },
+    { 0, SW5_CS10, SW4_CS10, SW6_CS10 },
+    { 0, SW5_CS11, SW4_CS11, SW6_CS11 },
+    { 0, SW5_CS12, SW4_CS12, SW6_CS12 },
+    { 0, SW5_CS13, SW4_CS13, SW6_CS13 },
+    { 0, SW5_CS14, SW4_CS14, SW6_CS14 },
 
-    { 0, H_1,  G_1,  I_1 },
-    { 0, H_2,  G_2,  I_2 },
-    { 0, H_3,  G_3,  I_3 },
-    { 0, H_4,  G_4,  I_4 },
-    { 0, H_5,  G_5,  I_5 },
-    { 0, H_6,  G_6,  I_6 },
-    { 0, H_7,  G_7,  I_7 },
-    { 0, H_8,  G_8,  I_8 },
-    { 0, H_9,  G_9,  I_9 },
-    { 0, H_10, G_10, I_10 },
-    { 0, H_11, G_11, I_11 },
-    { 0, H_12, G_12, I_12 },
-    { 0, H_14, G_14, I_14 },
+    { 0, SW8_CS1,  SW7_CS1,  SW9_CS1 },
+    { 0, SW8_CS2,  SW7_CS2,  SW9_CS2 },
+    { 0, SW8_CS3,  SW7_CS3,  SW9_CS3 },
+    { 0, SW8_CS4,  SW7_CS4,  SW9_CS4 },
+    { 0, SW8_CS5,  SW7_CS5,  SW9_CS5 },
+    { 0, SW8_CS6,  SW7_CS6,  SW9_CS6 },
+    { 0, SW8_CS7,  SW7_CS7,  SW9_CS7 },
+    { 0, SW8_CS8,  SW7_CS8,  SW9_CS8 },
+    { 0, SW8_CS9,  SW7_CS9,  SW9_CS9 },
+    { 0, SW8_CS10, SW7_CS10, SW9_CS10 },
+    { 0, SW8_CS11, SW7_CS11, SW9_CS11 },
+    { 0, SW8_CS12, SW7_CS12, SW9_CS12 },
+    { 0, SW8_CS14, SW7_CS14, SW9_CS14 },
 
-    { 0, K_1,  J_1,  L_1 },
-    { 0, K_2,  J_2,  L_2 },
-    { 0, K_3,  J_3,  L_3 },
-    { 0, K_4,  J_4,  L_4 },
-    { 0, K_5,  J_5,  L_5 },
-    { 0, K_6,  J_6,  L_6 },
-    { 0, K_7,  J_7,  L_7 },
-    { 0, K_8,  J_8,  L_8 },
-    { 0, K_9,  J_9,  L_9 },
-    { 0, K_10, J_10, L_10 },
-    { 0, K_11, J_11, L_11 },
-    { 0, K_13, J_13, L_13 },
+    { 0, SW11_CS1,  SW10_CS1,  SW12_CS1 },
+    { 0, SW11_CS2,  SW10_CS2,  SW12_CS2 },
+    { 0, SW11_CS3,  SW10_CS3,  SW12_CS3 },
+    { 0, SW11_CS4,  SW10_CS4,  SW12_CS4 },
+    { 0, SW11_CS5,  SW10_CS5,  SW12_CS5 },
+    { 0, SW11_CS6,  SW10_CS6,  SW12_CS6 },
+    { 0, SW11_CS7,  SW10_CS7,  SW12_CS7 },
+    { 0, SW11_CS8,  SW10_CS8,  SW12_CS8 },
+    { 0, SW11_CS9,  SW10_CS9,  SW12_CS9 },
+    { 0, SW11_CS10, SW10_CS10, SW12_CS10 },
+    { 0, SW11_CS11, SW10_CS11, SW12_CS11 },
+    { 0, SW11_CS13, SW10_CS13, SW12_CS13 },
 
-    { 0, H_16, G_16, I_16 },
-    { 0, H_15, G_15, I_15 },
-    { 0, H_13, G_13, I_13 },
-    { 0, E_15, D_15, F_15 },
-    { 0, K_15, J_15, L_15 },
-    { 0, K_16, J_16, L_16 },
-    { 0, K_12, J_12, L_12 },
-    { 0, E_16, D_16, F_16 }
+    { 0, SW8_CS16, SW7_CS16, SW9_CS16 },
+    { 0, SW8_CS15, SW7_CS15, SW9_CS15 },
+    { 0, SW8_CS13, SW7_CS13, SW9_CS13 },
+    { 0, SW5_CS15, SW4_CS15, SW6_CS15 },
+    { 0, SW11_CS15, SW10_CS15, SW12_CS15 },
+    { 0, SW11_CS16, SW10_CS16, SW12_CS16 },
+    { 0, SW11_CS12, SW10_CS12, SW12_CS12 },
+    { 0, SW5_CS16, SW4_CS16, SW6_CS16 }
 };
 
 led_config_t g_led_config = {
diff --git a/keyboards/kprepublic/bm65hsrgb_iso/keymaps/p4yne/config.h b/keyboards/kprepublic/bm65hsrgb_iso/keymaps/p4yne/config.h
deleted file mode 100644
index 0e066527156..00000000000
--- a/keyboards/kprepublic/bm65hsrgb_iso/keymaps/p4yne/config.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2021 deadolus 2022 p4yne
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-// place overrides here
-
-#pragma once
-#define LSPO_KEYS KC_LSFT, KC_LSFT, KC_8
-#define RSPC_KEYS KC_RSFT, KC_LSFT, KC_9
-#define LAPO_KEYS KC_LALT, KC_RALT, KC_QUOT
-#define RAPC_KEYS KC_RALT, KC_RALT, KC_NUHS
-
-#define LEADER_TIMEOUT 1000
-#define LEADER_PER_KEY_TIMING 250
-
-// control underglow
-// i.e. switch it off
-//#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_STATIC_LIGHT
-//#define RGBLIGHT_DEFAULT_HUE 0
-//#define RGBLIGHT_DEFAULT_SAT UINT8_MAX
-//#define RGBLIGHT_DEFAULT_SAT 0
-//#define RGBLIGHT_DEFAULT_VAL RGBLIGHT_LIMIT_VAL
-//#define RGBLIGHT_DEFAULT_VAL 0
-//#define RGBLIGHT_DEFAULT_SPD 0 
diff --git a/keyboards/kprepublic/bm65hsrgb_iso/keymaps/p4yne/custom_keymap.h b/keyboards/kprepublic/bm65hsrgb_iso/keymaps/p4yne/custom_keymap.h
deleted file mode 100644
index 8f11e4072bf..00000000000
--- a/keyboards/kprepublic/bm65hsrgb_iso/keymaps/p4yne/custom_keymap.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* Copyright 2019 ash0x0 2021 peepeetee, deadolus 2022 p4yne
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-
-#include "print.h"
-#include <string.h>
-// HID has not yet been implemented for this keyboard
-// #include "raw_hid.h"
-
-#define MILLISECONDS_IN_SECOND 1000
-
-// Custom HSV values
-#define C_HSV_WINERED        0, 255,  85
-#define C_HSV_DARKGOLD      36, 255,  85
-#define C_HSV_DARKBLUE     170, 255,  85
-
-// Default color HSV Values (for inspiration)
-// #define HSV_AZURE       132, 102, 255
-// #define HSV_BLACK         0,   0,   0
-// #define HSV_BLUE        170, 255, 255
-// #define HSV_CHARTREUSE   64, 255, 255
-// #define HSV_CORAL        11, 176, 255
-// #define HSV_CYAN        128, 255, 255
-// #define HSV_GOLD         36, 255, 255
-// #define HSV_GOLDENROD    30, 218, 218
-// #define HSV_GREEN        85, 255, 255
-// #define HSV_MAGENTA     213, 255, 255
-// #define HSV_ORANGE       28, 255, 255
-// #define HSV_PINK        234, 128, 255
-// #define HSV_PURPLE      191, 255, 255
-// #define HSV_RED           0, 255, 255
-// #define HSV_SPRINGGREEN 106, 255, 255
-// #define HSV_TEAL        128, 255, 128
-// #define HSV_TURQUOISE   123,  90, 112
-// #define HSV_WHITE         0,   0, 255
-// #define HSV_YELLOW       43, 255, 255
-// #define HSV_OFF         HSV_BLACK
-
-
-//========================================================== CONFIGURABLE DEFAULTS ==========================================================
-#define RGB_DEFAULT_TIME_OUT 30
-#define RGB_FAST_MODE_TIME_OUT 3
-#define RGB_TIME_OUT_MAX 600
-#define RGB_TIME_OUT_MIN 10
-#define RGB_TIME_OUT_STEP 10
-
-bool disable_layer_color;
-
-uint8_t dfa_state;  //state for my language switching DFA
-
-
-bool rgb_enabled_flag;                  // Current LED state flag. If false then LED is off.
-bool rgb_time_out_enable;               // Idle LED toggle enable. If false then LED will not turn off after idle timeout.
-bool rgb_time_out_fast_mode_enabled;    // Enable flag for RGB timeout fast mode
-bool rgb_time_out_user_value;           // This holds the toggle value set by user with ROUT_TG. It's necessary as RGB_TOG changes timeout enable.
-uint16_t rgb_time_out_seconds;          // Idle LED timeout value, in seconds not milliseconds
-uint16_t rgb_time_out_saved_seconds;    // The saved user config for RGB timeout period
-led_flags_t rgb_time_out_saved_flag;    // Store LED flag before timeout so it can be restored when LED is turned on again.
diff --git a/keyboards/kprepublic/bm65hsrgb_iso/keymaps/p4yne/keymap.c b/keyboards/kprepublic/bm65hsrgb_iso/keymaps/p4yne/keymap.c
deleted file mode 100644
index 03d1ddabedf..00000000000
--- a/keyboards/kprepublic/bm65hsrgb_iso/keymaps/p4yne/keymap.c
+++ /dev/null
@@ -1,463 +0,0 @@
-/* Copyright 2019 ashlar 2021 peepeetee, deadolus 2022 p4yne
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-#include "custom_keymap.h"
-#include "sendstring_german.h"
-
-#ifdef TAP_DANCE_ENABLE
-enum {
-  TD_HOME_END,
-};
-
-// Tap Dance definitions
-tap_dance_action_t tap_dance_actions[] = {
-  // tap once for home, twice for end
-  [TD_HOME_END] = ACTION_TAP_DANCE_DOUBLE(KC_HOME, KC_END)
-};
-#endif
-
-// Custom layer types
-enum layertypes {
-  LYR_SOLID, // fullsize coloring
-  LYR_TRANS, // used keys in layer color, lower layer shines through on unused keys
-  LYR_BLACK  // only used key in layer color
-};
-
-// Defines names for use in layer keycodes and the keymap
-enum layers {
-  _LVL0_,
-  _LVL1_,
-  _LVL2_,
-  _LVL3_,
-  _LVL4_,
-  _LVL5_,
-  _LVL6_,
-  _LVL7_
-};
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /*
-     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
-     * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp│Hom│
-     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
-     * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │     │PgU│
-     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ Ent├───┤
-     * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ # │    │PgD│
-     * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼───┤
-     * │Shft│ \ │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ Shift│ ↑ │End│
-     * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
-     * │Ctrl│GUI │Alt │                        │ Alt│Ctrl│ │ ← │ ↓ │ → │
-     * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
-     */
-#ifdef TAP_DANCE_ENABLE
-/* 0: ISO qwertz, SPACECADET and TAPDANCE */
-/*  [_LVL0_] = LAYOUT_65_iso_blocker(
-      KC_ESC,     KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,      KC_MINS,  KC_EQL, KC_BSPC, KC_DEL,
-      KC_TAB,     KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,      KC_LBRC, KC_RBRC,          TD(TD_HOME_END),
-      KC_CAPS,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,   KC_QUOT, KC_NUHS, KC_ENT,  KC_PGUP,
-      SC_LSPO, KC_NUBS,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,    KC_SLSH, SC_RSPC, KC_UP,   KC_PGDN,
-      KC_LCTL, KC_LGUI, SC_LAPO,                    KC_SPC,                               SC_RAPC, MO(_LVL1_),         KC_LEFT, KC_DOWN, KC_RGHT
-      ),
- */
-/* 0: ISO DE qwertz, SPACECADET and TAPDANCE */
-  [_LVL0_] = LAYOUT_65_iso_blocker(
-      KC_ESC,     DE_1,    DE_2,    DE_3,    DE_4,    DE_5,    DE_6,    DE_7,    DE_8,    DE_9,    DE_0,      DE_SS,   DE_ACUT, KC_BSPC, KC_DEL,
-      KC_TAB,     DE_Q,    DE_W,    DE_E,    DE_R,    DE_T,    DE_Z,    DE_U,    DE_I,    DE_O,    DE_P,      DE_UDIA, DE_PLUS,          TD(TD_HOME_END),
-      KC_CAPS,    DE_A,    DE_S,    DE_D,    DE_F,    DE_G,    DE_H,    DE_J,    DE_K,    DE_L,    DE_ODIA,   DE_ADIA, DE_HASH, KC_ENT,  KC_PGUP,
-      SC_LSPO, DE_LABK,    DE_Y,    DE_X,    DE_C,    DE_V,    DE_B,    DE_N,    DE_M,    DE_COMM, DE_DOT,    DE_MINS, SC_RSPC, KC_UP,   KC_PGDN,
-      KC_LCTL, KC_LGUI, SC_LAPO,                    KC_SPC,                               SC_RAPC, MO(_LVL1_),         KC_LEFT, KC_DOWN, KC_RGHT
-      ),
-#else
-  /* 0: ISO qwertz, SPACECADET but no TAPDANCE */
-  [_LVL0_] = LAYOUT_65_iso_blocker(
-      KC_ESC,     KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,      KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
-      KC_TAB,     KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,      KC_LBRC, KC_RBRC, KC_ENT,  KC_HOME,
-      KC_CAPS,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,   KC_QUOT, KC_NUHS,          KC_PGUP,
-      SC_LSPO, KC_NUBS,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,    KC_SLSH, SC_RSPC, KC_UP,   KC_PGDN,
-      KC_LCTL, KC_LGUI, SC_LAPO,                    KC_SPC,                               SC_RAPC, MO(_LVL1_),         KC_LEFT, KC_DOWN, KC_RGHT
-      ),
-#endif
-  /* 1: Function key, multimedia control, layer switching board and LEADER */
-  [_LVL1_] = LAYOUT_65_iso_blocker(
-      KC_GRV,    KC_F1,      KC_F2,      KC_F3,      KC_F4,      KC_F5,      KC_F6,      KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,     _______,    LGUI(KC_END),
-      S(KC_GRV), _______,    _______,    _______,    _______,    _______,    _______,    _______, _______, _______, _______, _______, _______,                LGUI(KC_PAUSE),
-      QK_BOOT,     TO(_LVL2_), TO(_LVL3_), TO(_LVL4_), TO(_LVL5_), TO(_LVL6_), TO(_LVL7_), _______, _______, _______, KC_BRIU, _______, KC_MUTE,    TO(_LVL0_), KC_VOLU,
-      _______,   _______,    _______,    _______,    _______,    _______,    _______,    _______, _______, _______, KC_BRID, _______, S(KC_MUTE), KC_MPLY,    KC_VOLD,
-      _______,   _______,    _______,                            QK_LEAD,                                  _______, _______,          KC_MPRV,    KC_MSTP,    KC_MNXT
-      ),
-  /* 2: Mouse layer and virtual/multiple desktop navigation */
-  [_LVL2_] = LAYOUT_65_iso_blocker(
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______,      _______,
-      _______, KC_ACL0, KC_ACL1, KC_ACL2, _______, _______, _______, KC_PGDN, KC_PGUP, KC_PSCR, KC_WH_U, _______, _______,                    _______,
-      _______, _______, KC_BTN1, KC_BTN2, _______, _______, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_WH_D, _______, _______,      TO(_LVL0_),   _______,
-      _______, _______, _______, _______, _______, _______, _______, KC_HOME,  KC_END, _______, _______, _______, _______,      LCA(KC_UP),   LCA(KC_E),
-      _______, _______, _______,                   _______,                            _______, _______,          LCA(KC_LEFT), LCA(KC_DOWN), LCA(KC_RGHT)
-      ),
-#ifdef DYNAMIC_MACRO_ENABLE
-  /* 3: Dynamic macro, NUMPAD and settings */
-  [_LVL3_] = LAYOUT_65_iso_blocker(
-      _______, DM_PLY1, DM_PLY2, _______, _______,  _______, _______, _______, _______, KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS, _______,    _______,
-      _______, DM_REC1, DM_REC2, _______, RGB_MOD,  RGB_HUI, RGB_SAI, RGB_VAI, _______, KC_P7,   KC_P8,   KC_P9,   KC_PMNS,             _______,
-      _______, _______, _______, _______, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, KC_P4,   KC_P5,   KC_P6,   KC_PPLS, TO(_LVL0_), _______,
-      _______, _______, _______, _______, _______,  _______, _______, _______, _______, KC_P1,   KC_P2,   KC_P3,   KC_PENT, _______,    _______,
-      _______, _______, _______,                    RGB_TOG,                            KC_0,    KC_PCMM,          _______, _______,    _______
-      ),
-#else
-  /* 3: NUMPAD and settings */
-  [_LVL3_] = LAYOUT_65_iso_blocker(
-      _______, _______, _______, _______, _______,  _______, _______, _______, _______, KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS, _______,    _______,
-      _______, _______, _______, _______, RGB_MOD,  RGB_HUI, RGB_SAI, RGB_VAI, _______, KC_P7,   KC_P8,   KC_P9,   KC_PMNS,             _______,
-      _______, _______, _______, _______, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, KC_P4,   KC_P5,   KC_P6,   KC_PPLS, TO(_LVL0_), _______,
-      _______, _______, _______, _______, _______,  _______, _______, _______, _______, KC_P1,   KC_P2,   KC_P3,   KC_PENT, _______,    _______,
-      _______, _______, _______,                    RGB_TOG,                            KC_0,    KC_PCMM,          _______, _______,    _______
-      ),
-#endif
-  /* Gaming layer no TAPDANCE no SPACECADET simple QWERTZ layout for custom coloring */
-  [_LVL4_] = LAYOUT_65_iso_blocker(
-      KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,      KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
-      KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,      KC_LBRC, KC_RBRC,          KC_HOME,
-      KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,   KC_QUOT, KC_NUHS, KC_ENT,  KC_PGUP,
-      KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,    KC_SLSH, KC_RSFT, KC_UP,   KC_PGDN,
-      KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, TO(_LVL0_),         KC_LEFT, KC_DOWN, KC_RGHT
-      ),
-  /* 5: ISO qwerty DE 2 US Base Layer */
-  [_LVL5_] = LAYOUT_65_iso_blocker(
-      KC_ESC,     KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,       DE_MINS, DE_EQL,     KC_BSPC, KC_DEL,
-      KC_TAB,     KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    DE_Y,    KC_U,    KC_I,    KC_O,    KC_P,       DE_LBRC, DE_RBRC,             KC_HOME,
-      KC_CAPS,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    DE_SCLN,    DE_QUOT, DE_BSLS,    KC_ENT,  KC_PGUP,
-      MO(_LVL6_), DE_GRV,  DE_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    DE_COMM, DE_DOT,     DE_SLSH, MO(_LVL6_), KC_UP,   KC_PGDN,
-      KC_LCTL,    KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, TO(_LVL0_),          KC_LEFT,    KC_DOWN, KC_RGHT
-      ),
-  /* 6: ISO qwerty DE 2 US Shifted Layer */
-  [_LVL6_] = LAYOUT_65_iso_blocker(
-      _______, DE_EXLM, DE_AT,   DE_HASH, DE_DLR,  DE_PERC, DE_CIRC, DE_AMPR, DE_ASTR, DE_LPRN, DE_RPRN,    DE_UNDS, DE_PLUS, _______, _______,
-      _______, S(KC_Q), S(KC_W), S(KC_E), S(KC_R), S(KC_T), S(DE_Y), S(KC_U), S(KC_I), S(KC_O), S(KC_P),    DE_LCBR, DE_RCBR,          KC_END,
-      KC_CAPS, S(KC_A), S(KC_S), S(KC_D), S(KC_F), S(KC_G), S(KC_H), S(KC_J), S(KC_K), S(KC_L), DE_COLN,    DE_DQUO, DE_PIPE, _______, _______,
-      KC_LSFT, DE_TILD, S(DE_Z), S(KC_X), S(KC_C), S(KC_V), S(KC_B), S(KC_N), S(KC_M), DE_LABK, DE_RABK,    DE_QUES, KC_RSFT, _______, _______,
-      _______, _______, _______,                   _______,                            _______, TO(_LVL0_),          _______, _______, _______
-      ),
-/* Led Type Lighting Layer functionally equivalent to _LVL0_ / layer 0 */
-#ifdef TAP_DANCE_ENABLE
-  /* 7: ISO DE qwertz, SPACECADET and TAPDANCE */
-  [_LVL7_] = LAYOUT_65_iso_blocker(
-      KC_ESC,     DE_1,    DE_2,    DE_3,    DE_4,    DE_5,    DE_6,    DE_7,    DE_8,    DE_9,    DE_0,      DE_SS,   DE_ACUT, KC_BSPC, KC_DEL,
-      KC_TAB,     DE_Q,    DE_W,    DE_E,    DE_R,    DE_T,    DE_Z,    DE_U,    DE_I,    DE_O,    DE_P,      DE_UDIA, DE_PLUS,          TD(TD_HOME_END),
-      KC_CAPS,    DE_A,    DE_S,    DE_D,    DE_F,    DE_G,    DE_H,    DE_J,    DE_K,    DE_L,    DE_ODIA,   DE_ADIA, DE_HASH, KC_ENT,  KC_PGUP,
-      SC_LSPO, DE_LABK,    DE_Y,    DE_X,    DE_C,    DE_V,    DE_B,    DE_N,    DE_M,    DE_COMM, DE_DOT,    DE_MINS, SC_RSPC, KC_UP,   KC_PGDN,
-      KC_LCTL, KC_LGUI, SC_LAPO,                    KC_SPC,                               SC_RAPC, TO(_LVL0_),         KC_LEFT, KC_DOWN, KC_RGHT
-      ),
-#else
-  /* 7: ISO qwertz, SPACECADET but no TAPDANCE */
-  [_LVL7_] = LAYOUT_65_iso_blocker(
-      KC_ESC,     KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,      KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
-      KC_TAB,     KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,      KC_LBRC, KC_RBRC,          KC_HOME,
-      KC_CAPS,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,   KC_QUOT, KC_NUHS, KC_ENT,  KC_PGUP,
-      SC_LSPO, KC_NUBS,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,    KC_SLSH, SC_RSPC, KC_UP,   KC_PGDN,
-      KC_LCTL, KC_LGUI, SC_LAPO,                    KC_SPC,                               SC_RAPC, TO(_LVL0_),         KC_LEFT, KC_DOWN, KC_RGHT
-      ),
-#endif
-
-
-  /*template
-    [_UL] = LAYOUT_65_iso_blocker(
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TO(0),   _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______,                   _______,                            _______, _______,          _______, _______, _______
-    )
-    */
-};
-
-
-// layer color and type
-const uint8_t PROGMEM ledmap[][4] = {
-  // LEDs off on Layer 0
-  //[_LVL0_] = {{0, 0, 0},       LYR_SOLID},
-  [_LVL0_] = {C_HSV_WINERED,   LYR_SOLID},
-  [_LVL1_] = {HSV_RED,         LYR_TRANS},
-  [_LVL2_] = {HSV_MAGENTA,     LYR_BLACK},
-  [_LVL3_] = {HSV_PURPLE,      LYR_BLACK},
-  [_LVL4_] = {C_HSV_DARKGOLD,  LYR_SOLID},
-  [_LVL5_] = {C_HSV_DARKBLUE,  LYR_SOLID},
-  [_LVL6_] = {HSV_BLUE,        LYR_TRANS},
-  [_LVL7_] = {C_HSV_WINERED,   LYR_SOLID}
-};
-
-
-void keyboard_post_init_user(void) {
-  // Call the post init code.
-#ifdef CONSOLE_ENABLE
-  debug_enable=true;
-  debug_matrix=true;
-#endif
-  //rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
-  //rgb_matrix_set_flags(LED_FLAG_NONE);
-  rgb_matrix_set_flags(LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR);
-  //rgb_matrix_mode(RGB_MATRIX_SOLID_COLOR);
-  //rgb_matrix_sethsv(HSV_OFF);
-  //rgb_matrix_mode_noeeprom(RGB_MATRIX_SOLID_COLOR);
-  //rgb_matrix_sethsv_noeeprom(HSV_OFF);
-  //rgb_matrix_set_color_all(RGB_BLACK);
-  rgb_matrix_enable();
-}
-
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-#ifdef CONSOLE_ENABLE
-    // useful for getting matrix right
-    uprintf("KL: kc: 0x%04X, col: %u, row: %u, pressed: %u, time: %u, interrupt: %u, count: %u\n", keycode, record->event.key.col, record->event.key.row, record->event.pressed, record->event.time, record->tap.interrupted, record->tap.count);
-#endif
-
-    switch (keycode) {
-      case RGB_TOG:
-        if (record->event.pressed) {
-          switch (rgb_matrix_get_flags()) {
-            case LED_FLAG_ALL: {
-               rgb_matrix_set_flags(LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR);
-               rgb_matrix_set_color_all(RGB_BLACK);
-            }
-            break;
-            case (LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR): {
-               rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
-               rgb_matrix_set_color_all(RGB_BLACK);
-            }
-            break;
-            case LED_FLAG_UNDERGLOW: {
-               rgb_matrix_set_flags(LED_FLAG_NONE);
-               rgb_matrix_disable_noeeprom();
-            }
-            break;
-            default: {
-               rgb_matrix_set_flags(LED_FLAG_ALL);
-               rgb_matrix_enable_noeeprom();
-            }
-            break;
-          }
-        }
-        return false;
-      default:
-        return true; // Process all other keycodes normally
-  }
-}
-
-
-void set_led_color_by_hsv(int ledkey, uint8_t h_in, uint8_t s_in, uint8_t v_in){
-    HSV hsv = { .h = h_in, .s = s_in, .v = v_in};
-    RGB rgb = hsv_to_rgb(hsv);
-    float f = (float)rgb_matrix_config.hsv.v / UINT8_MAX;
-    rgb_matrix_set_color(ledkey, f * rgb.r, f * rgb.g, f * rgb.b);
-}
-
-void set_led_color_by_layer(int layer, int ledkey){
-    set_led_color_by_hsv(ledkey, pgm_read_byte(&ledmap[layer][0]),
-                              pgm_read_byte(&ledmap[layer][1]),
-                              pgm_read_byte(&ledmap[layer][2]));
-}
-
-void set_ledkey_by_layer_type(int layer, int ledkey, uint16_t key){
-    if (rgb_matrix_get_flags() != LED_FLAG_ALL){
-        if ( key == KC_TRNS ) {
-            if ((pgm_read_byte(&ledmap[layer][3]) == LYR_TRANS) && (layer > 0)){
-                // this key is transparent and the layer below does something
-                // - light it up in  (lower) layer-1 specific color
-                set_led_color_by_layer(layer-1, ledkey);
-            }
-            if (pgm_read_byte(&ledmap[layer][3]) == LYR_BLACK){
-                // this key is transparent but the lower layer is not intended
-                // to be used, it still works but not intended; type BLACK
-                set_led_color_by_hsv(ledkey, HSV_BLACK);
-            }
-        } else {
-            // this key does something - light it up in layer specific color
-            // regular key and SOLID or BLACK as layer type
-            set_led_color_by_layer(layer, ledkey);
-        }
-    }
-}
-
-void set_caps_lock(int layer) {
-    int caps_lock_led = 30;
-    led_t host_leds = host_keyboard_led_state();
-    if (host_leds.caps_lock) {
-        set_led_color_by_hsv(caps_lock_led, HSV_WHITE);
-    } else {
-        // if capslock is not pressed don't clear it,
-        // it might be used for displaying led pattern
-        if((rgb_matrix_get_flags() != LED_FLAG_ALL)) {
-            // or to keep the correct lighting on for the layer that use all keys
-            // on all other layers turn the led off, so only switch it of when
-            // layer is BLACK
-            if(pgm_read_byte(&ledmap[layer][3]) == LYR_BLACK){
-              set_led_color_by_hsv(caps_lock_led, HSV_BLACK);
-            }
-        }
-    }
-}
-
-void set_layer_color(int layer) {
-    // key specific lighting
-    int ledkey=0;
-    for (int keyindex=0; keyindex<MATRIX_COLS*MATRIX_ROWS;keyindex++) {
-        uint8_t row = keyindex/MATRIX_COLS;
-        uint8_t col = (keyindex-(keyindex/MATRIX_COLS)*MATRIX_COLS);
-        uint16_t key=pgm_read_word(&keymaps[layer][row][col]);
-
-        // continue if this is not a valid key
-        if (key==KC_NO) { continue; }
-
-        // handle layer specific coloring
-        set_ledkey_by_layer_type(layer, ledkey, key);
-        /* === below this function add custom overriding ledkey lighting === */
-
-        // gaming layer with highlighted keys
-        //if (IS_LAYER_ON(_LVL4_)) {
-        if (layer == _LVL4_) {
-            if((key==KC_W) || (key==KC_A) || (key==KC_S) || (key==KC_D)) {
-                set_led_color_by_hsv(ledkey, HSV_GOLD);
-            }
-            if((key==KC_R) || (key==KC_SPC) || (key==KC_LSFT) || (key==KC_LCTL)) {
-                set_led_color_by_hsv(ledkey, HSV_GOLDENROD);
-            }
-        }
-
-        // color testing layer
-        /*if (layer == _LVL7_) {
-        switch (ledkey) {
-          case 16: {
-                set_led_color_by_hsv(ledkey, HSV_AZURE);
-              }
-              break;
-          case 17: {
-                set_led_color_by_hsv(ledkey, HSV_BLUE);
-              }
-              break;
-          case 18: {
-                set_led_color_by_hsv(ledkey, HSV_CHARTREUSE);
-              }
-              break;
-          case 19: {
-                set_led_color_by_hsv(ledkey, HSV_CORAL);
-              }
-              break;
-          case 20: {
-                set_led_color_by_hsv(ledkey, HSV_CYAN);
-              }
-              break;
-          case 21: {
-                set_led_color_by_hsv(ledkey, HSV_GOLD);
-              }
-              break;
-          case 22: {
-                set_led_color_by_hsv(ledkey, HSV_GOLDENROD);
-              }
-              break;
-          case 23: {
-                set_led_color_by_hsv(ledkey, HSV_MAGENTA);
-              }
-              break;
-          case 24: {
-                set_led_color_by_hsv(ledkey, HSV_ORANGE);
-              }
-              break;
-          case 25: {
-                set_led_color_by_hsv(ledkey, HSV_PINK);
-              }
-              break;
-          case 26: {
-                set_led_color_by_hsv(ledkey, HSV_RED);
-              }
-              break;
-          case 27: {
-                set_led_color_by_hsv(ledkey, HSV_SPRINGGREEN);
-              }
-              break;
-          case 32: {
-                set_led_color_by_hsv(ledkey, HSV_MAGENTA);
-              }
-              break;
-          case 33: {
-                set_led_color_by_hsv(ledkey, HSV_TEAL);
-              }
-              break;
-          case 34: {
-                set_led_color_by_hsv(ledkey, HSV_TURQUOISE);
-              }
-              break;
-          case 35: {
-                set_led_color_by_hsv(ledkey, HSV_WHITE);
-              }
-              break;
-          case 36: {
-                set_led_color_by_hsv(ledkey, HSV_YELLOW);
-              }
-              break;
-          case 37: {
-                set_led_color_by_hsv(ledkey, HSV_PURPLE);
-              }
-              break;
-          case 38: {
-                set_led_color_by_hsv(ledkey, HSV_GREEN);
-              }
-              break;
-          default: {
-              }
-              break;
-            }
-        }*/
-        ledkey++;
-    }
-    // non key specific lighting instead led flag based
-    if (layer == _LVL7_){
-        for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; ++i) {
-            if (HAS_ANY_FLAGS(g_led_config.flags[i], LED_FLAG_MODIFIER)) {
-                set_led_color_by_hsv(i, C_HSV_DARKGOLD);
-            }
-            if (HAS_ANY_FLAGS(g_led_config.flags[i], LED_FLAG_UNDERGLOW)) {
-                set_led_color_by_hsv(i, HSV_BLACK);
-            }
-            if (HAS_ANY_FLAGS(g_led_config.flags[i], LED_FLAG_KEYLIGHT)) {
-                set_led_color_by_layer(layer, i);
-            }
-        }
-    }
-
-    return;
-}
-
-bool rgb_matrix_indicators_user(void) {
-    int layer = get_highest_layer(layer_state);
-    set_layer_color(layer);
-    set_caps_lock(layer);
-    return false;
-}
-
-void leader_end_user(void) {
-    if (leader_sequence_one_key(KC_F)) {
-        // Anything you can do in a macro.
-        SEND_STRING("QMK is awesome.");
-    }
-    if (leader_sequence_two_keys(KC_D, KC_D)) {
-        SEND_STRING(SS_LCTL("a") SS_LCTL("c"));
-    }
-    if (leader_sequence_two_keys(KC_S, KC_S)) {
-        SEND_STRING(SS_LCTL("v"));
-    }
-    if (leader_sequence_three_keys(KC_D, KC_D, KC_S)) {
-        SEND_STRING("https://start.duckduckgo.com\n");
-    }
-}
diff --git a/keyboards/kprepublic/bm65hsrgb_iso/keymaps/p4yne/readme.md b/keyboards/kprepublic/bm65hsrgb_iso/keymaps/p4yne/readme.md
deleted file mode 100644
index 924e63cef79..00000000000
--- a/keyboards/kprepublic/bm65hsrgb_iso/keymaps/p4yne/readme.md
+++ /dev/null
@@ -1,22 +0,0 @@
-# p4yne's keymap for the bm65iso
-
-* Eight layers (DE, LYR_SW_MEDIA, MOUSE_DSKTP_NAV, DYN_MACRO_NUMPAD_LEADER, GAMING, US, US_SHIFTED, DE_FLAG_LIGHTNING)
-* Different color for each layer (DRK_RED, RED, MAGENTA, PURPLE, DRK_GOLD, DRK_BLUE, BLUE, DRK_RED)
-* Keys with something else defined than KC_TRNS are lit up in the layer color, so you easily can see which keys have some function defined
-* Custom layer types for KC_TRNS keys to let lower layer shine through, or stay black/off
-* Custom lighting based on layer, key and led flag 
-* Caps-Lock lights up when active
-* Some leader shortcuts defined - nothing useful yet
-* Some space cadet keys defined for easier insertion of () and {}
-* Bootmagic lite enabled via default settings so you can plug in the keyboard while holding esc to land in bootloader mode
-* Manages all this and still fits in to the program memory
-
-Make example for this keyboard (after setting up your build environment):
-
-    make kprepublic/bm65hsrgb_iso:p4yne
-
-Flashing example for this keyboard:
-
-    make kprepublic/bm65hsrgb_iso:p4yne:flash
-
-Keyboard Maintainer: **[p4yne](https://github.com/p4yne)**
diff --git a/keyboards/kprepublic/bm65hsrgb_iso/keymaps/p4yne/rules.mk b/keyboards/kprepublic/bm65hsrgb_iso/keymaps/p4yne/rules.mk
deleted file mode 100644
index a94bdba88b9..00000000000
--- a/keyboards/kprepublic/bm65hsrgb_iso/keymaps/p4yne/rules.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#Features
-TAP_DANCE_ENABLE = yes
-SPACE_CADET_ENABLE = yes
-
-
-MAGIC_ENABLE = yes
-EXTRAKEY_ENABLE = yes
-MOUSEKEY_ENABLE = yes
-LEADER_ENABLE = yes
-DYNAMIC_MACRO_ENABLE = yes
-
-#Disabled Features
-#COMBO_ENABLE = no
-# Combo Key Grave and Escape
-#GRAVE_ESC_ENABLE = no
-# no unicode support
-#UNICODE_ENABLE = no
-
-#Debugging
-#COMMAND_ENABLE = no
-#CONSOLE_ENABLE = yes
-
-
diff --git a/keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/deadolus/config.h b/keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/deadolus/config.h
deleted file mode 100644
index 1dc1414fa5f..00000000000
--- a/keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/deadolus/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright 2021 deadolus
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-// place overrides here
-
-#pragma once
-#define LSPO_KEYS KC_LSFT, KC_LSFT, KC_8
-#define RSPC_KEYS KC_RSFT, KC_LSFT, KC_9
-#define LAPO_KEYS KC_LALT, KC_RALT, KC_QUOT
-#define RAPC_KEYS KC_RALT, KC_RALT, KC_NUHS
-
-#define LEADER_TIMEOUT 1000
-#define LEADER_PER_KEY_TIMING 250
-
diff --git a/keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/deadolus/keymap.c b/keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/deadolus/keymap.c
deleted file mode 100644
index 11f81032973..00000000000
--- a/keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/deadolus/keymap.c
+++ /dev/null
@@ -1,273 +0,0 @@
-/* Copyright 2019 ashlar 2021 peepeetee, deadolus
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-#include "keymap.h"
-
-#ifdef TAP_DANCE_ENABLE
-enum {
-  TD_HOME_END,
-};
-
-// Tap Dance definitions
-tap_dance_action_t tap_dance_actions[] = {
-  //tap once for home, twice for end
-  [TD_HOME_END] = ACTION_TAP_DANCE_DOUBLE(KC_HOME, KC_END)
-};
-#endif
-
-
-// // Defines names for use in layer keycodes and the keymap
-enum  layers {
-  _BL,
-  _RED_,
-  _GREEN_,
-  _BLUE_,
-  _CYAN_,
-  _MAGENTA_,
-  _YELLOW_
-};
-
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /*
-   * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
-   * │   │   │   │   │   │   │   │   │   │   │   │   │   │       │   │
-   * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
-   * │     │   │   │   │   │   │   │   │   │   │   │   │   │     │   │
-   * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    ├───┤
-   * │      │   │   │   │   │   │   │   │   │   │   │   │   │    │   │
-   * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼───┤
-   * │    │   │   │   │   │   │   │   │   │   │   │   │      │   │   │
-   * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤
-   * │    │    │    │                        │   │   │   │   │   │   │
-   * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
-   */
-#ifdef TAP_DANCE_ENABLE
-  /* 0: ISO qwerty */
-  [_BL] = LAYOUT_65_iso_blocker(
-      KC_CAPS, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,      KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
-      KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,      KC_LBRC, KC_RBRC,          TD(TD_HOME_END),
-      KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,   KC_QUOT, KC_NUHS, KC_ENT,  KC_PGUP,
-      SC_LSPO, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,    KC_SLSH, SC_RSPC, KC_UP,   KC_PGDN,
-      KC_LCTL, KC_LGUI, SC_LAPO,                   KC_SPC,                             SC_RAPC, MO(_RED_),          KC_LEFT, KC_DOWN, KC_RGHT
-
-      ),
-#else
-  [_BL] = LAYOUT_65_iso_blocker(
-      KC_CAPS, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,      KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
-      KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,      KC_LBRC, KC_RBRC,          KC_HOME,
-      KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,   KC_QUOT, KC_NUHS, KC_ENT,  KC_PGUP,
-      SC_LSPO, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,    KC_SLSH, SC_RSPC, KC_UP,   KC_PGDN,
-      KC_LCTL, KC_LGUI, SC_LAPO,                   KC_SPC,                             SC_RAPC, MO(_RED_),          KC_LEFT, KC_DOWN, KC_RGHT
-
-      ),
-#endif
-
-  [_RED_] = LAYOUT_65_iso_blocker(
-      KC_GRV,  KC_F1,       KC_F2,      KC_F3,      KC_F4,         KC_F5,        KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, LGUI(KC_END),
-      _______, _______,     _______,    _______,    _______,       _______,      _______, _______, _______, _______, _______, _______, _______,          LGUI(KC_PAUSE),
-      _______, TO(_GREEN_), TO(_BLUE_), TO(_CYAN_), TO(_MAGENTA_), TO(_YELLOW_), _______, _______, _______, _______, _______, _______, _______, TO(0),   _______,
-      _______, _______,     _______,    _______,    _______,       _______,      _______, _______, _______, _______, _______, _______, _______, KC_VOLU, _______,
-      QK_BOOT, _______,     _______,                               QK_LEAD,                                 _______, _______,          KC_MPLY, KC_VOLD, KC_MUTE
-      ),
-
-
-  [_GREEN_] = LAYOUT_65_iso_blocker(
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-      _______, _______, _______, _______, _______, _______, _______, KC_PGDN, KC_PGUP, KC_PSCR, _______, _______, _______,          _______,
-      _______, KC_ACL0, KC_ACL1, KC_ACL2, _______, _______, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_BTN1, KC_BTN2, _______, TO(0),   _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_END,  _______, _______, _______, _______,
-      _______, _______, _______,                   _______,                            _______, _______,          _______, _______, _______
-      ),
-
-
-  [_BLUE_] = LAYOUT_65_iso_blocker(
-      _______, DM_PLY1, DM_PLY2, _______, _______, _______, _______, _______, KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS, _______, _______, _______,
-      _______, DM_REC1, DM_REC2, _______, _______, _______, _______, _______, _______, KC_P7,   KC_P8,   KC_P9,   KC_PMNS,          _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_P4,   KC_P5,   KC_P6,   KC_PPLS, TO(0),   _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_P1,   KC_P2,   KC_P3,   KC_PENT, _______, _______,
-      _______, _______, _______,                   _______,                            KC_0,    KC_PCMM,          _______, _______, _______
-      ),
-  [_CYAN_] = LAYOUT_65_iso_blocker(
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TO(0),   _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-      _______, _______, _______,                   _______,                            _______, _______,          _______, _______, _______
-      ),
-  [_MAGENTA_] = LAYOUT_65_iso_blocker(
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TO(0),   _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-      _______, _______, _______,                   _______,                            _______, _______,          _______, _______, _______
-      ),
-  [_YELLOW_] = LAYOUT_65_iso_blocker(
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TO(0),   _______,
-      _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______,
-      _______, _______, _______,                   _______,                            _______, _______,          _______, _______, _______
-      ),
-
-  /*template
-    [_UL] = LAYOUT_65_iso_blocker(
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TO(0),   _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______,                   _______,                            _______, _______,          _______, _______, _______
-    )
-    */
-};
-
-#ifdef _______
-#undef _______
-#define _______ {0, 0, 0}
-
-const uint8_t PROGMEM ledmap[][3] = {
-  [_BL] = _______,
-  [_RED_] = RED,
-  [_GREEN_] = GREEN,
-  [_BLUE_] = BLUE,
-  [_CYAN_] = CYAN,
-  [_MAGENTA_] = MAGENTA,
-  [_YELLOW_] = YELLOW
-};
-
-#undef _______
-#define _______ KC_TRNS
-#endif
-
-
-
-void keyboard_post_init_user(void) {
-  // Call the post init code.
-#ifdef CONSOLE_ENABLE
-  debug_enable=true;
-  debug_matrix=true;
-#endif
-  rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
-}
-
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-#ifdef CONSOLE_ENABLE
-  //useful for getting matrix right
-  uprintf("KL: kc: 0x%04X, col: %u, row: %u, pressed: %b, time: %u, interrupt: %b, count: %u\n", keycode, record->event.key.col, record->event.key.row, record->event.pressed, record->event.time, record->tap.interrupted, record->tap.count);
-#endif
-
-  switch (keycode) {
-    case RGB_TOG:
-      if (record->event.pressed) {
-        switch (rgb_matrix_get_flags()) {
-          case LED_FLAG_ALL: {
-                               rgb_matrix_set_flags(LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR);
-                               rgb_matrix_set_color_all(0, 0, 0);
-                             }
-                             break;
-          case (LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR): {
-                                                                               rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
-                                                                               rgb_matrix_set_color_all(0, 0, 0);
-                                                                             }
-                                                                             break;
-          case LED_FLAG_UNDERGLOW: {
-                                     rgb_matrix_set_flags(LED_FLAG_NONE);
-                                     rgb_matrix_disable_noeeprom();
-                                   }
-                                   break;
-          default: {
-                     rgb_matrix_set_flags(LED_FLAG_ALL);
-                     rgb_matrix_enable_noeeprom();
-                   }
-                   break;
-        }
-      }
-      return false;
-    default:
-      return true; // Process all other keycodes normally
-  }
-}
-
-void setCapsLock(void) {
-  led_t host_leds = host_keyboard_led_state();
-  if (host_leds.caps_lock) {
-    rgb_matrix_set_color(30, 0xFF, 0xFF, 0xFF);
-
-  } else {
-    //if capslock is not pressed don't clear it, it might be used for displaying led pattern
-    if((rgb_matrix_get_flags() != LED_FLAG_ALL)) {
-      rgb_matrix_set_color(30, 0x0, 0x0, 0x0);
-    }
-  }
-}
-
-void set_layer_color(int layer) {
-  int ledkey=0;
-  for(int i=0; i<MATRIX_COLS*MATRIX_ROWS;i++) {
-    uint8_t row = i/MATRIX_COLS;
-    uint8_t col=(i-(i/MATRIX_COLS)*MATRIX_COLS);
-    uint16_t key=pgm_read_word(&keymaps[layer][row][col]);
-    //continue if this is not a valid key
-    if(key==KC_NO) { continue; }
-    //clear key if it is only a transition
-    if ((key == KC_TRNS)) {
-      if(rgb_matrix_get_flags() != LED_FLAG_ALL){
-        rgb_matrix_set_color(ledkey, 0, 0, 0);
-      }
-    }else {
-      //this key does something - light it up
-      HSV hsv = {
-        .h = pgm_read_byte(&ledmap[layer][0]),
-        .s = pgm_read_byte(&ledmap[layer][1]),
-        .v = pgm_read_byte(&ledmap[layer][2]),
-      };
-
-      RGB rgb = hsv_to_rgb(hsv);
-      float f = (float)rgb_matrix_config.hsv.v / UINT8_MAX;
-      if( (layer != 0) || (rgb_matrix_get_flags() != LED_FLAG_ALL))
-        rgb_matrix_set_color(ledkey, f * rgb.r, f * rgb.g, f * rgb.b);
-    }
-    //if we are on layer 0 set capslock to correct status
-    if(layer==0 && i==30) { setCapsLock(); }
-    ledkey++;
-  }
-  return;
-}
-
-bool rgb_matrix_indicators_user(void) {
-  set_layer_color(get_highest_layer(layer_state));
-
-    return false;
-}
-
-void leader_end_user(void) {
-  if (leader_sequence_one_key(KC_F)) {
-    // Anything you can do in a macro.
-    SEND_STRING("QMK is awesome.");
-  }
-  if (leader_sequence_two_keys(KC_D, KC_D)) {
-    SEND_STRING(SS_LCTL("a") SS_LCTL("c"));
-  }
-  if (leader_sequence_three_keys(KC_D, KC_D, KC_S)) {
-    SEND_STRING("https");
-    register_code(KC_LSFT);
-    SEND_STRING(".77");
-    unregister_code(KC_LSFT);
-    SEND_STRING("start.duckduckgo.com\n");
-  }
-}
diff --git a/keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/deadolus/keymap.h b/keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/deadolus/keymap.h
deleted file mode 100644
index 1459e2c5bba..00000000000
--- a/keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/deadolus/keymap.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* Copyright 2019 ash0x0 2021 peepeetee, deadolus
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-
-#include "print.h"
-#include <string.h>
-// HID has not yet been implemented for this keyboard
-// #include "raw_hid.h"
-
-#define MILLISECONDS_IN_SECOND 1000
-
-// These are just to make it neater to use builtin HSV values in the keymap
-#define RED {HSV_RED}
-#define CORAL {HSV_CORAL}
-#define ORANGE {HSV_ORANGE}
-#define GOLDEN {HSV_GOLDENROD}
-#define GOLD {HSV_GOLD}
-#define YELLOW {HSV_YELLOW}
-#define CHART {HSV_CHARTREUSE}
-#define GREEN {HSV_GREEN}
-#define SPRING {HSV_SPRINGGREEN}
-#define TURQ {HSV_TURQUOISE}
-#define TEAL {HSV_TEAL}
-#define CYAN {HSV_CYAN}
-#define AZURE {HSV_AZURE}
-#define BLUE {HSV_BLUE}
-#define PURPLE {HSV_PURPLE}
-#define MAGENTA {HSV_MAGENTA}
-#define PINK {HSV_PINK}
-
-//========================================================== CONFIGURABLE DEFAULTS ==========================================================
-#define RGB_DEFAULT_TIME_OUT 30
-#define RGB_FAST_MODE_TIME_OUT 3
-#define RGB_TIME_OUT_MAX 600
-#define RGB_TIME_OUT_MIN 10
-#define RGB_TIME_OUT_STEP 10
-
-extern bool g_suspend_state;
-bool disable_layer_color;
-
-uint8_t dfa_state;  //state for my language switching DFA
-
-
-bool rgb_enabled_flag;                  // Current LED state flag. If false then LED is off.
-bool rgb_time_out_enable;               // Idle LED toggle enable. If false then LED will not turn off after idle timeout.
-bool rgb_time_out_fast_mode_enabled;    // Enable flag for RGB timeout fast mode
-bool rgb_time_out_user_value;           // This holds the toggle value set by user with ROUT_TG. It's necessary as RGB_TOG changes timeout enable.
-uint16_t rgb_time_out_seconds;          // Idle LED timeout value, in seconds not milliseconds
-uint16_t rgb_time_out_saved_seconds;    // The saved user config for RGB timeout period
-led_flags_t rgb_time_out_saved_flag;    // Store LED flag before timeout so it can be restored when LED is turned on again.
diff --git a/keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/deadolus/readme.md b/keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/deadolus/readme.md
deleted file mode 100644
index 095550b01a8..00000000000
--- a/keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/deadolus/readme.md
+++ /dev/null
@@ -1,20 +0,0 @@
-# Deadolus' keymap for the bm65iso
-
-* Six layers (even though three are mostly empty)
-* Different color for each layer (r,g,b,c,m,y)
-* **Keys with something else defined than KC_TRNS are lit up in the layer color, so you easily can see which keys have some function defined**
-* Caps-Lock lights up when active and on layer 0
-* Some leader shortcuts defined - nothing useful yet
-* Some space cadet keys defined for easier insertion of () and {}
-* Bootmagic lite enabled via default settings so you can plug in the keyboard while holding esc to land in bootloader mode
-* Manages all this and still fits in to the program memory
-
-Make example for this keyboard (after setting up your build environment):
-
-    make kprepublic/bm65hsrgb_iso:deadolus
-
-Flashing example for this keyboard:
-
-    make kprepublic/bm65hsrgb_iso:deadolus:flash
-
-Keyboard Maintainer: **[deadolus](https://github.com/deadolus)**
diff --git a/keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/deadolus/rules.mk b/keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/deadolus/rules.mk
deleted file mode 100644
index c8354ea2561..00000000000
--- a/keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/deadolus/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-DYNAMIC_MACRO_ENABLE = yes
-TAP_DANCE_ENABLE = yes
-LEADER_ENABLE = yes
-#CONSOLE_ENABLE=yes
diff --git a/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/config.h b/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/config.h
deleted file mode 100644
index 854b36d862e..00000000000
--- a/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/config.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/* Copyright 2021 peepeetee
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-
-// #define MODS_SHIFT  (get_mods() & MOD_MASK_SHIFT)
-// #define MODS_CTRL   (get_mods() & MOD_MASK_CTRL)
-// #define MODS_ALT    (get_mods() & MOD_MASK_ALT)
-
-// #define IS_COMMAND() (get_mods() == MOD_MASK_SHIFT)      // Key combination that allows the use of magic commands (useful for debugging)
-
-// #define NO_DEBUG                    // Disable debugging
-// #define NO_PRINT                    // Disable printing/debugging using hid_listen
-// #define NO_ACTION_LAYER             // Disable layers
-// #define NO_ACTION_TAPPING           // Disable tap dance and other tapping features
-// #define NO_ACTION_ONESHOT           // Disable one-shot modifiers
-// #define NO_ACTION_MACRO             // Disable old style macro handling: MACRO() & action_get_macro
-// #define TERMINAL_HELP
-// #define MOUSEKEY_INTERVAL 20
-// #define MOUSEKEY_DELAY 0
-// #define MOUSEKEY_TIME_TO_MAX 60
-// #define MOUSEKEY_MAX_SPEED 10
-// #define MOUSEKEY_WHEEL_DELAY 0
-#define FORCE_NKRO                  // NKRO by default requires to be turned on, this forces it on during keyboard startup regardless of EEPROM setting. NKRO can still be turned off but will be turned on again if the keyboard reboots.
-// #define STRICT_LAYER_RELEASE        // Force a key release to be evaluated using the current layer stack instead of remembering which layer it came from (used for advanced cases)
-// #define LOCKING_SUPPORT_ENABLE      // Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap
-// #define LOCKING_RESYNC_ENABLE       // Tries to keep switch state consistent with keyboard LED state
- #define TAPPING_TERM 200            // How long before a tap becomes a hold, if set above 500, a key tapped during the tapping term will turn it into a hold too
-// #define TAPPING_TERM_PER_KEY        // Enables handling for per key TAPPING_TERM settings
-// #define RETRO_TAPPING               // Tap anyway, even after TAPPING_TERM, if there was no other key interruption between press and release
-// #define TAPPING_TOGGLE 2            // How many taps before triggering the toggle
-// #define PERMISSIVE_HOLD             // Makes tap and hold keys trigger the hold if another key is pressed before releasing, even if it hasn't hit the TAPPING_TERM. See Permissive Hold for details
-// #define QUICK_TAP_TERM 0          // Makes it possible to use a dual role key as modifier shortly after having been tapped. See Hold after tap. Breaks any Tap Toggle functionality (TT or the One Shot Tap Toggle)
-// #define LEADER_TIMEOUT 300          // How long before the leader key times out. If you're having issues finishing the sequence before it times out, you may need to increase the timeout setting. Or you may want to enable the LEADER_PER_KEY_TIMING option, which resets the timeout after each key is tapped.
-// #define LEADER_PER_KEY_TIMING       // Sets the timer for leader key chords to run on each key press rather than overall
-// #define LEADER_KEY_STRICT_KEY_PROCESSING    // Disables keycode filtering for Mod-Tap and Layer-Tap keycodes. Eg, if you enable this, you would need to specify MT(MOD_CTL, KC_A) if you want to use KC_A.
-// #define ONESHOT_TIMEOUT 300         // How long before oneshot times out
-// #define ONESHOT_TAP_TOGGLE 2        // How many taps before oneshot toggle is triggered
-// #define COMBO_TERM 200              // How long for the Combo keys to be detected. Defaults to TAPPING_TERM if not defined.
-// #define TAP_CODE_DELAY 100          // Sets the delay between register_code and unregister_code, if you're having issues with it registering properly (common on VUSB boards). The value is in milliseconds.
-// #define TAP_HOLD_CAPS_DELAY 80      // Sets the delay for Tap Hold keys (LT, MT) when using KC_CAPS_LOCK keycode, as this has some special handling on MacOS.  The value is in milliseconds, and defaults to 80 ms if not defined. For macOS, you may want to set this to 200 or higher.
-
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_KEYPRESSES         // reacts to keypresses
-// #define RGB_MATRIX_KEYRELEASES        // reacts to keyreleases (instead of keypresses)
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_ALPHAS_MODS // Sets the default mode, if none has been set
-// #define RGBLIGHT_HUE_STEP 12        // Units to step when in/decreasing hue
-// #define RGBLIGHT_SAT_STEP 25        // Units to step when in/decreasing saturation
-// #define RGBLIGHT_VAL_STEP 12        // Units to step when in/decreasing value (brightness)
-// #define RGB_MATRIX_SLEEP // turn off effects when suspended
-// #define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
-// #define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
-
-// #define RGBLIGHT_EFFECT_BREATHE_CENTER              // If defined, used to calculate the curve for the breathing animation. Valid values are 1.0 to 2.7
-// #define RGBLIGHT_EFFECT_BREATHE_MAX 255             // The maximum brightness for the breathing mode. Valid values are 1 to 255
-// #define RGBLIGHT_EFFECT_CHRISTMAS_INTERVAL 1000     // How long to wait between light changes for the "Christmas" animation, in milliseconds
-// #define RGBLIGHT_EFFECT_CHRISTMAS_STEP 2            // The number of LEDs to group the red/green colors by for the "Christmas" animation
-// #define RGBLIGHT_EFFECT_KNIGHT_LED_NUM RGBLED_NUM   // The number of LEDs to have the "Knight" animation travel
-// #define RGBLIGHT_EFFECT_KNIGHT_LENGTH 3             // The number of LEDs to light up for the "Knight" animation
-// #define RGBLIGHT_EFFECT_KNIGHT_OFFSET 0             // The number of LEDs to start the "Knight" animation from the start of the strip by
-// #define RGBLIGHT_RAINBOW_SWIRL_RANGE 255            // Range adjustment for the rainbow swirl effect to get different swirls
-// #define RGBLIGHT_EFFECT_SNAKE_LENGTH 4              // The number of LEDs to light up for the "Snake" animation
-
-// This list in in the correct mode order. Next mode is the following line, previous mode is previous line. Loops around.
-// #undef ENABLE_RGB_MATRIX_SOLID_COLOR                   // Static single hue, no speed support
-// #undef ENABLE_RGB_MATRIX_ALPHAS_MODS                   // Static dual hue, speed is hue for secondary hue
-#undef ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN     // Static gradient top to bottom, speed controls how much gradient changes
-#undef ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT  // Static gradient top to bottom, speed controls how much gradient changes
-#undef ENABLE_RGB_MATRIX_BREATHING            // Single hue brightness cycling animation
-#undef ENABLE_RGB_MATRIX_BAND_SAT             // Single hue band fading saturation scrolling left to right
-#undef ENABLE_RGB_MATRIX_BAND_VAL             // Single hue band fading brightness scrolling left to right
-#undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT    // Single hue 3 blade spinning pinwheel fades saturation
-#undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL    // Single hue 3 blade spinning pinwheel fades brightness
-#undef ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT      // Single hue spinning spiral fades saturation
-#undef ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL      // Single hue spinning spiral fades brightness
-#undef ENABLE_RGB_MATRIX_CYCLE_ALL            // Full keyboard solid hue cycling through full gradient
-//#undef ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT              // Full gradient scrolling left to right
-#undef ENABLE_RGB_MATRIX_CYCLE_UP_DOWN           // Full gradient scrolling top to bottom
-#undef ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON  // Full gradent Chevron shapped scrolling left to right
-#undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN            // Full gradient scrolling out to in
-#undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL       // Full dual gradients scrolling out to in
-#undef ENABLE_RGB_MATRIX_CYCLE_PINWHEEL          // Full gradient spinning pinwheel around center of keyboard
-#undef ENABLE_RGB_MATRIX_CYCLE_SPIRAL            // Full gradient spinning spiral around center of keyboard
-#undef ENABLE_RGB_MATRIX_DUAL_BEACON             // Full gradient spinning around center of keyboard
-#undef ENABLE_RGB_MATRIX_RAINBOW_BEACON          // Full tighter gradient spinning around center of keyboard
-#undef ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS       // Full dual gradients spinning two halfs of keyboard
-#undef ENABLE_RGB_MATRIX_RAINDROPS               // Randomly changes a single key's hue
-#undef ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS     // Randomly changes a single key's hue and saturation
-// =================================================== Requires RGB_MATRIX_FRAMEBUFFER_EFFECTS =============================================================
-// #undef ENABLE_RGB_MATRIX_TYPING_HEATMAP                // How hot is your WPM!
-#undef ENABLE_RGB_MATRIX_DIGITAL_RAIN               // That famous computer simulation
-                                                    // =================================================== RGB_MATRIX_KEYPRESSES OR RGB_MATRIX_KEYRELEASES =====================================================
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE      // Pulses keys hit to hue & value then fades value out
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE             // Static single hue, pulses keys hit to shifted hue then fades to current hue
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE        // Hue & value pulse near a single key hit then fades value out
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE   // Hue & value pulse near multiple key hits then fades value out
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS       // Hue & value pulse the same column and row of a single key hit then fades value out
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS  // Hue & value pulse the same column and row of multiple key hits then fades value out
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS       // Hue & value pulse away on the same column and row of a single key hit then fades value out
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS  // Hue & value pulse away on the same column and row of multiple key hits then fades value out
-#undef ENABLE_RGB_MATRIX_SPLASH                     // Full gradient & value pulse away from a single key hit then fades value out
-#undef ENABLE_RGB_MATRIX_MULTISPLASH                // Full gradient & value pulse away from multiple key hits then fades value out
-#undef ENABLE_RGB_MATRIX_SOLID_SPLASH               // Hue & value pulse away from a single key hit then fades value out
-#undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH          // Hue & value pulse away from multiple key hits then fades value out
diff --git a/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/keymap.c b/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/keymap.c
deleted file mode 100644
index fdfe7406889..00000000000
--- a/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/keymap.c
+++ /dev/null
@@ -1,304 +0,0 @@
-/* Copyright 2019 ash0x0 2021 peepeetee
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-#include "keymap.h"
-// // Defines names for use in layer keycodes and the keymap
-// enum layer_names {
-//     _BASE,
-//     _FN
-// };
-
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT_65_ansi(
-         KC_ESC,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_MINS,  KC_EQL,  KC_BSPC,   KC_HOME,
-         KC_TAB,    KC_Q,     KC_W,     KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_LBRC, KC_RBRC,  KC_BSLS, KC_PGUP,
-        KC_CAPS,       KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN, KC_QUOT,        KC_ENT,    KC_PGDN,
-        KC_LSFT,         KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,     KC_RSFT,     KC_UP,  KC_END,
-        KC_LCTL,   KC_LGUI,LT(1, KC_LALT),                     KC_SPC,                         KC_RALT,   MO(1),KC_RCTL, KC_LEFT, KC_DOWN,  KC_RGHT
-    ),
-    [1] = LAYOUT_65_ansi(
-        KC_GRAVE,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,  _______,   KC_DELETE,
-        RGB_MOD,   RGB_HUI, RGB_VAI, RGB_SAI, RGB_SPI, _______, KC_KP_7, KC_KP_8, KC_KP_9, _______, _______, _______, _______,  _______, KC_PGUP,
-        RGB_TOG,    RGB_HUD, RGB_VAD, RGB_SAD, RGB_SPD, _______, KC_KP_4, KC_KP_5, KC_KP_6, _______, _______, _______,       _______,    KC_PGDN,
-        BL_TOGG,      _______, _______, _______, _______,   QK_BOOT, KC_KP_1, KC_KP_2, KC_KP_3, _______, _______,     _______,   KC_AUDIO_VOL_UP,  KC_END,
-        _______,   _______,   _______,                    _______,                         _______, _______, _______, KC_BRIGHTNESS_DOWN, KC_AUDIO_VOL_DOWN,  KC_BRIGHTNESS_UP
-    ),
-
-};
-
-/*
-Templete
-    [ ] = LAYOUT_65_ansi(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,   _______,
-        _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______,
-        _______,    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,       _______,    _______,
-        _______,      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______,   _______,  _______,
-        _______,   _______,   _______,                    _______,                         _______, _______, _______, _______, _______,  _______
-    ),
-*/
-
-#ifdef _______
-#undef _______
-#define _______ {0, 0, 0}
-
-const uint8_t PROGMEM ledmap[][RGB_MATRIX_LED_COUNT][3] = {
-    [1] = {
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,   _______,
-        GREEN,   BLUE, {0, 0, 255}, PURPLE, AZURE, _______, {0, 0, 255}, {0, 0, 255}, {0, 0, 255}, _______, _______, _______, _______,  _______, _______,
-        RED,    BLUE, {0, 0, 1}, PURPLE, AZURE, _______, {0, 0, 255}, {0, 0, 255}, {0, 0, 255}, _______, _______, _______,       _______,    _______,
-        _______,      _______, _______, _______, _______, RED, {0, 0, 255}, {0, 0, 255}, {0, 0, 255}, _______, _______,     _______,   _______,  _______,
-        _______,   _______,   _______,                    _______,                         _______, _______, _______, _______, _______,  _______
-    }
-
-};
-
-#undef _______
-#define _______ KC_TRNS
-#endif
-
-
-
-void keyboard_post_init_user(void) {
-  // Call the post init code.
-    dfa_state = 0; // ENGLISH
-}
-
-
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case KC_DELETE:
-      if (record->event.pressed) {
-                dfa_state = 0;
-    } else {
-        // Do something else when release
-      }
-      return false; // Skip all further processing of this key
-    case KC_SPC:
-      if (record->event.pressed) {
-          if ((get_mods() & MOD_BIT(KC_LGUI)) == MOD_BIT(KC_LGUI)){
-              if(dfa_state == 3){
-                  dfa_state = 0;
-              } else {
-                  dfa_state = dfa_state + 1;
-              }
-          }
-    } else {
-        // Do something else when release
-      }
-      return true; // Continue execution
-
-
-    case KC_HOME:
-      if (record->event.pressed) {
-          switch(dfa_state){
-            case 0 :{
-                return false;
-            }
-            case 1 :{
-                tap_code16(G(KC_SPC));
-                wait_ms(100);
-                tap_code16(G(KC_SPC));
-                wait_ms(100);
-                tap_code16(G(KC_SPC));
-                dfa_state = 0;
-                return false;
-            }
-            case 2 :{
-                tap_code16(G(KC_SPC));
-                wait_ms(100);
-                tap_code16(G(KC_SPC));
-                dfa_state = 0;
-                return false;
-            }
-            case 3 :{
-                tap_code16(G(KC_SPC));
-                dfa_state = 0;
-                return false;
-            }
-          }
-
-        // Do something when pressed
-      } else {
-        // Do something else when release
-      }
-      return false; // Skip all further processing of this key
-    // case KC_PGUP:
-    //   if (record->event.pressed) {
-    //       switch(dfa_state){
-    //         case 0 :{
-    //             tap_code16(G(KC_SPC));
-    //             dfa_state = 1;
-    //             return false;
-    //         }
-    //         case 1 :{
-    //             return false;
-    //         }
-    //         case 2 :{
-    //             tap_code16(G(KC_SPC));
-    //             wait_ms(100);
-    //             tap_code16(G(KC_SPC));
-    //             wait_ms(100);
-    //             tap_code16(G(KC_SPC));
-    //             dfa_state = 1;
-    //             return false;
-    //         }
-    //         case 3 :{
-    //             tap_code16(G(KC_SPC));
-    //             wait_ms(100);
-    //             tap_code16(G(KC_SPC));
-    //             dfa_state = 1;
-    //             return false;
-    //         }
-    //       }
-    //     // Do something when pressed
-    //   } else {
-    //     // Do something else when release
-    //   }
-    //   return false; // Skip all further processing of this key
-    // case KC_PGDN:
-    //   if (record->event.pressed) {
-    //       switch(dfa_state){
-    //         case 0 :{
-    //             tap_code16(G(KC_SPC));
-    //             wait_ms(100);
-    //             tap_code16(G(KC_SPC));
-    //             dfa_state = 2;
-    //             return false;
-    //         }
-    //         case 1 :{
-    //             tap_code16(G(KC_SPC));
-    //             dfa_state = 2;
-    //             return false;
-    //         }
-    //         case 2 :{
-    //             return false;
-    //         }
-    //         case 3 :{
-    //             tap_code16(G(KC_SPC));
-    //             wait_ms(100);
-    //             tap_code16(G(KC_SPC));
-    //             wait_ms(100);
-    //             tap_code16(G(KC_SPC));
-    //             dfa_state = 2;
-    //             return false;
-    //         }
-    //       }
-    //     // Do something when pressed
-    //   } else {
-    //     // Do something else when release
-    //   }
-    //   return false; // Skip all further processing of this key
-    // case KC_END:
-    //   if (record->event.pressed) {
-    //       switch(dfa_state){
-    //         case 0 :{
-    //             tap_code16(G(KC_SPC));
-    //             wait_ms(100);
-    //             tap_code16(G(KC_SPC));
-    //             wait_ms(100);
-    //             tap_code16(G(KC_SPC));
-    //             dfa_state = 3;
-    //             return false;
-    //         }
-    //         case 1 :{
-    //             tap_code16(G(KC_SPC));
-    //             wait_ms(100);
-    //             tap_code16(G(KC_SPC));
-    //             dfa_state = 3;
-    //             return false;
-    //         }
-    //         case 2 :{
-    //             tap_code16(G(KC_SPC));
-    //             dfa_state = 3;
-    //             return false;
-    //         }
-    //         case 3 :{
-    //             return false;
-    //         }
-    //       }
-    //     // Do something when pressed
-    //   } else {
-    //     // Do something else when release
-    //   }
-    //   return false; // Skip all further processing of this key
-            case RGB_TOG:
-            if (record->event.pressed) {
-              switch (rgb_matrix_get_flags()) {
-                case LED_FLAG_ALL: {
-                    rgb_matrix_set_flags(LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR);
-                    rgb_matrix_set_color_all(0, 0, 0);
-                  }
-                  break;
-                case (LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR): {
-                    rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
-                    rgb_matrix_set_color_all(0, 0, 0);
-                  }
-                  break;
-                case LED_FLAG_UNDERGLOW: {
-                    rgb_matrix_set_flags(LED_FLAG_NONE);
-                    rgb_matrix_disable_noeeprom();
-                  }
-                  break;
-                default: {
-                    rgb_matrix_set_flags(LED_FLAG_ALL);
-                    rgb_matrix_enable_noeeprom();
-                  }
-                  break;
-              }
-            }
-            return false;
-    default:
-      return true; // Process all other keycodes normally
-  }
-}
-
-void set_layer_color(int layer) {
-    if (layer == 0) { return; }
-    for (int i = 0; i < RGB_MATRIX_LED_COUNT; i++) {
-        HSV hsv = {
-            .h = pgm_read_byte(&ledmap[layer][i][0]),
-            .s = pgm_read_byte(&ledmap[layer][i][1]),
-            .v = pgm_read_byte(&ledmap[layer][i][2]),
-        };
-        if (hsv.h || hsv.s || hsv.v) {
-            RGB rgb = hsv_to_rgb(hsv);
-            float f = (float)rgb_matrix_config.hsv.v / UINT8_MAX;
-            rgb_matrix_set_color(i, f * rgb.r, f * rgb.g, f * rgb.b);
-        } else if (layer != 1) {
-            // Only deactivate non-defined key LEDs at layers other than FN. Because at FN we have RGB adjustments and need to see them live.
-            // If the values are all false then it's a transparent key and deactivate LED at this layer
-            rgb_matrix_set_color(i, 0, 0, 0);
-        }
-    }
-}
-
-bool rgb_matrix_indicators_user(void) {
-
-    led_t host_leds = host_keyboard_led_state();
-    if (host_leds.caps_lock) {
-        //rgb_matrix_set_color(30, 0xFF, 0xFF, 0xFF);
-        rgb_matrix_set_color(30, 0x0, 0x0, 0x0);
-
-    } else {
-        //rgb_matrix_set_color(30, 0x0, 0x0, 0x0);
-    }
-        set_layer_color(get_highest_layer(layer_state));
-
-    return false;
-}
diff --git a/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/keymap.h b/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/keymap.h
deleted file mode 100644
index e8d0170d4d6..00000000000
--- a/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/keymap.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* Copyright 2019 ash0x0 2021 peepeetee
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-
-#include "print.h"
-#include <string.h>
-// HID has not yet been implemented for this keyboard
-// #include "raw_hid.h"
-
-#define MILLISECONDS_IN_SECOND 1000
-
-// These are just to make it neater to use builtin HSV values in the keymap
-#define RED {HSV_RED}
-#define CORAL {HSV_CORAL}
-#define ORANGE {HSV_ORANGE}
-#define GOLDEN {HSV_GOLDENROD}
-#define GOLD {HSV_GOLD}
-#define YELLOW {HSV_YELLOW}
-#define CHART {HSV_CHARTREUSE}
-#define GREEN {HSV_GREEN}
-#define SPRING {HSV_SPRINGGREEN}
-#define TURQ {HSV_TURQUOISE}
-#define TEAL {HSV_TEAL}
-#define CYAN {HSV_CYAN}
-#define AZURE {HSV_AZURE}
-#define BLUE {HSV_BLUE}
-#define PURPLE {HSV_PURPLE}
-#define MAGENT {HSV_MAGENTA}
-#define PINK {HSV_PINK}
-
-//========================================================== CONFIGURABLE DEFAULTS ==========================================================
-#define RGB_DEFAULT_TIME_OUT 30
-#define RGB_FAST_MODE_TIME_OUT 3
-#define RGB_TIME_OUT_MAX 600
-#define RGB_TIME_OUT_MIN 10
-#define RGB_TIME_OUT_STEP 10
-
-extern bool g_suspend_state;
-bool disable_layer_color;
-
-uint8_t dfa_state;  //state for my language switching DFA
-
-
-bool rgb_enabled_flag;                  // Current LED state flag. If false then LED is off.
-bool rgb_time_out_enable;               // Idle LED toggle enable. If false then LED will not turn off after idle timeout.
-bool rgb_time_out_fast_mode_enabled;    // Enable flag for RGB timeout fast mode
-bool rgb_time_out_user_value;           // This holds the toggle value set by user with ROUT_TG. It's necessary as RGB_TOG changes timeout enable.
-uint16_t rgb_time_out_seconds;          // Idle LED timeout value, in seconds not milliseconds
-uint16_t rgb_time_out_saved_seconds;    // The saved user config for RGB timeout period
-led_flags_t rgb_time_out_saved_flag;    // Store LED flag before timeout so it can be restored when LED is turned on again.
diff --git a/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/readme.md b/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/readme.md
deleted file mode 100644
index 47899c27e18..00000000000
--- a/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# peepeetee's keymap for the bm68rgb. Includes a DFA to set the windows system language back to English by pressing the top right button. Said DFA will only work with 4 languages(for now).
\ No newline at end of file
diff --git a/keyboards/kprepublic/bm68hsrgb/rev2/rev2.c b/keyboards/kprepublic/bm68hsrgb/rev2/rev2.c
index 357ce13e960..68068d7fb97 100644
--- a/keyboards/kprepublic/bm68hsrgb/rev2/rev2.c
+++ b/keyboards/kprepublic/bm68hsrgb/rev2/rev2.c
@@ -18,78 +18,78 @@
 #ifdef RGB_MATRIX_ENABLE
 
 const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
-    {0, CS6_SW1, CS5_SW1, CS4_SW1},
-    {0, CS6_SW2, CS5_SW2, CS4_SW2},
-    {0, CS6_SW3, CS5_SW3, CS4_SW3},
-    {0, CS6_SW4, CS5_SW4, CS4_SW4},
-    {0, CS6_SW5, CS5_SW5, CS4_SW5},
-    {0, CS6_SW6, CS5_SW6, CS4_SW6},
-    {0, CS6_SW7, CS5_SW7, CS4_SW7},
-    {0, CS6_SW8, CS5_SW8, CS4_SW8},
-    {0, CS18_SW1, CS17_SW1, CS16_SW1},
-    {0, CS18_SW2, CS17_SW2, CS16_SW2},
-    {0, CS18_SW3, CS17_SW3, CS16_SW3},
-    {0, CS18_SW4, CS17_SW4, CS16_SW4},
-    {0, CS18_SW5, CS17_SW5, CS16_SW5},
-    {0, CS18_SW6, CS17_SW6, CS16_SW6},
-    {0, CS18_SW7, CS17_SW7, CS16_SW7},
+    {0, SW1_CS6, SW1_CS5, SW1_CS4},
+    {0, SW2_CS6, SW2_CS5, SW2_CS4},
+    {0, SW3_CS6, SW3_CS5, SW3_CS4},
+    {0, SW4_CS6, SW4_CS5, SW4_CS4},
+    {0, SW5_CS6, SW5_CS5, SW5_CS4},
+    {0, SW6_CS6, SW6_CS5, SW6_CS4},
+    {0, SW7_CS6, SW7_CS5, SW7_CS4},
+    {0, SW8_CS6, SW8_CS5, SW8_CS4},
+    {0, SW1_CS18, SW1_CS17, SW1_CS16},
+    {0, SW2_CS18, SW2_CS17, SW2_CS16},
+    {0, SW3_CS18, SW3_CS17, SW3_CS16},
+    {0, SW4_CS18, SW4_CS17, SW4_CS16},
+    {0, SW5_CS18, SW5_CS17, SW5_CS16},
+    {0, SW6_CS18, SW6_CS17, SW6_CS16},
+    {0, SW7_CS18, SW7_CS17, SW7_CS16},
 
-    {0, CS9_SW1, CS8_SW1, CS7_SW1},
-    {0, CS9_SW2, CS8_SW2, CS7_SW2},
-    {0, CS9_SW3, CS8_SW3, CS7_SW3},
-    {0, CS9_SW4, CS8_SW4, CS7_SW4},
-    {0, CS9_SW5, CS8_SW5, CS7_SW5},
-    {0, CS9_SW6, CS8_SW6, CS7_SW6},
-    {0, CS9_SW7, CS8_SW7, CS7_SW7},
-    {0, CS9_SW8, CS8_SW8, CS7_SW8},
-    {0, CS21_SW1, CS20_SW1, CS19_SW1},
-    {0, CS21_SW2, CS20_SW2, CS19_SW2},
-    {0, CS21_SW3, CS20_SW3, CS19_SW3},
-    {0, CS21_SW4, CS20_SW4, CS19_SW4},
-    {0, CS21_SW5, CS20_SW5, CS19_SW5},
-    {0, CS21_SW6, CS20_SW6, CS19_SW6},
-    {0, CS21_SW7, CS20_SW7, CS19_SW7},
+    {0, SW1_CS9, SW1_CS8, SW1_CS7},
+    {0, SW2_CS9, SW2_CS8, SW2_CS7},
+    {0, SW3_CS9, SW3_CS8, SW3_CS7},
+    {0, SW4_CS9, SW4_CS8, SW4_CS7},
+    {0, SW5_CS9, SW5_CS8, SW5_CS7},
+    {0, SW6_CS9, SW6_CS8, SW6_CS7},
+    {0, SW7_CS9, SW7_CS8, SW7_CS7},
+    {0, SW8_CS9, SW8_CS8, SW8_CS7},
+    {0, SW1_CS21, SW1_CS20, SW1_CS19},
+    {0, SW2_CS21, SW2_CS20, SW2_CS19},
+    {0, SW3_CS21, SW3_CS20, SW3_CS19},
+    {0, SW4_CS21, SW4_CS20, SW4_CS19},
+    {0, SW5_CS21, SW5_CS20, SW5_CS19},
+    {0, SW6_CS21, SW6_CS20, SW6_CS19},
+    {0, SW7_CS21, SW7_CS20, SW7_CS19},
 
-    {0, CS12_SW1, CS11_SW1, CS10_SW1},
-    {0, CS12_SW2, CS11_SW2, CS10_SW2},
-    {0, CS12_SW3, CS11_SW3, CS10_SW3},
-    {0, CS12_SW4, CS11_SW4, CS10_SW4},
-    {0, CS12_SW5, CS11_SW5, CS10_SW5},
-    {0, CS12_SW6, CS11_SW6, CS10_SW6},
-    {0, CS12_SW7, CS11_SW7, CS10_SW7},
-    {0, CS12_SW8, CS11_SW8, CS10_SW8},
-    {0, CS24_SW1, CS23_SW1, CS22_SW1},
-    {0, CS24_SW2, CS23_SW2, CS22_SW2},
-    {0, CS24_SW3, CS23_SW3, CS22_SW3},
-    {0, CS24_SW4, CS23_SW4, CS22_SW4},
-    {0, CS24_SW6, CS23_SW6, CS22_SW6},
-    {0, CS24_SW7, CS23_SW7, CS22_SW7},
+    {0, SW1_CS12, SW1_CS11, SW1_CS10},
+    {0, SW2_CS12, SW2_CS11, SW2_CS10},
+    {0, SW3_CS12, SW3_CS11, SW3_CS10},
+    {0, SW4_CS12, SW4_CS11, SW4_CS10},
+    {0, SW5_CS12, SW5_CS11, SW5_CS10},
+    {0, SW6_CS12, SW6_CS11, SW6_CS10},
+    {0, SW7_CS12, SW7_CS11, SW7_CS10},
+    {0, SW8_CS12, SW8_CS11, SW8_CS10},
+    {0, SW1_CS24, SW1_CS23, SW1_CS22},
+    {0, SW2_CS24, SW2_CS23, SW2_CS22},
+    {0, SW3_CS24, SW3_CS23, SW3_CS22},
+    {0, SW4_CS24, SW4_CS23, SW4_CS22},
+    {0, SW6_CS24, SW6_CS23, SW6_CS22},
+    {0, SW7_CS24, SW7_CS23, SW7_CS22},
 
-    {0, CS15_SW1, CS14_SW1, CS13_SW1},
-    {0, CS15_SW3, CS14_SW3, CS13_SW3},
-    {0, CS15_SW4, CS14_SW4, CS13_SW4},
-    {0, CS15_SW5, CS14_SW5, CS13_SW5},
-    {0, CS15_SW6, CS14_SW6, CS13_SW6},
-    {0, CS15_SW7, CS14_SW7, CS13_SW7},
-    {0, CS15_SW8, CS14_SW8, CS13_SW8},
-    {0, CS27_SW1, CS26_SW1, CS25_SW1},
-    {0, CS27_SW2, CS26_SW2, CS25_SW2},
-    {0, CS27_SW3, CS26_SW3, CS25_SW3},
-    {0, CS27_SW4, CS26_SW4, CS25_SW4},
-    {0, CS27_SW5, CS26_SW5, CS25_SW5},
-    {0, CS27_SW6, CS26_SW6, CS25_SW6},
-    {0, CS27_SW7, CS26_SW7, CS25_SW7},
+    {0, SW1_CS15, SW1_CS14, SW1_CS13},
+    {0, SW3_CS15, SW3_CS14, SW3_CS13},
+    {0, SW4_CS15, SW4_CS14, SW4_CS13},
+    {0, SW5_CS15, SW5_CS14, SW5_CS13},
+    {0, SW6_CS15, SW6_CS14, SW6_CS13},
+    {0, SW7_CS15, SW7_CS14, SW7_CS13},
+    {0, SW8_CS15, SW8_CS14, SW8_CS13},
+    {0, SW1_CS27, SW1_CS26, SW1_CS25},
+    {0, SW2_CS27, SW2_CS26, SW2_CS25},
+    {0, SW3_CS27, SW3_CS26, SW3_CS25},
+    {0, SW4_CS27, SW4_CS26, SW4_CS25},
+    {0, SW5_CS27, SW5_CS26, SW5_CS25},
+    {0, SW6_CS27, SW6_CS26, SW6_CS25},
+    {0, SW7_CS27, SW7_CS26, SW7_CS25},
 
-    {0, CS3_SW1, CS2_SW1, CS1_SW1},
-    {0, CS3_SW2, CS2_SW2, CS1_SW2},
-    {0, CS3_SW3, CS2_SW3, CS1_SW3},
-    {0, CS3_SW7, CS2_SW7, CS1_SW7},
-    {0, CS30_SW2, CS29_SW2, CS28_SW2},
-    {0, CS30_SW3, CS29_SW3, CS28_SW3},
-    {0, CS30_SW4, CS29_SW4, CS28_SW4},
-    {0, CS30_SW5, CS29_SW5, CS28_SW5},
-    {0, CS30_SW6, CS29_SW6, CS28_SW6},
-    {0, CS30_SW7, CS29_SW7, CS28_SW7}
+    {0, SW1_CS3, SW1_CS2, SW1_CS1},
+    {0, SW2_CS3, SW2_CS2, SW2_CS1},
+    {0, SW3_CS3, SW3_CS2, SW3_CS1},
+    {0, SW7_CS3, SW7_CS2, SW7_CS1},
+    {0, SW2_CS30, SW2_CS29, SW2_CS28},
+    {0, SW3_CS30, SW3_CS29, SW3_CS28},
+    {0, SW4_CS30, SW4_CS29, SW4_CS28},
+    {0, SW5_CS30, SW5_CS29, SW5_CS28},
+    {0, SW6_CS30, SW6_CS29, SW6_CS28},
+    {0, SW7_CS30, SW7_CS29, SW7_CS28}
 
 };
 led_config_t g_led_config = { {
diff --git a/keyboards/kprepublic/bm80hsrgb/keymaps/peepeetee/config.h b/keyboards/kprepublic/bm80hsrgb/keymaps/peepeetee/config.h
deleted file mode 100644
index bf64e8be787..00000000000
--- a/keyboards/kprepublic/bm80hsrgb/keymaps/peepeetee/config.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/* Copyright 2021 peepeetee
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-
-
-// #define IS_COMMAND() (get_mods() == MOD_MASK_SHIFT)      // Key combination that allows the use of magic commands (useful for debugging)
-
-// #define TERMINAL_HELP
-
-#define FORCE_NKRO                  // NKRO by default requires to be turned on, this forces it on during keyboard startup regardless of EEPROM setting. NKRO can still be turned off but will be turned on again if the keyboard reboots.
-// #define STRICT_LAYER_RELEASE        // Force a key release to be evaluated using the current layer stack instead of remembering which layer it came from (used for advanced cases)
-// #define TAPPING_TERM 200            // How long before a tap becomes a hold, if set above 500, a key tapped during the tapping term will turn it into a hold too
-// #define TAPPING_TERM_PER_KEY        // Enables handling for per key TAPPING_TERM settings
-// #define RETRO_TAPPING               // Tap anyway, even after TAPPING_TERM, if there was no other key interruption between press and release
-// #define TAPPING_TOGGLE 2            // How many taps before triggering the toggle
-// #define PERMISSIVE_HOLD             // Makes tap and hold keys trigger the hold if another key is pressed before releasing, even if it hasn't hit the TAPPING_TERM. See Permissive Hold for details
-// #define QUICK_TAP_TERM 0          // Makes it possible to use a dual role key as modifier shortly after having been tapped. See Hold after tap. Breaks any Tap Toggle functionality (TT or the One Shot Tap Toggle)
-// #define LEADER_TIMEOUT 300          // How long before the leader key times out. If you're having issues finishing the sequence before it times out, you may need to increase the timeout setting. Or you may want to enable the LEADER_PER_KEY_TIMING option, which resets the timeout after each key is tapped.
-// #define LEADER_PER_KEY_TIMING       // Sets the timer for leader key chords to run on each key press rather than overall
-// #define LEADER_KEY_STRICT_KEY_PROCESSING    // Disables keycode filtering for Mod-Tap and Layer-Tap keycodes. Eg, if you enable this, you would need to specify MT(MOD_CTL, KC_A) if you want to use KC_A.
-// #define ONESHOT_TIMEOUT 300         // How long before oneshot times out
-// #define ONESHOT_TAP_TOGGLE 2        // How many taps before oneshot toggle is triggered
-// #define COMBO_TERM 200              // How long for the Combo keys to be detected. Defaults to TAPPING_TERM if not defined.
-// #define TAP_CODE_DELAY 100          // Sets the delay between register_code and unregister_code, if you're having issues with it registering properly (common on VUSB boards). The value is in milliseconds.
-// #define TAP_HOLD_CAPS_DELAY 80      // Sets the delay for Tap Hold keys (LT, MT) when using KC_CAPS_LOCK keycode, as this has some special handling on MacOS.  The value is in milliseconds, and defaults to 80 ms if not defined. For macOS, you may want to set this to 200 or higher.
-
-// #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-// #define RGB_MATRIX_KEYPRESSES         // reacts to keypresses
-// #define RGB_MATRIX_KEYRELEASES        // reacts to keyreleases (instead of keypresses)
-// #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_ALPHAS_MODS // Sets the default mode, if none has been set
-// #define RGB_MATRIX_SLEEP // turn off effects when suspended
-// #define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
-// #define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
-
-
-// This list in in the correct mode order. Next mode is the following line, previous mode is previous line. Loops around.
-// #define DISABLE_RGB_MATRIX_SOLID_COLOR                   // Static single hue, no speed support
-// #define DISABLE_RGB_MATRIX_ALPHAS_MODS                   // Static dual hue, speed is hue for secondary hue
-#define DISABLE_RGB_MATRIX_GRADIENT_UP_DOWN              // Static gradient top to bottom, speed controls how much gradient changes
-#define DISABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT           // Static gradient top to bottom, speed controls how much gradient changes
-#define DISABLE_RGB_MATRIX_BREATHING                     // Single hue brightness cycling animation
-#define DISABLE_RGB_MATRIX_BAND_SAT                      // Single hue band fading saturation scrolling left to right
-#define DISABLE_RGB_MATRIX_BAND_VAL                      // Single hue band fading brightness scrolling left to right
-#define DISABLE_RGB_MATRIX_BAND_PINWHEEL_SAT             // Single hue 3 blade spinning pinwheel fades saturation
-#define DISABLE_RGB_MATRIX_BAND_PINWHEEL_VAL             // Single hue 3 blade spinning pinwheel fades brightness
-#define DISABLE_RGB_MATRIX_BAND_SPIRAL_SAT               // Single hue spinning spiral fades saturation
-#define DISABLE_RGB_MATRIX_BAND_SPIRAL_VAL               // Single hue spinning spiral fades brightness
-#define DISABLE_RGB_MATRIX_CYCLE_ALL                     // Full keyboard solid hue cycling through full gradient
-//#define DISABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT              // Full gradient scrolling left to right
-#define DISABLE_RGB_MATRIX_CYCLE_UP_DOWN                 // Full gradient scrolling top to bottom
-#define DISABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON        // Full gradent Chevron shapped scrolling left to right
-#define DISABLE_RGB_MATRIX_CYCLE_OUT_IN                  // Full gradient scrolling out to in
-#define DISABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL             // Full dual gradients scrolling out to in
-#define DISABLE_RGB_MATRIX_CYCLE_PINWHEEL                // Full gradient spinning pinwheel around center of keyboard
-#define DISABLE_RGB_MATRIX_CYCLE_SPIRAL                  // Full gradient spinning spiral around center of keyboard
-#define DISABLE_RGB_MATRIX_DUAL_BEACON                   // Full gradient spinning around center of keyboard
-#define DISABLE_RGB_MATRIX_RAINBOW_BEACON                // Full tighter gradient spinning around center of keyboard
-#define DISABLE_RGB_MATRIX_RAINBOW_PINWHEELS             // Full dual gradients spinning two halfs of keyboard
-#define DISABLE_RGB_MATRIX_RAINDROPS                     // Randomly changes a single key's hue
-#define DISABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS           // Randomly changes a single key's hue and saturation
-#define DISABLE_RGB_MATRIX_HUE_BREATHING                 // Hue shifts up a slight ammount at the same time, then shifts back
-#define DISABLE_RGB_MATRIX_HUE_PENDULUM                  // Hue shifts up a slight ammount in a wave to the right, then back to the left
-#define DISABLE_RGB_MATRIX_HUE_WAVE                      // Hue shifts up a slight ammount and then back down in a wave to the right
-// =================================================== Requires RGB_MATRIX_FRAMEBUFFER_EFFECTS =============================================================
-// #define DISABLE_RGB_MATRIX_TYPING_HEATMAP                // How hot is your WPM!
-#define DISABLE_RGB_MATRIX_DIGITAL_RAIN                  // That famous computer simulation
-// =================================================== RGB_MATRIX_KEYPRESSES OR RGB_MATRIX_KEYRELEASES =====================================================
-#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE         // Pulses keys hit to hue & value then fades value out
-#define DISABLE_RGB_MATRIX_SOLID_REACTIVE                // Static single hue, pulses keys hit to shifted hue then fades to current hue
-#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE           // Hue & value pulse near a single key hit then fades value out
-#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE      // Hue & value pulse near multiple key hits then fades value out
-#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS          // Hue & value pulse the same column and row of a single key hit then fades value out
-#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS     // Hue & value pulse the same column and row of multiple key hits then fades value out
-#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS          // Hue & value pulse away on the same column and row of a single key hit then fades value out
-#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS     // Hue & value pulse away on the same column and row of multiple key hits then fades value out
-#define DISABLE_RGB_MATRIX_SPLASH                        // Full gradient & value pulse away from a single key hit then fades value out
-//#define DISABLE_RGB_MATRIX_MULTISPLASH                   // Full gradient & value pulse away from multiple key hits then fades value out
-#define DISABLE_RGB_MATRIX_SOLID_SPLASH                  // Hue & value pulse away from a single key hit then fades value out
-#define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH             // Hue & value pulse away from multiple key hits then fades value out
diff --git a/keyboards/kprepublic/bm80hsrgb/keymaps/peepeetee/keymap.c b/keyboards/kprepublic/bm80hsrgb/keymaps/peepeetee/keymap.c
deleted file mode 100644
index 70c8a5f3afd..00000000000
--- a/keyboards/kprepublic/bm80hsrgb/keymaps/peepeetee/keymap.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/* Copyright 2021 peepeetee
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    [0] = LAYOUT_tkl_ansi(
-        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,     KC_PSCR, KC_SCRL, KC_PAUS,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,    KC_DEL,  KC_END,  KC_PGDN,
-        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
-        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,             KC_UP,
-        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, MO(1),   KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-
-    [1] = LAYOUT_tkl_ansi(
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
-        RGB_MOD, RGB_HUI, RGB_VAI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
-        RGB_TOG, RGB_HUD, RGB_VAD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______,          _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______,          _______,             KC_AUDIO_VOL_UP,
-        _______, _______, _______,                            _______,                            _______, _______, _______, _______,    KC_BRIGHTNESS_DOWN, KC_AUDIO_VOL_DOWN, KC_BRIGHTNESS_UP
-    )
-
-/*
-    [X] = LAYOUT_tkl_ansi(
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,             _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______, _______,    _______, _______, _______
-    ),
-*/
-
-
-};
-
diff --git a/keyboards/kprepublic/bm80v2/bm80v2.c b/keyboards/kprepublic/bm80v2/bm80v2.c
index 3e3de08288b..9c1b71d0579 100644
--- a/keyboards/kprepublic/bm80v2/bm80v2.c
+++ b/keyboards/kprepublic/bm80v2/bm80v2.c
@@ -17,99 +17,99 @@
 #ifdef RGB_MATRIX_ENABLE
 
 const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
-    {0, CS6_SW1, CS5_SW1, CS4_SW1},
-    {0, CS6_SW3, CS5_SW3, CS4_SW3},
-    {0, CS6_SW4, CS5_SW4, CS4_SW4},
-    {0, CS6_SW5, CS5_SW5, CS4_SW5},
-    {0, CS6_SW6, CS5_SW6, CS4_SW6},
-    {0, CS6_SW7, CS5_SW7, CS4_SW7},
-    {0, CS6_SW8, CS5_SW8, CS4_SW8},
-    {0, CS6_SW9, CS5_SW9, CS4_SW9},
-    {0, CS21_SW1, CS20_SW1, CS19_SW1},
-    {0, CS21_SW2, CS20_SW2, CS19_SW2},
-    {0, CS21_SW3, CS20_SW3, CS19_SW3},
-    {0, CS21_SW4, CS20_SW4, CS19_SW4},
-    {0, CS21_SW5, CS20_SW5, CS19_SW5},
-    {0, CS21_SW6, CS20_SW6, CS19_SW6},
-    {0, CS21_SW7, CS20_SW7, CS19_SW7},
-    {0, CS21_SW8, CS20_SW8, CS19_SW8},
+    {0, SW1_CS6, SW1_CS5, SW1_CS4},
+    {0, SW3_CS6, SW3_CS5, SW3_CS4},
+    {0, SW4_CS6, SW4_CS5, SW4_CS4},
+    {0, SW5_CS6, SW5_CS5, SW5_CS4},
+    {0, SW6_CS6, SW6_CS5, SW6_CS4},
+    {0, SW7_CS6, SW7_CS5, SW7_CS4},
+    {0, SW8_CS6, SW8_CS5, SW8_CS4},
+    {0, SW9_CS6, SW9_CS5, SW9_CS4},
+    {0, SW1_CS21, SW1_CS20, SW1_CS19},
+    {0, SW2_CS21, SW2_CS20, SW2_CS19},
+    {0, SW3_CS21, SW3_CS20, SW3_CS19},
+    {0, SW4_CS21, SW4_CS20, SW4_CS19},
+    {0, SW5_CS21, SW5_CS20, SW5_CS19},
+    {0, SW6_CS21, SW6_CS20, SW6_CS19},
+    {0, SW7_CS21, SW7_CS20, SW7_CS19},
+    {0, SW8_CS21, SW8_CS20, SW8_CS19},
 
 
-    {0, CS9_SW1, CS8_SW1, CS7_SW1},
-    {0, CS9_SW2, CS8_SW2, CS7_SW2},
-    {0, CS9_SW3, CS8_SW3, CS7_SW3},
-    {0, CS9_SW4, CS8_SW4, CS7_SW4},
-    {0, CS9_SW5, CS8_SW5, CS7_SW5},
-    {0, CS9_SW6, CS8_SW6, CS7_SW6},
-    {0, CS9_SW7, CS8_SW7, CS7_SW7},
-    {0, CS9_SW8, CS8_SW8, CS7_SW8},
-    {0, CS9_SW9, CS8_SW9, CS7_SW9},
-    {0,CS24_SW1, CS23_SW1, CS22_SW1},
-    {0,CS24_SW2, CS23_SW2, CS22_SW2},
-    {0,CS24_SW3, CS23_SW3, CS22_SW3},
-    {0,CS24_SW4, CS23_SW4, CS22_SW4},
-    {0,CS24_SW5, CS23_SW5, CS22_SW5},
-    {0,CS24_SW6, CS23_SW6, CS22_SW6},
-    {0,CS24_SW7, CS23_SW7, CS22_SW7},
-    {0,CS24_SW8, CS23_SW8, CS22_SW8},
+    {0, SW1_CS9, SW1_CS8, SW1_CS7},
+    {0, SW2_CS9, SW2_CS8, SW2_CS7},
+    {0, SW3_CS9, SW3_CS8, SW3_CS7},
+    {0, SW4_CS9, SW4_CS8, SW4_CS7},
+    {0, SW5_CS9, SW5_CS8, SW5_CS7},
+    {0, SW6_CS9, SW6_CS8, SW6_CS7},
+    {0, SW7_CS9, SW7_CS8, SW7_CS7},
+    {0, SW8_CS9, SW8_CS8, SW8_CS7},
+    {0, SW9_CS9, SW9_CS8, SW9_CS7},
+    {0,SW1_CS24, SW1_CS23, SW1_CS22},
+    {0,SW2_CS24, SW2_CS23, SW2_CS22},
+    {0,SW3_CS24, SW3_CS23, SW3_CS22},
+    {0,SW4_CS24, SW4_CS23, SW4_CS22},
+    {0,SW5_CS24, SW5_CS23, SW5_CS22},
+    {0,SW6_CS24, SW6_CS23, SW6_CS22},
+    {0,SW7_CS24, SW7_CS23, SW7_CS22},
+    {0,SW8_CS24, SW8_CS23, SW8_CS22},
 
-    {0, CS12_SW1, CS11_SW1, CS10_SW1},
-    {0, CS12_SW2, CS11_SW2, CS10_SW2},
-    {0, CS12_SW3, CS11_SW3, CS10_SW3},
-    {0, CS12_SW4, CS11_SW4, CS10_SW4},
-    {0, CS12_SW5, CS11_SW5, CS10_SW5},
-    {0, CS12_SW6, CS11_SW6, CS10_SW6},
-    {0, CS12_SW7, CS11_SW7, CS10_SW7},
-    {0, CS12_SW8, CS11_SW8, CS10_SW8},
-    {0, CS12_SW9, CS11_SW9, CS10_SW9},
-    {0, CS27_SW1, CS26_SW1, CS25_SW1},
-    {0, CS27_SW2, CS26_SW2, CS25_SW2},
-    {0, CS27_SW3, CS26_SW3, CS25_SW3},
-    {0, CS27_SW4, CS26_SW4, CS25_SW4},
-    {0, CS27_SW5, CS26_SW5, CS25_SW5},
-    {0, CS27_SW6, CS26_SW6, CS25_SW6},
-    {0, CS27_SW7, CS26_SW7, CS25_SW7},
-    {0, CS27_SW8, CS26_SW8, CS25_SW8},
+    {0, SW1_CS12, SW1_CS11, SW1_CS10},
+    {0, SW2_CS12, SW2_CS11, SW2_CS10},
+    {0, SW3_CS12, SW3_CS11, SW3_CS10},
+    {0, SW4_CS12, SW4_CS11, SW4_CS10},
+    {0, SW5_CS12, SW5_CS11, SW5_CS10},
+    {0, SW6_CS12, SW6_CS11, SW6_CS10},
+    {0, SW7_CS12, SW7_CS11, SW7_CS10},
+    {0, SW8_CS12, SW8_CS11, SW8_CS10},
+    {0, SW9_CS12, SW9_CS11, SW9_CS10},
+    {0, SW1_CS27, SW1_CS26, SW1_CS25},
+    {0, SW2_CS27, SW2_CS26, SW2_CS25},
+    {0, SW3_CS27, SW3_CS26, SW3_CS25},
+    {0, SW4_CS27, SW4_CS26, SW4_CS25},
+    {0, SW5_CS27, SW5_CS26, SW5_CS25},
+    {0, SW6_CS27, SW6_CS26, SW6_CS25},
+    {0, SW7_CS27, SW7_CS26, SW7_CS25},
+    {0, SW8_CS27, SW8_CS26, SW8_CS25},
 
-    {0, CS15_SW1, CS14_SW1, CS13_SW1},
-    {0, CS15_SW2, CS14_SW2, CS13_SW2},
-    {0, CS15_SW3, CS14_SW3, CS13_SW3},
-    {0, CS15_SW4, CS14_SW4, CS13_SW4},
-    {0, CS15_SW5, CS14_SW5, CS13_SW5},
-    {0, CS15_SW6, CS14_SW6, CS13_SW6},
-    {0, CS15_SW7, CS14_SW7, CS13_SW7},
-    {0, CS15_SW8, CS14_SW8, CS13_SW8},
-    {0, CS15_SW9, CS14_SW9, CS13_SW9},
-    {0, CS30_SW1, CS29_SW1, CS28_SW1},
-    {0, CS30_SW2, CS29_SW2, CS28_SW2},
-    {0, CS30_SW3, CS29_SW3, CS28_SW3},
-    {0, CS30_SW4, CS29_SW4, CS28_SW4},
+    {0, SW1_CS15, SW1_CS14, SW1_CS13},
+    {0, SW2_CS15, SW2_CS14, SW2_CS13},
+    {0, SW3_CS15, SW3_CS14, SW3_CS13},
+    {0, SW4_CS15, SW4_CS14, SW4_CS13},
+    {0, SW5_CS15, SW5_CS14, SW5_CS13},
+    {0, SW6_CS15, SW6_CS14, SW6_CS13},
+    {0, SW7_CS15, SW7_CS14, SW7_CS13},
+    {0, SW8_CS15, SW8_CS14, SW8_CS13},
+    {0, SW9_CS15, SW9_CS14, SW9_CS13},
+    {0, SW1_CS30, SW1_CS29, SW1_CS28},
+    {0, SW2_CS30, SW2_CS29, SW2_CS28},
+    {0, SW3_CS30, SW3_CS29, SW3_CS28},
+    {0, SW4_CS30, SW4_CS29, SW4_CS28},
 
-    {0, CS18_SW1, CS17_SW1, CS16_SW1},
-    {0, CS18_SW3, CS17_SW3, CS16_SW3},
-    {0, CS18_SW4, CS17_SW4, CS16_SW4},
-    {0, CS18_SW5, CS17_SW5, CS16_SW5},
-    {0, CS18_SW6, CS17_SW6, CS16_SW6},
-    {0, CS18_SW7, CS17_SW7, CS16_SW7},
-    {0, CS18_SW8, CS17_SW8, CS16_SW8},
-    {0, CS18_SW9, CS17_SW9, CS16_SW9},
-    {0, CS33_SW1, CS32_SW1, CS31_SW1},
-    {0, CS33_SW2, CS32_SW2, CS31_SW2},
-    {0, CS33_SW3, CS32_SW3, CS31_SW3},
-    {0, CS33_SW4, CS32_SW4, CS31_SW4},
-    {0, CS33_SW7, CS32_SW7, CS31_SW7},
+    {0, SW1_CS18, SW1_CS17, SW1_CS16},
+    {0, SW3_CS18, SW3_CS17, SW3_CS16},
+    {0, SW4_CS18, SW4_CS17, SW4_CS16},
+    {0, SW5_CS18, SW5_CS17, SW5_CS16},
+    {0, SW6_CS18, SW6_CS17, SW6_CS16},
+    {0, SW7_CS18, SW7_CS17, SW7_CS16},
+    {0, SW8_CS18, SW8_CS17, SW8_CS16},
+    {0, SW9_CS18, SW9_CS17, SW9_CS16},
+    {0, SW1_CS33, SW1_CS32, SW1_CS31},
+    {0, SW2_CS33, SW2_CS32, SW2_CS31},
+    {0, SW3_CS33, SW3_CS32, SW3_CS31},
+    {0, SW4_CS33, SW4_CS32, SW4_CS31},
+    {0, SW7_CS33, SW7_CS32, SW7_CS31},
 
-    {0, CS3_SW1, CS2_SW1, CS1_SW1},
-    {0, CS3_SW2, CS2_SW2, CS1_SW2},
-    {0, CS3_SW3, CS2_SW3, CS1_SW3},
-    {0, CS3_SW6, CS2_SW6, CS1_SW6},
-    {0, CS36_SW2, CS35_SW2, CS34_SW2},
-    {0, CS36_SW3, CS35_SW3, CS34_SW3},
-    {0, CS36_SW4, CS35_SW4, CS34_SW4},
-    {0, CS36_SW5, CS35_SW5, CS34_SW5},
-    {0, CS36_SW6, CS35_SW6, CS34_SW6},
-    {0, CS36_SW7, CS35_SW7, CS34_SW7},
-    {0, CS36_SW8, CS35_SW8, CS34_SW8}
+    {0, SW1_CS3, SW1_CS2, SW1_CS1},
+    {0, SW2_CS3, SW2_CS2, SW2_CS1},
+    {0, SW3_CS3, SW3_CS2, SW3_CS1},
+    {0, SW6_CS3, SW6_CS2, SW6_CS1},
+    {0, SW2_CS36, SW2_CS35, SW2_CS34},
+    {0, SW3_CS36, SW3_CS35, SW3_CS34},
+    {0, SW4_CS36, SW4_CS35, SW4_CS34},
+    {0, SW5_CS36, SW5_CS35, SW5_CS34},
+    {0, SW6_CS36, SW6_CS35, SW6_CS34},
+    {0, SW7_CS36, SW7_CS35, SW7_CS34},
+    {0, SW8_CS36, SW8_CS35, SW8_CS34}
 
 };
 led_config_t g_led_config = { {
diff --git a/keyboards/kprepublic/bm80v2/keymaps/saph1s/config.h b/keyboards/kprepublic/bm80v2/keymaps/saph1s/config.h
deleted file mode 100644
index 7989b68f7de..00000000000
--- a/keyboards/kprepublic/bm80v2/keymaps/saph1s/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2023 Saph1s @Saph1s
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#ifdef RGB_MATRIX_ENABLE
-    #undef RGB_MATRIX_DEFAULT_MODE
-    #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
-    #define RGB_MATRIX_SLEEP
-#endif
diff --git a/keyboards/kprepublic/bm80v2/keymaps/saph1s/keymap.c b/keyboards/kprepublic/bm80v2/keymaps/saph1s/keymap.c
deleted file mode 100644
index 295832774f0..00000000000
--- a/keyboards/kprepublic/bm80v2/keymaps/saph1s/keymap.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/* Copyright 2023 Saph1s @Saph1s
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include QMK_KEYBOARD_H
-
-#include "rgb_matrix_map.h"
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    [0] = LAYOUT_tkl_ansi(
-        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,     KC_PSCR, KC_SCRL, KC_PAUS,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,    KC_DEL,  KC_END,  KC_PGDN,
-        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
-        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,             KC_UP,
-        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                      KC_RALT, MO(1),   KC_APP,  KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-
-    [1] = LAYOUT_tkl_ansi(
-        QK_BOOT,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
-        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD, _______, _______, _______,    _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
-        _______, KC_MPLY, KC_MPRV, KC_MNXT, KC_VOLD, KC_VOLU, _______, _______, _______, _______, _______, _______, _______,
-        _______,          _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______,                      _______,
-        _______, GUI_TOG, _______,                   _______,                                     _______, _______, _______, _______,    _______, _______, _______
-    )
-
-};
-
-#ifdef RGB_MATRIX_ENABLE
-    bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
-        if (keymap_config.no_gui) {
-            rgb_matrix_set_color(LED_LGUI, RGB_RED);  //LGUI light
-        }
-        return false;
-    }
-#endif
diff --git a/keyboards/kprepublic/bm80v2/keymaps/saph1s/readme.md b/keyboards/kprepublic/bm80v2/keymaps/saph1s/readme.md
deleted file mode 100644
index f97a0f9b276..00000000000
--- a/keyboards/kprepublic/bm80v2/keymaps/saph1s/readme.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# [Saph1s](https://github.com/Saph1s) | KPrepublic BM80v2 keymap
-
-## Features
-
-- RGUI has been replaced by Fn
-- Add Win Key lock function (Fn+Win) + RGB indication
diff --git a/keyboards/kprepublic/bm80v2/keymaps/saph1s/rgb_matrix_map.h b/keyboards/kprepublic/bm80v2/keymaps/saph1s/rgb_matrix_map.h
deleted file mode 100644
index f68a4a68f11..00000000000
--- a/keyboards/kprepublic/bm80v2/keymaps/saph1s/rgb_matrix_map.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/* Copyright 2023 Saph1s @Saph1s
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#pragma once
-#ifdef RGB_MATRIX_ENABLE
-
-    enum led_location_map {
-        LED_ESC,
-        LED_F1,
-        LED_F2,
-        LED_F3,
-        LED_F4,
-        LED_F5,
-        LED_F6,
-        LED_F7,
-        LED_F8,
-        LED_F9,
-        LED_F10,
-        LED_F11,
-        LED_F12,
-        LED_PSCR,
-        LED_SCRL,
-        LED_PAUS,
-
-        LED_GRV,
-        LED_1,
-        LED_2,
-        LED_3,
-        LED_4,
-        LED_5,
-        LED_6,
-        LED_7,
-        LED_8,
-        LED_9,
-        LED_0,
-        LED_MINS,
-        LED_EQL,
-        LED_BSPC,
-        LED_INS,
-        LED_HOME,
-        LED_PGUP,
-
-        LED_TAB,
-        LED_Q,
-        LED_W,
-        LED_E,
-        LED_R,
-        LED_T,
-        LED_Y,
-        LED_U,
-        LED_I,
-        LED_O,
-        LED_P,
-        LED_LBRC,
-        LED_RBRC,
-        LED_BSLS,
-        LED_DEL,
-        LED_END,
-        LED_PGDN,
-
-        LED_CAPS,
-        LED_A,
-        LED_S,
-        LED_D,
-        LED_F,
-        LED_G,
-        LED_H,
-        LED_J,
-        LED_K,
-        LED_L,
-        LED_SCLN,
-        LED_QUOT,
-        LED_ENT,
-
-        LED_LSFT,
-        LED_Z,
-        LED_X,
-        LED_C,
-        LED_V,
-        LED_B,
-        LED_N,
-        LED_M,
-        LED_COMM,
-        LED_DOT,
-        LED_SLSH,
-        LED_RSFT,
-        LED_UP,
-
-        LED_LCTL,
-        LED_LGUI,
-        LED_LALT,
-        LED_SPC,
-        LED_RALT,
-        LED_FN,
-        LED_APP,
-        LED_RCTL,
-        LED_LEFT,
-        LED_DOWN,
-        LED_RGHT
-    };
-#endif
diff --git a/keyboards/kprepublic/bm80v2/keymaps/saph1s/rules.mk b/keyboards/kprepublic/bm80v2/keymaps/saph1s/rules.mk
deleted file mode 100644
index 36b7ba9cbc9..00000000000
--- a/keyboards/kprepublic/bm80v2/keymaps/saph1s/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-VIA_ENABLE = yes
-LTO_ENABLE = yes
diff --git a/keyboards/kprepublic/bm80v2/keymaps/smooted/config.h b/keyboards/kprepublic/bm80v2/keymaps/smooted/config.h
deleted file mode 100644
index 88fa41d1109..00000000000
--- a/keyboards/kprepublic/bm80v2/keymaps/smooted/config.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 bdtc123 *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-#define FORCE_NKRO
diff --git a/keyboards/kprepublic/bm80v2/keymaps/smooted/keymap.c b/keyboards/kprepublic/bm80v2/keymaps/smooted/keymap.c
deleted file mode 100644
index ba91157d927..00000000000
--- a/keyboards/kprepublic/bm80v2/keymaps/smooted/keymap.c
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2021 Yizhen Liu (@edwardslau)
-// SPDX-License-Identifier: GPL-2.0
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    [0] = LAYOUT_tkl_ansi(
-        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,     KC_PSCR, KC_SCRL, KC_PAUS,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,     KC_DEL,  KC_END,  KC_PGDN,
-        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,  KC_ENT,        
-        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,             KC_UP,
-        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                      KC_RALT, KC_RGUI, MO(1),   KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-
-    [1] = LAYOUT_tkl_ansi(
-        QK_BOOT,            _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______,    _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
-        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______,    _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______,          _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______,                      _______,
-        _______, _______, _______,                   _______,                                     _______, _______, _______, _______,    _______, _______, _______
-    )
-
-};
diff --git a/keyboards/kprepublic/bm80v2_iso/bm80v2_iso.c b/keyboards/kprepublic/bm80v2_iso/bm80v2_iso.c
index 1d6e3df5479..3009359c65f 100644
--- a/keyboards/kprepublic/bm80v2_iso/bm80v2_iso.c
+++ b/keyboards/kprepublic/bm80v2_iso/bm80v2_iso.c
@@ -17,100 +17,100 @@
 #ifdef RGB_MATRIX_ENABLE
 
 const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
-    {0, CS6_SW1, CS5_SW1, CS4_SW1},
-    {0, CS6_SW3, CS5_SW3, CS4_SW3},
-    {0, CS6_SW4, CS5_SW4, CS4_SW4},
-    {0, CS6_SW5, CS5_SW5, CS4_SW5},
-    {0, CS6_SW6, CS5_SW6, CS4_SW6},
-    {0, CS6_SW7, CS5_SW7, CS4_SW7},
-    {0, CS6_SW8, CS5_SW8, CS4_SW8},
-    {0, CS6_SW9, CS5_SW9, CS4_SW9},
-    {0, CS21_SW1, CS20_SW1, CS19_SW1},
-    {0, CS21_SW2, CS20_SW2, CS19_SW2},
-    {0, CS21_SW3, CS20_SW3, CS19_SW3},
-    {0, CS21_SW4, CS20_SW4, CS19_SW4},
-    {0, CS21_SW5, CS20_SW5, CS19_SW5},
-    {0, CS21_SW6, CS20_SW6, CS19_SW6},
-    {0, CS21_SW7, CS20_SW7, CS19_SW7},
-    {0, CS21_SW8, CS20_SW8, CS19_SW8},
+    {0, SW1_CS6, SW1_CS5, SW1_CS4},
+    {0, SW3_CS6, SW3_CS5, SW3_CS4},
+    {0, SW4_CS6, SW4_CS5, SW4_CS4},
+    {0, SW5_CS6, SW5_CS5, SW5_CS4},
+    {0, SW6_CS6, SW6_CS5, SW6_CS4},
+    {0, SW7_CS6, SW7_CS5, SW7_CS4},
+    {0, SW8_CS6, SW8_CS5, SW8_CS4},
+    {0, SW9_CS6, SW9_CS5, SW9_CS4},
+    {0, SW1_CS21, SW1_CS20, SW1_CS19},
+    {0, SW2_CS21, SW2_CS20, SW2_CS19},
+    {0, SW3_CS21, SW3_CS20, SW3_CS19},
+    {0, SW4_CS21, SW4_CS20, SW4_CS19},
+    {0, SW5_CS21, SW5_CS20, SW5_CS19},
+    {0, SW6_CS21, SW6_CS20, SW6_CS19},
+    {0, SW7_CS21, SW7_CS20, SW7_CS19},
+    {0, SW8_CS21, SW8_CS20, SW8_CS19},
 
 
-    {0, CS9_SW1, CS8_SW1, CS7_SW1},
-    {0, CS9_SW2, CS8_SW2, CS7_SW2},
-    {0, CS9_SW3, CS8_SW3, CS7_SW3},
-    {0, CS9_SW4, CS8_SW4, CS7_SW4},
-    {0, CS9_SW5, CS8_SW5, CS7_SW5},
-    {0, CS9_SW6, CS8_SW6, CS7_SW6},
-    {0, CS9_SW7, CS8_SW7, CS7_SW7},
-    {0, CS9_SW8, CS8_SW8, CS7_SW8},
-    {0, CS9_SW9, CS8_SW9, CS7_SW9},
-    {0,CS24_SW1, CS23_SW1, CS22_SW1},
-    {0,CS24_SW2, CS23_SW2, CS22_SW2},
-    {0,CS24_SW3, CS23_SW3, CS22_SW3},
-    {0,CS24_SW4, CS23_SW4, CS22_SW4},
-    {0,CS24_SW5, CS23_SW5, CS22_SW5},
-    {0,CS24_SW6, CS23_SW6, CS22_SW6},
-    {0,CS24_SW7, CS23_SW7, CS22_SW7},
-    {0,CS24_SW8, CS23_SW8, CS22_SW8},
+    {0, SW1_CS9, SW1_CS8, SW1_CS7},
+    {0, SW2_CS9, SW2_CS8, SW2_CS7},
+    {0, SW3_CS9, SW3_CS8, SW3_CS7},
+    {0, SW4_CS9, SW4_CS8, SW4_CS7},
+    {0, SW5_CS9, SW5_CS8, SW5_CS7},
+    {0, SW6_CS9, SW6_CS8, SW6_CS7},
+    {0, SW7_CS9, SW7_CS8, SW7_CS7},
+    {0, SW8_CS9, SW8_CS8, SW8_CS7},
+    {0, SW9_CS9, SW9_CS8, SW9_CS7},
+    {0,SW1_CS24, SW1_CS23, SW1_CS22},
+    {0,SW2_CS24, SW2_CS23, SW2_CS22},
+    {0,SW3_CS24, SW3_CS23, SW3_CS22},
+    {0,SW4_CS24, SW4_CS23, SW4_CS22},
+    {0,SW5_CS24, SW5_CS23, SW5_CS22},
+    {0,SW6_CS24, SW6_CS23, SW6_CS22},
+    {0,SW7_CS24, SW7_CS23, SW7_CS22},
+    {0,SW8_CS24, SW8_CS23, SW8_CS22},
 
-    {0, CS12_SW1, CS11_SW1, CS10_SW1},
-    {0, CS12_SW2, CS11_SW2, CS10_SW2},
-    {0, CS12_SW3, CS11_SW3, CS10_SW3},
-    {0, CS12_SW4, CS11_SW4, CS10_SW4},
-    {0, CS12_SW5, CS11_SW5, CS10_SW5},
-    {0, CS12_SW6, CS11_SW6, CS10_SW6},
-    {0, CS12_SW7, CS11_SW7, CS10_SW7},
-    {0, CS12_SW8, CS11_SW8, CS10_SW8},
-    {0, CS12_SW9, CS11_SW9, CS10_SW9},
-    {0, CS27_SW1, CS26_SW1, CS25_SW1},
-    {0, CS27_SW2, CS26_SW2, CS25_SW2},
-    {0, CS27_SW3, CS26_SW3, CS25_SW3},
-    {0, CS27_SW4, CS26_SW4, CS25_SW4},
-    {0, CS27_SW5, CS26_SW5, CS25_SW5},
-    {0, CS27_SW6, CS26_SW6, CS25_SW6},
-    {0, CS27_SW7, CS26_SW7, CS25_SW7},
-    {0, CS27_SW8, CS26_SW8, CS25_SW8},
+    {0, SW1_CS12, SW1_CS11, SW1_CS10},
+    {0, SW2_CS12, SW2_CS11, SW2_CS10},
+    {0, SW3_CS12, SW3_CS11, SW3_CS10},
+    {0, SW4_CS12, SW4_CS11, SW4_CS10},
+    {0, SW5_CS12, SW5_CS11, SW5_CS10},
+    {0, SW6_CS12, SW6_CS11, SW6_CS10},
+    {0, SW7_CS12, SW7_CS11, SW7_CS10},
+    {0, SW8_CS12, SW8_CS11, SW8_CS10},
+    {0, SW9_CS12, SW9_CS11, SW9_CS10},
+    {0, SW1_CS27, SW1_CS26, SW1_CS25},
+    {0, SW2_CS27, SW2_CS26, SW2_CS25},
+    {0, SW3_CS27, SW3_CS26, SW3_CS25},
+    {0, SW4_CS27, SW4_CS26, SW4_CS25},
+    {0, SW5_CS27, SW5_CS26, SW5_CS25},
+    {0, SW6_CS27, SW6_CS26, SW6_CS25},
+    {0, SW7_CS27, SW7_CS26, SW7_CS25},
+    {0, SW8_CS27, SW8_CS26, SW8_CS25},
 
-    {0, CS15_SW1, CS14_SW1, CS13_SW1},
-    {0, CS15_SW2, CS14_SW2, CS13_SW2},
-    {0, CS15_SW3, CS14_SW3, CS13_SW3},
-    {0, CS15_SW4, CS14_SW4, CS13_SW4},
-    {0, CS15_SW5, CS14_SW5, CS13_SW5},
-    {0, CS15_SW6, CS14_SW6, CS13_SW6},
-    {0, CS15_SW7, CS14_SW7, CS13_SW7},
-    {0, CS15_SW8, CS14_SW8, CS13_SW8},
-    {0, CS15_SW9, CS14_SW9, CS13_SW9},
-    {0, CS30_SW1, CS29_SW1, CS28_SW1},
-    {0, CS30_SW2, CS29_SW2, CS28_SW2},
-    {0, CS30_SW3, CS29_SW3, CS28_SW3},
-    {0, CS30_SW4, CS29_SW4, CS28_SW4},
+    {0, SW1_CS15, SW1_CS14, SW1_CS13},
+    {0, SW2_CS15, SW2_CS14, SW2_CS13},
+    {0, SW3_CS15, SW3_CS14, SW3_CS13},
+    {0, SW4_CS15, SW4_CS14, SW4_CS13},
+    {0, SW5_CS15, SW5_CS14, SW5_CS13},
+    {0, SW6_CS15, SW6_CS14, SW6_CS13},
+    {0, SW7_CS15, SW7_CS14, SW7_CS13},
+    {0, SW8_CS15, SW8_CS14, SW8_CS13},
+    {0, SW9_CS15, SW9_CS14, SW9_CS13},
+    {0, SW1_CS30, SW1_CS29, SW1_CS28},
+    {0, SW2_CS30, SW2_CS29, SW2_CS28},
+    {0, SW3_CS30, SW3_CS29, SW3_CS28},
+    {0, SW4_CS30, SW4_CS29, SW4_CS28},
 
-    {0, CS18_SW1, CS17_SW1, CS16_SW1},
-    {0, CS18_SW2, CS17_SW2, CS16_SW2},
-    {0, CS18_SW3, CS17_SW3, CS16_SW3},
-    {0, CS18_SW4, CS17_SW4, CS16_SW4},
-    {0, CS18_SW5, CS17_SW5, CS16_SW5},
-    {0, CS18_SW6, CS17_SW6, CS16_SW6},
-    {0, CS18_SW7, CS17_SW7, CS16_SW7},
-    {0, CS18_SW8, CS17_SW8, CS16_SW8},
-    {0, CS18_SW9, CS17_SW9, CS16_SW9},
-    {0, CS33_SW1, CS32_SW1, CS31_SW1},
-    {0, CS33_SW2, CS32_SW2, CS31_SW2},
-    {0, CS33_SW3, CS32_SW3, CS31_SW3},
-    {0, CS33_SW4, CS32_SW4, CS31_SW4},
-    {0, CS33_SW7, CS32_SW7, CS31_SW7},
+    {0, SW1_CS18, SW1_CS17, SW1_CS16},
+    {0, SW2_CS18, SW2_CS17, SW2_CS16},
+    {0, SW3_CS18, SW3_CS17, SW3_CS16},
+    {0, SW4_CS18, SW4_CS17, SW4_CS16},
+    {0, SW5_CS18, SW5_CS17, SW5_CS16},
+    {0, SW6_CS18, SW6_CS17, SW6_CS16},
+    {0, SW7_CS18, SW7_CS17, SW7_CS16},
+    {0, SW8_CS18, SW8_CS17, SW8_CS16},
+    {0, SW9_CS18, SW9_CS17, SW9_CS16},
+    {0, SW1_CS33, SW1_CS32, SW1_CS31},
+    {0, SW2_CS33, SW2_CS32, SW2_CS31},
+    {0, SW3_CS33, SW3_CS32, SW3_CS31},
+    {0, SW4_CS33, SW4_CS32, SW4_CS31},
+    {0, SW7_CS33, SW7_CS32, SW7_CS31},
 
-    {0, CS3_SW1, CS2_SW1, CS1_SW1},
-    {0, CS3_SW2, CS2_SW2, CS1_SW2},
-    {0, CS3_SW3, CS2_SW3, CS1_SW3},
-    {0, CS3_SW6, CS2_SW6, CS1_SW6},
-    {0, CS36_SW2, CS35_SW2, CS34_SW2},
-    {0, CS36_SW3, CS35_SW3, CS34_SW3},
-    {0, CS36_SW4, CS35_SW4, CS34_SW4},
-    {0, CS36_SW5, CS35_SW5, CS34_SW5},
-    {0, CS36_SW6, CS35_SW6, CS34_SW6},
-    {0, CS36_SW7, CS35_SW7, CS34_SW7},
-    {0, CS36_SW8, CS35_SW8, CS34_SW8}
+    {0, SW1_CS3, SW1_CS2, SW1_CS1},
+    {0, SW2_CS3, SW2_CS2, SW2_CS1},
+    {0, SW3_CS3, SW3_CS2, SW3_CS1},
+    {0, SW6_CS3, SW6_CS2, SW6_CS1},
+    {0, SW2_CS36, SW2_CS35, SW2_CS34},
+    {0, SW3_CS36, SW3_CS35, SW3_CS34},
+    {0, SW4_CS36, SW4_CS35, SW4_CS34},
+    {0, SW5_CS36, SW5_CS35, SW5_CS34},
+    {0, SW6_CS36, SW6_CS35, SW6_CS34},
+    {0, SW7_CS36, SW7_CS35, SW7_CS34},
+    {0, SW8_CS36, SW8_CS35, SW8_CS34}
 
 };
 led_config_t g_led_config = { {
diff --git a/keyboards/kprepublic/bm980hsrgb/keymaps/peepeetee/keymap.c b/keyboards/kprepublic/bm980hsrgb/keymaps/peepeetee/keymap.c
deleted file mode 100644
index f5705ac6ad9..00000000000
--- a/keyboards/kprepublic/bm980hsrgb/keymaps/peepeetee/keymap.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/* Copyright 2021 peepeetee
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [0] = LAYOUT(
-    KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,                        KC_INS,  KC_DEL,   KC_AUDIO_VOL_DOWN,  KC_AUDIO_VOL_UP,
-	  KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,            KC_NUM,   KC_HOME,  KC_END,  KC_PGUP,
-	  KC_TAB, 	     KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,       KC_P7,    KC_P8,    KC_P9,    KC_PGDN,
-        KC_CAPS,       KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,                  KC_P4,   KC_P5,   KC_P6,
-        KC_LSFT,            KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,     KC_P1,   KC_P2,   KC_P3,   KC_PENT,
-        KC_LCTL,   KC_LALT, KC_LGUI,                       KC_SPC,                             KC_RALT, MO(1),   KC_RCTL,      KC_LEFT, KC_DOWN, KC_RGHT,   KC_P0,   KC_PDOT
-  ),
-
-  [1] = LAYOUT(
-       QK_BOOT, _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,   _______,   _______,                                   _______,    _______,    _______,  _______,
-	  _______,   _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,  _______,   _______,            _______,    _______,    _______,  _______,
-	  RGB_MOD, 	     RGB_HUI,     RGB_VAI,     RGB_SAI,     RGB_SPI,     _______,     _______,     _______,     _______,     _______,     _______,     _______,  _______,  _______,         _______,    _______,    _______,  _______,
-	  RGB_TOG,          RGB_HUD,     RGB_VAD,     RGB_SAD,     RGB_SPD,     _______,     _______,     _______,     _______,     _______,     _______,  _______,  _______,                   _______,    _______,    _______,
-        _______,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,   _______, _______, _______, _______,
-        _______,   _______, _______,                      _______,                             _______, _______, _______,      _______, _______, _______,   _______, _______
-  )
-
-    // [X] = LAYOUT(
-    //     _______,          _______, _______, _______, _______,     _______, _______, _______, _______,      _______, _______, _______, _______,     _______, _______, _______, _______,
-    //     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,              _______, _______, _______, _______,
-    //     _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______,
-    //     _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                 _______, _______, _______,
-    //     _______,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,   _______, _______, _______, _______,
-    //     _______,   _______, _______,                      _______,                             _______, _______, _______,      _______, _______, _______,   _______, _______
-    // ),
-};
-
-
-bool rgb_matrix_indicators_user(void) {
-
-    led_t host_leds = host_keyboard_led_state();
-    if (host_leds.num_lock) {
-        rgb_matrix_set_color(31, 0xFF, 0xFF, 0xFF);
-        //rgb_matrix_set_color(30, 0x0, 0x0, 0x0);
-
-    } else {
-        //rgb_matrix_set_color(30, 0x0, 0x0, 0x0);
-    }
-        //set_layer_color(get_highest_layer(layer_state));
-
-    return false;
-}
diff --git a/keyboards/kprepublic/cospad/keymaps/detrus/keymap.c b/keyboards/kprepublic/cospad/keymaps/detrus/keymap.c
deleted file mode 100644
index c3fc1a2925f..00000000000
--- a/keyboards/kprepublic/cospad/keymaps/detrus/keymap.c
+++ /dev/null
@@ -1,367 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "led.h"
-#include <print.h>
-
-#ifdef RGBLIGHT_ENABLE
-#include "rgblight.h"
-#endif
-
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-enum cospad_layers {
-	_QWERTY_LAYER,
-	_QWERTZ_LAYER,
-	_COLEMA_LAYER,
-	_DVORAK_LAYER,
-	_QWERTY_LOWER_LAYER,
-	_QWERTZ_LOWER_LAYER,
-	_COLEMA_LOWER_LAYER,
-	_DVORAK_LOWER_LAYER,
-	_RAISE_LAYER,
-	_ALTER_LAYER,
-};
-
-// To switch the default layer used for the layout, there are special keycodes.
-// Which onces detected below serve to switch it.
-enum cospad_keycodes {
-	QWERTY = SAFE_RANGE,
-	QWERTZ,
-	COLEMAK,
-	DVORAK
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	/* Keymap _QWERTY_LAYER: Default layer
-	 * ,-----------------------.
-	 * |  T  |  G  |  B  | Alt |
-	 * |-----|-----|-----|-----|
-	 * |  R  |  F  |  V  | LOW |
-	 * |-----|-----|-----|-----|
-	 * |  E  |  D  |  C  |     |
-	 * |-----|-----|-----| Spc |
-	 * |  W  |  S  |  X  |     |
-	 * |-----|-----|-----|-----|
-	 * |  Q  |  A  |  Z  | RAI |
-	 * |-----|-----|-----|-----|
-	 * | Esc | Tab | Sft | Ctl |
-	 * `-----------------------'
-	 *
-	 *   And it's LOWER layer
-	 * ,-----------------------.
-	 * |  P  |  ;  |  /  | Alt |
-	 * |-----|-----|-----|-----|
-	 * |  O  |  L  |  .  | LOW |
-	 * |-----|-----|-----|-----|
-	 * |  I  |  K  |  ,  |     |
-	 * |-----|-----|-----| Ent |
-	 * |  U  |  J  |  M  |     |
-	 * |-----|-----|-----|-----|
-	 * |  Y  |  H  |  N  | RAI |
-	 * |-----|-----|-----|-----|
-	 * | Esc | Tab | Sft | Ctl |
-	 * `-----------------------'
-	 */
-	[_QWERTY_LAYER] = LAYOUT_gamepad_6x4(
-			KC_T,    KC_G,    KC_B,    KC_LALT,
-			KC_R,    KC_F,    KC_V,    MO(_QWERTY_LOWER_LAYER),
-			KC_E,    KC_D,    KC_C,
-			KC_W,    KC_S,    KC_X,    KC_SPACE,
-			KC_Q,    KC_A,    KC_Z,    MO(_RAISE_LAYER),
-			QK_GESC, KC_TAB,  KC_LSFT, KC_LCTL),
-	[_QWERTY_LOWER_LAYER] = LAYOUT_gamepad_6x4(
-			KC_P,    KC_SCLN, KC_SLSH, KC_LALT,
-			KC_O,    KC_L,    KC_DOT,  _______,
-			KC_I,    KC_K,    KC_COMM,
-			KC_U,    KC_J,    KC_M,    KC_ENTER,
-			KC_Y,    KC_H,    KC_N,    _______,
-			_______, _______,  _______, _______),
-
-
-
-	/* Keymap _QWERTZ_LAYER: Alternate default layer
-	 * ,-----------------------.
-	 * |  T  |  G  |  B  | Alt |
-	 * |-----|-----|-----|-----|
-	 * |  R  |  F  |  V  | LOW |
-	 * |-----|-----|-----|-----|
-	 * |  E  |  D  |  C  |     |
-	 * |-----|-----|-----| Spc |
-	 * |  W  |  S  |  X  |     |
-	 * |-----|-----|-----|-----|
-	 * |  Q  |  A  |  Y  | RAI |
-	 * |-----|-----|-----|-----|
-	 * | Esc | Tab | Sft | Ctl |
-	 * `-----------------------'
-	 *
-	 *   And it's LOWER layer
-	 * ,-----------------------.
-	 * |  P  |  ;  |  /  | Alt |
-	 * |-----|-----|-----|-----|
-	 * |  O  |  L  |  >  | LOW |
-	 * |-----|-----|-----|-----|
-	 * |  I  |  K  |  <  |     |
-	 * |-----|-----|-----| Ent |
-	 * |  U  |  J  |  M  |     |
-	 * |-----|-----|-----|-----|
-	 * |  Z  |  H  |  N  | RAI |
-	 * |-----|-----|-----|-----|
-	 * | Esc | Tab | Sft | Ctl |
-	 * `-----------------------'
-	 */
-	[_QWERTZ_LAYER] = LAYOUT_gamepad_6x4(
-			KC_T,    KC_G,    KC_B,    KC_LALT,
-			KC_R,    KC_F,    KC_V,    MO(_QWERTZ_LOWER_LAYER),
-			KC_E,    KC_D,    KC_C,
-			KC_W,    KC_S,    KC_X,    KC_SPACE,
-			KC_Q,    KC_A,    KC_Y,    MO(_RAISE_LAYER),
-			QK_GESC, KC_TAB,  KC_LSFT, KC_LCTL),
-	[_QWERTZ_LOWER_LAYER] = LAYOUT_gamepad_6x4(
-			KC_P,    KC_SCLN, KC_SLSH, KC_LALT,
-			KC_O,    KC_L,    KC_DOT,  _______,
-			KC_I,    KC_K,    KC_COMM,
-			KC_U,    KC_J,    KC_M,    KC_ENTER,
-			KC_Z,    KC_H,    KC_N,    _______,
-			_______, _______, _______, _______),
-
-
-
-	/* Keymap _COLEMA_LAYER: Alternate default layer
-	 * ,-----------------------.
-	 * |  G  |  D  |  B  | Alt |
-	 * |-----|-----|-----|-----|
-	 * |  P  |  T  |  V  | LOW |
-	 * |-----|-----|-----|-----|
-	 * |  F  |  S  |  C  |     |
-	 * |-----|-----|-----| Spc |
-	 * |  W  |  R  |  X  |     |
-	 * |-----|-----|-----|-----|
-	 * |  Q  |  A  |  Z  | RAI |
-	 * |-----|-----|-----|-----|
-	 * | Esc | Tab | Sft | Ctl |
-	 * `-----------------------'
-	 *
-	 *   And it's LOWER layer
-	 * ,-----------------------.
-	 * |  ;  |  O  |  /  | Alt |
-	 * |-----|-----|-----|-----|
-	 * |  Y  |  I  |  .  | LOW |
-	 * |-----|-----|-----|-----|
-	 * |  U  |  E  |  ,  |     |
-	 * |-----|-----|-----| Ent |
-	 * |  L  |  N  |  M  |     |
-	 * |-----|-----|-----|-----|
-	 * |  J  |  H  |  K  | RAI |
-	 * |-----|-----|-----|-----|
-	 * | Esc | Tab | Sft | Ctl |
-	 * `-----------------------'
-	 */
-	[_COLEMA_LAYER] = LAYOUT_gamepad_6x4(
-			KC_T,    KC_D,     KC_B,    KC_LALT,
-			KC_R,    KC_T,     KC_V,    MO(_COLEMA_LOWER_LAYER),
-			KC_E,    KC_S,     KC_C,
-			KC_W,    KC_R,     KC_X,    KC_SPACE,
-			KC_Q,    KC_A,     KC_Z,    MO(_RAISE_LAYER),
-			QK_GESC, KC_TAB,   KC_LSFT, KC_LCTL),
-	[_COLEMA_LOWER_LAYER] = LAYOUT_gamepad_6x4(
-			KC_SCLN, KC_O,     KC_SLSH, _______,
-			KC_Y,    KC_I,     KC_DOT,  _______,
-			KC_U,    KC_E,     KC_COMM,
-			KC_L,    KC_N,     KC_M,    KC_ENTER,
-			KC_J,    KC_H,     KC_K,    _______,
-			KC_F,    KC_G,     _______, _______),
-
-
-
-	/* Keymap _DVORAK_LAYER: Alternate default layer
-	 * ,-----------------------.
-	 * |  Y  |  I  |  X  | Alt |
-	 * |-----|-----|-----|-----|
-	 * |  P  |  U  |  K  | LOW |
-	 * |-----|-----|-----|-----|
-	 * |  .  |  E  |  J  |     |
-	 * |-----|-----|-----| Spc |
-	 * |  ,  |  O  |  Q  |     |
-	 * |-----|-----|-----|-----|
-	 * |  '  |  A  |  ;  | RAI |
-	 * |-----|-----|-----|-----|
-	 * | Esc | Tab | Sft | Ctl |
-	 * `-----------------------'
-	 *
-	 *   And it's LOWER layer
-	 * ,-----------------------.
-	 * |  L  |  S  |  Z  | Alt |
-	 * |-----|-----|-----|-----|
-	 * |  R  |  N  |  V  | LOW |
-	 * |-----|-----|-----|-----|
-	 * |  C  |  T  |  W  |     |
-	 * |-----|-----|-----| Ent |
-	 * |  G  |  H  |  M  |     |
-	 * |-----|-----|-----|-----|
-	 * |  F  |  D  |  B  | RAI |
-	 * |-----|-----|-----|-----|
-	 * | Esc | Tab | Sft | Ctl |
-	 * `-----------------------'
-	 */
-	[_DVORAK_LAYER] = LAYOUT_gamepad_6x4(
-			KC_Y,    KC_I,    KC_X,    KC_LALT,
-			KC_P,    KC_U,    KC_K,    MO(_DVORAK_LOWER_LAYER),
-			KC_DOT,  KC_E,    KC_J,
-			KC_COMM, KC_O,    KC_A,    KC_SPACE,
-			KC_QUOT, KC_A,    KC_SCLN, MO(_RAISE_LAYER),
-			QK_GESC, KC_TAB,  KC_LSFT, KC_LCTL),
-	[_DVORAK_LOWER_LAYER] = LAYOUT_gamepad_6x4(
-			KC_L,    KC_S,    KC_Z,    KC_LALT,
-			KC_R,    KC_N,    KC_V,    _______,
-			KC_C,    KC_T,    KC_W,
-			KC_G,    KC_H,    KC_M,    KC_ENTER,
-			KC_F,    KC_D,    KC_B,    _______,
-			_______, _______, _______, _______),
-
-
-
-	/* Keymap _RAISE_LAYER: Additional layer to access more
-	 * ,-----------------------.
-	 * |  5  |  0  | del | Alt |
-	 * |-----|-----|-----|-----|
-	 * |  4  |  9  | ->  | LOW |
-	 * |-----|-----|-----|-----|
-	 * |  3  |  8  |  <- |     |
-	 * |-----|-----|-----| Spc |
-	 * |  2  |  7  | ->  |     |
-	 * |-----|-----|-----|-----|
-	 * |  1  |  6  |  <- | RAI |
-	 * |-----|-----|-----|-----|
-	 * | Esc | Tab | Sft | Ctl |
-	 * `-----------------------'
-	 */
-	[_RAISE_LAYER] = LAYOUT_gamepad_6x4(
-			KC_5,    KC_0,   KC_BSPC,  _______,
-			KC_4,    KC_9,   KC_RIGHT, _______,
-			KC_3,    KC_8,   KC_UP,
-			KC_2,    KC_7,   KC_DOWN,  _______,
-			KC_1,    KC_6,   KC_LEFT,  _______,
-			_______, _______, _______, _______),
-
-
-
-	/* Keymap _ALTER_LAYER: Function layer used to control the Leds
-	 *                     and use media buttons
-	 * ,----------------------------------------.
-	 * | Val Dec | Bl Toggle  | Qwertz  | Super |
-	 * |---------|------------|---------|-------|
-	 * | Val Inc |   Bl Off   | Qwerty  |       |
-	 * |---------|------------|---------|-------|
-	 * | Sat Dec |   Bl On    | Colemak |       |
-	 * |---------|------------|---------|       |
-	 * | Sat Inc | RGB Toggle | Dvorak  |       |
-	 * |---------|------------|---------|-------|
-	 * | Hue Dec |  RGB Next  | Vol Dwn |       |
-	 * |---------|------------|---------|-------|
-	 * | Hue Inc |  RGB Prev  | Vol Up  | Reset |
-	 * `----------------------------------------'
-	 */
-	[_ALTER_LAYER] = LAYOUT_gamepad_6x4(
-			RGB_VAD, BL_TOGG,  QWERTZ,  KC_LGUI,
-			RGB_VAI, BL_OFF,   QWERTY,  _______,
-			RGB_SAD, BL_ON,    COLEMAK,
-			RGB_SAI, RGB_TOG,  DVORAK,  _______,
-			RGB_HUD, RGB_MOD,  KC_VOLD, _______,
-			RGB_HUI, RGB_RMOD, KC_VOLU, QK_BOOT),
-};
-
-// Makes sure to update the good tri-layer if a layer changes
-layer_state_t layer_state_set_user(layer_state_t state) {
-	switch (get_highest_layer(default_layer_state)) {
-		case _QWERTY_LAYER:
-			state = update_tri_layer_state(state, _RAISE_LAYER, _QWERTY_LOWER_LAYER, _ALTER_LAYER);
-			break;
-		case _QWERTZ_LAYER:
-			state = update_tri_layer_state(state, _RAISE_LAYER, _QWERTZ_LOWER_LAYER, _ALTER_LAYER);
-			break;
-		case _COLEMA_LAYER:
-			state = update_tri_layer_state(state, _RAISE_LAYER, _COLEMA_LOWER_LAYER, _ALTER_LAYER);
-			break;
-		case _DVORAK_LAYER:
-			state = update_tri_layer_state(state, _RAISE_LAYER, _DVORAK_LOWER_LAYER, _ALTER_LAYER);
-			break;
-	}
-	return state;
-}
-
-// Makes the tri-layer
-layer_state_t default_layer_state_set_kb(layer_state_t state) {
-	switch (get_highest_layer(state)) {
-		case _QWERTY_LAYER:
-			state = update_tri_layer_state(state, _RAISE_LAYER, _QWERTZ_LOWER_LAYER, _ALTER_LAYER);
-			state = update_tri_layer_state(state, _RAISE_LAYER, _COLEMA_LOWER_LAYER, _ALTER_LAYER);
-			state = update_tri_layer_state(state, _RAISE_LAYER, _DVORAK_LOWER_LAYER, _ALTER_LAYER);
-			layer_move(_QWERTY_LAYER);
-			break;
-		case _QWERTZ_LAYER:
-			state = update_tri_layer_state(state, _RAISE_LAYER, _QWERTY_LOWER_LAYER, _ALTER_LAYER);
-			state = update_tri_layer_state(state, _RAISE_LAYER, _COLEMA_LOWER_LAYER, _ALTER_LAYER);
-			state = update_tri_layer_state(state, _RAISE_LAYER, _DVORAK_LOWER_LAYER, _ALTER_LAYER);
-			layer_move(_QWERTZ_LAYER);
-			break;
-		case _COLEMA_LAYER:
-			state = update_tri_layer_state(state, _RAISE_LAYER, _QWERTY_LOWER_LAYER, _ALTER_LAYER);
-			state = update_tri_layer_state(state, _RAISE_LAYER, _QWERTZ_LOWER_LAYER, _ALTER_LAYER);
-			state = update_tri_layer_state(state, _RAISE_LAYER, _DVORAK_LOWER_LAYER, _ALTER_LAYER);
-			layer_move(_COLEMA_LAYER);
-			break;
-		case _DVORAK_LAYER:
-			state = update_tri_layer_state(state, _RAISE_LAYER, _QWERTY_LOWER_LAYER, _ALTER_LAYER);
-			state = update_tri_layer_state(state, _RAISE_LAYER, _QWERTZ_LOWER_LAYER, _ALTER_LAYER);
-			state = update_tri_layer_state(state, _RAISE_LAYER, _COLEMA_LOWER_LAYER, _ALTER_LAYER);
-			layer_move(_DVORAK_LAYER);
-			break;
-	}
-	return state;
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-	switch (keycode) {
-		case BL_TOGG:
-			if (record->event.pressed) {
-				cospad_bl_led_togg();
-			}
-			return false;
-		case BL_ON:
-			if (record->event.pressed) {
-				cospad_bl_led_on();
-			}
-			return false;
-		case BL_OFF:
-			if (record->event.pressed) {
-				cospad_bl_led_off();
-			}
-			return false;
-		case QWERTY:
-			if (record->event.pressed) {
-				set_single_persistent_default_layer(_QWERTY_LAYER);
-				print("switched to QWERTY layout\n");
-			}
-			return false;
-			break;
-		case QWERTZ:
-			if (record->event.pressed) {
-				set_single_persistent_default_layer(_QWERTZ_LAYER);
-			}
-			return false;
-			break;
-		case COLEMAK:
-			if (record->event.pressed) {
-				set_single_persistent_default_layer(_COLEMA_LAYER);
-			}
-			return false;
-			break;
-		case DVORAK:
-			if (record->event.pressed) {
-				set_single_persistent_default_layer(_DVORAK_LAYER);
-			}
-			return false;
-			break;
-		default:
-			return true;
-	}
-}
diff --git a/keyboards/kprepublic/cstc40/daughterboard/daughterboard.c b/keyboards/kprepublic/cstc40/daughterboard/daughterboard.c
index 1df130fe533..38fac99155a 100644
--- a/keyboards/kprepublic/cstc40/daughterboard/daughterboard.c
+++ b/keyboards/kprepublic/cstc40/daughterboard/daughterboard.c
@@ -17,55 +17,55 @@
 
 #ifdef RGB_MATRIX_ENABLE
 const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_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, SW12_CS1,  SW11_CS1,  SW10_CS1 },
+    { 0, SW12_CS2,  SW11_CS2,  SW10_CS2 },
+    { 0, SW12_CS3,  SW11_CS3,  SW10_CS3 },
+    { 0, SW12_CS4,  SW11_CS4,  SW10_CS4 },
+    { 0, SW12_CS5,  SW11_CS5,  SW10_CS5 },
+    { 0, SW12_CS6,  SW11_CS6,  SW10_CS6 },
+    { 0, SW12_CS7,  SW11_CS7,  SW10_CS7 },
+    { 0, SW12_CS8,  SW11_CS8,  SW10_CS8 },
+    { 0, SW12_CS9,  SW11_CS9,  SW10_CS9 },
+    { 0, SW12_CS10, SW11_CS10, SW10_CS10 },
+    { 0, SW12_CS11, SW11_CS11, SW10_CS11 },
+    { 0, SW12_CS12, SW11_CS12, SW10_CS12 },
 
-    { 0, I_1,  H_1,  G_1 },
-    { 0, I_2,  H_2,  G_2 },
-    { 0, I_3,  H_3,  G_3 },
-    { 0, I_4,  H_4,  G_4 },
-    { 0, I_5,  H_5,  G_5 },
-    { 0, I_6,  H_6,  G_6 },
-    { 0, I_7,  H_7,  G_7 },
-    { 0, I_8,  H_8,  G_8 },
-    { 0, I_9,  H_9,  G_9 },
-    { 0, I_10, H_10, G_10 },
-    { 0, I_11, H_11, G_11 },
-    { 0, I_12, H_12, G_12 },
+    { 0, SW9_CS1,  SW8_CS1,  SW7_CS1 },
+    { 0, SW9_CS2,  SW8_CS2,  SW7_CS2 },
+    { 0, SW9_CS3,  SW8_CS3,  SW7_CS3 },
+    { 0, SW9_CS4,  SW8_CS4,  SW7_CS4 },
+    { 0, SW9_CS5,  SW8_CS5,  SW7_CS5 },
+    { 0, SW9_CS6,  SW8_CS6,  SW7_CS6 },
+    { 0, SW9_CS7,  SW8_CS7,  SW7_CS7 },
+    { 0, SW9_CS8,  SW8_CS8,  SW7_CS8 },
+    { 0, SW9_CS9,  SW8_CS9,  SW7_CS9 },
+    { 0, SW9_CS10, SW8_CS10, SW7_CS10 },
+    { 0, SW9_CS11, SW8_CS11, SW7_CS11 },
+    { 0, SW9_CS12, SW8_CS12, SW7_CS12 },
 
-    { 0, F_1,  E_1,  D_1 },
-    { 0, F_2,  E_2,  D_2 },
-    { 0, F_3,  E_3,  D_3 },
-    { 0, F_4,  E_4,  D_4 },
-    { 0, F_5,  E_5,  D_5 },
-    { 0, F_6,  E_6,  D_6 },
-    { 0, F_7,  E_7,  D_7 },
-    { 0, F_8,  E_8,  D_8 },
-    { 0, F_9,  E_9,  D_9 },
-    { 0, F_10, E_10, D_10 },
-    { 0, F_11, E_11, D_11 },
-    { 0, F_12, E_12, D_12 },
+    { 0, SW6_CS1,  SW5_CS1,  SW4_CS1 },
+    { 0, SW6_CS2,  SW5_CS2,  SW4_CS2 },
+    { 0, SW6_CS3,  SW5_CS3,  SW4_CS3 },
+    { 0, SW6_CS4,  SW5_CS4,  SW4_CS4 },
+    { 0, SW6_CS5,  SW5_CS5,  SW4_CS5 },
+    { 0, SW6_CS6,  SW5_CS6,  SW4_CS6 },
+    { 0, SW6_CS7,  SW5_CS7,  SW4_CS7 },
+    { 0, SW6_CS8,  SW5_CS8,  SW4_CS8 },
+    { 0, SW6_CS9,  SW5_CS9,  SW4_CS9 },
+    { 0, SW6_CS10, SW5_CS10, SW4_CS10 },
+    { 0, SW6_CS11, SW5_CS11, SW4_CS11 },
+    { 0, SW6_CS12, SW5_CS12, SW4_CS12 },
 
-    { 0, C_1, B_1, A_1 },
-    { 0, C_2, B_2, A_2 },
-    { 0, C_3, B_3, A_3 },
-    { 0, C_4, B_4, A_4 },
-    { 0, C_5, B_5, A_5 },
-    { 0, C_6, B_6, A_6 },
-    { 0, C_8, B_8, A_8 },
-    { 0, C_9, B_9, A_9 },
-    { 0, C_10, B_10, A_10 },
-    { 0, C_11, B_11, A_11 },
-    { 0, C_12, B_12, A_12 }
+    { 0, SW3_CS1, SW2_CS1, SW1_CS1 },
+    { 0, SW3_CS2, SW2_CS2, SW1_CS2 },
+    { 0, SW3_CS3, SW2_CS3, SW1_CS3 },
+    { 0, SW3_CS4, SW2_CS4, SW1_CS4 },
+    { 0, SW3_CS5, SW2_CS5, SW1_CS5 },
+    { 0, SW3_CS6, SW2_CS6, SW1_CS6 },
+    { 0, SW3_CS8, SW2_CS8, SW1_CS8 },
+    { 0, SW3_CS9, SW2_CS9, SW1_CS9 },
+    { 0, SW3_CS10, SW2_CS10, SW1_CS10 },
+    { 0, SW3_CS11, SW2_CS11, SW1_CS11 },
+    { 0, SW3_CS12, SW2_CS12, SW1_CS12 }
 };
 #endif
\ No newline at end of file
diff --git a/keyboards/kprepublic/cstc40/single_pcb/single_pcb.c b/keyboards/kprepublic/cstc40/single_pcb/single_pcb.c
index 1df130fe533..38fac99155a 100644
--- a/keyboards/kprepublic/cstc40/single_pcb/single_pcb.c
+++ b/keyboards/kprepublic/cstc40/single_pcb/single_pcb.c
@@ -17,55 +17,55 @@
 
 #ifdef RGB_MATRIX_ENABLE
 const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_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, SW12_CS1,  SW11_CS1,  SW10_CS1 },
+    { 0, SW12_CS2,  SW11_CS2,  SW10_CS2 },
+    { 0, SW12_CS3,  SW11_CS3,  SW10_CS3 },
+    { 0, SW12_CS4,  SW11_CS4,  SW10_CS4 },
+    { 0, SW12_CS5,  SW11_CS5,  SW10_CS5 },
+    { 0, SW12_CS6,  SW11_CS6,  SW10_CS6 },
+    { 0, SW12_CS7,  SW11_CS7,  SW10_CS7 },
+    { 0, SW12_CS8,  SW11_CS8,  SW10_CS8 },
+    { 0, SW12_CS9,  SW11_CS9,  SW10_CS9 },
+    { 0, SW12_CS10, SW11_CS10, SW10_CS10 },
+    { 0, SW12_CS11, SW11_CS11, SW10_CS11 },
+    { 0, SW12_CS12, SW11_CS12, SW10_CS12 },
 
-    { 0, I_1,  H_1,  G_1 },
-    { 0, I_2,  H_2,  G_2 },
-    { 0, I_3,  H_3,  G_3 },
-    { 0, I_4,  H_4,  G_4 },
-    { 0, I_5,  H_5,  G_5 },
-    { 0, I_6,  H_6,  G_6 },
-    { 0, I_7,  H_7,  G_7 },
-    { 0, I_8,  H_8,  G_8 },
-    { 0, I_9,  H_9,  G_9 },
-    { 0, I_10, H_10, G_10 },
-    { 0, I_11, H_11, G_11 },
-    { 0, I_12, H_12, G_12 },
+    { 0, SW9_CS1,  SW8_CS1,  SW7_CS1 },
+    { 0, SW9_CS2,  SW8_CS2,  SW7_CS2 },
+    { 0, SW9_CS3,  SW8_CS3,  SW7_CS3 },
+    { 0, SW9_CS4,  SW8_CS4,  SW7_CS4 },
+    { 0, SW9_CS5,  SW8_CS5,  SW7_CS5 },
+    { 0, SW9_CS6,  SW8_CS6,  SW7_CS6 },
+    { 0, SW9_CS7,  SW8_CS7,  SW7_CS7 },
+    { 0, SW9_CS8,  SW8_CS8,  SW7_CS8 },
+    { 0, SW9_CS9,  SW8_CS9,  SW7_CS9 },
+    { 0, SW9_CS10, SW8_CS10, SW7_CS10 },
+    { 0, SW9_CS11, SW8_CS11, SW7_CS11 },
+    { 0, SW9_CS12, SW8_CS12, SW7_CS12 },
 
-    { 0, F_1,  E_1,  D_1 },
-    { 0, F_2,  E_2,  D_2 },
-    { 0, F_3,  E_3,  D_3 },
-    { 0, F_4,  E_4,  D_4 },
-    { 0, F_5,  E_5,  D_5 },
-    { 0, F_6,  E_6,  D_6 },
-    { 0, F_7,  E_7,  D_7 },
-    { 0, F_8,  E_8,  D_8 },
-    { 0, F_9,  E_9,  D_9 },
-    { 0, F_10, E_10, D_10 },
-    { 0, F_11, E_11, D_11 },
-    { 0, F_12, E_12, D_12 },
+    { 0, SW6_CS1,  SW5_CS1,  SW4_CS1 },
+    { 0, SW6_CS2,  SW5_CS2,  SW4_CS2 },
+    { 0, SW6_CS3,  SW5_CS3,  SW4_CS3 },
+    { 0, SW6_CS4,  SW5_CS4,  SW4_CS4 },
+    { 0, SW6_CS5,  SW5_CS5,  SW4_CS5 },
+    { 0, SW6_CS6,  SW5_CS6,  SW4_CS6 },
+    { 0, SW6_CS7,  SW5_CS7,  SW4_CS7 },
+    { 0, SW6_CS8,  SW5_CS8,  SW4_CS8 },
+    { 0, SW6_CS9,  SW5_CS9,  SW4_CS9 },
+    { 0, SW6_CS10, SW5_CS10, SW4_CS10 },
+    { 0, SW6_CS11, SW5_CS11, SW4_CS11 },
+    { 0, SW6_CS12, SW5_CS12, SW4_CS12 },
 
-    { 0, C_1, B_1, A_1 },
-    { 0, C_2, B_2, A_2 },
-    { 0, C_3, B_3, A_3 },
-    { 0, C_4, B_4, A_4 },
-    { 0, C_5, B_5, A_5 },
-    { 0, C_6, B_6, A_6 },
-    { 0, C_8, B_8, A_8 },
-    { 0, C_9, B_9, A_9 },
-    { 0, C_10, B_10, A_10 },
-    { 0, C_11, B_11, A_11 },
-    { 0, C_12, B_12, A_12 }
+    { 0, SW3_CS1, SW2_CS1, SW1_CS1 },
+    { 0, SW3_CS2, SW2_CS2, SW1_CS2 },
+    { 0, SW3_CS3, SW2_CS3, SW1_CS3 },
+    { 0, SW3_CS4, SW2_CS4, SW1_CS4 },
+    { 0, SW3_CS5, SW2_CS5, SW1_CS5 },
+    { 0, SW3_CS6, SW2_CS6, SW1_CS6 },
+    { 0, SW3_CS8, SW2_CS8, SW1_CS8 },
+    { 0, SW3_CS9, SW2_CS9, SW1_CS9 },
+    { 0, SW3_CS10, SW2_CS10, SW1_CS10 },
+    { 0, SW3_CS11, SW2_CS11, SW1_CS11 },
+    { 0, SW3_CS12, SW2_CS12, SW1_CS12 }
 };
 #endif
\ No newline at end of file
diff --git a/keyboards/kprepublic/jj50/keymaps/abstractkb_gergomatch/config.h b/keyboards/kprepublic/jj50/keymaps/abstractkb_gergomatch/config.h
deleted file mode 100644
index 9439a929e98..00000000000
--- a/keyboards/kprepublic/jj50/keymaps/abstractkb_gergomatch/config.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-#define RGBLIGHT_SLEEP
\ No newline at end of file
diff --git a/keyboards/kprepublic/jj50/keymaps/abstractkb_gergomatch/keymap.c b/keyboards/kprepublic/jj50/keymaps/abstractkb_gergomatch/keymap.c
deleted file mode 100644
index 888e43e7dd6..00000000000
--- a/keyboards/kprepublic/jj50/keymaps/abstractkb_gergomatch/keymap.c
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
-Base Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
-Modified 2017 Andrew Novak <ndrw.nvk@gmail.com>
-Modified 2018 Wayne Jones (WarmCatUK) <waynekjones@gmail.com>
-Modified 2019 AbstractKB
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public LicensezZZ
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include QMK_KEYBOARD_H
-
-enum layers {
-  _DEFLT,
-  _FUNC,
-  _SYM,
-  _META
-};
-
-enum custom_keycodes {
-  MYRGB_TG = SAFE_RANGE
-};
-
-bool rgbinit = true;
-bool rgbon = true;
-
-const uint8_t RGBLED_RAINBOW_SWIRL_INTERVALS[] PROGMEM = {1,5,5}; //only using the first one
-
-void keyboard_post_init_user(void) {
-  rgblight_enable_noeeprom();
-  led_set_user(host_keyboard_leds());
-}
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  switch (get_highest_layer(state)) {
-    case _FUNC:
-      rgblight_sethsv_noeeprom(170,255,255);
-      rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
-      break;
-    case _SYM:
-      rgblight_sethsv_noeeprom(0,255,255);
-      rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
-      break;
-    case _META:
-      rgblight_sethsv_noeeprom(0,255,255);
-      rgblight_mode_noeeprom(RGBLIGHT_MODE_RAINBOW_SWIRL);
-      break;
-    default: //_DEFLT
-      rgblight_sethsv_noeeprom(0,0,255);
-      rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
-      break;
-  }
-
-  return state;
-}
-
-bool led_update_user(led_t led_state) {
-  if (led_state.caps_lock) {
-    rgblight_mode_noeeprom(RGBLIGHT_MODE_ALTERNATING);
-  } else {
-    layer_state_set_user(layer_state);
-  }
-  return false;
-}
-
-void myrgb_toggle(void) {
-  if (rgbon) {
-    rgblight_disable_noeeprom();
-    rgbon = false;
-  } else {
-    rgblight_enable_noeeprom();
-    layer_state_set_user(layer_state);
-    led_set_user(host_keyboard_leds());
-    rgbon = true;
-  }
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch(keycode) {
-    case MYRGB_TG:
-      if (record->event.pressed) {
-        myrgb_toggle();
-      }
-      return false;
-    default:
-      return true;
-  }
-}
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    [_DEFLT] = LAYOUT(
-        KC_ESC,	 KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_ENT,
-        KC_BSPC, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-        KC_LCTL, MO(_META), KC_LGUI, KC_LALT, MO(_SYM),KC_SPC,KC_SPC,MO(_FUNC),KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-    ),
-
-
-    [_FUNC] = LAYOUT(
-       KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-       _______, _______, _______, _______, _______, _______, _______, _______, LCTL(LGUI(KC_LEFT)), LGUI(KC_L), LCTL(LGUI(KC_RGHT)), _______,
-       _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MNXT, KC_CAPS, _______,
-       _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_MPLY
-    ),
-
-
-    [_SYM] = LAYOUT(
-        KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-        _______,S(KC_1),S(KC_2),S(KC_LBRC),S(KC_RBRC),S(KC_BSLS),_______, S(KC_MINS), _______, _______, _______, _______,
-        _______, S(KC_3), S(KC_4), S(KC_9), S(KC_0), KC_GRV, S(KC_EQL), KC_MINS, KC_BSLS, S(KC_8), _______, _______,
-        _______, S(KC_5), S(KC_6), KC_LBRC,KC_RBRC,S(KC_GRV), S(KC_7),KC_EQL, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-    ),
-
-
-    [_META] = LAYOUT(
-       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
-       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MYRGB_TG
-    )
-};
diff --git a/keyboards/kprepublic/jj50/keymaps/abstractkb_gergomatch/readme.md b/keyboards/kprepublic/jj50/keymaps/abstractkb_gergomatch/readme.md
deleted file mode 100644
index a45ece7ff78..00000000000
--- a/keyboards/kprepublic/jj50/keymaps/abstractkb_gergomatch/readme.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# My personal layout for the JJ50
-
-It is an approximation of a cross between a 60% the gergo function layout
-It also uses layer based rgb underglow, and the underglow flashes when capslock is enabled
\ No newline at end of file
diff --git a/keyboards/kprepublic/jj50/keymaps/archetype/README.md b/keyboards/kprepublic/jj50/keymaps/archetype/README.md
deleted file mode 100644
index a2ae4e9123f..00000000000
--- a/keyboards/kprepublic/jj50/keymaps/archetype/README.md
+++ /dev/null
@@ -1,22 +0,0 @@
-# archetype keymap for jj50 keyboards
-A keymap that can be used with the jj50 ortholinear keyboard.
-
-## Features
-
-- `QWERTY` layout (Default)
-- `COLEMAK` layout
-- `FN` layout (various keys that are rarely needed)
-- `FX` layout (Control lighting and audio)
-- Use `Left Ctrl` and `Left Alt` to output `()`, `[]` and `{}` by tapping once, twice or thrice respectively. Hold them down for the regular keycode (LCtrl or LAlt)
-- `Right Shift` when held or Enter when tapped
-- Auto-Shift enabled (long press on alphas and numeric keys outputs shifted character)
-- Full arrow keys available
-
-
-## Feedback
-
-I made this keymap based on the existing default one. If you happen to use this keymap [drop me a line](mailto://idimitrakopoulos@gmail.com) about what could be improved etc
-
-Enjoy!
-
-Iason Dimitrakopoulos
diff --git a/keyboards/kprepublic/jj50/keymaps/archetype/config.h b/keyboards/kprepublic/jj50/keymaps/archetype/config.h
deleted file mode 100644
index 17ce95a3632..00000000000
--- a/keyboards/kprepublic/jj50/keymaps/archetype/config.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#pragma once
-
-#undef AUTO_SHIFT_TIMEOUT
-#undef TAPPING_TERM
-
-#define AUTO_SHIFT_TIMEOUT 150
-#define NO_AUTO_SHIFT_ALPHA
-#define TAPPING_TERM 150
-#define TAPPING_TERM_PER_KEY
diff --git a/keyboards/kprepublic/jj50/keymaps/archetype/keymap.c b/keyboards/kprepublic/jj50/keymaps/archetype/keymap.c
deleted file mode 100644
index a4856144386..00000000000
--- a/keyboards/kprepublic/jj50/keymaps/archetype/keymap.c
+++ /dev/null
@@ -1,286 +0,0 @@
-/*
-Base Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
-Modified 2017 Andrew Novak <ndrw.nvk@gmail.com>
-Modified 2018 Wayne Jones (WarmCatUK) <waynekjones@gmail.com>
-Modified 2019 Iason Dimitrakopoulos (idimitrakopoulos) <idimitrakopoulos@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public LicensezZZ
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include QMK_KEYBOARD_H
-#include "action_layer.h"
-#include "rgblight.h"
-#include "quantum.h"
-
-#define _QWERTY 0
-#define _COLEMAK 1
-#define _FN 2
-#define _FX 3
-
-enum {
-  TD_BSPC_DEL = 0,
-  TD_LCTL_LBRC = 1,
-  TD_LALT_RBRC = 2,
-  TD_ESC_LAYER = 3,
-};
-
-
-void left_brackets(tap_dance_state_t *state, void *user_data) {
-    if (state->count == 1) {
-      if (!state->pressed) {
-        register_code16(KC_LPRN);
-      } else {
-        register_code(KC_LCTL);
-      }
-    } else if (state->count == 2) {
-        register_code16(KC_LBRC);
-    } else if (state->count == 3) {
-        register_code16(KC_LCBR);
-    }
-}
-
-void left_brackets_reset(tap_dance_state_t *state, void *user_data) {
-    if (state->count == 1) {
-        unregister_code16(KC_LPRN);
-    } else if (state->count == 2) {
-        unregister_code16(KC_LBRC);
-    } else if (state->count == 3) {
-        unregister_code16(KC_LCBR);
-    }
-
-    unregister_code(KC_LCTL);
-}
-
-void right_brackets(tap_dance_state_t *state, void *user_data) {
-    if (state->count == 1) {
-      if (!state->pressed) {
-        register_code16(KC_RPRN);
-      } else {
-        register_code(KC_LALT);
-      }
-    } else if (state->count == 2) {
-        register_code16(KC_RBRC);
-    } else if (state->count == 3) {
-        register_code16(KC_RCBR);
-    }
-}
-
-void right_brackets_reset(tap_dance_state_t *state, void *user_data) {
-    if (state->count == 1) {
-        unregister_code16(KC_RPRN);
-    } else if (state->count == 2) {
-        unregister_code16(KC_RBRC);
-    } else if (state->count == 3) {
-        unregister_code16(KC_RCBR);
-    }
-
-    unregister_code(KC_LALT);
-}
-
-typedef struct {
-  bool is_press_action;
-  int state;
-} tap;
-
-enum {
-  SINGLE_TAP = 1,
-  SINGLE_HOLD = 2,
-  DOUBLE_TAP = 3,
-  DOUBLE_HOLD = 4,
-  DOUBLE_SINGLE_TAP = 5, //send two single taps
-  TRIPLE_TAP = 6,
-  TRIPLE_HOLD = 7,
-  TRIPLE_SINGLE_TAP = 8, //send three single taps
-};
-
-int cur_dance (tap_dance_state_t *state) {
-  if (state->count == 1) {
-    if (state->interrupted || !state->pressed)  return SINGLE_TAP;
-    else return SINGLE_HOLD;
-  }
-  else if (state->count == 2) {
-    if (state->interrupted) return DOUBLE_SINGLE_TAP;
-    else if (state->pressed) return DOUBLE_HOLD;
-    else return DOUBLE_TAP;
-  }
-
-  if (state->count == 3) {
-    if (state->interrupted) return TRIPLE_SINGLE_TAP;
-    else if (state->pressed) return TRIPLE_HOLD;
-    else return TRIPLE_TAP;
-  }
-  else return 9; //magic number. At some point this method will expand to work for more presses
-}
-
-static tap tap_state = {
-  .is_press_action = true,
-  .state = 0
-};
-
-void layer_switcher (tap_dance_state_t *state, void *user_data) {
-  tap_state.state = cur_dance(state);
-  switch (tap_state.state) {
-    case SINGLE_TAP: register_code(KC_ESC); break;
-    case SINGLE_HOLD: register_code(KC_ESC); break;
-    case DOUBLE_TAP: register_code(KC_ESC); break;
-    case DOUBLE_HOLD: layer_on(_COLEMAK); break;
-    case DOUBLE_SINGLE_TAP: register_code(KC_ESC); unregister_code(KC_ESC); register_code(KC_ESC); break;
-    case TRIPLE_TAP: register_code(KC_ESC); break;
-    case TRIPLE_HOLD: layer_on(_FX); break;
-    case TRIPLE_SINGLE_TAP: register_code(KC_ESC); unregister_code(KC_ESC); register_code(KC_ESC); unregister_code(KC_ESC); register_code(KC_ESC); break;
-    //Last case is for fast typing. Assuming your key is `f`:
-    //For example, when typing the word `buffer`, and you want to make sure that you send `ff` and not `Esc`.
-    //In order to type `ff` when typing fast, the next character will have to be hit within the `TAPPING_TERM`, which by default is 200ms.
-  }
-}
-
-void layer_switcher_reset (tap_dance_state_t *state, void *user_data) {
-  switch (tap_state.state) {
-    case SINGLE_TAP: unregister_code(KC_ESC); break;
-    case SINGLE_HOLD: unregister_code(KC_ESC); break;
-    case DOUBLE_TAP: unregister_code(KC_ESC); break;
-    case DOUBLE_HOLD: break;
-    case DOUBLE_SINGLE_TAP: unregister_code(KC_ESC); break;
-    case TRIPLE_TAP: unregister_code(KC_ESC); break;
-    case TRIPLE_HOLD: break;
-    case TRIPLE_SINGLE_TAP: unregister_code(KC_ESC); break;
-  }
-  tap_state.state = 0;
-}
-
-tap_dance_action_t tap_dance_actions[] = {
-  // Single tap = Backspace | Double tap = Delete
-  [TD_BSPC_DEL] = ACTION_TAP_DANCE_DOUBLE(KC_BSPC, KC_DEL),
-  // Single tap = ( | Double tap = [ | Triple tap = { | Single hold = KC_LCTL
-  [TD_LCTL_LBRC] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, left_brackets, left_brackets_reset),
-  // Single tap = ) | Double tap = ] | Triple tap = } | Single hold = KC_LALT
-  [TD_LALT_RBRC] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, right_brackets, right_brackets_reset),
-  // Layer Switcher ESC
-  [TD_ESC_LAYER] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, layer_switcher, layer_switcher_reset),
-};
-
-uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case TD(TD_ESC_LAYER):
-            return 100;
-        default:
-            return TAPPING_TERM;
-    }
-}
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    [_QWERTY] = LAYOUT(
-
-      //,----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+.
-      //|                |                 |                 |                 |                 |                 |                 |                 |                 |                 |                 |                  |
-        TD(TD_ESC_LAYER),     KC_1,             KC_2,             KC_3,             KC_4,             KC_5,             KC_6,             KC_7,             KC_8,             KC_9,             KC_0,             KC_BSPC,
-      //|                |                 |                 |                 |                 |                 |                 |                 |                 |                 |                 |                  |
-      //,----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+|
-      //|                |                 |                 |                 |                 |                 |                 |                 |                 |                 |                 |                  |
-            KC_TAB,           KC_Q,             KC_W,             KC_E,             KC_R,             KC_T,             KC_Y,             KC_U,             KC_I,             KC_O,             KC_P,             KC_BSLS,
-      //|                |                 |                 |                 |                 |                 |                 |                 |                 |                 |                 |                  |
-      //,----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+|
-      //|                |                 |                 |                 |                 |                 |                 |                 |                 |                 |                 |                  |
-            KC_CAPS,          KC_A,             KC_S,             KC_D,             KC_F,             KC_G,             KC_H,             KC_J,             KC_K,             KC_L,             KC_SCLN,          KC_QUOT,
-      //|                |                 |                 |                 |                 |                 |                 |                 |                 |                 |                 |                  |
-      //,----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+|
-      //|                |                 |                 |                 |                 |                 |                 |                 |                 |                 |                 |                  |
-            KC_LSFT,          KC_Z,             KC_X,             KC_C,             KC_V,             KC_B,             KC_N,             KC_M,             KC_DOT,           KC_SLSH,          KC_UP,          SFT_T(KC_ENT),
-      //|                |                 |                 |                 |                 |                 |                 |                 |                 |                 |                 |                  |
-      //,----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+|
-      //|                |                 |                 |                 |                 |                 |                 |                 |                 |                 |                 |                  |
-        TD(TD_LCTL_LBRC),     KC_LGUI,      TD(TD_LALT_RBRC),     _______,          _______,        LT(_FN, KC_SPC),    _______,        LT(_FX, KC_SPC),    KC_COMM,          KC_LEFT,          KC_DOWN,          KC_RGHT
-      //|                |                 |                 |                 |                 |                 |                 |                 |                 |                 |                 |                  |
-      //,----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+'
-    ),
-
-    [_COLEMAK] = LAYOUT(
-
-      //,----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+.
-      //|                |                 |                 |                 |                 |                 |                 |                 |                 |                 |                 |                  |
-            _______,          _______,          _______,          _______,          _______,          _______,          _______,          _______,          _______,          _______,          _______,          _______,
-      //|                |                 |                 |                 |                 |                 |                 |                 |                 |                 |                 |                  |
-      //,----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+|
-      //|                |                 |                 |                 |                 |                 |                 |                 |                 |                 |                 |                  |
-            _______,          _______,          _______,          KC_F,             KC_P,             KC_G,             KC_J,             KC_L,             KC_U,             KC_Y,             KC_SCLN,          _______,
-      //|                |                 |                 |                 |                 |                 |                 |                 |                 |                 |                 |                  |
-      //,----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+|
-      //|                |                 |                 |                 |                 |                 |                 |                 |                 |                 |                 |                  |
-            _______,          _______,          KC_R,             KC_S,             KC_T,             KC_D,             _______,          KC_N,             KC_E,             KC_I,             KC_O,             _______,
-      //|                |                 |                 |                 |                 |                 |                 |                 |                 |                 |                 |                  |
-      //,----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+|
-      //|                |                 |                 |                 |                 |                 |                 |                 |                 |                 |                 |                  |
-            _______,          _______,          _______,          _______,          _______,          _______,          KC_K,             _______,          _______,          _______,          _______,          _______,
-      //|                |                 |                 |                 |                 |                 |                 |                 |                 |                 |                 |                  |
-      //,----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+|
-      //|                |                 |                 |                 |                 |                 |                 |                 |                 |                 |                 |                  |
-            _______,          _______,          _______,          _______,          _______,          _______,          _______,          _______,          _______,          _______,          _______,          _______
-      //|                |                 |                 |                 |                 |                 |                 |                 |                 |                 |                 |                  |
-      //,----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+'
-    ),
-
-    [_FN] = LAYOUT(
-
-      //,----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+.
-      //|                |                 |                 |                 |                 |                 |                 |                 |                 |                 |                 |                  |
-            KC_GRV,           KC_F1,            KC_F2,            KC_F3,            KC_F4,            KC_F5,            KC_F6,            KC_F7,            KC_F8,            KC_F9,            KC_F10,           KC_DEL,
-      //|                |                 |                 |                 |                 |                 |                 |                 |                 |                 |                 |                  |
-      //,----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+|
-      //|                |                 |                 |                 |                 |                 |                 |                 |                 |                 |                 |                  |
-            KC_PSCR,          _______,          _______,          _______,          _______,          _______,          _______,          _______,          _______,          _______,          _______,          KC_EQUAL,
-      //|                |                 |                 |                 |                 |                 |                 |                 |                 |                 |                 |                  |
-      //,----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+|
-      //|                |                 |                 |                 |                 |                 |                 |                 |                 |                 |                 |                  |
-            KC_CAPS,          _______,          _______,          _______,          _______,          _______,          _______,          _______,          _______,          _______,          _______,          KC_MINUS,
-      //|                |                 |                 |                 |                 |                 |                 |                 |                 |                 |                 |                  |
-      //,----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+|
-      //|                |                 |                 |                 |                 |                 |                 |                 |                 |                 |                 |                  |
-            _______,          _______,          _______,          _______,          _______,          _______,          _______,          _______,          _______,          _______,          KC_PGUP,          _______,
-      //|                |                 |                 |                 |                 |                 |                 |                 |                 |                 |                 |                  |
-      //,----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+|
-      //|                |                 |                 |                 |                 |                 |                 |                 |                 |                 |                 |                  |
-            _______,          _______,          _______,          _______,          _______,          _______,          _______,          _______,          _______,          KC_HOME,          KC_PGDN,          KC_END
-      //|                |                 |                 |                 |                 |                 |                 |                 |                 |                 |                 |                  |
-      //,----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+'
-    ),
-
-    [_FX] = LAYOUT(
-
-      //,----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+.
-      //|                |                 |                 |                 |                 |                 |                 |                 |                 |                 |                 |                  |
-            _______,          _______,          _______,          _______,          _______,          _______,          _______,          _______,          _______,          _______,          _______,          _______,
-      //|                |                 |                 |                 |                 |                 |                 |                 |                 |                 |                 |                  |
-      //,----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+|
-      //|                |                 |                 |                 |                 |                 |                 |                 |                 |                 |                 |                  |
-            _______,          _______,          _______,          _______,          _______,          _______,          _______,          _______,          _______,          _______,          RGB_VAI,          _______,
-      //|                |                 |                 |                 |                 |                 |                 |                 |                 |                 |                 |                  |
-      //,----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+|
-      //|                |                 |                 |                 |                 |                 |                 |                 |                 |                 |                 |                  |
-            _______,          _______,          _______,          _______,          _______,          _______,          _______,          _______,          _______,          _______,          RGB_VAD,          _______,
-      //|                |                 |                 |                 |                 |                 |                 |                 |                 |                 |                 |                  |
-      //,----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+|
-      //|                |                 |                 |                 |                 |                 |                 |                 |                 |                 |                 |                  |
-            _______,          _______,          _______,          _______,          _______,          _______,          _______,          _______,          _______,          RGB_MOD,          RGB_HUI,          RGB_TOG,
-      //|                |                 |                 |                 |                 |                 |                 |                 |                 |                 |                 |                  |
-      //,----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+|
-      //|                |                 |                 |                 |                 |                 |                 |                 |                 |                 |                 |                  |
-            _______,          _______,          _______,          _______,          _______,          _______,          _______,          _______,          _______,          RGB_SAI,          RGB_HUD,          RGB_SAD
-      //|                |                 |                 |                 |                 |                 |                 |                 |                 |                 |                 |                  |
-      //,----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+-----------------+'
-    ),
-
-
-};
diff --git a/keyboards/kprepublic/jj50/keymaps/archetype/rules.mk b/keyboards/kprepublic/jj50/keymaps/archetype/rules.mk
deleted file mode 100644
index c77317fdc3c..00000000000
--- a/keyboards/kprepublic/jj50/keymaps/archetype/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-COMMAND_ENABLE = yes
-TAP_DANCE_ENABLE = yes
-AUTO_SHIFT_ENABLE = yes
-KEY_LOCK_ENABLE = yes
diff --git a/keyboards/ktec/ergodone/keymaps/eozaki/keymap.c b/keyboards/ktec/ergodone/keymaps/eozaki/keymap.c
deleted file mode 100644
index 3910756f817..00000000000
--- a/keyboards/ktec/ergodone/keymaps/eozaki/keymap.c
+++ /dev/null
@@ -1,201 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "debug.h"
-#include "action_layer.h"
-#include "version.h"
-
-#define BASE 0 // default layer
-#define SYMB 1 // symbols
-#define MDIA 2 // media keys
-
-enum custom_keycodes {
-  PLACEHOLDER = SAFE_RANGE, // can always be here
-  EPRM,
-  VRSN,
-  RGB_SLD
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Keymap 0: Basic layer
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * | Esc    |   1  |   2  |   3  |   4  |   5  |  ~   |           |  '   |   6  |   7  |   8  |   9  |   0  |   =    |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * | Del    |   Q  |   W  |   E  |   R  |   T  |  ~   |           |  "   |   Y  |   U  |   I  |   O  |   P  |   -    |
- * |--------+------+------+------+------+------|  `   |           |      |------+------+------+------+------+--------|
- * | Ctrl   |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |  ;   |    \   |
- * |--------+------+------+------+------+------|  {   |           |  }   |------+------+------+------+------+--------|
- * | LAlt   |   Z  |   X  |   C  |   V  |   B  |  [   |           |  ]   |   N  |   M  |   ,  |   .  |  /   | LShift |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   | LT-1 |  F4  |  F5  |  F6  |  F11 |                                       | Left | Down |  Up  | Right|  RAlt  |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |  L1  | Prev |       | Vol+ |  L2  |
- *                                 ,------|------|------|       |------+--------+------.
- *                                 |      |      | Play |       | Vol- |        |      |
- *                                 | Space|Backsp|------|       |------|  Tab   |Enter |
- *                                 |      |ace   | Next |       | Mute |        |      |
- *                                 `--------------------'       `----------------------'
- */
-// If it accepts an argument (i.e, is a function), it doesn't need KC_.
-// Otherwise, it needs KC_*
-[BASE] = LAYOUT_ergodox(  // layer 0 : default
-        // left hand
-        KC_ESC,         KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   LSFT(KC_GRV),
-        KC_DEL,         KC_Q,         KC_W,   KC_E,   KC_R,   KC_T,   KC_GRV,
-        KC_LCTL,        KC_A,         KC_S,   KC_D,   KC_F,   KC_G,
-        KC_LALT,        KC_Z,         KC_X,   KC_C,   KC_V,   KC_B,   KC_LBRC,
-        LT(SYMB, KC_F2),       KC_F4,        KC_F5,  KC_F6,  KC_F11,
-                                                   TG(SYMB),  KC_MPRV,
-                                                              KC_MPLY,
-                                               KC_SPC,KC_BSPC,KC_MNXT,
-        // right hand
-             KC_QUOT,         KC_6,   KC_7,   KC_8,   KC_9,   KC_0,             KC_EQL,
-             LSFT(KC_QUOT),  KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,             KC_MINS,
-                              KC_H,   KC_J,   KC_K,   KC_L,   LT(MDIA, KC_SCLN),KC_BSLS,
-             KC_RBRC,         KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,          KC_LSFT,
-                              KC_LEFT,KC_DOWN,KC_UP,  KC_RGHT,KC_RALT,
-             KC_VOLU,        TG(MDIA),
-             KC_VOLD,
-             KC_MUTE,KC_TAB, KC_ENT
-    ),
-/* Keymap 1: Symbol Layer
- *
- * ,---------------------------------------------------.           ,--------------------------------------------------.
- * |Version  |  F1  |  F2  |  F3  |  F4  |  F5  |      |           |      |  F6  |  F7  |  F8  |  F9  |  F10 |   F11  |
- * |---------+------+------+------+------+------+------|           |------+------+------+------+------+------+--------|
- * |         |   !  |   @  |   {  |   }  |   |  |      |           |      |   Up |   7  |   8  |   9  |   *  |   F12  |
- * |---------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |         |   #  |   $  |   (  |   )  |   `  |------|           |------| Down |   4  |   5  |   6  |   +  |        |
- * |---------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |         |   %  |   ^  |   [  |   ]  |   ~  |      |           |      |   &  |   1  |   2  |   3  |   \  |        |
- * `---------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   | EPRM  |      |      |      |      |                                       |      |    . |   0  |   =  |      |
- *   `-----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |Animat|      |       |Toggle|Solid |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |Bright|Bright|      |       |      |Hue-  |Hue+  |
- *                                 |ness- |ness+ |------|       |------|      |      |
- *                                 |      |      |      |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-// SYMBOLS
-[SYMB] = LAYOUT_ergodox(
-       // left hand
-       VRSN,   KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS,
-       KC_TRNS,KC_EXLM,KC_AT,  KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS,
-       KC_TRNS,KC_HASH,KC_DLR, KC_LPRN,KC_RPRN,KC_GRV,
-       KC_TRNS,KC_PERC,KC_CIRC,KC_LBRC,KC_RBRC,KC_TILD,KC_TRNS,
-          EPRM,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-                                       RGB_MOD,KC_TRNS,
-                                               KC_TRNS,
-                               RGB_VAD,RGB_VAI,KC_TRNS,
-       // right hand
-       KC_TRNS, KC_F6,   KC_F7,  KC_F8,   KC_F9,   KC_F10,  KC_F11,
-       KC_TRNS, KC_UP,   KC_7,   KC_8,    KC_9,    KC_ASTR, KC_F12,
-                KC_DOWN, KC_4,   KC_5,    KC_6,    KC_PLUS, KC_TRNS,
-       KC_TRNS, KC_AMPR, KC_1,   KC_2,    KC_3,    KC_BSLS, KC_TRNS,
-                         KC_TRNS,KC_DOT,  KC_0,    KC_EQL,  KC_TRNS,
-       RGB_TOG, RGB_SLD,
-       KC_TRNS,
-       KC_TRNS, RGB_HUD, RGB_HUI
-),
-/* Keymap 2: Media and mouse keys
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |      |      | MsUp |      |      |      |           |      |      |      |      |      |      |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |MsLeft|MsDown|MsRght|      |------|           |------|      |      |      |      |      |  Play  |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |      |      |      |      |      |           |      |      |      | Prev | Next |      |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      | Lclk | Rclk |                                       |VolUp |VolDn | Mute |      |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       |      |      |Brwser|
- *                                 |      |      |------|       |------|      |Back  |
- *                                 |      |      |      |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-// MEDIA AND MOUSE
-[MDIA] = LAYOUT_ergodox(
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2,
-                                           KC_TRNS, KC_TRNS,
-                                                    KC_TRNS,
-                                  KC_TRNS, KC_TRNS, KC_TRNS,
-    // right hand
-       KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY,
-       KC_TRNS,  KC_TRNS, KC_TRNS, KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS,
-                          KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS,
-       KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_WBAK
-),
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    // dynamically generate these.
-    case EPRM:
-      if (record->event.pressed) {
-        eeconfig_init();
-      }
-      return false;
-      break;
-    case VRSN:
-      if (record->event.pressed) {
-        SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
-      }
-      return false;
-      break;
-    case RGB_SLD:
-      if (record->event.pressed) {
-        #ifdef RGBLIGHT_ENABLE
-          rgblight_mode(1);
-        #endif
-      }
-      return false;
-      break;
-  }
-  return true;
-}
-
-// Runs just one time when the keyboard initializes.
-void matrix_init_user(void) {
-
-};
-
-
-// Runs constantly in the background, in a loop.
-void matrix_scan_user(void) {
-
-    uint8_t layer = get_highest_layer(layer_state);
-
-    ergodox_board_led_off();
-    ergodox_right_led_1_off();
-    ergodox_right_led_2_off();
-    ergodox_right_led_3_off();
-    switch (layer) {
-      // TODO: Make this relevant to the ErgoDox EZ.
-        case 1:
-            ergodox_right_led_1_on();
-            break;
-        case 2:
-            ergodox_right_led_2_on();
-            break;
-        default:
-            // none
-            break;
-    }
-
-};
diff --git a/keyboards/ktec/ergodone/keymaps/eozaki/readme.md b/keyboards/ktec/ergodone/keymaps/eozaki/readme.md
deleted file mode 100644
index bfde2b2c8e4..00000000000
--- a/keyboards/ktec/ergodone/keymaps/eozaki/readme.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# ErgoDox EZ Based Configuration
-
-## Changelog
-
-* Aug 2018:
-  * New custom L0 layout.
-* Dec 2016:
-  * Added LED keys
-  * Refreshed layout graphic, comes from http://configure.ergodox-ez.com now.
-* Sep 22, 2016:
-  * Created a new key in layer 1 (bottom-corner key) that resets the EEPROM.
-* Feb 2, 2016 (V1.1): 
-  * Made the right-hand quote key double as Cmd/Win on hold. So you get ' when you tap it, " when you tap it with Shift, and Cmd or Win when you hold it. You can then use it as a modifier, or just press and hold it for a moment (and then let go) to send a single Cmd or Win keystroke (handy for opening the Start menu on Windows).
diff --git a/keyboards/ktec/ergodone/keymaps/vega/keymap.c b/keyboards/ktec/ergodone/keymaps/vega/keymap.c
deleted file mode 100644
index d668f9b41ea..00000000000
--- a/keyboards/ktec/ergodone/keymaps/vega/keymap.c
+++ /dev/null
@@ -1,828 +0,0 @@
-// Copyright 2021 Vega Carlson (@VegaDeftwing)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-
-enum layer_names { BASE, GREL, GREU, SYMB, MATH, QWER, FNLR, TINY, FULL, FULU };
-
-enum unicode_names {
-    // MATH
-    neq,     //≠
-    intgrl,  //∫
-    angl,    //∠
-    imply,   //⇒
-    equiv,   //⇔
-    porp,    //∝
-    exists,  //∃
-    nexists, //∄
-    forall,  //∀
-    and,     //∧
-    or
-    ,             //∨
-    xor,          //⊕
-    apeql,        //≅
-    root,         //√
-    not,          //¬
-    sum,          //∑
-    plsminus,     //±
-    infin,        //∞
-    emtyset,      //∅
-    Mn,           //ℕ
-    Mz,           //ℤ
-    Mq,           //ℚ
-    Mr,           //ℝ
-    Mc,           //ℂ
-    eleof,        //∈
-    member,       //∋
-    neleof,       //∉
-    nmember,      //∌
-    subsetof,     //⊂
-    suprsetof,    //⊃
-    intersection, //∩
-    Munion,       //∪
-
-    // SYMB
-    arwl,
-    arwu,
-    arwr,
-    arwd,
-
-    uxclm,
-    cent,
-    degree,
-    trade,
-    copy,
-    numero,
-    sect,
-    mdot,
-    rang,
-
-    lshade,
-    mshade,
-    dshade,
-
-    fire,
-    water,
-    cleft,
-    baster,
-    neteen,
-    floppy,
-
-    boxemp,
-    boxchk,
-    boxX,
-
-    bbstr,
-    bbstl,
-    bbml,
-    bbmr,
-    bbmb,
-    bbrtr,
-    bbrbr,
-    bbrtl,
-    bbrbl,
-    bbsbr,
-    bbsbl,
-    bbmbr,
-    bbmbl,
-
-    Agrave,
-    Aacute,
-    Acircm,
-    Atilde,
-    Abreve,
-    Adiaer,
-    Adacut,
-
-    // not all ogham letters, as I
-    // actually intend to use them for hex
-    OS,
-    Oa,
-    Ob,
-    Oc,
-    Od,
-    Oe,
-    Of,
-    Og,
-    Oh,
-    Oi,
-    OA,
-    OB,
-    OC,
-    OD,
-    OE,
-    OF,
-    Os,
-    OED,
-    Ox,
-    gnd,
-    sqr,
-    sine,
-    opt,
-
-    geq,
-    leq,
-    brkup,
-    brkdn,
-    perup,
-    perdn,
-
-    // GREEL
-    rone, // 1:: ⅰ
-    rtwo,
-    rthree,
-    rfour,  // 4:: ⅳ
-    rfive,  // 5:: ⅴ
-    rsix,   // 6:: ⅵ
-    rseven, // 7:: ⅶ
-    reight, // 8:: ⅷ
-    rnine,  // 9:: ⅸ
-    rten,   // 0:: ⅹ
-    gq,     // q:: θ
-    gw,     // w:: ω
-    ge,     // e:: ε
-    gr,     // r:: ρ
-    gt,     // t:: τ
-    gy,     // y:: ψ
-    gu,     // u:: υ
-    gi,     // i:: ι
-    go,     // o:: ο
-    gp,     // p:: π
-    ga,     // a:: α
-    gs,     // s:: σ
-    gd,     // d:: δ
-    gf,     // f:: φ
-    gg,     // g:: γ
-    gh,     // h:: η
-    gj,     // j:: ϑ
-    gk,     // k:: κ
-    gl,     // l:: λ
-    gz,     // z:: ζ
-    gx,     // x:: ξ
-    gc,     // c:: χ
-    gv,     // v:: ς
-    gb,     // b:: β
-    gn,     // n:: ν
-    gm,     // m:: μ
-
-    // GREEU
-    Rone,   // 1:: Ⅰ
-    Rtwo,   // 2:: Ⅱ
-    Rthree, // 3:: Ⅲ
-    Rfour,  // 4:: Ⅳ
-    Rfive,  // 5:: Ⅴ
-    Rsix,   // 6:: Ⅵ
-    Rseven, // 7:: Ⅶ
-    Reight, // 8:: Ⅷ
-    Rnine,  // 9:: Ⅸ
-    Rten,
-    Gq, // Q:: Θ
-    Gw, // W:: Ω
-    Ge, // E:: Ε
-    Gr, // R:: Ρ
-    Gt, // T:: Τ
-    Gy, // Y:: Ψ
-    Gu, // U:: Υ
-    Gi, // I:: Ι
-    Go, // O:: Ο
-    Gp, // P:: Π
-    Ga, // A:: Α
-    Gs, // S:: Σ
-    Gd, // D:: Δ
-    Gf, // F:: Φ
-    Gg, // G:: Γ
-    Gh, // H:: Η
-    Gj, // J:: J
-    Gk, // K:: Κ
-    Gl, // L:: Λ
-    Gz, // Z:: Ζ
-    Gx, // X:: Ξ
-    Gc, // C:: Χ
-    Gv, // V:: V
-    Gb, // B:: Β
-    Gn, // N:: Ν
-    Gm, // M:: Μ
-    // ᵃ ᵇ ᶜ ᵈ ᵉ ᶠ ᵍ ʰ ⁱ ʲ ᵏ ˡ ᵐ ⁿ ᵒ ᵖ ʳ ˢ ᵗ ᵘ ᵛ ʷ ˣ ʸ ᶻ ⁰ ¹ ² ³ ⁴ ⁵ ⁶ ⁷ ⁸ ⁹
-    tone,   // 1:: ¹
-    ttwo,   // 2:: ²
-    tthree, // 3:: ³
-    tfour,  // 4:: ⁴
-    tfive,  // 5:: ⁵
-    tsix,   // 6:: ⁶
-    tseven, // 7:: ⁷
-    teight, // 8:: ⁸
-    tnine,  // 9:: ⁹
-    tzero,  // 0 :: ⁰
-    tq,     // Q:: ۹
-    tw,     // W:: ʷ
-    te,     // E:: ᵉ
-    tr,     // R:: ʳ
-    tt,     // T:: ᵗ
-    ty,     // Y:: ʸ
-    tu,     // U:: ᵘ
-    ti,     // I:: ⁱ
-    to,     // O:: ᵒ
-    tp,     // P:: ᵖ
-    ta,     // A:: ᵃ
-    ts,     // S:: ˢ
-    td,     // D:: ᵈ
-    tf,     // F:: ᶠ
-    tg,     // G:: ᵍ
-    th,     // H:: ʰ
-    tj,     // J:: ʲ
-    tk,     // K:: ᵏ
-    tl,     // L:: ˡ
-    tz,     // Z:: ᶻ
-    tx,     // X:: ˣ
-    tc,     // C:: ᶜ
-    tv,     // V:: ᵛ
-    tb,     // B:: ᵇ
-    tn,     // N:: ⁿ
-    tm,     // M:: ᵐ
-    // Fullwitdth - note, these are *not* the monospace unicode code points.
-    // This is done to prevent something eating it and using a weird font, which,
-    // presumably, isn't desired if doing this.
-    fwone,   // 1:: １
-    fwtwo,   // 2:: ２
-    fwthree, // 3:: ３
-    fwfour,  // 4:: ４
-    fwfive,  // 5:: ５
-    fwsix,   // 6:: ６
-    fwseven, // 7:: ７
-    fweight, // 8:: ８
-    fwnine,  // 9:: ９
-    fwzero,  // 0 :: ０
-    fwq,     // Q:: ｑ
-    fww,     // W:: ｗ
-    fwe,     // E:: ｅ
-    fwr,     // R:: ｒ
-    fwt,     // T:: ｔ
-    fwy,     // Y:: ｙ
-    fwu,     // U:: ｕ
-    fwi,     // I:: ｉ
-    fwo,     // O:: ｏ
-    fwp,     // P:: ｐ
-    fwa,     // A:: ａ
-    fws,     // S:: ｓ
-    fwd,     // D:: ｄ
-    fwf,     // F:: ｆ
-    fwg,     // G:: ｇ
-    fwh,     // H:: ｈ
-    fwj,     // J:: ｊ
-    fwk,     // K:: ｋ
-    fwl,     // L:: ｌ
-    fwz,     // Z:: ｚ
-    fwx,     // X:: ｘ
-    fwc,     // C:: ｃ
-    fwv,     // V:: ｖ
-    fwb,     // B:: ｂ
-    fwn,     // N:: ｎ
-    fwm,     // M:: ｍ
-    // Full width caps + fractions, and a few extra symbols that lack a better place
-    Fwone,   // 1:: ¼
-    Fwtwo,   // 2:: ½
-    Fwthree, // 3:: ¾
-    Fwfour,  // 4:: ⅓
-    Fwfive,  // 5:: ⅔
-    Fwsix,   // 6:: ⅕
-    Fwseven, // 7:: ⅛
-    Fweight, // 8:: 𝒳
-    Fwnine,  // 9:: 𝒴
-    Fwzero,  // 0 :: 𝒵
-    Fwq,     // Q:: Ｑ
-    Fww,     // W:: Ｗ
-    Fwe,     // E:: Ｅ
-    Fwr,     // R:: Ｒ
-    Fwt,     // T:: Ｔ
-    Fwy,     // Y:: Ｙ
-    Fwu,     // U:: Ｕ
-    Fwi,     // I:: Ｉ
-    Fwo,     // O:: Ｏ
-    Fwp,     // P:: Ｐ
-    Fwa,     // A:: Ａ
-    Fws,     // S:: Ｓ
-    Fwd,     // D:: Ｄ
-    Fwf,     // F:: Ｆ
-    Fwg,     // G:: Ｇ
-    Fwh,     // H:: Ｈ
-    Fwj,     // J:: Ｊ
-    Fwk,     // K:: Ｋ
-    Fwl,     // L:: Ｌ
-    Fwz,     // Z:: Ｚ
-    Fwx,     // X:: Ｘ
-    Fwc,     // C:: Ｃ
-    Fwv,     // V:: Ｖ
-    Fwb,     // B:: Ｂ
-    Fwn,     // N:: Ｎ
-    Fwm,     // M:: Ｍ
-    nbsp,    // You know what this is &nbsp;
-    ibang,   //‽
-    nullpic, // Null picture - ␀
-};
-
-const uint32_t unicode_map[] PROGMEM = {
-    // MATH
-    [neq]          = 0x2260, //≠
-    [intgrl]       = 0x222B, //∫
-    [angl]         = 0x2220, //∠
-    [imply]        = 0x21D2, //⇒
-    [equiv]        = 0x21D4, //⇔
-    [porp]         = 0x221D, //∝
-    [exists]       = 0x2203, //∃
-    [nexists]      = 0x2204, //∄
-    [forall]       = 0x2200, //∀
-    [and]          = 0x2227, //∧
-    [or]           = 0x2228, //∨
-    [xor]          = 0x2295, //⊕
-    [apeql]        = 0x2245, //≅
-    [root]         = 0x221A, //√
-    [not ]         = 0x00AC, //¬
-    [sum]          = 0x2211, //∑
-    [plsminus]     = 0x00B1, //±
-    [infin]        = 0x221E, //∞
-    [emtyset]      = 0x2205, //∅
-    [Mn]           = 0x2115, //ℕ
-    [Mz]           = 0x2124, //ℤ
-    [Mq]           = 0x211A, //ℚ
-    [Mr]           = 0x211D, //ℝ
-    [Mc]           = 0x2102, //ℂ
-    [eleof]        = 0x2208, //∈
-    [member]       = 0x220B, //∋
-    [neleof]       = 0x2209, //∉
-    [nmember]      = 0x220C, //∌
-    [subsetof]     = 0x2282, //⊂
-    [suprsetof]    = 0x2283, //
-    [intersection] = 0x2229, //∩
-    [Munion]       = 0x222A, //∪
-                             // Symbol
-    [arwl] = 0x2190,         //←
-    [arwu] = 0x2191,         //↑
-    [arwr] = 0x2192,         //→
-    [arwd] = 0x2193,         //↓
-
-    [uxclm]  = 0x00A1, //¡
-    [cent]   = 0x00A2, //¢
-    [degree] = 0x00B0, //°
-    [trade]  = 0x2122, //™
-    [copy]   = 0x00A9, //©
-    [numero] = 0x2116, //№
-    [sect]   = 0x00A7, //§
-    [mdot]   = 0x00B7, //·
-    [rang]   = 0x299C, //⦜
-
-    [lshade] = 0x2591, //░
-    [mshade] = 0x2592, //▒
-    [dshade] = 0x2593, //▓
-
-    [fire]   = 0x1F525, //🔥
-    [water]  = 0x1F322, //🌢
-    [cleft]  = 0x1F12F, //🄯
-    [baster] = 0x1F7BC, //🞼
-    [neteen] = 0x1F51E, //🔞
-    [floppy] = 0x1F5AB, //🖫
-
-    [boxemp] = 0x2610, //☐
-    [boxchk] = 0x2611, //☑
-    [boxX]   = 0x2612, //☒
-
-    [bbstr] = 0x23A1, //⎡
-    [bbstl] = 0x23A4, //⎤
-    [bbml]  = 0x23A8, //⎨
-    [bbmr]  = 0x23AC, //⎬
-    [bbmb]  = 0x23AA, //⎪
-    [bbrtr] = 0x23A7, //⎧
-    [bbrbr] = 0x23A9, //⎩
-    [bbrtl] = 0x23AB, //⎫
-    [bbrbl] = 0x23AD, //⎭
-    [bbsbr] = 0x23A3, //⎣
-    [bbsbl] = 0x23A6, //⎦
-    [bbmbr] = 0x23A5, //⎥
-    [bbmbl] = 0x23A2, //⎢
-
-    [Agrave] = 0x0300, // è //above  [wtf] = 0x1242A, //𒐪
-    [Aacute] = 0x0301, // é //1st
-    [Acircm] = 0x0302, // ê //2nd
-    [Atilde] = 0x0303, // ẽ //5th
-    [Abreve] = 0x0306, // ĕ //4th
-    [Adiaer] = 0x0308, // ë //3rd
-    [Adacut] = 0x030B, // e̋
-
-    // not all ogham letters, as I
-    // actually intend to use them for hex
-    [OS]  = 0x1680, // space
-    [Oa]  = 0x1681, // 1
-    [Ob]  = 0x1682, // 2
-    [Oc]  = 0x1683, // 3
-    [Od]  = 0x1684, // 4
-    [Oe]  = 0x1685, // 5
-    [Of]  = 0x1686, // 6
-    [Og]  = 0x1687, // 7
-    [Oh]  = 0x1688, // 8
-    [Oi]  = 0x1689, // 9
-    [OA]  = 0x168A, // A
-    [OB]  = 0x168B, // B
-    [OC]  = 0x168C, // C
-    [OD]  = 0x168D, // D
-    [OE]  = 0x168E, // E
-    [OF]  = 0x168F, // F
-    [Os]  = 0x169B, // Start
-    [OED] = 0x169C, // End
-    [Ox]  = 0x1695, // X
-
-    [gnd]  = 0x23DA, //⏚
-    [sqr]  = 0x238D, //⎍, actually monostable
-    [sine] = 0x223F, //∿
-    [opt]  = 0x2325, //⌥, actually option used for switch
-
-    [geq]   = 0x2264, //≤
-    [leq]   = 0x2265, //≥
-    [brkup] = 0xFE38, //︸
-    [brkdn] = 0xFE37, //︷
-    [perup] = 0xFE35, //︵
-    [perdn] = 0xFE36, //︶
-    // GREEKL
-    [rone]   = 0x2170, // 1:: ⅰ
-    [rtwo]   = 0x2171, // 2:: ⅱ
-    [rthree] = 0x2172, // 3:: ⅲ
-    [rfour]  = 0x2173, // 4:: ⅳ
-    [rfive]  = 0x2174, // 5:: ⅴ
-    [rsix]   = 0x2175, // 6:: ⅵ
-    [rseven] = 0x2176, // 7:: ⅶ
-    [reight] = 0x2177, // 8:: ⅷ
-    [rnine]  = 0x2178, // 9:: ⅸ
-    [rten]   = 0x2179, // 0:: ⅹ
-    [gq]     = 0x03B8, // q:: θ
-    [gw]     = 0x03C9, // w:: ω
-    [ge]     = 0x03B5, // e:: ε
-    [gr]     = 0x03C1, // r:: ρ
-    [gt]     = 0x03C4, // t:: τ
-    [gy]     = 0x03C8, // y:: ψ
-    [gu]     = 0x03C5, // u:: υ
-    [gi]     = 0x03B9, // i:: ι
-    [go]     = 0x03BF, // o:: ο
-    [gp]     = 0x03C0, // p:: π
-    [ga]     = 0x03B1, // a:: α
-    [gs]     = 0x03C3, // s:: σ
-    [gd]     = 0x03B4, // d:: δ
-    [gf]     = 0x03C6, // f:: φ
-    [gg]     = 0x03B3, // g:: γ
-    [gh]     = 0x03B7, // h:: η
-    [gj]     = 0x03D1, // j:: ϑ
-    [gk]     = 0x03BA, // k:: κ
-    [gl]     = 0x03BB, // l:: λ
-    [gz]     = 0x03B6, // z:: ζ
-    [gx]     = 0x03BE, // x:: ξ
-    [gc]     = 0x03C7, // c:: χ
-    [gv]     = 0x03C2, // v:: ς
-    [gb]     = 0x03B2, // b:: β
-    [gn]     = 0x03BD, // n:: ν
-    [gm]     = 0x03BC, // m:: μ
-                       // GREEKU
-    [Rone]   = 0x2160, // 1:: Ⅰ
-    [Rtwo]   = 0x2161, // 2:: Ⅱ
-    [Rthree] = 0x2162, // 3:: Ⅲ
-    [Rfour]  = 0x2163, // 4:: Ⅳ
-    [Rfive]  = 0x2164, // 5:: Ⅴ
-    [Rsix]   = 0x2165, // 6:: Ⅵ
-    [Rseven] = 0x2166, // 7:: Ⅶ
-    [Reight] = 0x2167, // 8:: Ⅷ
-    [Rnine]  = 0x2168, // 9:: Ⅸ
-    [Rten]   = 0x2169, // 0:: Ⅹ
-    [Gq]     = 0x0398, // Q:: Θ
-    [Gw]     = 0x03A9, // W:: Ω
-    [Ge]     = 0x0395, // E:: Ε
-    [Gr]     = 0x03A1, // R:: Ρ
-    [Gt]     = 0x03A4, // T:: Τ
-    [Gy]     = 0x03A8, // Y:: Ψ
-    [Gu]     = 0x03A5, // U:: Υ
-    [Gi]     = 0x0399, // I:: Ι
-    [Go]     = 0x039F, // O:: Ο
-    [Gp]     = 0x03A0, // P:: Π
-    [Ga]     = 0x0391, // A:: Α
-    [Gs]     = 0x03A3, // S:: Σ
-    [Gd]     = 0x0394, // D:: Δ
-    [Gf]     = 0x03A6, // F:: Φ
-    [Gg]     = 0x0393, // G:: Γ
-    [Gh]     = 0x0397, // H:: Η
-    [Gj]     = 0x004A, // J:: J
-    [Gk]     = 0x039A, // K:: Κ
-    [Gl]     = 0x039B, // L:: Λ
-    [Gz]     = 0x0396, // Z:: Ζ
-    [Gx]     = 0x039E, // X:: Ξ
-    [Gc]     = 0x03A7, // C:: Χ
-    [Gv]     = 0x0056, // V:: V
-    [Gb]     = 0x0392, // B:: Β
-    [Gn]     = 0x039D, // N:: Ν
-    [Gm]     = 0x039C, // M:: Μ
-
-    [tone]   = 0x00B9, // 1:: ¹
-    [ttwo]   = 0x00B2, // 2:: ²
-    [tthree] = 0x00B3, // 3:: ³
-    [tfour]  = 0x2074, // 4:: ⁴
-    [tfive]  = 0x2075, // 5:: ⁵
-    [tsix]   = 0x2076, // 6:: ⁶
-    [tseven] = 0x2077, // 7:: ⁷
-    [teight] = 0x2078, // 8:: ⁸
-    [tnine]  = 0x2079, // 9:: ⁹
-    [tzero]  = 0x2070, // 0 :: ⁰
-    [tq]     = 0x06F9, // Q:: ۹ - superscript q doesn't exist.
-    [tw]     = 0x02B7, // W:: ʷ
-    [te]     = 0x1D49, // E:: ᵉ
-    [tr]     = 0x02B3, // R:: ʳ
-    [tt]     = 0x1D57, // T:: ᵗ
-    [ty]     = 0x02B8, // Y:: ʸ
-    [tu]     = 0x1D58, // U:: ᵘ
-    [ti]     = 0x2071, // I:: ⁱ
-    [to]     = 0x1D52, // O:: ᵒ
-    [tp]     = 0x1D56, // P:: ᵖ
-    [ta]     = 0x1D43, // A:: ᵃ
-    [ts]     = 0x02E2, // S:: ˢ
-    [td]     = 0x1D48, // D:: ᵈ
-    [tf]     = 0x1DA0, // F:: ᶠ
-    [tg]     = 0x1D4D, // G:: ᵍ
-    [th]     = 0x02B0, // H:: ʰ
-    [tj]     = 0x02B2, // J:: ʲ
-    [tk]     = 0x1D4F, // K:: ᵏ
-    [tl]     = 0x02E1, // L:: ˡ
-    [tz]     = 0x1DBB, // Z:: ᶻ
-    [tx]     = 0x02E3, // X:: ˣ
-    [tc]     = 0x1D9C, // C:: ᶜ
-    [tv]     = 0x1D5B, // V:: ᵛ
-    [tb]     = 0x1D47, // B:: ᵇ
-    [tn]     = 0x207F, // N:: ⁿ
-    [tm]     = 0x1D50, // M:: ᵐ
-
-    [fwone]   = 0xFF11, // 1:: １
-    [fwtwo]   = 0xFF12, // 2:: ２
-    [fwthree] = 0xFF13, // 3:: ３
-    [fwfour]  = 0xFF14, // 4:: ４
-    [fwfive]  = 0xFF15, // 5:: ５
-    [fwsix]   = 0xFF16, // 6:: ６
-    [fwseven] = 0xFF17, // 7:: ７
-    [fweight] = 0xFF18, // 8:: ８
-    [fwnine]  = 0xFF19, // 9:: ９
-    [fwzero]  = 0xFF10, // 0 :: ０
-    [fwq]     = 0xFF51, // Q:: ｑ
-    [fww]     = 0xFF57, // W:: ｗ
-    [fwe]     = 0xFF45, // E:: ｅ
-    [fwr]     = 0xFF52, // R:: ｒ
-    [fwt]     = 0xFF54, // T:: ｔ
-    [fwy]     = 0xFF59, // Y:: ｙ
-    [fwu]     = 0xFF55, // U:: ｕ
-    [fwi]     = 0xFF49, // I:: ｉ
-    [fwo]     = 0xFF4F, // O:: ｏ
-    [fwp]     = 0xFF50, // P:: ｐ
-    [fwa]     = 0xFF41, // A:: ａ
-    [fws]     = 0xFF53, // S:: ｓ
-    [fwd]     = 0xFF44, // D:: ｄ
-    [fwf]     = 0xFF46, // F:: ｆ
-    [fwg]     = 0xFF47, // G:: ｇ
-    [fwh]     = 0xFF48, // H:: ｈ
-    [fwj]     = 0xFF4A, // J:: ｊ
-    [fwk]     = 0xFF4B, // K:: ｋ
-    [fwl]     = 0xFF4C, // L:: ｌ
-    [fwz]     = 0xFF5A, // Z:: ｚ
-    [fwx]     = 0xFF58, // X:: ｘ
-    [fwc]     = 0xFF43, // C:: ｃ
-    [fwv]     = 0xFF56, // V:: ｖ
-    [fwb]     = 0xFF42, // B:: ｂ
-    [fwn]     = 0xFF4E, // N:: ｎ
-    [fwm]     = 0xFF4D, // M:: ｍ
-    // Full width caps + fractions, and a few extra symbols that lack a better place
-    [Fwone]   = 0x00BC, // 1:: ¼
-    [Fwtwo]   = 0x00BD, // 2:: ½
-    [Fwthree] = 0x00BE, // 3:: ¾
-    [Fwfour]  = 0x2153, // 4:: ⅓
-    [Fwfive]  = 0x2154, // 5:: ⅔
-    [Fwsix]   = 0x2155, // 6:: ⅕
-    [Fwseven] = 0x215B, // 7:: ⅛
-    [Fweight] = 0x00A0, // 8:: &nbsp
-    [Fwnine]  = 0x203D, // 9:: ibang ‽
-    [Fwzero]  = 0x2400, // 0 :: nullpic ␀
-    [Fwq]     = 0xFF31, // Q:: Ｑ
-    [Fww]     = 0xFF37, // W:: Ｗ
-    [Fwe]     = 0xFF25, // E:: Ｅ
-    [Fwr]     = 0xFF32, // R:: Ｒ
-    [Fwt]     = 0xFF34, // T:: Ｔ
-    [Fwy]     = 0xFF39, // Y:: Ｙ
-    [Fwu]     = 0xFF35, // U:: Ｕ
-    [Fwi]     = 0xFF29, // I:: Ｉ
-    [Fwo]     = 0xFF2F, // O:: Ｏ
-    [Fwp]     = 0xFF30, // P:: Ｐ
-    [Fwa]     = 0xFF21, // A:: Ａ
-    [Fws]     = 0xFF33, // S:: Ｓ
-    [Fwd]     = 0xFF24, // D:: Ｄ
-    [Fwf]     = 0xFF26, // F:: Ｆ
-    [Fwg]     = 0xFF27, // G:: Ｇ
-    [Fwh]     = 0xFF28, // H:: Ｈ
-    [Fwj]     = 0xFF2A, // J:: Ｊ
-    [Fwk]     = 0xFF2B, // K:: Ｋ
-    [Fwl]     = 0xFF2C, // L:: Ｌ
-    [Fwz]     = 0xFF3A, // Z:: Ｚ
-    [Fwx]     = 0xFF38, // X:: Ｘ
-    [Fwc]     = 0xFF23, // C:: Ｃ
-    [Fwv]     = 0xFF36, // V:: Ｖ
-    [Fwb]     = 0xFF22, // B:: Ｂ
-    [Fwn]     = 0xFF2E, // N:: Ｎ
-    [Fwm]     = 0xFF2D, // M:: Ｍ
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    // clang-format off
-
-[BASE] = LAYOUT_ergodox(  // layer 0 : default
-        KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_GRV,
-        KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_BSLS,
-        KC_EQL, KC_A, KC_O, KC_E, KC_U, KC_I,
-        SC_LSPO, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_AMPR,
-        OSL(FNLR), TT(GREL), TT(MATH), KC_UP, KC_DOWN,
-        KC_LBRC, KC_HOME, KC_INS, KC_SPC, KC_LGUI, KC_DEL,
-
-        OSL(FNLR), KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
-        KC_PGUP, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH,
-        KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS,
-        KC_PGDN, KC_B, KC_M, KC_W, KC_V, KC_Z, SC_RSPC,
-        KC_LEFT, KC_RIGHT, KC_RALT, TT(SYMB), TT(QWER),
-        KC_END, KC_RBRC, KC_PSCR, KC_RALT, KC_RCTL, KC_ENT
-),
-
-[FNLR] = LAYOUT_ergodox(
-       // left hand
-       UC_LINX,   KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_NO,
-       UC_WINC,KC_F11, KC_F12, KC_F13,KC_F14, KC_F15,  KC_NO,
-       TO(TINY),KC_F21, KC_F22, KC_F23,KC_F24, MAGIC_TOGGLE_NKRO,
-       TO(FULL),KC_PAUSE,KC_PSCR,KC_SCRL,KC_NO,KC_NO,KC_NO,
-          EE_CLR,TO(BASE),TO(BASE),TO(BASE),TO(BASE),
-                                       KC_NO,KC_NO,
-                                               KC_NO,
-                               KC_NO,KC_NO,KC_NO,
-       // right hand
-       TO(BASE), KC_F6,   KC_F7,  KC_F8,   KC_F9,   KC_F10,  UC_LINX,
-       KC_NO, KC_F16,  KC_F17,KC_F18,   KC_F19,  KC_F20,  UC_WIN,
-                KC_NO, KC_NO,   KC_NO,    KC_NO,    KC_NO, KC_NO,
-       KC_NO, KC_NO, KC_NO,   KC_NO,    KC_NO,    KC_NO, KC_NO,
-                         KC_NO,KC_NO,  KC_NO,    KC_NO,  KC_NO,
-       KC_NO, KC_NO,
-       KC_NO,
-       KC_NO, KC_RCTL, KC_NO
-),
-
-[QWER] = LAYOUT_ergodox(
-        KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_GRV,
-        KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_BSLS,
-        KC_AMPR, KC_A, KC_S, KC_D, KC_F, KC_G,
-        SC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_QUOT,
-        KC_BSLS, KC_LCTL, KC_LGUI, KC_RALT, KC_APP,
-        KC_LBRC, KC_HOME, KC_PGUP, KC_SPC, KC_LSFT, KC_PGDN,
-
-        OSL(FNLR), KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
-        KC_MINS, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_SLSH,
-        KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT,
-        KC_EQL, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SC_RSPC,
-        KC_UP, KC_DOWN, KC_LEFT, KC_RIGHT, TO(BASE),
-        KC_END, KC_INS, KC_DEL, KC_RGHT, KC_ENT, KC_SPC
-),
-
-[MATH] = LAYOUT_ergodox(
-	KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_GRV,
-	KC_TAB,	UM(Mc),	UM(Munion),	UM(arwl),	UM(or),	UM(exists),	KC_BSLS,
-	UM(arwr), UM(root), UM(and), UM(imply), UM(nexists), UM(forall),
-	SC_LSPO,	KC_SCLN,	UM(intgrl),	UM(Mn),	UM(Mz),	UM(member),	UM(arwl),
-	KC_MS_L, TO(BASE), TO(BASE), KC_INS, KC_DEL,
-	KC_LBRC, KC_HOME, KC_UP, KC_SPC, KC_LGUI, KC_DOWN,
-
-	TT(FNLR), KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
-	KC_PGUP, UM(plsminus),	UM(infin),	UM(neleof),	UM(equiv),	UM(Mq),	KC_EQL,
-	UM(sum),	UM(emtyset),	UM(porp),	UM(suprsetof),	UM(not),	UM(neq),
-	KC_PGDN,	UM(subsetof),	UM(intersection),	UM(angl),	UM(nmember),	UM(eleof),	SC_RSPC,
-	KC_RCTL, KC_RALT, KC_APP, TO(BASE), TO(BASE),
-	KC_END, KC_RBRC, KC_LEFT, KC_RGHT, KC_ENT, KC_SPC
-),
-
-[SYMB] = LAYOUT_ergodox(
-	UM(Os), UM(Oa), UM(Ob), UM(Oc), UM(Od), UM(Oe), UM(mdot),
-	UM(boxemp), UM(bbstr), UM(bbrtr), UM(bbrtl), UM(bbstl), UM(degree), UM(brkdn),
-	UM(boxchk), UM(bbmbl), UM(bbml), UM(bbmr), UM(bbmbr), UM(neteen),
-	UM(boxX), UM(bbsbr), UM(bbrbr), UM(bbrbl), UM(bbsbl), UM(uxclm), UM(brkup),
-	UM(floppy), TO(BASE), TO(BASE), UM(arwu), UM(arwd),
-	UM(fire), UM(lshade), UM(mshade), KC_SPC, UM(OS), UM(dshade),
-
-	UM(Ox), UM(Of), UM(Og), UM(Oh), UM(Oi), UM(OA), UM(OB),
-	UM(numero), UM(trade), UM(copy), UM(cleft), UM(cent), UM(OED), UM(OC),
-	UM(Agrave), UM(gnd), UM(sqr), UM(sine), UM(opt), UM(OD),
-	UM(sect), UM(Aacute), UM(Acircm), UM(Adiaer), UM(Abreve), UM(Atilde), UM(OE),
-	UM(arwl), UM(arwr), UM(geq), UM(leq), UM(OF),
-	UM(rang), UM(water), UM(perup), UM(perdn), UM(baster), KC_ENT
-),
-
-[GREL] = LAYOUT_ergodox(
-	KC_ESC, UM(Rone), UM(Rtwo), UM(Rthree), UM(Rfour), UM(Rfive), KC_GRV,
-	KC_TAB, KC_QUOT, KC_COMM, KC_DOT, UM(gp), UM(gy), KC_SLSH,
-	KC_SLSH, UM(ga), UM(go), UM(ge), UM(gu), UM(gi),
-	MO(GREU), KC_SCLN, UM(gq), UM(gj), UM(gk), UM(gx), KC_AMPR,
-	KC_MS_L, TO(BASE), TO(BASE), KC_INS, KC_DEL,
-	KC_LBRC, KC_HOME, KC_UP, KC_SPC, KC_LGUI, KC_DOWN,
-
-	TO(BASE), UM(Rsix), UM(Rseven), UM(Reight), UM(Rnine), UM(Rten), KC_BSPC,
-	KC_PGUP, UM(gf), UM(gg), UM(gc), UM(gr), UM(gl), KC_EQL,
-	UM(gd), UM(gh), UM(gt), UM(gn), UM(gs), KC_MINS,
-	KC_PGDN, UM(gb), UM(gm), UM(gw), UM(gv), UM(gz), MO(GREU),
-	KC_RCTL, KC_RALT, KC_APP, TO(BASE), TO(BASE),
-	KC_END, KC_RBRC, KC_LEFT, KC_RGHT, KC_ENT, KC_SPC
-),
-
-[GREU] = LAYOUT_ergodox(
-	KC_ESC, UM(Rone), UM(Rtwo), UM(Rthree), UM(Rfour), UM(Rfive), KC_GRV,
-	KC_TAB, KC_QUOT, KC_COMM, KC_DOT, UM(Gp), UM(Gy), KC_SLSH,
-	KC_SLSH, UM(Ga), UM(Go), UM(Ge), UM(Gu), UM(Gi),
-	KC_TRNS, KC_SCLN, UM(Gq), UM(Gj), UM(Gk), UM(Gx), KC_AMPR,
-	KC_MS_L, TO(BASE), TO(BASE), KC_INS, KC_DEL,
-	KC_LBRC, KC_HOME, KC_UP, KC_SPC, KC_LGUI, KC_DOWN,
-
-	TO(BASE), UM(Rsix), UM(Rseven), UM(Reight), UM(Rnine), UM(Rten), KC_BSPC,
-	KC_PGUP, UM(Gf), UM(Gg), UM(Gc), UM(Gr), UM(Gl), KC_EQL,
-	UM(Gd), UM(Gh), UM(Gt), UM(Gn), UM(Gs), KC_MINS,
-	KC_PGDN, UM(Gb), UM(Gm), UM(Gw), UM(Gv), UM(Gz), KC_TRNS,
-	KC_RCTL, KC_RALT, KC_APP, TO(BASE), TO(BASE),
-	KC_END, KC_RBRC, KC_LEFT, KC_RGHT, KC_ENT, KC_SPC
-),
-
-[TINY] = LAYOUT_ergodox(
-	KC_ESC, UM(tone), UM(ttwo), UM(tthree), UM(tfour), UM(tfive), KC_GRV,
-	KC_TAB, KC_QUOT, KC_COMM, KC_DOT, UM(tp), UM(ty), KC_SLSH,
-	KC_SLSH, UM(ta), UM(to), UM(te), UM(tu), UM(ti),
-	KC_TRNS, KC_SCLN, UM(tq), UM(tj), UM(tk), UM(tx), KC_AMPR,
-	KC_MS_L, TO(BASE), TO(BASE), KC_INS, KC_DEL,
-	KC_LBRC, KC_HOME, KC_UP, KC_SPC, KC_LGUI, KC_DOWN,
-
-	TO(BASE), UM(tsix), UM(tseven), UM(teight), UM(tnine), UM(tzero), KC_BSPC,
-	KC_PGUP, UM(tf), UM(tg), UM(tc), UM(tr), UM(tl), KC_EQL,
-	UM(td), UM(th), UM(tt), UM(tn), UM(ts), KC_MINS,
-	KC_PGDN, UM(tb), UM(tm), UM(tw), UM(tv), UM(tz), KC_TRNS,
-	KC_RCTL, KC_RALT, KC_APP, TO(BASE), TO(BASE),
-	KC_END, KC_RBRC, KC_LEFT, KC_RGHT, KC_ENT, KC_SPC
-),
-
-[FULL] = LAYOUT_ergodox(
-	KC_ESC, UM(fwone), UM(fwtwo), UM(fwthree), UM(fwfour), UM(fwfive), KC_GRV,
-	KC_TAB, KC_QUOT, KC_COMM, KC_DOT, UM(fwp), UM(fwy), KC_SLSH,
-	KC_SLSH, UM(fwa), UM(fwo), UM(fwe), UM(fwu), UM(fwi),
-	MO(FULU), KC_SCLN, UM(fwq), UM(fwj), UM(fwk), UM(fwx), KC_AMPR,
-	KC_MS_L, TO(BASE), TO(BASE), KC_INS, KC_DEL,
-	KC_LBRC, KC_HOME, KC_UP, KC_SPC, KC_LGUI, KC_DOWN,
-
-	TO(BASE), UM(fwsix), UM(fwseven), UM(fweight), UM(fwnine), UM(fwzero), KC_BSPC,
-	KC_PGUP, UM(fwf), UM(fwg), UM(fwc), UM(fwr), UM(fwl), KC_EQL,
-	UM(fwd), UM(fwh), UM(fwt), UM(fwn), UM(fws), KC_MINS,
-	KC_PGDN, UM(fwb), UM(fwm), UM(fww), UM(fwv), UM(fwz), MO(FULU),
-	KC_RCTL, KC_RALT, KC_APP, TO(BASE), TO(BASE),
-	KC_END, KC_RBRC, KC_LEFT, KC_RGHT, KC_ENT, KC_SPC
-),
-
-[FULU] = LAYOUT_ergodox(
-	KC_ESC, UM(Fwone), UM(Fwtwo), UM(Fwthree), UM(Fwfour), UM(Fwfive), KC_GRV,
-	KC_TAB, KC_QUOT, KC_COMM, KC_DOT, UM(Fwp), UM(Fwy), KC_SLSH,
-	KC_SLSH, UM(Fwa), UM(Fwo), UM(Fwe), UM(Fwu), UM(Fwi),
-	KC_TRNS, KC_SCLN, UM(Fwq), UM(Fwj), UM(Fwk), UM(Fwx), KC_AMPR,
-	KC_MS_L, TO(BASE), TO(BASE), KC_INS, KC_DEL,
-	KC_LBRC, KC_HOME, KC_UP, KC_SPC, KC_LGUI, KC_DOWN,
-
-	TO(BASE), UM(Fwsix), UM(Fwseven), UM(Fweight), UM(Fwnine), UM(Fwzero), KC_BSPC,
-	KC_PGUP, UM(Fwf), UM(Fwg), UM(Fwc), UM(Fwr), UM(Fwl), KC_EQL,
-	UM(Fwd), UM(Fwh), UM(Fwt), UM(Fwn), UM(Fws), KC_MINS,
-	KC_PGDN, UM(Fwb), UM(Fwm), UM(Fww), UM(Fwv), UM(Fwz), KC_TRNS,
-	KC_RCTL, KC_RALT, KC_APP, TO(BASE), TO(BASE),
-	KC_END, KC_RBRC, KC_LEFT, KC_RGHT, KC_ENT, KC_SPC
-),
-
-    // clang-format on
-
-};
-
-// Runs just one time when the keyboard initializes.
-void matrix_init_user(void){
-
-};
-
-// Runs constantly in the background, in a loop.
-void matrix_scan_user(void) {
-    uint8_t layer = get_highest_layer(layer_state);
-
-    ergodox_board_led_off();
-    ergodox_right_led_1_off();
-    ergodox_right_led_2_off();
-    ergodox_right_led_3_off();
-    switch (layer) {
-            // TODO: Make this relevant to the ErgoDox EZ.
-        case 1:
-            ergodox_right_led_1_on();
-            break;
-        case 2:
-            ergodox_right_led_2_on();
-            break;
-        default:
-            // none
-            break;
-    }
-};
diff --git a/keyboards/ktec/ergodone/keymaps/vega/rules.mk b/keyboards/ktec/ergodone/keymaps/vega/rules.mk
deleted file mode 100644
index d4b85472257..00000000000
--- a/keyboards/ktec/ergodone/keymaps/vega/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-UNICODE_ENABLE          = no # Unicode
-UNICODEMAP_ENABLE = yes
diff --git a/keyboards/kumaokobo/kudox/rev1/keymaps/x1/keymap.c b/keyboards/kumaokobo/kudox/rev1/keymaps/x1/keymap.c
deleted file mode 100644
index aef3892f58d..00000000000
--- a/keyboards/kumaokobo/kudox/rev1/keymaps/x1/keymap.c
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright Kumao Kobo <kumaokobo@gmail.com>
-// SPDX-License-Identifier: GPL-2.0+
-
-#include QMK_KEYBOARD_H
-
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-// The underscores don't mean anything - you can have a layer called STUFF or any other name.
-// Layer names don't all need to be of the same length, obviously, and you can also skip them
-// entirely and just use numbers.
-#define _QWERTY 0
-#define _SYMB 1
-#define _NUMB 2
-
-// Shortcut to make keymap more readable
-#define SYM_L   MO(_SYMB)
-#define NUM_L   MO(_NUMB)
-
-#define KC_ALES LALT_T(KC_ESC)
-
-#define KC_RGENT MT(KC_RGUI, KC_ENT)
-#define KC_LGUI2 RALT_T(KC_LNG2)
-
-#define KC_L1SYM LT(_SYMB, KC_LNG1)
-#define KC_L2SYM LT(_SYMB, KC_LNG2)
-
-#define KC_L1NUM LT(_NUMB, KC_LNG1)
-#define KC_ENNUM LT(_NUMB, KC_ENT)
-
-#define KC_FSYM LT(_SYMB, KC_F)
-#define KC_JNUM LT(_NUMB, KC_J)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [_QWERTY] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                                  ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     KC_ESC  ,KC_1    ,KC_2    ,KC_3    ,KC_4    ,KC_5    ,                                   KC_6    ,KC_7    ,KC_8    ,KC_9    ,KC_0    ,KC_BSPC ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_TAB  ,KC_Q    ,KC_W    ,KC_E    ,KC_R    ,KC_T    ,KC_L2SYM,                 KC_Y    ,KC_U    ,KC_I    ,KC_O    ,KC_P    ,KC_SLSH ,KC_BSLS ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┘                └────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_LCTL ,KC_A    ,KC_S    ,KC_D    ,KC_FSYM ,KC_G    ,                                   KC_H    ,KC_JNUM ,KC_K    ,KC_L    ,KC_SCLN ,KC_ENT  ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                                  ├────────┼────────┼────────┼────────┼────────┼────────┤
-     KC_LSFT ,KC_Z    ,KC_X    ,KC_C    ,KC_V    ,KC_B    ,                                   KC_L1NUM,KC_N    ,KC_M    ,KC_COMM ,KC_DOT  ,KC_RSFT ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                ┌────────┼────────┼────────┴────────┼────────┼────────┼────────┤
-     KC_ALES ,KC_QUOT ,KC_MINS ,KC_EQL  ,KC_ENNUM,KC_LGUI ,KC_SPC  ,                 KC_RGENT,KC_DEL  ,SYM_L   ,KC_LEFT ,KC_DOWN ,KC_UP   ,KC_RGHT
-  //└────────┴────────┴────────┴────────┴────────┴────────┴────────┘                └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
-  ),
-
-  [_SYMB] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                                  ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     KC_GRV  ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,                                   KC_F6   ,KC_F7   ,KC_F8   ,KC_F9   ,KC_F10  ,_______ ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,KC_DQUO ,KC_QUOT ,KC_GRV  ,KC_ASTR ,KC_PLUS ,KC_EQL  ,                 KC_LPRN ,KC_RPRN ,KC_PIPE ,KC_ASTR ,KC_TILD ,KC_CIRC ,KC_INT3 ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┘                └────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,KC_AT   ,KC_COLN ,KC_GRV  ,_______ ,KC_MINS ,                                   KC_LBRC ,KC_RBRC ,KC_DOT  ,KC_SLSH ,KC_MINS ,_______ ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                                  ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,XXXXXXX ,XXXXXXX ,XXXXXXX ,KC_DOT  ,KC_SLSH ,                                   _______ ,KC_LCBR ,KC_RCBR ,KC_DOT  ,KC_SLSH ,_______ ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                ┌────────┼────────┼────────┴────────┼────────┼────────┼────────┤
-     _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                 _______ ,_______ ,_______ ,KC_LT   ,KC_UNDS ,KC_CIRC ,KC_GT
-  //└────────┴────────┴────────┴────────┴────────┴────────┴────────┘                └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
-  ),
-
-  [_NUMB] = LAYOUT(
-  //┌────────┬────────┬────────┬────────┬────────┬────────┐                                  ┌────────┬────────┬────────┬────────┬────────┬────────┐
-     KC_GRV  ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,                                   XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,_______ ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,KC_7    ,KC_8    ,KC_9    ,KC_ASTR ,KC_PLUS ,KC_EQL  ,                 XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,_______ ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┘                └────────┼────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,KC_4    ,KC_5    ,KC_6    ,KC_0    ,KC_MINS ,                                   XXXXXXX ,_______ ,XXXXXXX ,XXXXXXX ,XXXXXXX ,_______ ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┤                                  ├────────┼────────┼────────┼────────┼────────┼────────┤
-     _______ ,KC_1    ,KC_2    ,KC_3    ,KC_DOT  ,KC_SLSH ,                                   XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,_______ ,
-  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                ┌────────┼────────┼────────┴────────┼────────┼────────┼────────┤
-     _______ ,KC_INT3 ,KC_0    ,_______ ,_______ ,_______ ,_______ ,                 XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX
-  //└────────┴────────┴────────┴────────┴────────┴────────┴────────┘                └────────┴────────┴────────┴────────┴────────┴────────┴────────┘
-  )
-
-};
diff --git a/keyboards/kumaokobo/kudox/rev1/keymaps/x1/readme.md b/keyboards/kumaokobo/kudox/rev1/keymaps/x1/readme.md
deleted file mode 100644
index 1085735afc5..00000000000
--- a/keyboards/kumaokobo/kudox/rev1/keymaps/x1/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# [x1](https://github.com/x1-) 's keymap for Kudox Keyboard
diff --git a/keyboards/kuro/kuro65/info.json b/keyboards/kuro/kuro65/info.json
index fc89b989d3e..72549735d96 100644
--- a/keyboards/kuro/kuro65/info.json
+++ b/keyboards/kuro/kuro65/info.json
@@ -25,10 +25,6 @@
         "console": false,
         "command": false,
         "nkro": true,
-        "backlight": false,
-        "rgblight": false,
-        "audio": false,
-        "key_lock": false,
         "rgb_matrix": true
     },
     "ws2812": {
diff --git a/keyboards/kuro/kuro65/keymaps/0x544d/keymap.c b/keyboards/kuro/kuro65/keymaps/0x544d/keymap.c
deleted file mode 100644
index bc7986f5578..00000000000
--- a/keyboards/kuro/kuro65/keymaps/0x544d/keymap.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/* Copyright 2023 Tobias Minn (0x544D)
-  *
-  * This program is free software: you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-  * the Free Software Foundation, either version 2 of the License, or
-  * (at your option) any later version.
-  *
-  * This program is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  * GNU General Public License for more details.
-  *
-  * You should have received a copy of the GNU General Public License
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */
-
-#include QMK_KEYBOARD_H
-
-enum layers {
-    BL_WIN,
-    BL_MAC,
-    FN1,
-    FN2
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-   /* ISO 65 layout by 0x544D (ISO German keyboard layout shown)
-   *
-   * ,-----------------------------------------------------------------------------------------------.
-   * | Esc | 1 ! | 2 " | 3 § | 4 $ | 5 % | 6 & | 7 / | 8 ( | 9 ) | 0 = | ß ? | ´ ` | Backspace | Del |
-   * |-----------------------------------------------------------------------------------------------|
-   * | Tab    |  Q  |  W  |  E  |  R  |  T  |  Z  |  U  |  I  |  O  |  P  |  Ü  | + * | Enter  | PgU |
-   * |----------------------------------------------------------------------------------       |-----|
-   * | MO(2)   |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  Ö  |  Ä  | # ' |       | PgD |
-   * |-----------------------------------------------------------------------------------------------|
-   * | Shift | < > |  Y  |  X  |  C  |  V  |  B  |  N  |  M  | , ; | . : | - _ |  Shift  |  Up | Del |
-   * |-----------------------------------------------------------------------------------------------|
-   * | LCtl  | LGUI  | LAlt  |            Space                  |RAlt |MO(1)|RCtl | Lft | Dwn | Rgh |
-   * `-----------------------------------------------------------------------------------------------'
-   */
-    [BL_WIN] = LAYOUT_65_iso(
-        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,  KC_BSPC, KC_DEL,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,  KC_RBRC,          KC_PGUP,
-        MO(3),   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,  KC_BSLS, KC_ENT,  KC_PGDN,
-        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT, KC_UP,   KC_DEL,  
-        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, MO(2),   KC_RCTL,  KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-
-    [BL_MAC] = LAYOUT_65_iso(
-        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,  KC_BSPC, KC_DEL,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,  KC_RBRC,          KC_PGUP,
-        MO(3),   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,  KC_BSLS, KC_ENT,  KC_PGDN,
-        KC_LSFT, KC_GRV,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT, KC_UP,   KC_DEL,  
-        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, MO(2),   KC_RCTL,  KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-
-   /* Funtion Layer 1: Media Controls with arrow keys / RShift (Play Pause), F keys,
-   *                   RGB matrix control
-   * ,-----------------------------------------------------------------------------------------------.
-   * | °^  | F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9  | F10 | F11 | F12 |   Delete  |Home |
-   * |-----------------------------------------------------------------------------------------------|
-   * |        |RGB_T|RGB+ |RGB- |HUE+ |HUE- |SAT+ |SAT- |BGH+ |BGH- |     |     |     |        |Home |
-   * |----------------------------------------------------------------------------------       |-----|
-   * |         |     |     |     |     |     |     |     |     |     |     |     |     |       | End |
-   * |-----------------------------------------------------------------------------------------------|
-   * |       |     |     |     |     |     |     |     |     |     |     |     |  MPlay  |Vol_U| End |
-   * |-----------------------------------------------------------------------------------------------|
-   * |       |       |       |                                   |     |Trans|     | MPrv|Vol_D| MNxt|
-   * `-----------------------------------------------------------------------------------------------'
-   */
-    [FN1] = LAYOUT_65_iso(
-        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,   KC_F12,  KC_DEL,  KC_HOME,
-        KC_NO,   RGB_TOG, RGB_MOD, RGB_RMOD,RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_NO,   KC_NO,    KC_NO,            KC_HOME,
-        KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,    KC_NO,   KC_NO,   KC_END,
-        KC_TRNS, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,    KC_MPLY, KC_VOLU, KC_END,
-        KC_NO,   KC_NO,   KC_NO,                              KC_NO,                     KC_NO,   KC_TRNS, KC_NO,    KC_MPRV, KC_VOLD, KC_MNXT
-    ),
-
-
-   /* Funtion Layer 2: Media Controls left hand, F keys, Page up/down, Home/end, Program/RESET
-   * ,-----------------------------------------------------------------------------------------------.
-   * | °^  | F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9  | F10 | F11 | F12 |   Delete  |Home |
-   * |-----------------------------------------------------------------------------------------------|
-   * |        |     |Vol_D|Vol_U|     |     |     |     |     |     |RESET|     |     |        |Home |
-   * |----------------------------------------------------------------------------------       |-----|
-   * |  Trans  |MPrv |MPlay| MNxt|     |     |     |     |     |     |     |     |     |       | End |
-   * |-----------------------------------------------------------------------------------------------|
-   * |       |     |     |     |     |     |     |     |TG(1)|     |     |     |         |PGUP | End |
-   * |-----------------------------------------------------------------------------------------------|
-   * |       |       |       |                                   |     |     |     | Home|PGDN | End |
-   * `-----------------------------------------------------------------------------------------------'
-   */
-    [FN2] = LAYOUT_65_iso(
-        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,   KC_F12,  KC_DEL,  KC_HOME,
-        KC_NO,   KC_NO,   KC_VOLD, KC_VOLU, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   QK_BOOT, KC_NO,    KC_NO,            KC_HOME,
-        KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,    KC_NO,   KC_NO,   KC_END,
-        KC_TRNS, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   TG(1),   KC_NO,   KC_NO,   KC_NO,    KC_NO,   KC_PGUP, KC_END,
-        KC_NO,   KC_NO,   KC_NO,                              KC_NO,                     KC_NO,   KC_NO,   KC_NO,    KC_HOME, KC_PGDN, KC_END
-    )
-
-};
\ No newline at end of file
diff --git a/keyboards/kuro/kuro65/keymaps/0x544d/rules.mk b/keyboards/kuro/kuro65/keymaps/0x544d/rules.mk
deleted file mode 100644
index 1821917788e..00000000000
--- a/keyboards/kuro/kuro65/keymaps/0x544d/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-VIA_ENABLE = yes            # enable VIA support
\ No newline at end of file
diff --git a/keyboards/kwub/bloop/keymaps/crispyy/keymap.c b/keyboards/kwub/bloop/keymaps/crispyy/keymap.c
deleted file mode 100644
index 1b4f2a3ab40..00000000000
--- a/keyboards/kwub/bloop/keymaps/crispyy/keymap.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright 2021 Kwabena Aduse-Poku (Kwub)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-enum keyboard_layers {
-    _BL = 0,  // Base layer
-    _FL,      // Function
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    // clang-format off
-    [_BL]= LAYOUT_625_split_bs(
-        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
-        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,           KC_VOLU,
-        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,            KC_VOLD,
-        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             MO(_FL), KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT),
-
-    [_FL]= LAYOUT_625_split_bs(
-        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_VOLU,          KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT)
-};
diff --git a/keyboards/labbe/labbeminiv1/keymaps/rgb/config.h b/keyboards/labbe/labbeminiv1/keymaps/rgb/config.h
index 0a7038363d9..087f4d76758 100644
--- a/keyboards/labbe/labbeminiv1/keymaps/rgb/config.h
+++ b/keyboards/labbe/labbeminiv1/keymaps/rgb/config.h
@@ -18,7 +18,7 @@
 // ws2812 options
 #define WS2812_DI_PIN C7 // pin the DI on the ws2812 is hooked-up to
 
-#define RGBLED_NUM 4 // number of LEDs
+#define RGBLIGHT_LED_COUNT 4 // number of LEDs
 #define RGBLIGHT_DEFAULT_MODE 6 // set the rainbow mode
 #define RGBLIGHT_HUE_STEP 12 // units to step when in/decreasing hue
 #define RGBLIGHT_SAT_STEP 25 // units to step when in/decresing saturation
diff --git a/keyboards/labbe/labbeminiv1/keymaps/rgbmatrix/config.h b/keyboards/labbe/labbeminiv1/keymaps/rgbmatrix/config.h
index a06078bce13..3aa0db7e381 100644
--- a/keyboards/labbe/labbeminiv1/keymaps/rgbmatrix/config.h
+++ b/keyboards/labbe/labbeminiv1/keymaps/rgbmatrix/config.h
@@ -17,8 +17,8 @@
 
 // ws2812 options
 #define WS2812_DI_PIN C7 // pin the DI on the ws2812 is hooked-up to
-#define RGBLED_NUM 4 // number of LEDs
-#define RGB_MATRIX_LED_COUNT RGBLED_NUM
+#define RGBLIGHT_LED_COUNT 4 // number of LEDs
+#define RGB_MATRIX_LED_COUNT RGBLIGHT_LED_COUNT
 
 #define RGB_MATRIX_KEYPRESSES
 
diff --git a/keyboards/laneware/raindrop/info.json b/keyboards/laneware/raindrop/info.json
index bc67d437fa3..d1896a41b45 100644
--- a/keyboards/laneware/raindrop/info.json
+++ b/keyboards/laneware/raindrop/info.json
@@ -21,11 +21,7 @@
         "extrakey": true,
         "console": false,
         "command": false,
-        "nkro": true,
-        "backlight": false,
-        "audio": false,
-        "rgblight": false,
-        "sleep_led": false
+        "nkro": true
     },
     "layout_aliases": {
         "LAYOUT_all": "LAYOUT_64_ansi_split_bs"
diff --git a/keyboards/latincompass/latin60rgb/latin60rgb.c b/keyboards/latincompass/latin60rgb/latin60rgb.c
index 95ddc428daa..8a032d76b14 100644
--- a/keyboards/latincompass/latin60rgb/latin60rgb.c
+++ b/keyboards/latincompass/latin60rgb/latin60rgb.c
@@ -17,69 +17,69 @@
 
 #ifdef RGB_MATRIX_ENABLE
 const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
-    { 0, K_13, J_13, L_13 },
-    { 0, K_12, J_12, L_12 },
-    { 0, K_11, J_11, L_11 },
-    { 0, K_10, J_10, L_10 },
-    { 0, K_9,  J_9,  L_9 },
-    { 0, K_8,  J_8,  L_8 },
-    { 0, K_7,  J_7,  L_7 },
-    { 0, K_6,  J_6,  L_6 },
-    { 0, K_5,  J_5,  L_5 },
-    { 0, K_4,  J_4,  L_4 },
-    { 0, K_3,  J_3,  L_3 },
-    { 0, K_2,  J_2,  L_2 },
-    { 0, K_1,  J_1,  L_1 },
+    { 0, SW11_CS13, SW10_CS13, SW12_CS13 },
+    { 0, SW11_CS12, SW10_CS12, SW12_CS12 },
+    { 0, SW11_CS11, SW10_CS11, SW12_CS11 },
+    { 0, SW11_CS10, SW10_CS10, SW12_CS10 },
+    { 0, SW11_CS9,  SW10_CS9,  SW12_CS9 },
+    { 0, SW11_CS8,  SW10_CS8,  SW12_CS8 },
+    { 0, SW11_CS7,  SW10_CS7,  SW12_CS7 },
+    { 0, SW11_CS6,  SW10_CS6,  SW12_CS6 },
+    { 0, SW11_CS5,  SW10_CS5,  SW12_CS5 },
+    { 0, SW11_CS4,  SW10_CS4,  SW12_CS4 },
+    { 0, SW11_CS3,  SW10_CS3,  SW12_CS3 },
+    { 0, SW11_CS2,  SW10_CS2,  SW12_CS2 },
+    { 0, SW11_CS1,  SW10_CS1,  SW12_CS1 },
 
-    { 0, H_16, G_16, I_16 },
-    { 0, H_15, G_15, I_15 },
-    { 0, H_14, G_14, I_14 },
-    { 0, H_13, G_13, I_13 },
-    { 0, H_12, G_12, I_12 },
-    { 0, H_11, G_11, I_11 },
-    { 0, H_10, G_10, I_10 },
-    { 0, H_9,  G_9,  I_9 },
-    { 0, H_8,  G_8,  I_8 },
-    { 0, H_7,  G_7,  I_7 },
-    { 0, H_6,  G_6,  I_6 },
-    { 0, H_5,  G_5,  I_5 },
-    { 0, H_4,  G_4,  I_4 },
-    { 0, H_3,  G_3,  I_3 },
-    { 0, H_2,  G_2,  I_2 },
-    { 0, H_1,  G_1,  I_1 },
+    { 0, SW8_CS16, SW7_CS16, SW9_CS16 },
+    { 0, SW8_CS15, SW7_CS15, SW9_CS15 },
+    { 0, SW8_CS14, SW7_CS14, SW9_CS14 },
+    { 0, SW8_CS13, SW7_CS13, SW9_CS13 },
+    { 0, SW8_CS12, SW7_CS12, SW9_CS12 },
+    { 0, SW8_CS11, SW7_CS11, SW9_CS11 },
+    { 0, SW8_CS10, SW7_CS10, SW9_CS10 },
+    { 0, SW8_CS9,  SW7_CS9,  SW9_CS9 },
+    { 0, SW8_CS8,  SW7_CS8,  SW9_CS8 },
+    { 0, SW8_CS7,  SW7_CS7,  SW9_CS7 },
+    { 0, SW8_CS6,  SW7_CS6,  SW9_CS6 },
+    { 0, SW8_CS5,  SW7_CS5,  SW9_CS5 },
+    { 0, SW8_CS4,  SW7_CS4,  SW9_CS4 },
+    { 0, SW8_CS3,  SW7_CS3,  SW9_CS3 },
+    { 0, SW8_CS2,  SW7_CS2,  SW9_CS2 },
+    { 0, SW8_CS1,  SW7_CS1,  SW9_CS1 },
 
-    { 0, E_16, D_16, F_16 },
-    { 0, E_15, D_15, F_15 },
-    { 0, E_14, D_14, F_14 },
-    { 0, E_13, D_13, F_13 },
-    { 0, E_12, D_12, F_12 },
-    { 0, E_11, D_11, F_11 },
-    { 0, E_10, D_10, F_10 },
-    { 0, E_9,  D_9,  F_9 },
-    { 0, E_8,  D_8,  F_8 },
-    { 0, E_7,  D_7,  F_7 },
-    { 0, E_6,  D_6,  F_6 },
-    { 0, E_5,  D_5,  F_5 },
-    { 0, E_4,  D_4,  F_4 },
-    { 0, E_3,  D_3,  F_3 },
-    { 0, E_2,  D_2,  F_2 },
-    { 0, E_1,  D_1,  F_1 },
+    { 0, SW5_CS16, SW4_CS16, SW6_CS16 },
+    { 0, SW5_CS15, SW4_CS15, SW6_CS15 },
+    { 0, SW5_CS14, SW4_CS14, SW6_CS14 },
+    { 0, SW5_CS13, SW4_CS13, SW6_CS13 },
+    { 0, SW5_CS12, SW4_CS12, SW6_CS12 },
+    { 0, SW5_CS11, SW4_CS11, SW6_CS11 },
+    { 0, SW5_CS10, SW4_CS10, SW6_CS10 },
+    { 0, SW5_CS9,  SW4_CS9,  SW6_CS9 },
+    { 0, SW5_CS8,  SW4_CS8,  SW6_CS8 },
+    { 0, SW5_CS7,  SW4_CS7,  SW6_CS7 },
+    { 0, SW5_CS6,  SW4_CS6,  SW6_CS6 },
+    { 0, SW5_CS5,  SW4_CS5,  SW6_CS5 },
+    { 0, SW5_CS4,  SW4_CS4,  SW6_CS4 },
+    { 0, SW5_CS3,  SW4_CS3,  SW6_CS3 },
+    { 0, SW5_CS2,  SW4_CS2,  SW6_CS2 },
+    { 0, SW5_CS1,  SW4_CS1,  SW6_CS1 },
 
-    { 0, B_16, A_16, C_16 },
-    { 0, B_14, A_14, C_14 },
-    { 0, B_13, A_13, C_13 },
-    { 0, B_12, A_12, C_12 },
-    { 0, B_11, A_11, C_11 },
-    { 0, B_10, A_10, C_10 },
-    { 0, B_9,  A_9,  C_9 },
-    { 0, B_8,  A_8,  C_8 },
-    { 0, B_7,  A_7,  C_7 },
-    { 0, B_6,  A_6,  C_6 },
-    { 0, B_5,  A_5,  C_5 },
-    { 0, B_4,  A_4,  C_4 },
-    { 0, B_3,  A_3,  C_3 },
-    { 0, B_2,  A_2,  C_2 },
-    { 0, B_1,  A_1,  C_1 }
+    { 0, SW2_CS16, SW1_CS16, SW3_CS16 },
+    { 0, SW2_CS14, SW1_CS14, SW3_CS14 },
+    { 0, SW2_CS13, SW1_CS13, SW3_CS13 },
+    { 0, SW2_CS12, SW1_CS12, SW3_CS12 },
+    { 0, SW2_CS11, SW1_CS11, SW3_CS11 },
+    { 0, SW2_CS10, SW1_CS10, SW3_CS10 },
+    { 0, SW2_CS9,  SW1_CS9,  SW3_CS9 },
+    { 0, SW2_CS8,  SW1_CS8,  SW3_CS8 },
+    { 0, SW2_CS7,  SW1_CS7,  SW3_CS7 },
+    { 0, SW2_CS6,  SW1_CS6,  SW3_CS6 },
+    { 0, SW2_CS5,  SW1_CS5,  SW3_CS5 },
+    { 0, SW2_CS4,  SW1_CS4,  SW3_CS4 },
+    { 0, SW2_CS3,  SW1_CS3,  SW3_CS3 },
+    { 0, SW2_CS2,  SW1_CS2,  SW3_CS2 },
+    { 0, SW2_CS1,  SW1_CS1,  SW3_CS1 }
 
 };
 
diff --git a/keyboards/lazydesigners/dimple/staggered/keymaps/oncesavedgaming/keymap.c b/keyboards/lazydesigners/dimple/staggered/keymaps/oncesavedgaming/keymap.c
deleted file mode 100644
index e490d689007..00000000000
--- a/keyboards/lazydesigners/dimple/staggered/keymaps/oncesavedgaming/keymap.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2021 LAZYDESIGNERS
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[0] = LAYOUT(KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, KC_ENT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, RSFT(KC_SLSH), KC_DEL, KC_ESC, KC_LALT, KC_SPC, LT(1,KC_SPC), KC_RALT, KC_RGUI, KC_LCTL),
-	[1] = LAYOUT(KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, QK_BOOT, RGB_SPI, RGB_SPD, RGB_M_P, RGB_M_B, RGB_M_SW, RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, KC_SCLN, KC_NO, KC_LSFT, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_HUI, RGB_HUD, RGB_VAI, RGB_VAD, KC_NO, KC_UP, KC_NO, KC_NO, KC_NO, KC_NO, MO(2), KC_NO, KC_LEFT, KC_DOWN, KC_RGHT),
-	[2] = LAYOUT(KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO)
-};
diff --git a/keyboards/lfkeyboards/lfk78/keymaps/ca178858/keymap.c b/keyboards/lfkeyboards/lfk78/keymaps/ca178858/keymap.c
deleted file mode 100644
index 80e267e4586..00000000000
--- a/keyboards/lfkeyboards/lfk78/keymaps/ca178858/keymap.c
+++ /dev/null
@@ -1,136 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum keymap_layout {
-    VANILLA = 0,  // matches MF68 layout
-    CS_GO,        // 0x08
-    FUNC,         // 0x10
-    SETTINGS,     // 0x20
-};
-
-enum {
-    TD_ESC_FUNC = 0,
-    TD_ESC_CTRL,
-    TD_SPC_SPAM
-};
-
-bool spam_space = false;
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Keymap BASE: (Base Layer) Default Layer
-     * ,---------.  ,------------------------------------------------------------.  ,---------.
-     * |Vol-|Vol+|  |Esc~| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 |  0| - | = |Backspa|  | Ins|PgUp|
-     * |---------|  |------------------------------------------------------------|  |---------|
-     * | F3 | F4 |  |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|     \|  | Del|PgDn|
-     * |---------|  |------------------------------------------------------------|  `---------'
-     * | F5 | F6 |  |Control |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |
-     * |---------|  |------------------------------------------------------------|  ,----.
-     * | F7 | F8 |  |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|  Shift    |  | Up |
-     * |---------|  |-------------------------------------------------------------------------.
-     * | F9 | F10|  |Func|Alt |Cmd |      Space            |Cmd |Alt |Func |    |Lft| Dn |Rig |
-     * `---------'  `------------------------------------------------------'    `-------------'
-     */
-    [VANILLA] = LAYOUT_split_rshift(
-        KC_VOLD, KC_VOLU, QK_GESC,         KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,       KC_BSPC,            LALT(KC_F5), KC_PGUP,
-        KC_F3,   KC_F4,   KC_TAB,          KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,      KC_BSLS,            KC_DEL,      KC_PGDN,
-        KC_F5,   KC_F6,   TD(TD_ESC_FUNC), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,               KC_ENT,
-        KC_F7,   KC_F8,   KC_LSFT,         KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,      MO(CS_GO),          KC_UP,
-        KC_F9,   KC_F10,  KC_LCTL,         KC_LALT, KC_LGUI,                            KC_SPC,                             KC_RGUI, KC_RCTL, MO(FUNC),                KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-
-    [CS_GO] = LAYOUT_split_rshift(
-        _______, _______, QK_GESC,         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______,            _______,     _______,
-        _______, _______, _______,         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______,            _______,     _______,
-        _______, _______, KC_LCTL,         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,               _______,
-        _______, _______, _______,         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                          _______,
-        _______, _______, _______,         _______, _______,                            _______,                            _______, _______, _______,                 _______, _______, _______
-    ),
-
-    /* Keymap FUNCTION: Function Layer
-     * ,---------.  ,-------------------------------------------------------------.  ,---------.
-     * | V- | V+ |  | ` |F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|Delete   |  | Ins|Home|
-     * |---------|  |-------------------------------------------------------------|  |---------|
-     * |    |    |  |Tab  |   |PgU|   |   |   |   |   | Up|   |   |   |   |       |  | Del|End |
-     * |---------|  |-------------------------------------------------------------|  `---------'
-     * |    |    |  |Control|Hme|PgD|End|   |   |   |Lft|Dwn|Rgt|   |   |         |
-     * |---------|  |-------------------------------------------------------------|  ,----.
-     * |    |    |  |Shift   |   |Del|   |   |   |   |Mute|V- |V+ |  |TG(SETTINGS)|  | Up |
-     * |---------|  |--------------------------------------------------------------------------.
-     * |    | F10|  |Func|Win |Alt |        PgD           |Alt |Ctrl |Func |     |Lft| Dn |Rig |
-     * `---------'  `------------------------------------------------------'     `-------------'
-     */
-    [FUNC] = LAYOUT_split_rshift(
-        _______, _______, KC_GRV,          KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,       KC_DEL,             TO(CS_GO),   KC_HOME,
-        _______, _______, XXXXXXX,         KC_PGUP, KC_UP,   KC_PGDN, KC_HOME, XXXXXXX, XXXXXXX, XXXXXXX, KC_UP,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,      XXXXXXX,            _______,     KC_END,
-        _______, _______, _______,         KC_LEFT, KC_DOWN, KC_RGHT, KC_END,  XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX,               XXXXXXX,
-        _______, _______, _______,         XXXXXXX, KC_DEL,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX,          TG(SETTINGS), XXXXXXX,            _______,
-        _______, _______, _______,         _______, _______,                            KC_PGDN,                            _______, _______, _______,                 _______, _______, _______
-    ),
-
-    /* Keymap SETTINGS: Settings Layer
-     * ,---------.  ,-----------------------------------------------------------.  ,-------------.
-     * |    |    |  |FN0 |BL0|BL1|BL2|BL3|   |   |   |   |  |   |BL-|BL+|BL Togl|  |RGB Tog |Val+|
-     * |---------|  |-----------------------------------------------------------|  |-------------|
-     * |    |    |  |Debug|   |   |   |   |   |   |   |   |   |   |   |  |RGBTst|  |RGB Mode|Val-|
-     * |---------|  |-----------------------------------------------------------|  `-------------'
-     * |    |    |  |LayrClr|Hz+|MS+|   |   |   |   |   |   |   |   |   |  RST  |
-     * |---------|  |-----------------------------------------------------------|  ,----.
-     * |    |    |  |ClickTgl|Hz-|MS-|   |   |   |   |   |   |   |   |Layer Clr |  |Hue+|
-     * |---------|  |------------------------------------------------------------------------.
-     * |    |    |  |    |    |    |      Print Debug      |    |    |     |  |Sat-|Hue-|Sat+|
-     * `---------'  `------------------------------------------------------'  `--------------'
-     */
-    [SETTINGS] = LAYOUT_split_rshift(
-        XXXXXXX, XXXXXXX, XXXXXXX,         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DOWN, BL_UP,        BL_TOGG,            RGB_TOG,     RGB_VAI,
-        XXXXXXX, XXXXXXX, DB_TOGG,         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,      XXXXXXX,            RGB_MOD,     RGB_VAD,
-        XXXXXXX, XXXXXXX, XXXXXXX,         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,               QK_BOOT,
-        XXXXXXX, XXXXXXX, XXXXXXX,         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX,      XXXXXXX,            RGB_HUI,
-        XXXXXXX, XXXXXXX, XXXXXXX,         XXXXXXX, XXXXXXX,                            XXXXXXX,                            XXXXXXX, XXXXXXX, XXXXXXX,                 RGB_SAD, RGB_HUD, RGB_SAI
-    )
-};
-
-void tap_space_spam_finished(tap_dance_state_t *state, void *user_data) {
-    if (get_mods() & (MOD_BIT(KC_LGUI))) {
-      return;
-    }
-    if (state->pressed) {
-        spam_space = true;
-    }
-    tap_code(KC_SPC);
-}
-
-void tap_space_spam_reset(tap_dance_state_t *state, void *user_data) {
-    spam_space = false;
-    unregister_code(KC_SPC);
-}
-
-void tap_esc_func_finished(tap_dance_state_t *state, void *user_data) {
-    if (state->pressed) {
-        layer_on(FUNC);
-    } else {
-        tap_code(KC_ESC);
-    }
-}
-
-void tap_esc_func_reset(tap_dance_state_t *state, void *user_data) {
-    layer_off(FUNC);
-}
-
-tap_dance_action_t tap_dance_actions[] = {
-    [TD_ESC_FUNC] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, tap_esc_func_finished, tap_esc_func_reset),
-    [TD_SPC_SPAM] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, tap_space_spam_finished, tap_space_spam_reset),
-};
-
-void matrix_scan_user(void) {
-    if (spam_space && !(get_mods() & (MOD_BIT(KC_LGUI)))) {
-        tap_code(KC_SPC);
-    }
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    if ((layer_state & (1 << CS_GO)) && (keycode == 44)) {
-        if (get_mods() & (MOD_BIT(KC_LGUI))) {
-            return false;
-        }
-    }
-    return true;
-}
diff --git a/keyboards/lfkeyboards/lfk78/keymaps/ca178858/readme.md b/keyboards/lfkeyboards/lfk78/keymaps/ca178858/readme.md
deleted file mode 100644
index 85b7b1a8d28..00000000000
--- a/keyboards/lfkeyboards/lfk78/keymaps/ca178858/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The default keymap for bluepad
diff --git a/keyboards/lfkeyboards/lfk78/keymaps/ca178858/rules.mk b/keyboards/lfkeyboards/lfk78/keymaps/ca178858/rules.mk
deleted file mode 100644
index 732bfcfa8f5..00000000000
--- a/keyboards/lfkeyboards/lfk78/keymaps/ca178858/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-AUDIO_ENABLE = no
-TAP_DANCE_ENABLE = yes
-WATCHDOG_ENABLE = yes		# Resets keyboard if matrix_scan isn't run every 250ms
diff --git a/keyboards/lfkeyboards/lfk87/keymaps/ca178858/keymap.c b/keyboards/lfkeyboards/lfk87/keymaps/ca178858/keymap.c
deleted file mode 100644
index 3be46837c1d..00000000000
--- a/keyboards/lfkeyboards/lfk87/keymaps/ca178858/keymap.c
+++ /dev/null
@@ -1,170 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum keymap_layout {
-    VANILLA = 0,  // matches MF68 layout
-    DEFAULT_WKL,  // 0x02 Function in CapsLock location, gui key disabled
-    DEFAULT_OSX,  // 0x04 Function in CapsLock location, gui/alt swapped for OSX
-    CS_GO,        // 0x08 Function in CapsLock location, gui/alt swapped for OSX
-    FUNC,         // 0x10
-    SETTINGS,     // 0x20
-};
-
-enum {
-    TD_ESC_FUNC = 0,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Keymap VANILLA: (Base Layer) Default Layer
-     * ,-----------------------------------------------------------------------------.
-     * |Esc  |f1| f2| f3| f4|  | f5| f6| f7| f8|   | f9|f10|f11|f12|  |Prnt|ScLk|Paus|
-     * |-----------------------------------------------------------|  |--------------|
-     * | ~ | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 |  0| - | = |Backsp |  | Ins|Home|PgUp|
-     * |-----------------------------------------------------------|  |--------------|
-     * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|    \|  | Del| End|PgDn|
-     * |-----------------------------------------------------------|  `--------------'
-     * |CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |
-     * |-----------------------------------------------------------|        ,----.
-     * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift     |        | Up |
-     * |-----------------------------------------------------------|   ,-------------.
-     * |Ctrl|Gui |Alt |      Space            |ALT |GUI |CTRL |Func|   |Lft| Dn |Rig |
-     * `-----------------------------------------------------------'   `-------------'
-     */
-    [VANILLA] = LAYOUT_tkl_ansi(
-        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_0,    KC_1,     KC_2,              KC_3,    KC_4,    KC_5,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,           KC_INS,  KC_HOME, KC_PGUP,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,  KC_BSLS,           KC_DEL,  KC_END,  KC_PGDN,
-        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,           KC_ENT,
-        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,                    KC_RSFT,                    KC_UP,
-        KC_LCTL, KC_LALT, KC_LGUI,                            KC_SPC,                             KC_RGUI, KC_RCTL, MO(FUNC), MO(SETTINGS),      KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-
-    /* Keymap DEFAULT_TKL: (Base Layer) Default Layer
-     * ,-----------------------------------------------------------------------------.
-     * |Esc  |f1| f2| f3| f4|  | f5| f6| f7| f8|   | f9|f10|f11|f12|  |Prnt|ScLk|Paus|
-     * |-----------------------------------------------------------|  |--------------|
-     * | ~ | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 |  0| - | = |Backsp |  | Ins|Home|PgUp|
-     * |-----------------------------------------------------------|  |--------------|
-     * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|    \|  | Del| End|PgDn|
-     * |-----------------------------------------------------------|  `--------------'
-     * |CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |
-     * |-----------------------------------------------------------|       ,----.
-     * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift     |       | Up |
-     * |-----------------------------------------------------------|   ,-------------.
-     * |Ctrl|    |Alt |      Space            |ALT |    |CTRL |Func|   |Lft| Dn |Rig |
-     * `-----------------------------------------------------------'   `-------------'
-     */
-    [DEFAULT_WKL] = LAYOUT_tkl_ansi(
-        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,        KC_PSCR, KC_SCRL, KC_PAUS,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,       KC_INS,  KC_HOME, KC_PGUP,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,       KC_DEL,  KC_END,  KC_PGDN,
-        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
-        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,                   KC_RSFT,                KC_UP,
-        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_RCTL, MO(FUNC),      KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-
-    /* Keymap DEFAULT_OSX: (Base Layer) Default Layer
-     * ,-----------------------------------------------------------------------------.
-     * |Esc  |f1| f2| f3| f4|  | f5| f6| f7| f8|   | f9|f10|f11|f12|  |Prnt|ScLk|Paus|
-     * |-----------------------------------------------------------|  |--------------|
-     * | ~ | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 |  0| - | = |Backsp |  | Ins|Home|PgUp|
-     * |-----------------------------------------------------------|  |--------------|
-     * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|    \|  | Del| End|PgDn|
-     * |-----------------------------------------------------------|  `--------------'
-     * |CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |
-     * |-----------------------------------------------------------|        ,----.
-     * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift     |        | Up |
-     * |-----------------------------------------------------------|   ,-------------.
-     * |Ctrl| Opt |Cmd |      Space           |Cmd |Opt |CTRL |Func|   |Lft| Dn |Rig |
-     * `-----------------------------------------------------------'   `-------------'
-     */
-    [DEFAULT_OSX] = LAYOUT_tkl_ansi(
-        KC_ESC,                   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,   KC_F12,             KC_SCRL, KC_PAUS, LALT(KC_F5),
-        KC_GRV,          KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,            KC_INS,  KC_HOME, KC_PGUP,
-        KC_TAB,          KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,  KC_BSLS,            KC_DEL,  KC_END,  KC_PGDN,
-        TD(TD_ESC_FUNC), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,           KC_ENT,
-        KC_LSFT,         KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,                    KC_RSFT,                     KC_UP,
-        KC_LCTL,         KC_LALT, KC_LGUI,                            KC_SPC,                             KC_RGUI, KC_RCTL, MO(FUNC), MO(SETTINGS),       KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-
-    [CS_GO] = LAYOUT_tkl_ansi(
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______, _______, _______,
-        KC_LCTL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,               _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______, _______,      _______, _______, _______
-    ),
-
-    /* Keymap FUNCTION: Function Layer
-     * ,-------------------------------------------------------------.  ,--------------.
-     * |Esc  |f1| f2| f3| f4|  | f5| f6| f7| f8|   | f9|f10|f11|f12  |  |Prnt|ScLk|Paus|
-     * |-------------------------------------------------------------|  |--------------|
-     * | ` |F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|Delete   |  |    |    |    |
-     * |-------------------------------------------------------------|  |--------------|
-     * |Tab  |   |PgU|   |   |   |   |   | Up|   |   |   |   |       |  |    |    |    |
-     * |-------------------------------------------------------------|  `--------------'
-     * |Control|Hme|PgD|End|   |   |   |Lft|Dwn|Rgt|   |   |         |
-     * |-------------------------------------------------------------|       ,----.
-     * |Shift   |   |Del|   |   |   |   |Mute|V- |V+ |  |TG(SETTINGS)|       | Up |
-     * |-------------------------------------------------------------'   ,-------------.
-     * |Func|Win |Alt |        PgD           |Alt |Ctrl |Func |          |Lft| Dn |Rig |
-     * `------------------------------------------------------'          `-------------'
-     */
-    [FUNC] = LAYOUT_tkl_ansi(
-        KC_ESC,           _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,           KC_PSCR,   KC_SCRL, KC_PAUS,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,            TO(CS_GO), _______, _______,
-        XXXXXXX, KC_PGUP, KC_UP,   KC_PGDN, KC_HOME, XXXXXXX, XXXXXXX, XXXXXXX, KC_UP,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,           _______,   _______, _______,
-        _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_END,  XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX,          XXXXXXX,
-        _______, XXXXXXX, KC_DEL,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX,                   TG(SETTINGS),                 _______,
-        _______, _______, _______,                            KC_PGDN,                            _______, _______, _______, _______,             _______, _______, _______
-    ),
-
-    /* Keymap SETTINGS: Settings Layer
-     * ,-----------------------------------------------------------.     ,-------------.
-     * |Esc  |f1| f2| f3| f4|  | f5| f6| f7| f8|   | f9|f10|f11|f12  |  |Prnt|ScLk|Paus|
-     * |-------------------------------------------------------------|  |--------------|
-     * |LayClr|   |   |   |   |   |   |   |   |  |   |BL-|BL+|BL Togl|    |RGB Tog |Val+|
-     * |-----------------------------------------------------------|    |-------------|
-     * |Debug|   |   |   |   |   |   |   |   |   |   |   |  |LEDTst|    |RGB Mode|Val-|
-     * |-----------------------------------------------------------|    `-------------'
-     * |AU_TOGG|Hz+|MS+|   |   |   |   |   |   |   |   |   |  RST  |
-     * |-----------------------------------------------------------|  ,----.
-     * |ClickTgl|Hz-|MS-|   |   |   |   |   |   |   |   |Layer Clr |  |Hue+|
-     * |------------------------------------------------------------------------.
-     * |    |    |    |      Print Debug      |    |    |     |  |Sat-|Hue-|Sat+|
-     * `------------------------------------------------------'  `--------------'
-     */
-    [SETTINGS] = LAYOUT_tkl_ansi(
-        XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DOWN,      XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DOWN, BL_UP,   BL_TOGG,      RGB_TOG, RGB_VAI, XXXXXXX,
-        MU_NEXT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,      RGB_MOD, RGB_VAD, XXXXXXX,
-        AU_TOGG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          QK_BOOT,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MU_TOGG, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX,               RGB_HUI,
-        XXXXXXX, XXXXXXX, XXXXXXX,                            XXXXXXX,                            XXXXXXX, XXXXXXX, XXXXXXX, _______,      RGB_SAD, RGB_HUD, RGB_SAI
-    )
-};
-
-void tap_esc_func_finished(tap_dance_state_t *state, void *user_data) {
-    if (state->pressed) {
-        layer_on(FUNC);
-    } else {
-        tap_code(KC_ESC);
-    }
-}
-
-void tap_esc_func_reset(tap_dance_state_t *state, void *user_data) {
-    layer_off(FUNC);
-}
-
-tap_dance_action_t tap_dance_actions[] = {
-    [TD_ESC_FUNC] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, tap_esc_func_finished, tap_esc_func_reset),
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    if ((layer_state & (1 << CS_GO)) && (keycode == 44)) {
-        if (get_mods() & (MOD_BIT(KC_LGUI))) {
-            return false;
-        }
-    }
-    return true;
-}
diff --git a/keyboards/lfkeyboards/lfk87/keymaps/ca178858/readme.md b/keyboards/lfkeyboards/lfk87/keymaps/ca178858/readme.md
deleted file mode 100644
index 56742f3b282..00000000000
--- a/keyboards/lfkeyboards/lfk87/keymaps/ca178858/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The default keymap for LFK87
diff --git a/keyboards/lfkeyboards/lfk87/keymaps/ca178858/rules.mk b/keyboards/lfkeyboards/lfk87/keymaps/ca178858/rules.mk
deleted file mode 100644
index eb12c33f4a3..00000000000
--- a/keyboards/lfkeyboards/lfk87/keymaps/ca178858/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-TAP_DANCE_ENABLE = yes
-WATCHDOG_ENABLE = yes		# Resets keyboard if matrix_scan isn't run every 250ms
diff --git a/keyboards/lfkeyboards/lfk87/keymaps/gbchk/keymap.c b/keyboards/lfkeyboards/lfk87/keymaps/gbchk/keymap.c
deleted file mode 100644
index 0191b3570fe..00000000000
--- a/keyboards/lfkeyboards/lfk87/keymaps/gbchk/keymap.c
+++ /dev/null
@@ -1,89 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum keymap_layout {
-    VANILLA = 0,  // matches MF68 layout
-    FUNC,         // 0x08
-    SETTINGS,     // 0x10
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Keymap VANILLA: (Base Layer) Default Layer
-     * ,-----------------------------------------------------------------------------.
-     * |Esc  |f1| f2| f3| f4|  | f5| f6| f7| f8|   | f9|f10|f11|f12|  |Prnt|ScLk|Paus|
-     * |-----------------------------------------------------------|  |--------------|
-     * | ~ | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 |  0| - | = |Backsp |  | Ins|Home|PgUp|
-     * |-----------------------------------------------------------|  |--------------|
-     * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|    \|  | Del| End|PgDn|
-     * |-----------------------------------------------------------|  `--------------'
-     * |CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |
-     * |-----------------------------------------------------------|        ,----.
-     * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift     |        | Up |
-     * |-----------------------------------------------------------|   ,-------------.
-     * |Ctrl|Gui |Alt |      Space            |ALT |GUI |Func|CTRL |   |Lft| Dn |Rig |
-     * `-----------------------------------------------------------'   `-------------'
-     */
-    [VANILLA] = LAYOUT_tkl_ansi(
-        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   LGUI(KC_D), KC_F6,   KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD,  KC_VOLU,      KC_PSCR, KC_SCRL, KC_PAUS,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,       KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,      KC_INS,  KC_HOME, KC_PGUP,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,       KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,  KC_BSLS,      KC_DEL,  KC_END,  KC_PGDN,
-        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,       KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,           KC_ENT,
-        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,       KC_M,    KC_COMM, KC_DOT,  KC_SLSH,                    KC_RSFT,               KC_UP,
-        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                KC_RALT, KC_RGUI, MO(FUNC), KC_RCTL,      KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-
-    /* Keymap FUNCTION: Function Layer
-     * ,-------------------------------------------------------------.  ,--------------.
-     * |Esc  |f1| f2| f3| f4|  | f5| f6| f7| f8|   | f9|f10|f11|f12  |  |Prnt|ScLk|Paus|
-     * |-------------------------------------------------------------|  |--------------|
-     * | ` |F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|Delete   |  |    |    |    |
-     * |-------------------------------------------------------------|  |--------------|
-     * |Tab  |   |PgU|   |   |   |   |   | Up|   |   |   |   |       |  |    |    |    |
-     * |-------------------------------------------------------------|  `--------------'
-     * |Control|Hme|PgD|End|   |   |   |Lft|Dwn|Rgt|   |   |         |
-     * |-------------------------------------------------------------|       ,----.
-     * |Shift   |   |Del|   |   |   |   |Mute|V- |V+ |  |TG(SETTINGS)|       | Up |
-     * |-------------------------------------------------------------'   ,-------------.
-     * |Func|Win |Alt |        PgD           |Alt |Ctrl |Func |          |Lft| Dn |Rig |
-     * `------------------------------------------------------'          `-------------'
-     */
-    [FUNC] = LAYOUT_tkl_ansi(
-        KC_ESC,           _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,           KC_PSCR, KC_SCRL, KC_PAUS,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,            _______, _______, _______,
-        XXXXXXX, XXXXXXX, KC_PGUP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_UP,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,           _______, _______, _______,
-        _______, KC_HOME, KC_PGDN, KC_END,  XXXXXXX, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX,          XXXXXXX,
-        _______, XXXXXXX, KC_DEL,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX,                   TG(SETTINGS),               _______,
-        _______, _______, _______,                            KC_PGDN,                            _______, _______, _______, _______,           _______, _______, _______
-    ),
-
-    /* Keymap SETTINGS: Settings Layer
-     * ,-----------------------------------------------------------.     ,-------------.
-     * |Esc  |f1| f2| f3| f4|  | f5| f6| f7| f8|   | f9|f10|f11|f12  |  |Prnt|ScLk|Paus|
-     * |-------------------------------------------------------------|  |--------------|
-     * |FN0 |   |   |   |   |   |   |   |   |  |   |BL-|BL+|BL Togl|    |RGB Tog |Val+|
-     * |-----------------------------------------------------------|    |-------------|
-     * |MuMode|   |   |   |   |   |   |   |   |   |   |   |  |LEDTst|    |RGB Mode|Val-|
-     * |-----------------------------------------------------------|    `-------------'
-     * |AudTgl |Hz+|MS+|   |   |   |   |   |   |   |   |   |  RST  |
-     * |-----------------------------------------------------------|      ,----.
-     * |ClickTgl|Hz-|MS-|   |   |   |   |   |   |   |   |Layer Clr |      |Hue+|
-     * |--------------------------------------------------------------------------.
-     * |    |    |    |                       |    |    |    |     | |Sat-|Hue-|Sat+|
-     * `----------------------------------------------------------------------------'
-     */
-    [SETTINGS] = LAYOUT_tkl_ansi(
-        XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DOWN,      XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DOWN, BL_UP,   BL_TOGG,      RGB_TOG, RGB_VAI, XXXXXXX,
-        MU_NEXT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,      RGB_MOD, RGB_VAD, XXXXXXX,
-        AU_TOGG, KC_F1,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          QK_BOOT,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MU_TOGG, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX,               RGB_HUI,
-        XXXXXXX, XXXXXXX, XXXXXXX,                            XXXXXXX,                            XXXXXXX, XXXXXXX, XXXXXXX, _______,      RGB_SAD, RGB_HUD, RGB_SAI
-    )
-};
-
-void matrix_init_user(void) {
-    // This keymap only has a single base layer, so reset the default if needed
-    if (eeconfig_read_default_layer() > 1) {
-        eeconfig_update_default_layer(1);
-        default_layer_set(1);
-    }
-}
diff --git a/keyboards/lfkeyboards/lfk87/keymaps/gbchk/rules.mk b/keyboards/lfkeyboards/lfk87/keymaps/gbchk/rules.mk
deleted file mode 100644
index bcd6b23d237..00000000000
--- a/keyboards/lfkeyboards/lfk87/keymaps/gbchk/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-WATCHDOG_ENABLE = no		# Resets keyboard if matrix_scan isn't run every 250ms
diff --git a/keyboards/lfkeyboards/lfkpad/keymaps/pascalpfeil/keymap.c b/keyboards/lfkeyboards/lfkpad/keymaps/pascalpfeil/keymap.c
deleted file mode 100644
index 466adfea476..00000000000
--- a/keyboards/lfkeyboards/lfkpad/keymaps/pascalpfeil/keymap.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/* Copyright 2021 Pascal Pfeil
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT_numpad_6x4(
-        KC_ESC,  KC_TAB,  KC_BSPC, MO(1),
-        KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
-        KC_P7,   KC_P8,   KC_P9,
-        KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
-        KC_P1,   KC_P2,   KC_P3,
-            KC_P0,        KC_PDOT, KC_PENT
-    ),
-
-    /* RGB */
-    [1] = LAYOUT_numpad_6x4(
-        RGB_SAI, RGB_VAI, RGB_HUI, _______,
-        RGB_SAD, RGB_VAD, RGB_HUD, QK_BOOT,
-        RGB_M_X, RGB_M_G, RGB_MOD,
-        RGB_M_SW,RGB_M_SN,RGB_M_K, RGB_RMOD,
-        RGB_M_P, RGB_M_B, RGB_M_R,
-            XXXXXXX,      XXXXXXX, RGB_TOG
-    ),
-
-    /* VIA wants four keymaps */
-    [2] = LAYOUT_numpad_6x4(
-        _______, _______, _______, _______,
-        _______, _______, _______, _______,
-        _______, _______, _______,
-        _______, _______, _______, _______,
-        _______, _______, _______,
-            _______,      _______, _______
-    ),
-
-    /* VIA wants four keymaps */
-    [3] = LAYOUT_numpad_6x4(
-        _______, _______, _______, _______,
-        _______, _______, _______, _______,
-        _______, _______, _______,
-        _______, _______, _______, _______,
-        _______, _______, _______,
-            _______,      _______, _______
-    ),
-};
diff --git a/keyboards/lfkeyboards/lfkpad/keymaps/pascalpfeil/rules.mk b/keyboards/lfkeyboards/lfkpad/keymaps/pascalpfeil/rules.mk
deleted file mode 100644
index 36b7ba9cbc9..00000000000
--- a/keyboards/lfkeyboards/lfkpad/keymaps/pascalpfeil/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-VIA_ENABLE = yes
-LTO_ENABLE = yes
diff --git a/keyboards/lfkeyboards/mini1800/keymaps/ca178858/keymap.c b/keyboards/lfkeyboards/mini1800/keymaps/ca178858/keymap.c
deleted file mode 100644
index 9e3927f5457..00000000000
--- a/keyboards/lfkeyboards/mini1800/keymaps/ca178858/keymap.c
+++ /dev/null
@@ -1,108 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum keymap_layout {
-    VANILLA = 0,  // matches MF68 layout
-    FUNC,         // 0x08
-    SETTINGS,     // 0x10
-};
-
-enum {
-    TD_ESC_FUNC = 0,
-    TD_ESC_CTRL,
-    TD_SPC_SPAM
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Keymap VANILLA: (Base Layer) Default Layer
-     * ,-----------------------------------------------------------------------------.
-     * |Esc  |f1| f2| f3| f4|  | f5| f6| f7| f8|   | f9|f10|f11|f12|  |Prnt|ScLk|Paus|
-     * |-----------------------------------------------------------|  |--------------|
-     * | ~ | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 |  0| - | = |Backsp |  | Ins|Home|PgUp|
-     * |-----------------------------------------------------------|  |--------------|
-     * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|    \|  | Del| End|PgDn|
-     * |-----------------------------------------------------------|  `--------------'
-     * |CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |
-     * |-----------------------------------------------------------|        ,----.
-     * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift     |        | Up |
-     * |-----------------------------------------------------------|   ,-------------.
-     * |Ctrl|Gui |Alt |      Space            |ALT |GUI |Func|CTRL |   |Lft| Dn |Rig |
-     * `-----------------------------------------------------------'   `-------------'
-     */
-    [VANILLA] = LAYOUT(
-        QK_GESC,         KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,                  KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
-        KC_TAB,          KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,  KC_BSLS,                  KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
-        TD(TD_ESC_FUNC), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,           KC_ENT,                   KC_P4,   KC_P5,   KC_P6,   LALT(KC_F5),
-        KC_LSFT,         KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,                    KC_RSFT,     KC_UP,       KC_P1,   KC_P2,   KC_P3,   KC_PENT,
-        KC_LCTL,         KC_LALT, KC_LGUI,                            KC_SPC,                             KC_RGUI, KC_RCTL, MO(FUNC),     KC_LEFT, KC_DOWN, KC_RGHT,     KC_P0,   KC_PDOT
-    ),
-
-    /* Keymap FUNCTION: Function Layer
-     * ,-------------------------------------------------------------.  ,--------------.
-     * |Esc  |f1| f2| f3| f4|  | f5| f6| f7| f8|   | f9|f10|f11|f12  |  |Prnt|ScLk|Paus|
-     * |-------------------------------------------------------------|  |--------------|
-     * | ` |F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|Delete   |  |    |    |    |
-     * |-------------------------------------------------------------|  |--------------|
-     * |Tab  |   |PgU|   |   |   |   |   | Up|   |   |   |   |       |  |    |    |    |
-     * |-------------------------------------------------------------|  `--------------'
-     * |Control|Hme|PgD|End|   |   |   |Lft|Dwn|Rgt|   |   |         |
-     * |-------------------------------------------------------------|       ,----.
-     * |Shift   |   |Del|   |   |   |   |Mute|V- |V+ |  |TG(SETTINGS)|       | Up |
-     * |-------------------------------------------------------------'   ,-------------.
-     * |Func|Win |Alt |        PgD           |Alt |Ctrl |Func |          |Lft| Dn |Rig |
-     * `------------------------------------------------------'          `-------------'
-     */
-    [FUNC] = LAYOUT(
-        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,                        _______, _______, _______, _______,
-        XXXXXXX, KC_HOME, KC_UP,   KC_END,  KC_PGUP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                       _______, _______, _______, _______,
-        _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, XXXXXXX, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, XXXXXXX, XXXXXXX,          XXXXXXX,                       _______, _______, _______, _______,
-        _______, XXXXXXX, KC_DEL,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX,                   TG(SETTINGS),     _______,     _______, _______, _______, _______,
-        _______, _______, _______,                            KC_PGDN,                            _______, _______, _______,          _______, _______, _______,     _______, _______
-    ),
-
-    /* Keymap SETTINGS: Settings Layer
-     * ,-----------------------------------------------------------.     ,-------------.
-     * |Esc  |f1| f2| f3| f4|  | f5| f6| f7| f8|   | f9|f10|f11|f12  |  |Prnt|ScLk|Paus|
-     * |-------------------------------------------------------------|  |--------------|
-     * |FN0 |   |   |   |   |   |   |   |   |  |   |BL-|BL+|BL Togl|    |RGB Tog |Val+|
-     * |-----------------------------------------------------------|    |-------------|
-     * |MuMode|   |   |   |   |   |   |   |   |   |   |   |  |LEDTst|    |RGB Mode|Val-|
-     * |-----------------------------------------------------------|    `-------------'
-     * |AudTgl |Hz+|MS+|   |   |   |   |   |   |   |   |   |  RST  |
-     * |-----------------------------------------------------------|      ,----.
-     * |ClickTgl|Hz-|MS-|   |   |   |   |   |   |   |   |Layer Clr |      |Hue+|
-     * |--------------------------------------------------------------------------.
-     * |    |    |    |                       |    |    |    |     | |Sat-|Hue-|Sat+|
-     * `----------------------------------------------------------------------------'
-     */
-    [SETTINGS] = LAYOUT(
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DOWN, BL_UP,   BL_TOGG,                  RGB_TOG, RGB_VAI, XXXXXXX, XXXXXXX,
-        MU_NEXT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                  RGB_MOD, RGB_VAD, XXXXXXX, XXXXXXX,
-        AU_TOGG, KC_F1,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          QK_BOOT,                  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MU_TOGG, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX,     RGB_HUI,     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        XXXXXXX, XXXXXXX, XXXXXXX,                            XXXXXXX,                            XXXXXXX, XXXXXXX, XXXXXXX,     RGB_SAD, RGB_HUD, RGB_SAI,     XXXXXXX, XXXXXXX
-    )
-};
-
-void tap_esc_func_finished(tap_dance_state_t *state, void *user_data) {
-    if (state->pressed) {
-        layer_on(FUNC);
-    } else {
-        tap_code(KC_ESC);
-    }
-}
-
-void tap_esc_func_reset(tap_dance_state_t *state, void *user_data) {
-    layer_off(FUNC);
-}
-
-tap_dance_action_t tap_dance_actions[] = {
-    [TD_ESC_FUNC] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, tap_esc_func_finished, tap_esc_func_reset),
-};
-
-void matrix_init_user(void) {
-    // This keymap only has a single base layer, so reset the default if needed
-    if (eeconfig_read_default_layer() > 1) {
-        eeconfig_update_default_layer(1);
-        default_layer_set(1);
-    }
-}
diff --git a/keyboards/lfkeyboards/mini1800/keymaps/ca178858/rules.mk b/keyboards/lfkeyboards/mini1800/keymaps/ca178858/rules.mk
deleted file mode 100644
index e5ddcae8d92..00000000000
--- a/keyboards/lfkeyboards/mini1800/keymaps/ca178858/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-TAP_DANCE_ENABLE = yes
diff --git a/keyboards/linworks/fave84h/info.json b/keyboards/linworks/fave84h/info.json
index 11ef16f2a34..1ca6cb911ab 100644
--- a/keyboards/linworks/fave84h/info.json
+++ b/keyboards/linworks/fave84h/info.json
@@ -12,8 +12,7 @@
         "extrakey": true,
         "mousekey": true,
         "nkro": true,
-        "rgb_matrix": true,
-        "rgblight": false
+        "rgb_matrix": true
     },
     "ws2812": {
         "pin": "D2"
diff --git a/keyboards/linworks/whale75/config.h b/keyboards/linworks/whale75/config.h
index 629c1dcf701..84b3c45cd91 100644
--- a/keyboards/linworks/whale75/config.h
+++ b/keyboards/linworks/whale75/config.h
@@ -24,5 +24,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #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 WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM7
+#define WS2812_PWM_DMA_CHANNEL 7
diff --git a/keyboards/loki65/config.h b/keyboards/loki65/config.h
index 3627f4c7e6d..ac6b9f5ceb7 100644
--- a/keyboards/loki65/config.h
+++ b/keyboards/loki65/config.h
@@ -24,6 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define WS2812_PWM_DRIVER PWMD1
 #define WS2812_PWM_CHANNEL 2
 #define WS2812_PWM_PAL_MODE 2
-#define WS2812_DMA_STREAM STM32_DMA1_STREAM5
-#define WS2812_DMA_CHANNEL 5
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM5
+#define WS2812_PWM_DMA_CHANNEL 5
 #define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_RGB
diff --git a/keyboards/m10a/keymaps/gam3cat/keymap.c b/keyboards/m10a/keymaps/gam3cat/keymap.c
deleted file mode 100644
index 8860bbd0108..00000000000
--- a/keyboards/m10a/keymaps/gam3cat/keymap.c
+++ /dev/null
@@ -1,150 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "version.h"
-
-extern keymap_config_t keymap_config;
-
-enum layers {
-    _L0 = 0,
-    _L1,
-    _L2,
-    _L3,
-    _L4,
-    _L5,
-    _L6,
-    _L7,
-    _L8,
-    _L9
-};
-
-enum custom_keycodes {
-    QMK_REV = SAFE_RANGE,
-    KC_WEB,
-    KC_WCLS,
-    DYNAMIC_MACRO_RANGE
-};
-
-extern backlight_config_t backlight_config;
-
-#include "dynamic_macro.h"
-#define FN_ZERO LT(_L9, KC_KP_0)
-#define KC_DMR1 DM_REC1
-#define KC_DMR2 DM_REC2
-#define KC_DMP1 DM_PLY1
-#define KC_DMP2 DM_PLY2
-#define KC_DMRS DM_RSTP
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /*## Layout Config:
-    *     .-----------.  .-----------.  .-----------.  .-----------.  .-----------.
-    *     |7  |8  |9  |  |+  |-  |*  |  |^  |&  |!  |  |VLU|Ver|WFD|  |VLU|NXT|FFD|
-    *     |-----------|  |-----------|  |-----------|  |-----------|  |-----------|
-    *     |4  |5  |6  |  |/  |%  |,  |  |D  |E  |F  |  |MUT|C-W|CHR|  |MUT|STP|PLY|
-    *     |-----------|  |-----------|  |-----------|  |-----------|  |-----------|
-    *     |1  |2  |3  |  |.  |=  |Ent|  |A  |B  |C  |  |VLD|CMP|WBK|  |VLD|PRV|RWD|
-    *     |-----------|  |-----------|  |-----------|  |-----------|  |-----------|
-    *     |#L0|_L9/0  |  |#L1|_L9    |  |#L2|_L9    |  |#L3|_L9    |  |#L4|_L9    |
-    *     *-----------*  *-----------*  *-----------*  *-----------*  *-----------*
-    *     .-----------.  .-----------.  .-----------.  .-----------.  .-----------.
-    *     |   |   |   |  |   |   |   |  |MP1|   |MP2|  |   |   |RST|  |_L6|_L7|_L8|
-    *     |-----------|  |-----------|  |-----------|  |-----------|  |-----------|
-    *     |   |   |   |  |   |   |   |  |   |MRS|   |  |   |   |   |  |_L3|_L4|_L5|
-    *     |-----------|  |-----------|  |-----------|  |-----------|  |-----------|
-    *     |   |   |   |  |   |   |   |  |MR1|   |MR2|  |   |   |   |  |_L0|_L1|_L2|
-    *     |-----------|  |-----------|  |-----------|  |-----------|  |-----------|
-    *     |#L5|_L9    |  |#L6|_L9    |  |#L7|_L9    |  |#L8|_L9    |  |#L9|       |
-    *     *-----------*  *-----------*  *-----------*  *-----------*  *-----------*
-    */
-    [_L0] = {{KC_KP_7, KC_KP_8, KC_KP_9}, {KC_KP_4, KC_KP_5, KC_KP_6}, {KC_KP_1, KC_KP_2, KC_KP_3}, {XXXXXXX, XXXXXXX, FN_ZERO}},
-    [_L1] = {{KC_PPLS, KC_PMNS, KC_PAST}, {KC_PSLS, KC_PERC, KC_COMM}, {KC_PDOT, KC_EQL,  KC_PENT}, {XXXXXXX, XXXXXXX, MO(_L9)}},
-    [_L2] = {{KC_CIRC, KC_AMPR, KC_EXLM}, {S(KC_D), S(KC_E), S(KC_F)}, {S(KC_A), S(KC_B), S(KC_C)}, {XXXXXXX, XXXXXXX, MO(_L9)}},
-    [_L3] = {{KC_VOLU, QMK_REV, KC_WFWD}, {KC_MUTE, KC_WCLS, KC_WEB }, {KC_VOLD, KC_MYCM, KC_WBAK}, {XXXXXXX, XXXXXXX, MO(_L9)}},
-    [_L4] = {{KC_VOLU, KC_MNXT, KC_MFFD}, {KC_MUTE, KC_MSTP, KC_MPLY}, {KC_VOLD, KC_MPRV, KC_MRWD}, {XXXXXXX, XXXXXXX, MO(_L9)}},
-    [_L5] = {{_______, _______, _______}, {_______, _______, _______}, {_______, _______, _______}, {XXXXXXX, XXXXXXX, MO(_L9)}},
-    [_L6] = {{_______, _______, _______}, {_______, _______, _______}, {_______, _______, _______}, {XXXXXXX, XXXXXXX, MO(_L9)}},
-    [_L7] = {{KC_DMP1, _______, KC_DMP2}, {_______, KC_DMRS, _______}, {KC_DMR1, _______, KC_DMR2}, {XXXXXXX, XXXXXXX, MO(_L9)}},
-    [_L8] = {{_______, _______, QK_BOOT  }, {_______, _______, _______}, {_______, _______, _______}, {XXXXXXX, XXXXXXX, MO(_L9)}},
-    [_L9] = {{DF(_L6), DF(_L7), DF(_L8)}, {DF(_L3), DF(_L4), DF(_L5)}, {DF(_L0), DF(_L1), DF(_L2)}, {XXXXXXX, XXXXXXX, _______}},
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case QMK_REV:
-            if (record->event.pressed) {
-                SEND_STRING(QMK_KEYBOARD "/" QMK_KEYMAP "@" QMK_VERSION ":" QMK_BUILDDATE);
-            }
-            return false;
-            break;
-        case KC_WEB:
-            if (record->event.pressed) {
-                SEND_STRING(SS_LGUI("r"));
-                wait_ms(100);
-                SEND_STRING("chrome.exe\n");
-            }
-            return false;
-            break;
-        case KC_WCLS:
-            if (record->event.pressed) {
-                SEND_STRING (SS_LCTL("w"));
-            }
-            return false;
-            break;
-    }
-    // Dynamic Macros.
-    if (!process_record_dynamic_macro(keycode, record)) {
-        return false;
-    }
-    return true;
-}
-
-void custom_backlight_level(uint8_t level) {
-    if (level > BACKLIGHT_LEVELS)
-        level = BACKLIGHT_LEVELS;
-    backlight_config.level = level;
-    backlight_config.enable = !!backlight_config.level;
-    backlight_set(backlight_config.level);
-}
-
-void matrix_init_user(void) {
-  #ifdef BACKLIGHT_ENABLE
-    custom_backlight_level(0);
-  #endif
-}
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    switch (get_highest_layer(state)) {
-        case _L0:
-            custom_backlight_level(0);
-            break;
-        case _L1:
-            custom_backlight_level(1);
-            break;
-        case _L2:
-            custom_backlight_level(2);
-            break;
-        case _L3:
-            custom_backlight_level(3);
-            break;
-        case _L4:
-            custom_backlight_level(4);
-            break;
-        case _L5:
-            custom_backlight_level(5);
-            break;
-        case _L6:
-            custom_backlight_level(6);
-            break;
-        case _L7:
-            custom_backlight_level(6);
-            break;
-        case _L8:
-            custom_backlight_level(6);
-            break;
-        case _L9:
-            custom_backlight_level(0);
-            break;
-        default:
-            custom_backlight_level(0);
-            break;
-    }
-    return state;
-}
diff --git a/keyboards/m10a/keymaps/gam3cat/readme.md b/keyboards/m10a/keymaps/gam3cat/readme.md
deleted file mode 100644
index 5c68e8c8936..00000000000
--- a/keyboards/m10a/keymaps/gam3cat/readme.md
+++ /dev/null
@@ -1,21 +0,0 @@
-# Keymap Maintainer: Gam3cat
-make m10a:gam3cat
-## Layout Config:
-    .-----------.  .-----------.  .-----------.  .-----------.  .-----------.
-    |7  |8  |9  |  |+  |-  |*  |  |^  |&  |!  |  |VLU|Ver|WFD|  |VLU|NXT|FFD|
-    |-----------|  |-----------|  |-----------|  |-----------|  |-----------|
-    |4  |5  |6  |  |/  |%  |,  |  |D  |E  |F  |  |MUT|C-W|CHR|  |MUT|STP|PLY|
-    |-----------|  |-----------|  |-----------|  |-----------|  |-----------|
-    |1  |2  |3  |  |.  |=  |Ent|  |A  |B  |C  |  |VLD|CMP|WBK|  |VLD|PRV|RWD|
-    |-----------|  |-----------|  |-----------|  |-----------|  |-----------|
-    |#L0|_L9/0  |  |#L1|_L9    |  |#L2|_L9    |  |#L3|_L9    |  |#L4|_L9    |
-    *-----------*  *-----------*  *-----------*  *-----------*  *-----------*
-    .-----------.  .-----------.  .-----------.  .-----------.  .-----------.
-    |   |   |   |  |   |   |   |  |MP1|   |MP2|  |   |   |RST|  |_L6|_L7|_L8|
-    |-----------|  |-----------|  |-----------|  |-----------|  |-----------|
-    |   |   |   |  |   |   |   |  |   |MRS|   |  |   |   |   |  |_L3|_L4|_L5|
-    |-----------|  |-----------|  |-----------|  |-----------|  |-----------|
-    |   |   |   |  |   |   |   |  |MR1|   |MR2|  |   |   |   |  |_L0|_L1|_L2|
-    |-----------|  |-----------|  |-----------|  |-----------|  |-----------|
-    |#L5|_L9    |  |#L6|_L9    |  |#L7|_L9    |  |#L8|_L9    |  |#L9|       |
-    *-----------*  *-----------*  *-----------*  *-----------*  *-----------*
diff --git a/keyboards/m10a/keymaps/gam3cat/rules.mk b/keyboards/m10a/keymaps/gam3cat/rules.mk
deleted file mode 100644
index ce170ae85fe..00000000000
--- a/keyboards/m10a/keymaps/gam3cat/rules.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
-TAP_DANCE_ENABLE = no       # Enable TapDance functionality
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+1500)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = no         # Commands for debug and configuration
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-NKRO_ENABLE = yes           # Nkey Rollover - If this doesn't work, add this to config.h: #define FORCE_NKRO
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-UNICODE_ENABLE = no         # Unicode
-UNICODEMAP_ENABLE = no      # Enable extended unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-AUDIO_ENABLE = no           # Audio output on port C6
-#VARIABLE_TRACE = no         # Use this to debug changes to variable values
-KEY_LOCK_ENABLE = no        # This enables key lock(+260)
-SPLIT_KEYBOARD = no         # This enables split keyboard support and includes all necessary files located at quantum/split_common
diff --git a/keyboards/maple_computing/lets_split_eh/keymaps/resfury/config.h b/keyboards/maple_computing/lets_split_eh/keymaps/resfury/config.h
deleted file mode 100644
index 0055bbf459d..00000000000
--- a/keyboards/maple_computing/lets_split_eh/keymaps/resfury/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#define EE_HANDS
\ No newline at end of file
diff --git a/keyboards/maple_computing/lets_split_eh/keymaps/resfury/keymap.c b/keyboards/maple_computing/lets_split_eh/keymaps/resfury/keymap.c
deleted file mode 100644
index d4b06c6ef35..00000000000
--- a/keyboards/maple_computing/lets_split_eh/keymaps/resfury/keymap.c
+++ /dev/null
@@ -1,189 +0,0 @@
-#include QMK_KEYBOARD_H
-
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-// The underscores don't mean anything - you can have a layer called STUFF or any other name.
-// Layer names don't all need to be of the same length, obviously, and you can also skip them
-// entirely and just use numbers.
-
-enum resfury_layers {
-  _COLEMAK,
-  _DVORAK,
-  _QWERTY
-};
-
-enum resfury_keycodes {
-  COLEMAK = SAFE_RANGE,
-  DVORAK,
-  QWERTY,
-};
-
-#define _LOWER 3
-#define _RAISE 4
-#define _FUNCTION 15
-#define _ADJUST 16
-
-#define LOWER     MO(_LOWER)
-#define RAISE     MO(_RAISE)
-#define FUNCTION  MO(_FUNCTION)
-#define ADJUST    MO(_ADJUST)
-
-
-// Defines for task manager and such
-#define CALTDEL LCTL(LALT(KC_DEL))
-#define TSKMGR LCTL(LSFT(KC_ESC))
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Colemak
- * ,-----------------------------------------------------------------------------------.
- * | Esc  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  |   \  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |F/TAB |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |   '  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Shift |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl |  GUI | Alt  | Ent  |Lower | Bksp | Spc  | Raise| Left |  Up  | Down |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_COLEMAK] = LAYOUT(
-  KC_ESC,               KC_Q,     KC_W,    KC_F,    KC_P,  KC_G,    KC_J,   KC_L,  KC_U,    KC_Y,    KC_SCLN, KC_BSLS,
-  LT(_FUNCTION,KC_TAB), KC_A,     KC_R,    KC_S,    KC_T,  KC_D,    KC_H,   KC_N,  KC_E,    KC_I,    KC_O,    KC_QUOT,
-  OSM(MOD_LSFT),        KC_Z,     KC_X,    KC_C,    KC_V,  KC_B,    KC_K,   KC_M,  KC_COMM, KC_DOT,  KC_SLSH, OSM(MOD_RSFT),
-  KC_LCTL,              KC_LGUI,  KC_LALT, KC_ENT,  LOWER, KC_BSPC, KC_SPC, RAISE, KC_LEFT, KC_UP,   KC_DOWN, KC_RGHT
-),
-
-  /* Dvorak
- * ,-----------------------------------------------------------------------------------.
- * | Esc  |   '  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  |   /  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |F/TAB |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   R  |   L  |   -  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Shift |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl |  GUI | Alt  | Ent  |Lower | Bksp | Spc  | Raise| Left |  Up  | Down |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_DVORAK] = LAYOUT(
-  KC_ESC,               KC_QUOT,  KC_COMM, KC_DOT,  KC_P,  KC_Y,    KC_F,   KC_G,  KC_C,    KC_R,    KC_L,    KC_SLSH,
-  LT(_FUNCTION,KC_TAB), KC_A,     KC_O,    KC_E,    KC_U,  KC_I,    KC_D,   KC_H,  KC_T,    KC_N,    KC_S,    KC_MINS,
-  OSM(MOD_LSFT),        KC_SCLN,  KC_Q,    KC_J,    KC_K,  KC_X,    KC_B,   KC_M,  KC_W,    KC_V,    KC_Z,    OSM(MOD_RSFT),
-  KC_LCTL,              KC_LGUI,  KC_LALT, KC_ENT,  LOWER, KC_BSPC, KC_SPC, RAISE, KC_LEFT, KC_UP,   KC_DOWN, KC_RGHT
-),
-
-
- /* Qwerty
- * ,-----------------------------------------------------------------------------------.
- * | Esc  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  |   \  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |F/TAB |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |   '  |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Shift |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl |  GUI | Alt  | Ent  |Lower | Bksp | Spc  | Raise| Left |  Up  | Down |Right |
- * `-----------------------------------------------------------------------------------'
- */
-[_QWERTY] = LAYOUT(
-  KC_ESC,               KC_Q,     KC_W,    KC_E,    KC_R,  KC_T,    KC_Y,   KC_U,  KC_I,    KC_O,    KC_P,    KC_BSLS,
-  LT(_FUNCTION,KC_TAB), KC_A,     KC_S,    KC_D,    KC_F,  KC_G,    KC_H,   KC_J,  KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-  OSM(MOD_LSFT),        KC_Z,     KC_X,    KC_C,    KC_V,  KC_B,    KC_N,   KC_M,  KC_COMM, KC_DOT,  KC_SLSH, OSM(MOD_RSFT),
-  KC_LCTL,              KC_LGUI,  KC_LALT, KC_ENT,  LOWER, KC_BSPC, KC_SPC, RAISE, KC_LEFT, KC_UP,   KC_DOWN, KC_RGHT
-),
-
-/* Lower
- * ,-----------------------------------------------------------------------------------.
- * | Esc  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |Enter |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |  ~   |  `   | Mute | Ctl/ |  |   |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |Lower | Bksp | Spc  |Adjust| Play | Vol+ | Vol- | Next |
- * `-----------------------------------------------------------------------------------'
- */
-[_LOWER] = LAYOUT(
-  KC_ESC,  KC_EXLM,  KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR,   KC_ASTR, KC_LPRN, KC_RPRN,       KC_DEL,
-  _______, KC_F1,    KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS,   KC_PLUS, KC_LCBR, KC_RCBR,       _______,
-  _______, KC_F7,    KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  S(KC_GRV), KC_GRV,  KC_MUTE, RCTL(KC_BSLS), KC_PIPE,
-  _______, _______,  _______, _______, _______, KC_BSPC, KC_SPC,  ADJUST,    KC_MPLY, KC_VOLU, KC_VOLD,       KC_MNXT
-),
-
-/* Raise
- * ,-----------------------------------------------------------------------------------.
- * | Esc  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Del  |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |   4  |   5  |   6  |   +  |   -  |  +   |   -  |   =  |   [  |   ]  |Enter |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |   7  |   8  |   9  |   *  |   /  |  *   |   /  |   .  | Mute | Ctl/ |   \  |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |   ,  |   0  |  .   |Adjust| Bksp | Spc  |Raise | Play | Vol+ | Vol- | Next |
- * `-----------------------------------------------------------------------------------'
- */
-[_RAISE] = LAYOUT(
-  KC_ESC,  KC_1,    KC_2,  KC_3,   KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,          KC_DEL,
-  _______, KC_4,    KC_5,  KC_6,   KC_PLUS, KC_MINS, KC_PLUS, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC,       _______,
-  _______, KC_7,    KC_8,  KC_9,   KC_ASTR, KC_SLSH, KC_ASTR, KC_SLSH, KC_DOT,  KC_MUTE, RCTL(KC_BSLS), KC_BSLS,
-  _______, KC_COMM, KC_0,  KC_DOT, ADJUST,  KC_BSPC, KC_SPC,  _______, KC_MPLY, KC_VOLU, KC_VOLD,       KC_MNXT
-),
-
-/* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * |Taskmg|      |      |      |      |      |      |      |RGBVAI|RGBSAI|RGBHUI|caltde|
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |_COLEMAK|    |      |      |      |      |      |      |RGBVAD|RGBSAD|RGBHUD|RGBTOG|
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |_DVORAK|     |      |      |      |      |      |      |      |      |RGBMOD|BLSTEP|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |_QWERTY|     |      |      |      |      |      |      |      |      |      | QK_BOOT|
- * `-----------------------------------------------------------------------------------'
- */
-[_ADJUST] = LAYOUT(
-  TSKMGR,       _______, _______, _______, _______, _______, _______, _______, RGB_VAI, RGB_SAI, RGB_HUI, CALTDEL,
-  DF(_COLEMAK), _______, _______, _______, _______, _______, _______, _______, RGB_VAD, RGB_SAD, RGB_HUD, RGB_TOG,
-  DF(_DVORAK),  _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD, BL_STEP,
-  DF(_QWERTY),  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT
-),
-
-/* Function
- * ,-----------------------------------------------------------------------------------.
- * | Caps |      |      |      |      |      | S(Hm)| Home |  Up  | End  |S(End)|      |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      | Ctrl | Shift| Alt  |      |      |      | Left | Down |Right |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
- */
-[_FUNCTION] = LAYOUT(
-  KC_CAPS, _______, _______, _______, _______, _______, S(KC_HOME), KC_HOME, KC_UP,   KC_END,  S(KC_END), _______,
-  _______, KC_LCTL, KC_LSFT, KC_LALT, _______, _______, _______,    KC_LEFT, KC_DOWN, KC_RGHT, _______,   _______,
-  _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______, _______,   _______,
-  _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______, _______,   _______
-)
-
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case COLEMAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_COLEMAK);
-      }
-      return false;
-      break;
-
-    case DVORAK:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_DVORAK);
-      }
-      return false;
-      break;
-
-    case QWERTY:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/maple_computing/lets_split_eh/keymaps/resfury/readme.md b/keyboards/maple_computing/lets_split_eh/keymaps/resfury/readme.md
deleted file mode 100644
index 6a882307b7e..00000000000
--- a/keyboards/maple_computing/lets_split_eh/keymaps/resfury/readme.md
+++ /dev/null
@@ -1,7 +0,0 @@
-![Let's Split Eh?](https://imgur.com/a/riUxwpl)
-
-# ResFury Let's Split, Eh Layout
-
-This layout specializes the Let's Split, Eh for Colevrak users that occasionally let others play with their toys. Adjust layer allows swapping to Colemak/Dvorak/Qwerty alphas. Heavily influenced by the default planck layout, but with up/down switched, a left hand 10-key, remapped backspace, and a few convenience keys.
-
-Master set by EE_HANDS method.
\ No newline at end of file
diff --git a/keyboards/maple_computing/lets_split_eh/keymaps/resfury/rules.mk b/keyboards/maple_computing/lets_split_eh/keymaps/resfury/rules.mk
deleted file mode 100644
index 7ad666d1a38..00000000000
--- a/keyboards/maple_computing/lets_split_eh/keymaps/resfury/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-RGBLIGHT_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/mariorion_v25/prod/config.h b/keyboards/mariorion_v25/prod/config.h
index 042f7662d8e..8895d16ecef 100644
--- a/keyboards/mariorion_v25/prod/config.h
+++ b/keyboards/mariorion_v25/prod/config.h
@@ -7,9 +7,9 @@
 
 #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 WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM1
+#define WS2812_PWM_DMA_CHANNEL 1
+// #define WS2812_PWM_DMAMUX_ID STM32_DMAMUX1_TIM17_UP
 
 #define INDICATOR_0 C9
 #define INDICATOR_1 C8
diff --git a/keyboards/mariorion_v25/proto/config.h b/keyboards/mariorion_v25/proto/config.h
index 6865f2dbb01..894b8fbf9e8 100644
--- a/keyboards/mariorion_v25/proto/config.h
+++ b/keyboards/mariorion_v25/proto/config.h
@@ -7,9 +7,9 @@
 
 #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 WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM1
+#define WS2812_PWM_DMA_CHANNEL 1
+// #define WS2812_PWM_DMAMUX_ID STM32_DMAMUX1_TIM17_UP
 
 #define INDICATOR_0 C8
 #define INDICATOR_1 C7
diff --git a/keyboards/maxr1998/phoebe/info.json b/keyboards/maxr1998/phoebe/info.json
index 7bb3832cbef..f6913ece0b9 100644
--- a/keyboards/maxr1998/phoebe/info.json
+++ b/keyboards/maxr1998/phoebe/info.json
@@ -10,7 +10,6 @@
     "features": {
         "bootmagic": true,
         "nkro": true,
-        "backlight": false,
         "rgblight": true,
         "key_lock": true,
         "leader": true
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev3/rev3.c b/keyboards/mechlovin/adelais/rgb_led/rev3/rev3.c
index 5eebd7ec8a9..33dd2157e40 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev3/rev3.c
+++ b/keyboards/mechlovin/adelais/rgb_led/rev3/rev3.c
@@ -18,74 +18,74 @@
 
 #ifdef RGB_MATRIX_ENABLE
 const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
-    {0, CS3_SW5, CS2_SW5, CS1_SW5}, /* D9-K31-00 */
-    {0, CS6_SW5, CS5_SW5, CS4_SW5}, /* D46-K00-01 */
-    {0, CS6_SW9, CS5_SW9, CS4_SW9}, /* D59-K01-02 */
-    {0, CS9_SW5, CS8_SW5, CS7_SW5}, /* D73-K02-03 */
-    {0, CS9_SW9, CS8_SW9, CS7_SW9}, /* D75-K03-04 */
-    {0, CS12_SW5, CS11_SW5, CS10_SW5}, /* D77-K04-05 */
-    {0, CS12_SW9, CS11_SW9, CS10_SW9}, /* D79-K05-06 */
-    {0, CS15_SW5, CS14_SW5, CS13_SW5}, /* D81-K06-07 */
-    {0, CS15_SW9, CS14_SW9, CS13_SW9}, /* D83-K07-08 */
-    {0, CS18_SW5, CS17_SW5, CS16_SW5}, /* D85-K08-09 */
-    {0, CS18_SW9, CS17_SW9, CS16_SW9}, /* D87-K09-10 */
-    {0, CS21_SW5, CS20_SW5, CS19_SW5}, /* D90-K0A-11 */
-    {0, CS21_SW9, CS20_SW9, CS19_SW9}, /* D93-K0B-12 */
-    {0, CS24_SW5, CS23_SW5, CS22_SW5}, /* D95-K0C-13 */
-    {0, CS24_SW9, CS23_SW9, CS22_SW9}, /* D98-K0D-14 */
-    {0, CS24_SW3, CS23_SW3, CS22_SW3}, /* D100-K0E-15 */
-    {0, CS3_SW4, CS2_SW4, CS1_SW4}, /* D94-K41-16 */
-    {0, CS6_SW4, CS5_SW4, CS4_SW4}, /* D92-K10-17 */
-    {0, CS6_SW6, CS5_SW6, CS4_SW6}, /* D89-K11-18 */
-    {0, CS9_SW4, CS8_SW4, CS7_SW4}, /* D86-K12-19 */
-    {0, CS9_SW6, CS8_SW6, CS7_SW6}, /* D84-K13-20 */
-    {0, CS12_SW4, CS11_SW4, CS10_SW4}, /* D82-K14-21 */
-    {0, CS12_SW6, CS11_SW6, CS10_SW6}, /* D80-K15-22 */
-    {0, CS15_SW4, CS14_SW4, CS13_SW4}, /* D78-K16-23 */
-    {0, CS15_SW6, CS14_SW6, CS13_SW6}, /* D76-K17-24 */
-    {0, CS18_SW4, CS17_SW4, CS16_SW4}, /* D74-K18-25 */
-    {0, CS18_SW6, CS17_SW6, CS16_SW6}, /* D72-K19-26 */
-    {0, CS21_SW4, CS20_SW4, CS19_SW4}, /* D51-K1A-27 */
-    {0, CS21_SW6, CS20_SW6, CS19_SW6}, /* D10-K1B-28 */
-    {0, CS24_SW4, CS23_SW4, CS22_SW4}, /* D101-K1C-29 */
-    {0, CS24_SW6, CS23_SW6, CS22_SW6}, /* D104-K1D-30 */
-    {0, CS3_SW3, CS2_SW3, CS1_SW3}, /* D108-K43-31 */
-    {0, CS6_SW3, CS5_SW3, CS4_SW3}, /* D111-K20-32 */
-    {0, CS6_SW7, CS5_SW7, CS4_SW7}, /* D114-K21-33 */
-    {0, CS9_SW3, CS8_SW3, CS7_SW3}, /* D117-K22-34 */
-    {0, CS9_SW7, CS8_SW7, CS7_SW7}, /* D120-K23-35 */
-    {0, CS12_SW3, CS11_SW3, CS10_SW3}, /* D123-K24-36 */
-    {0, CS12_SW7, CS11_SW7, CS10_SW7}, /* D126-K25-37 */
-    {0, CS15_SW3, CS14_SW3, CS13_SW3}, /* D129-K26-38 */
-    {0, CS15_SW7, CS14_SW7, CS13_SW7}, /* D133-K27-39 */
-    {0, CS18_SW3, CS17_SW3, CS16_SW3}, /* D142-K28-40 */
-    {0, CS18_SW7, CS17_SW7, CS16_SW7}, /* D146-K29-41 */
-    {0, CS21_SW3, CS20_SW3, CS19_SW3}, /* D160-K2A-42 */
-    {0, CS21_SW7, CS20_SW7, CS19_SW7}, /* D167-K2B-43 */
-    {0, CS24_SW7, CS23_SW7, CS22_SW7}, /* D168-K2D-44 */
+    {0, SW5_CS3, SW5_CS2, SW5_CS1}, /* D9-K31-00 */
+    {0, SW5_CS6, SW5_CS5, SW5_CS4}, /* D46-K00-01 */
+    {0, SW9_CS6, SW9_CS5, SW9_CS4}, /* D59-K01-02 */
+    {0, SW5_CS9, SW5_CS8, SW5_CS7}, /* D73-K02-03 */
+    {0, SW9_CS9, SW9_CS8, SW9_CS7}, /* D75-K03-04 */
+    {0, SW5_CS12, SW5_CS11, SW5_CS10}, /* D77-K04-05 */
+    {0, SW9_CS12, SW9_CS11, SW9_CS10}, /* D79-K05-06 */
+    {0, SW5_CS15, SW5_CS14, SW5_CS13}, /* D81-K06-07 */
+    {0, SW9_CS15, SW9_CS14, SW9_CS13}, /* D83-K07-08 */
+    {0, SW5_CS18, SW5_CS17, SW5_CS16}, /* D85-K08-09 */
+    {0, SW9_CS18, SW9_CS17, SW9_CS16}, /* D87-K09-10 */
+    {0, SW5_CS21, SW5_CS20, SW5_CS19}, /* D90-K0A-11 */
+    {0, SW9_CS21, SW9_CS20, SW9_CS19}, /* D93-K0B-12 */
+    {0, SW5_CS24, SW5_CS23, SW5_CS22}, /* D95-K0C-13 */
+    {0, SW9_CS24, SW9_CS23, SW9_CS22}, /* D98-K0D-14 */
+    {0, SW3_CS24, SW3_CS23, SW3_CS22}, /* D100-K0E-15 */
+    {0, SW4_CS3, SW4_CS2, SW4_CS1}, /* D94-K41-16 */
+    {0, SW4_CS6, SW4_CS5, SW4_CS4}, /* D92-K10-17 */
+    {0, SW6_CS6, SW6_CS5, SW6_CS4}, /* D89-K11-18 */
+    {0, SW4_CS9, SW4_CS8, SW4_CS7}, /* D86-K12-19 */
+    {0, SW6_CS9, SW6_CS8, SW6_CS7}, /* D84-K13-20 */
+    {0, SW4_CS12, SW4_CS11, SW4_CS10}, /* D82-K14-21 */
+    {0, SW6_CS12, SW6_CS11, SW6_CS10}, /* D80-K15-22 */
+    {0, SW4_CS15, SW4_CS14, SW4_CS13}, /* D78-K16-23 */
+    {0, SW6_CS15, SW6_CS14, SW6_CS13}, /* D76-K17-24 */
+    {0, SW4_CS18, SW4_CS17, SW4_CS16}, /* D74-K18-25 */
+    {0, SW6_CS18, SW6_CS17, SW6_CS16}, /* D72-K19-26 */
+    {0, SW4_CS21, SW4_CS20, SW4_CS19}, /* D51-K1A-27 */
+    {0, SW6_CS21, SW6_CS20, SW6_CS19}, /* D10-K1B-28 */
+    {0, SW4_CS24, SW4_CS23, SW4_CS22}, /* D101-K1C-29 */
+    {0, SW6_CS24, SW6_CS23, SW6_CS22}, /* D104-K1D-30 */
+    {0, SW3_CS3, SW3_CS2, SW3_CS1}, /* D108-K43-31 */
+    {0, SW3_CS6, SW3_CS5, SW3_CS4}, /* D111-K20-32 */
+    {0, SW7_CS6, SW7_CS5, SW7_CS4}, /* D114-K21-33 */
+    {0, SW3_CS9, SW3_CS8, SW3_CS7}, /* D117-K22-34 */
+    {0, SW7_CS9, SW7_CS8, SW7_CS7}, /* D120-K23-35 */
+    {0, SW3_CS12, SW3_CS11, SW3_CS10}, /* D123-K24-36 */
+    {0, SW7_CS12, SW7_CS11, SW7_CS10}, /* D126-K25-37 */
+    {0, SW3_CS15, SW3_CS14, SW3_CS13}, /* D129-K26-38 */
+    {0, SW7_CS15, SW7_CS14, SW7_CS13}, /* D133-K27-39 */
+    {0, SW3_CS18, SW3_CS17, SW3_CS16}, /* D142-K28-40 */
+    {0, SW7_CS18, SW7_CS17, SW7_CS16}, /* D146-K29-41 */
+    {0, SW3_CS21, SW3_CS20, SW3_CS19}, /* D160-K2A-42 */
+    {0, SW7_CS21, SW7_CS20, SW7_CS19}, /* D167-K2B-43 */
+    {0, SW7_CS24, SW7_CS23, SW7_CS22}, /* D168-K2D-44 */
 
-    {0, CS6_SW2, CS5_SW2, CS4_SW2}, /* D163-K30-45 */
-    {0, CS6_SW8, CS5_SW8, CS4_SW8}, /* D147-K31-46 */
-    {0, CS9_SW2, CS8_SW2, CS7_SW2}, /* D144-K32-47 */
-    {0, CS9_SW8, CS8_SW8, CS7_SW8}, /* D137-K33-48 */
-    {0, CS12_SW2, CS11_SW2, CS10_SW2}, /* D130-K34-49 */
-    {0, CS12_SW8, CS11_SW8, CS10_SW8}, /* D127-K35-50 */
-    {0, CS15_SW2, CS14_SW2, CS13_SW2}, /* D124-K36-51 */
-    {0, CS15_SW8, CS14_SW8, CS13_SW8}, /* D121-K37-52 */
-    {0, CS18_SW2, CS17_SW2, CS16_SW2}, /* D118-K38-53 */
-    {0, CS18_SW8, CS17_SW8, CS16_SW8}, /* D115-K39-54 */
-    {0, CS21_SW2, CS20_SW2, CS19_SW2}, /* D112-K3A-55 */
-    {0, CS21_SW8, CS20_SW8, CS19_SW8}, /* D109-K3B-56 */
-    {0, CS24_SW2, CS23_SW2, CS22_SW2}, /* D105-K3D-57 */
-    {0, CS24_SW8, CS23_SW8, CS22_SW8}, /* D103-K3E-58 */
+    {0, SW2_CS6, SW2_CS5, SW2_CS4}, /* D163-K30-45 */
+    {0, SW8_CS6, SW8_CS5, SW8_CS4}, /* D147-K31-46 */
+    {0, SW2_CS9, SW2_CS8, SW2_CS7}, /* D144-K32-47 */
+    {0, SW8_CS9, SW8_CS8, SW8_CS7}, /* D137-K33-48 */
+    {0, SW2_CS12, SW2_CS11, SW2_CS10}, /* D130-K34-49 */
+    {0, SW8_CS12, SW8_CS11, SW8_CS10}, /* D127-K35-50 */
+    {0, SW2_CS15, SW2_CS14, SW2_CS13}, /* D124-K36-51 */
+    {0, SW8_CS15, SW8_CS14, SW8_CS13}, /* D121-K37-52 */
+    {0, SW2_CS18, SW2_CS17, SW2_CS16}, /* D118-K38-53 */
+    {0, SW8_CS18, SW8_CS17, SW8_CS16}, /* D115-K39-54 */
+    {0, SW2_CS21, SW2_CS20, SW2_CS19}, /* D112-K3A-55 */
+    {0, SW8_CS21, SW8_CS20, SW8_CS19}, /* D109-K3B-56 */
+    {0, SW2_CS24, SW2_CS23, SW2_CS22}, /* D105-K3D-57 */
+    {0, SW8_CS24, SW8_CS23, SW8_CS22}, /* D103-K3E-58 */
 
-    {0, CS3_SW1, CS2_SW1, CS1_SW1}, /* D163-K40-59 */
-    {0, CS6_SW1, CS5_SW1, CS4_SW1}, /* D147-K42-60 */
-    {0, CS9_SW1, CS8_SW1, CS7_SW1}, /* D137-K44-61 */
-    {0, CS12_SW1, CS11_SW1, CS10_SW1}, /* D127-K46-62 */
-    {0, CS15_SW1, CS14_SW1, CS13_SW1}, /* D121-K48-63 */
-    {0, CS18_SW1, CS17_SW1, CS16_SW1}, /* D115-K4A-64 */
-    {0, CS24_SW1, CS23_SW1, CS22_SW1}, /* D103-K4E-65 */
+    {0, SW1_CS3, SW1_CS2, SW1_CS1}, /* D163-K40-59 */
+    {0, SW1_CS6, SW1_CS5, SW1_CS4}, /* D147-K42-60 */
+    {0, SW1_CS9, SW1_CS8, SW1_CS7}, /* D137-K44-61 */
+    {0, SW1_CS12, SW1_CS11, SW1_CS10}, /* D127-K46-62 */
+    {0, SW1_CS15, SW1_CS14, SW1_CS13}, /* D121-K48-63 */
+    {0, SW1_CS18, SW1_CS17, SW1_CS16}, /* D115-K4A-64 */
+    {0, SW1_CS24, SW1_CS23, SW1_CS22}, /* D103-K4E-65 */
 };
 
 led_config_t g_led_config = {
diff --git a/keyboards/mechlovin/hex4b/keymaps/nazzer/keymap.c b/keyboards/mechlovin/hex4b/keymaps/nazzer/keymap.c
deleted file mode 100644
index e0634d85dca..00000000000
--- a/keyboards/mechlovin/hex4b/keymaps/nazzer/keymap.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/* Copyright 2020 Team Mechlovin
- * Copyright 2021 Nazerim
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT_split_bs(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,            KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_SPC,  KC_HOME,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
-        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,           KC_PGDN,
-        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT, KC_UP,   KC_END,
-        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                      MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-    [1] = LAYOUT_split_bs(
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
-        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-    ),
-    [2] = LAYOUT_split_bs(
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
-        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-    ),
-    [3] = LAYOUT_split_bs(
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
-        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-    ),
-
-};
-
-bool led_update_user(led_t led_state) {
-
-	// Toggle CAPS_LOCK LED normally
-
-#    if LED_PIN_ON_STATE == 0
-        // invert the whole thing to avoid having to conditionally !led_state.x later
-        led_state.raw = ~led_state.raw;
-#    endif
-#    ifdef LED_CAPS_LOCK_PIN
-        writePin(LED_CAPS_LOCK_PIN, led_state.caps_lock);
-#    endif
-
-	// Don't call led_update_kb
-    return false;
-}
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-
-	uint8_t layer = get_highest_layer(state);
-
-#if defined(LED_NUM_LOCK_PIN) && defined(LED_SCROLL_LOCK_PIN)
-    switch (layer) {
-        case 0:
-			writePin(LED_SCROLL_LOCK_PIN, !LED_PIN_ON_STATE);
-			writePin(LED_NUM_LOCK_PIN, !LED_PIN_ON_STATE);
-            break;
-        case 1:
-			writePin(LED_SCROLL_LOCK_PIN, LED_PIN_ON_STATE);
-			writePin(LED_NUM_LOCK_PIN, !LED_PIN_ON_STATE);
-            break;
-        case 2:
-			writePin(LED_SCROLL_LOCK_PIN, !LED_PIN_ON_STATE);
-			writePin(LED_NUM_LOCK_PIN, LED_PIN_ON_STATE);
-            break;
-        case 3:
-			writePin(LED_SCROLL_LOCK_PIN, LED_PIN_ON_STATE);
-			writePin(LED_NUM_LOCK_PIN, LED_PIN_ON_STATE);
-            break;
-    }
-#endif
-
-	return state;
-
-}
diff --git a/keyboards/mechlovin/hex4b/keymaps/nazzer/reame.md b/keyboards/mechlovin/hex4b/keymaps/nazzer/reame.md
deleted file mode 100644
index a8a686d8bc4..00000000000
--- a/keyboards/mechlovin/hex4b/keymaps/nazzer/reame.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Nazzer's Hex 4b - Layers on Scroll Lock and Num Lock LED
-
-Repurposed the Scroll Lock and Num Lock LED's as Hex 4b does not have a NUM pad and default layout does not map Scroll Lock
-- Top LED shows CAPS lock status
-- Layer indicators:
-- Layer 0: bottom LED off, middle LED off
-- Layer 1: bottom LED on , middle LED off
-- Layer 2: bottom LED off, middle LED on
-- Layer 3: bottom LED on , middle LED on
-
-## Changelog
-
-### 15/11/2021 - 0.0.1
-
-- Initial release
diff --git a/keyboards/mechlovin/infinity87/rgb_rev1/rgb_rev1.c b/keyboards/mechlovin/infinity87/rgb_rev1/rgb_rev1.c
index cd8f2e2ca0f..8df305bb1a1 100644
--- a/keyboards/mechlovin/infinity87/rgb_rev1/rgb_rev1.c
+++ b/keyboards/mechlovin/infinity87/rgb_rev1/rgb_rev1.c
@@ -18,97 +18,97 @@
 
 #ifdef RGB_MATRIX_ENABLE
 const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
-    {0, CS34_SW1,   CS35_SW1,   CS36_SW1}, //D92-K00-0
-    {0, CS37_SW1,   CS38_SW1,   CS39_SW1}, //D94-K01-1
-    {0, CS31_SW1,   CS32_SW1,   CS33_SW1}, //D96-K02-2
-    {0, CS28_SW1,   CS29_SW1,   CS30_SW1}, //D98-K03-3
-    {0, CS25_SW1,   CS26_SW1,   CS27_SW1}, //D100-K04-4
-    {0, CS22_SW1,   CS23_SW1,   CS24_SW1}, //D102-K05-5
-    {0, CS19_SW1,   CS20_SW1,   CS21_SW1}, //D104-K06-6
-    {0, CS18_SW1,   CS17_SW1,   CS16_SW1}, //D106-K07-7
-    {0, CS15_SW1,   CS14_SW1,   CS13_SW1}, //D108-K08-8
-    {0, CS12_SW1,   CS11_SW1,   CS10_SW1}, //D110-K09-9
-    {0, CS9_SW1,    CS8_SW1,    CS7_SW1},  //D112-K0A-10
-    {0, CS6_SW1,    CS5_SW1,    CS4_SW1},  //D114-K0B-11
-    {0, CS3_SW1,    CS2_SW1,    CS1_SW1},  //D116-K0C-12
-    {0, CS15_SW7,   CS14_SW7,   CS13_SW7}, //D157-K0D-13
-    {0, CS18_SW7,   CS17_SW7,   CS16_SW7}, //D118-K0E-14
-    {0, CS19_SW7,   CS20_SW7,   CS21_SW7}, //D120-K0F-15
-    {0, CS12_SW7,   CS11_SW7,   CS10_SW7}, //D122-K0G-16
-    {0, CS34_SW2,   CS35_SW2,   CS36_SW2}, //D93-K10-17
-    {0, CS37_SW2,   CS38_SW2,   CS39_SW2}, //D95-K11-18
-    {0, CS31_SW2,   CS32_SW2,   CS33_SW2}, //D97-K12-19
-    {0, CS28_SW2,   CS29_SW2,   CS30_SW2}, //D99-K13-20
-    {0, CS25_SW2,   CS26_SW2,   CS27_SW2}, //D101-K14-21
-    {0, CS22_SW2,   CS23_SW2,   CS24_SW2}, //D103-K15-22
-    {0, CS19_SW2,   CS20_SW2,   CS21_SW2}, //D105-K16-23
-    {0, CS18_SW2,   CS17_SW2,   CS16_SW2}, //D107-K17-24
-    {0, CS15_SW2,   CS14_SW2,   CS13_SW2}, //D109-K18-25
-    {0, CS12_SW2,   CS11_SW2,   CS10_SW2}, //D111-K19-26
-    {0, CS9_SW2,    CS8_SW2,    CS7_SW2},  //D113-K1A-27
-    {0, CS6_SW2,    CS5_SW2,    CS4_SW2},  //D115-K1B-28
-    {0, CS3_SW2,    CS2_SW2,    CS1_SW2},  //D117-K1C-29
-    {0, CS3_SW8,    CS2_SW8,    CS1_SW8},  //D158-K1D-30
-    {0, CS3_SW7,    CS2_SW7,    CS1_SW7},  //D119-K1E-31
-    {0, CS18_SW8,   CS17_SW8,   CS16_SW8}, //D121-K1F-32
-    {0, CS9_SW9,    CS8_SW9,    CS7_SW9}, //D123-K1G-33
-    {0, CS34_SW3,   CS35_SW3,   CS36_SW3}, //D124-K20-34
-    {0, CS37_SW3,   CS38_SW3,   CS39_SW3}, //D127-K21-35
-    {0, CS31_SW3,   CS32_SW3,   CS33_SW3}, //D130-K22-36
-    {0, CS28_SW3,   CS29_SW3,   CS30_SW3}, //D133-K23-37
-    {0, CS25_SW3,   CS26_SW3,   CS27_SW3}, //D135-K24-38
-    {0, CS22_SW3,   CS23_SW3,   CS24_SW3}, //D137-K25-39
-    {0, CS19_SW3,   CS20_SW3,   CS21_SW3}, //D139-K26-40
-    {0, CS18_SW3,   CS17_SW3,   CS16_SW3}, //D142-K27-41
-    {0, CS15_SW3,   CS14_SW3,   CS13_SW3}, //D144-K28-42
-    {0, CS12_SW3,   CS11_SW3,   CS10_SW3}, //D146-K29-43
-    {0, CS9_SW3,    CS8_SW3,    CS7_SW3},  //D148-K2A-44
-    {0, CS6_SW3,    CS5_SW3,    CS4_SW3},  //D151-K2B-45
-    {0, CS3_SW3,    CS2_SW3,    CS1_SW3},  //D154-K2C-46
-    {0, CS6_SW8,    CS5_SW8,    CS4_SW8},  //D159-K2D-47
-    {0, CS6_SW7,    CS5_SW7,    CS4_SW7},  //D180-K2E-48
-    {0, CS19_SW8,   CS20_SW8,   CS21_SW8}, //D181-K2F-49
-    {0, CS9_SW7,    CS8_SW7,    CS7_SW7},  //D182-K2G-50
-    {0, CS34_SW4,   CS35_SW4,   CS36_SW4}, //D166-K30-51
-    {0, CS37_SW4,   CS38_SW4,   CS39_SW4}, //D167-K31-52
-    {0, CS31_SW4,   CS32_SW4,   CS33_SW4}, //D168-K32-53
-    {0, CS28_SW4,   CS29_SW4,   CS30_SW4}, //D169-K33-54
-    {0, CS25_SW4,   CS26_SW4,   CS27_SW4}, //D170-K34-55
-    {0, CS22_SW4,   CS23_SW4,   CS24_SW4}, //D171-K35-56
-    {0, CS19_SW4,   CS20_SW4,   CS21_SW4}, //D172-K36-57
-    {0, CS18_SW4,   CS17_SW4,   CS16_SW4}, //D173-K37-58
-    {0, CS15_SW4,   CS14_SW4,   CS13_SW4}, //D174-K38-59
-    {0, CS12_SW4,   CS11_SW4,   CS10_SW4}, //D175-K39-60
-    {0, CS9_SW4,    CS8_SW4,    CS7_SW4},  //D176-K3A-61
-    {0, CS6_SW4,    CS5_SW4,    CS4_SW4},  //D177-K3B-62
-    {0, CS3_SW4,    CS2_SW4,    CS1_SW4},  //D178-K3C-63
-    {0, CS9_SW8,    CS8_SW8,    CS7_SW8},  //D179-K3D-64
-    {0, CS34_SW5,   CS35_SW5,   CS36_SW5}, //D125-K40-65
-    {0, CS37_SW5,   CS38_SW5,   CS39_SW5}, //D128-K41-66
-    {0, CS31_SW5,   CS32_SW5,   CS33_SW5}, //D131-K42-67
-    {0, CS28_SW5,   CS29_SW5,   CS30_SW5}, //D134-K43-68
-    {0, CS25_SW5,   CS26_SW5,   CS27_SW5}, //D136-K44-69
-    {0, CS22_SW5,   CS23_SW5,   CS24_SW5}, //D138-K45-70
-    {0, CS19_SW5,   CS20_SW5,   CS21_SW5}, //D140-K46-71
-    {0, CS18_SW5,   CS17_SW5,   CS16_SW5}, //D143-K47-72
-    {0, CS15_SW5,   CS14_SW5,   CS13_SW5}, //D145-K48-73
-    {0, CS12_SW5,   CS11_SW5,   CS10_SW5}, //D147-K49-74
-    {0, CS9_SW5,    CS8_SW5,    CS7_SW5},  //D149-K4A-75
-    {0, CS6_SW5,    CS5_SW5,    CS4_SW5},  //D152-K4B-76
-    {0, CS3_SW5,    CS2_SW5,    CS1_SW5},  //D155-K4C-77
-    {0, CS12_SW8,   CS11_SW8,   CS10_SW8}, //D160-K4D-78
-    {0, CS12_SW9,   CS11_SW9,   CS10_SW9}, //D163-K4E-79
-    {0, CS34_SW6,   CS35_SW6,   CS36_SW6}, //D126-K20-80
-    {0, CS37_SW6,   CS38_SW6,   CS39_SW6}, //D129-K21-81
-    {0, CS31_SW6,   CS32_SW6,   CS33_SW6}, //D132-K22-82
-    {0, CS19_SW6,   CS20_SW6,   CS21_SW6}, //D141-K26-83
-    {0, CS9_SW6,    CS8_SW6,    CS7_SW6},  //D150-K2A-84
-    {0, CS6_SW6,    CS5_SW6,    CS4_SW6},  //D153-K2B-85
-    {0, CS3_SW6,    CS2_SW6,    CS1_SW6},  //D156-K2C-86
-    {0, CS15_SW8,   CS14_SW8,   CS13_SW8}, //D161-K2D-87
-    {0, CS15_SW9,   CS14_SW9,   CS13_SW9}, //D162-K2E-88
-    {0, CS18_SW9,   CS17_SW9,   CS16_SW9}, //D164-K2F-89
-    {0, CS19_SW9,   CS20_SW9,   CS21_SW9}, //D165-K2G-90
+    {0, SW1_CS34,   SW1_CS35,   SW1_CS36}, //D92-K00-0
+    {0, SW1_CS37,   SW1_CS38,   SW1_CS39}, //D94-K01-1
+    {0, SW1_CS31,   SW1_CS32,   SW1_CS33}, //D96-K02-2
+    {0, SW1_CS28,   SW1_CS29,   SW1_CS30}, //D98-K03-3
+    {0, SW1_CS25,   SW1_CS26,   SW1_CS27}, //D100-K04-4
+    {0, SW1_CS22,   SW1_CS23,   SW1_CS24}, //D102-K05-5
+    {0, SW1_CS19,   SW1_CS20,   SW1_CS21}, //D104-K06-6
+    {0, SW1_CS18,   SW1_CS17,   SW1_CS16}, //D106-K07-7
+    {0, SW1_CS15,   SW1_CS14,   SW1_CS13}, //D108-K08-8
+    {0, SW1_CS12,   SW1_CS11,   SW1_CS10}, //D110-K09-9
+    {0, SW1_CS9,    SW1_CS8,    SW1_CS7},  //D112-K0A-10
+    {0, SW1_CS6,    SW1_CS5,    SW1_CS4},  //D114-K0B-11
+    {0, SW1_CS3,    SW1_CS2,    SW1_CS1},  //D116-K0C-12
+    {0, SW7_CS15,   SW7_CS14,   SW7_CS13}, //D157-K0D-13
+    {0, SW7_CS18,   SW7_CS17,   SW7_CS16}, //D118-K0E-14
+    {0, SW7_CS19,   SW7_CS20,   SW7_CS21}, //D120-K0F-15
+    {0, SW7_CS12,   SW7_CS11,   SW7_CS10}, //D122-K0G-16
+    {0, SW2_CS34,   SW2_CS35,   SW2_CS36}, //D93-K10-17
+    {0, SW2_CS37,   SW2_CS38,   SW2_CS39}, //D95-K11-18
+    {0, SW2_CS31,   SW2_CS32,   SW2_CS33}, //D97-K12-19
+    {0, SW2_CS28,   SW2_CS29,   SW2_CS30}, //D99-K13-20
+    {0, SW2_CS25,   SW2_CS26,   SW2_CS27}, //D101-K14-21
+    {0, SW2_CS22,   SW2_CS23,   SW2_CS24}, //D103-K15-22
+    {0, SW2_CS19,   SW2_CS20,   SW2_CS21}, //D105-K16-23
+    {0, SW2_CS18,   SW2_CS17,   SW2_CS16}, //D107-K17-24
+    {0, SW2_CS15,   SW2_CS14,   SW2_CS13}, //D109-K18-25
+    {0, SW2_CS12,   SW2_CS11,   SW2_CS10}, //D111-K19-26
+    {0, SW2_CS9,    SW2_CS8,    SW2_CS7},  //D113-K1A-27
+    {0, SW2_CS6,    SW2_CS5,    SW2_CS4},  //D115-K1B-28
+    {0, SW2_CS3,    SW2_CS2,    SW2_CS1},  //D117-K1C-29
+    {0, SW8_CS3,    SW8_CS2,    SW8_CS1},  //D158-K1D-30
+    {0, SW7_CS3,    SW7_CS2,    SW7_CS1},  //D119-K1E-31
+    {0, SW8_CS18,   SW8_CS17,   SW8_CS16}, //D121-K1F-32
+    {0, SW9_CS9,    SW9_CS8,    SW9_CS7}, //D123-K1G-33
+    {0, SW3_CS34,   SW3_CS35,   SW3_CS36}, //D124-K20-34
+    {0, SW3_CS37,   SW3_CS38,   SW3_CS39}, //D127-K21-35
+    {0, SW3_CS31,   SW3_CS32,   SW3_CS33}, //D130-K22-36
+    {0, SW3_CS28,   SW3_CS29,   SW3_CS30}, //D133-K23-37
+    {0, SW3_CS25,   SW3_CS26,   SW3_CS27}, //D135-K24-38
+    {0, SW3_CS22,   SW3_CS23,   SW3_CS24}, //D137-K25-39
+    {0, SW3_CS19,   SW3_CS20,   SW3_CS21}, //D139-K26-40
+    {0, SW3_CS18,   SW3_CS17,   SW3_CS16}, //D142-K27-41
+    {0, SW3_CS15,   SW3_CS14,   SW3_CS13}, //D144-K28-42
+    {0, SW3_CS12,   SW3_CS11,   SW3_CS10}, //D146-K29-43
+    {0, SW3_CS9,    SW3_CS8,    SW3_CS7},  //D148-K2A-44
+    {0, SW3_CS6,    SW3_CS5,    SW3_CS4},  //D151-K2B-45
+    {0, SW3_CS3,    SW3_CS2,    SW3_CS1},  //D154-K2C-46
+    {0, SW8_CS6,    SW8_CS5,    SW8_CS4},  //D159-K2D-47
+    {0, SW7_CS6,    SW7_CS5,    SW7_CS4},  //D180-K2E-48
+    {0, SW8_CS19,   SW8_CS20,   SW8_CS21}, //D181-K2F-49
+    {0, SW7_CS9,    SW7_CS8,    SW7_CS7},  //D182-K2G-50
+    {0, SW4_CS34,   SW4_CS35,   SW4_CS36}, //D166-K30-51
+    {0, SW4_CS37,   SW4_CS38,   SW4_CS39}, //D167-K31-52
+    {0, SW4_CS31,   SW4_CS32,   SW4_CS33}, //D168-K32-53
+    {0, SW4_CS28,   SW4_CS29,   SW4_CS30}, //D169-K33-54
+    {0, SW4_CS25,   SW4_CS26,   SW4_CS27}, //D170-K34-55
+    {0, SW4_CS22,   SW4_CS23,   SW4_CS24}, //D171-K35-56
+    {0, SW4_CS19,   SW4_CS20,   SW4_CS21}, //D172-K36-57
+    {0, SW4_CS18,   SW4_CS17,   SW4_CS16}, //D173-K37-58
+    {0, SW4_CS15,   SW4_CS14,   SW4_CS13}, //D174-K38-59
+    {0, SW4_CS12,   SW4_CS11,   SW4_CS10}, //D175-K39-60
+    {0, SW4_CS9,    SW4_CS8,    SW4_CS7},  //D176-K3A-61
+    {0, SW4_CS6,    SW4_CS5,    SW4_CS4},  //D177-K3B-62
+    {0, SW4_CS3,    SW4_CS2,    SW4_CS1},  //D178-K3C-63
+    {0, SW8_CS9,    SW8_CS8,    SW8_CS7},  //D179-K3D-64
+    {0, SW5_CS34,   SW5_CS35,   SW5_CS36}, //D125-K40-65
+    {0, SW5_CS37,   SW5_CS38,   SW5_CS39}, //D128-K41-66
+    {0, SW5_CS31,   SW5_CS32,   SW5_CS33}, //D131-K42-67
+    {0, SW5_CS28,   SW5_CS29,   SW5_CS30}, //D134-K43-68
+    {0, SW5_CS25,   SW5_CS26,   SW5_CS27}, //D136-K44-69
+    {0, SW5_CS22,   SW5_CS23,   SW5_CS24}, //D138-K45-70
+    {0, SW5_CS19,   SW5_CS20,   SW5_CS21}, //D140-K46-71
+    {0, SW5_CS18,   SW5_CS17,   SW5_CS16}, //D143-K47-72
+    {0, SW5_CS15,   SW5_CS14,   SW5_CS13}, //D145-K48-73
+    {0, SW5_CS12,   SW5_CS11,   SW5_CS10}, //D147-K49-74
+    {0, SW5_CS9,    SW5_CS8,    SW5_CS7},  //D149-K4A-75
+    {0, SW5_CS6,    SW5_CS5,    SW5_CS4},  //D152-K4B-76
+    {0, SW5_CS3,    SW5_CS2,    SW5_CS1},  //D155-K4C-77
+    {0, SW8_CS12,   SW8_CS11,   SW8_CS10}, //D160-K4D-78
+    {0, SW9_CS12,   SW9_CS11,   SW9_CS10}, //D163-K4E-79
+    {0, SW6_CS34,   SW6_CS35,   SW6_CS36}, //D126-K20-80
+    {0, SW6_CS37,   SW6_CS38,   SW6_CS39}, //D129-K21-81
+    {0, SW6_CS31,   SW6_CS32,   SW6_CS33}, //D132-K22-82
+    {0, SW6_CS19,   SW6_CS20,   SW6_CS21}, //D141-K26-83
+    {0, SW6_CS9,    SW6_CS8,    SW6_CS7},  //D150-K2A-84
+    {0, SW6_CS6,    SW6_CS5,    SW6_CS4},  //D153-K2B-85
+    {0, SW6_CS3,    SW6_CS2,    SW6_CS1},  //D156-K2C-86
+    {0, SW8_CS15,   SW8_CS14,   SW8_CS13}, //D161-K2D-87
+    {0, SW9_CS15,   SW9_CS14,   SW9_CS13}, //D162-K2E-88
+    {0, SW9_CS18,   SW9_CS17,   SW9_CS16}, //D164-K2F-89
+    {0, SW9_CS19,   SW9_CS20,   SW9_CS21}, //D165-K2G-90
 };
 
 led_config_t g_led_config = { {
diff --git a/keyboards/mechlovin/mechlovin9/rev3/info.json b/keyboards/mechlovin/mechlovin9/rev3/info.json
index f5efcc1f6a9..faa4cf0a877 100644
--- a/keyboards/mechlovin/mechlovin9/rev3/info.json
+++ b/keyboards/mechlovin/mechlovin9/rev3/info.json
@@ -6,9 +6,6 @@
         "pid": "0x6509",
         "device_version": "0.0.3"
     },
-    "features": {
-        "backlight": false
-    },
     "bootmagic": {
         "matrix": [0, 13]
     },
diff --git a/keyboards/mechlovin/olly/octagon/halconf.h b/keyboards/mechlovin/olly/octagon/halconf.h
index 3635a5c4a2d..55add1de633 100644
--- a/keyboards/mechlovin/olly/octagon/halconf.h
+++ b/keyboards/mechlovin/olly/octagon/halconf.h
@@ -20,6 +20,4 @@
 
 #define HAL_USE_SPI TRUE
 
-
 #include_next <halconf.h>
-
diff --git a/keyboards/mechlovin/olly/octagon/info.json b/keyboards/mechlovin/olly/octagon/info.json
index 3ef290d3519..81b78b0b1cb 100644
--- a/keyboards/mechlovin/olly/octagon/info.json
+++ b/keyboards/mechlovin/olly/octagon/info.json
@@ -8,20 +8,25 @@
         "pid": "0xD750",
         "device_version": "0.0.1"
     },
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "nkro": true,
+        "led_matrix": true,
+        "rgblight": true
+    },
+    "build": {
+        "lto": true
+    },
     "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
         }
     },
diff --git a/keyboards/mechlovin/olly/octagon/keymaps/default/keymap.c b/keyboards/mechlovin/olly/octagon/keymaps/default/keymap.c
index fcb4929654a..353f5f5d6de 100644
--- a/keyboards/mechlovin/olly/octagon/keymaps/default/keymap.c
+++ b/keyboards/mechlovin/olly/octagon/keymaps/default/keymap.c
@@ -15,16 +15,13 @@
  */
 #include QMK_KEYBOARD_H
 
-#define LT1_CAP     LT(1, KC_CAPS)
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_split_bs(
         KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_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_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,
-        LT1_CAP, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,           KC_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_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_LSFT, 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_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, _______,   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    )
 };
diff --git a/keyboards/mechlovin/olly/octagon/keymaps/default/readme.md b/keyboards/mechlovin/olly/octagon/keymaps/default/readme.md
deleted file mode 100644
index 17d8ba9e078..00000000000
--- a/keyboards/mechlovin/olly/octagon/keymaps/default/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The default keymap for octagon
\ No newline at end of file
diff --git a/keyboards/mechlovin/olly/octagon/keymaps/via/keymap.c b/keyboards/mechlovin/olly/octagon/keymaps/via/keymap.c
index 2de37e94d31..353f5f5d6de 100644
--- a/keyboards/mechlovin/olly/octagon/keymaps/via/keymap.c
+++ b/keyboards/mechlovin/olly/octagon/keymaps/via/keymap.c
@@ -15,40 +15,13 @@
  */
 #include QMK_KEYBOARD_H
 
-#define LT1_CAP     LT(1, KC_CAPS)
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_split_bs(
         KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_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_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,
-        LT1_CAP, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,           KC_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_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_LSFT, 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_split_bs(
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-    ),
-    [1] = LAYOUT_split_bs(
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-    ),
-    [1] = LAYOUT_split_bs(
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-    ),
-
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, _______,   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    )
 };
diff --git a/keyboards/mechlovin/olly/octagon/mcuconf.h b/keyboards/mechlovin/olly/octagon/mcuconf.h
index 607305e5676..6e4987337d2 100644
--- a/keyboards/mechlovin/olly/octagon/mcuconf.h
+++ b/keyboards/mechlovin/olly/octagon/mcuconf.h
@@ -19,7 +19,6 @@
 
 #include_next <mcuconf.h>
 
-
 #undef STM32_SPI_USE_SPI1
 #define STM32_SPI_USE_SPI1 TRUE
 
diff --git a/keyboards/mechlovin/olly/octagon/octagon.c b/keyboards/mechlovin/olly/octagon/octagon.c
index 185ee32a3ee..c89565168b2 100644
--- a/keyboards/mechlovin/olly/octagon/octagon.c
+++ b/keyboards/mechlovin/olly/octagon/octagon.c
@@ -55,12 +55,13 @@ led_config_t g_led_config = {
        1,            1,             1,             1,             1,             1,             1,             1,             1,             1,             1,             1,             1,             1,                            1,
        1,            1,             1,             1,             1,             1,             1,             1,             1,             1,             1,             1,             1,             1,                            1,
        1,            1,             1,                                                          1,                                                          1,             1,             1,             1,             1,             1,
-    } 
+    }
 };
 
-
 bool led_matrix_indicators_kb(void) {
-    if (!led_matrix_indicators_user()) { return false; }
+    if (!led_matrix_indicators_user()) {
+        return false;
+    }
     if (host_keyboard_led_state().caps_lock) {
         led_matrix_set_value(87, 0xFF);
         led_matrix_set_value(47, 0xFF);
@@ -80,33 +81,25 @@ bool led_matrix_indicators_kb(void) {
     return true;
 }
 
-
 layer_state_t layer_state_set_kb(layer_state_t state) {
-  // if on layer 1, turn on L1 LED, otherwise off.
-    if (get_highest_layer(state) == 0) {
-        led_matrix_set_value(90, 0xFF);
-    } else {
-        led_matrix_set_value(90, 0x00);
-    }
-  // if on layer 2, turn on L2 LED, otherwise off.
-    if (get_highest_layer(state) == 1) {
-        led_matrix_set_value(91, 0xFF);
-    } else {
-        led_matrix_set_value(91, 0x00);
-    }
-
-  // if on layer 3, turn on L3 LED, otherwise off.
-    if (get_highest_layer(state) == 2) {
-        led_matrix_set_value(92, 0xFF);
-    } else {
-        led_matrix_set_value(92, 0x00);
-    }
-
-  // if on layer 4, turn on L4 LED, otherwise off.
-    if (get_highest_layer(state) == 3) {
-        led_matrix_set_value(93, 0xFF);
-    } else {
-        led_matrix_set_value(93, 0x00);
+    switch (get_highest_layer(state)) {
+        case 0:
+            led_matrix_set_value(90, 0xFF);
+            break;
+        case 1:
+            led_matrix_set_value(91, 0xFF);
+            break;
+        case 2:
+            led_matrix_set_value(92, 0xFF);
+            break;
+        case 3:
+            led_matrix_set_value(93, 0xFF);
+            break;
+        default:
+            led_matrix_set_value(90, 0x00);
+            led_matrix_set_value(91, 0x00);
+            led_matrix_set_value(92, 0x00);
+            led_matrix_set_value(93, 0x00);
     }
     return layer_state_set_user(state);
-}
\ No newline at end of file
+}
diff --git a/keyboards/mechlovin/olly/octagon/readme.md b/keyboards/mechlovin/olly/octagon/readme.md
index 6f1833a571a..5bf144ff5b3 100644
--- a/keyboards/mechlovin/olly/octagon/readme.md
+++ b/keyboards/mechlovin/olly/octagon/readme.md
@@ -1,6 +1,6 @@
 # Olly Octagon
 
-![Olly Octagon](https://i.imgur.com/lDMnyS4l.png)
+![Olly Octagon](https://i.imgur.com/lDMnyS4lh.png)
 
 A replacement PCB for Duck Octagon 75% keyboard.
 
@@ -24,5 +24,5 @@ Enter the bootloader in 3 ways:
 
 * **Bootmagic reset**: Hold down the key at (0,0) in the matrix (Escape) and plug in the keyboard
 * **Bootloader reset**: Hold down the key at (0,14) in the matrix (Backspace) and plug in the keyboard
-* **Keycode in layout**: Press the key mapped to `RESET` if it is available
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
 * **Hardware reset**: Press reset button (located on the bottom side of the PCB) 
diff --git a/keyboards/mechlovin/olly/octagon/rules.mk b/keyboards/mechlovin/olly/octagon/rules.mk
index 97303c7e2f8..6e7633bfe01 100644
--- a/keyboards/mechlovin/olly/octagon/rules.mk
+++ b/keyboards/mechlovin/olly/octagon/rules.mk
@@ -1,14 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-LED_MATRIX_ENABLE = yes
-RGBLIGHT_ENABLE = yes
\ No newline at end of file
+# This file intentionally left blank
diff --git a/keyboards/mechlovin/zed65/910/info.json b/keyboards/mechlovin/zed65/910/info.json
index d1de863c039..3b1472014d7 100644
--- a/keyboards/mechlovin/zed65/910/info.json
+++ b/keyboards/mechlovin/zed65/910/info.json
@@ -9,7 +9,6 @@
         "device_version": "0.0.1"
     },
     "features": {
-        "backlight": false,
         "nkro": true,
         "rgblight": true
     },
diff --git a/keyboards/mechwild/mercutio/keymaps/fearless_spiff/config.h b/keyboards/mechwild/mercutio/keymaps/fearless_spiff/config.h
deleted file mode 100644
index f29c91f9e00..00000000000
--- a/keyboards/mechwild/mercutio/keymaps/fearless_spiff/config.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright 2022 Fearless Spiff
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#define TAPPING_TERM 180
-
-#define MK_KINETIC_SPEED
-#define MOUSEKEY_DELAY 8
-#define MOUSEKEY_INTERVAL 5
-#define MOUSEKEY_MOVE_DELTA 1
-#define MOUSEKEY_INITIAL_SPEED 3
-#define MOUSEKEY_BASE_SPEED 120
-#define MOUSEKEY_DECELERATED_SPEED 100
-#define MOUSEKEY_ACCELERATED_SPEED 1000
diff --git a/keyboards/mechwild/mercutio/keymaps/fearless_spiff/keymap.c b/keyboards/mechwild/mercutio/keymaps/fearless_spiff/keymap.c
deleted file mode 100644
index 76438f9dc3b..00000000000
--- a/keyboards/mechwild/mercutio/keymaps/fearless_spiff/keymap.c
+++ /dev/null
@@ -1,301 +0,0 @@
-/* Copyright 2021 Kyle McCreery
- * Copyright 2021 Jonavin Eng
- * Copyright 2022 Fearless Spiff
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-#include "keymap_german.h"
-
-// OLED setup for bongocat
-#define IDLE_FRAMES 5
-#define IDLE_SPEED 30
-#define TAP_FRAMES 2
-#define TAP_SPEED 40
-#define ANIM_FRAME_DURATION 200
-#define ANIM_SIZE 512
-
-#define LABEL_LENGTH 8
-
-#define KC_CAD	        LALT(LCTL(KC_DEL))
-#define KC_TEAMS_CAM	C(S(KC_O))
-#define KC_TEAMS_MUTE	C(S(KC_M))
-
-enum layers {
-  QWERT,
-  FN_1,
-  FN_2,
-  FN_MOUSE
-};
-
-enum custom_user_keycodes {
-  KC_ENC = SAFE_RANGE
-};
-
-static long int oled_timeout = 1800000; //  30 minutes
-bool gui_on = true;
-char wpm_str[10];
-uint32_t anim_timer = 0;
-uint32_t anim_sleep = 0;
-uint8_t current_idle_frame = 0;
-uint8_t current_tap_frame = 0;
-
-// Tap Dance declarations
-enum {
-    TD_TAB_ESC,
-};
-
-// Tap Dance definitions
-tap_dance_action_t tap_dance_actions[] = {
-    // Tap once for Tab, twice for Esc
-    [TD_TAB_ESC] = ACTION_TAP_DANCE_DOUBLE(KC_TAB, KC_ESC),
-};
-
-typedef struct {
-    char label_top[LABEL_LENGTH];
-    char label_mid[LABEL_LENGTH];
-    char label_bottom[LABEL_LENGTH];
-    uint16_t keycode;
-} encoder_key;
-
-static const encoder_key PROGMEM encoder_keys[] = {
-    // list of key codes that will be scrolled through by encoder and description
-    // Be aware that it only works when using one char less than defined. In this case 7 max. No idea why?
-    {"Teams", "Toggle", "Mic", KC_TEAMS_MUTE},
-    {"Teams", "Toggle", "Cam", KC_TEAMS_CAM},
-    {"Ctrl", "Alt", "Del", KC_CAD},
-    {"Caps", "Lock", "", KC_CAPS_LOCK},
-    {"Pause", "", "", KC_PAUSE},
-    {"PrtScr", "", "", KC_PSCR},
-    {"Insert", "", "", KC_INS},
-    {"Play", "", "", KC_MEDIA_PLAY_PAUSE}
-};
-
-#define NUMBER_OF_ENCODER_KEYS ARRAY_SIZE(encoder_keys)
-
-static uint8_t selected_encoder_key_id = 0;
-static encoder_key selected_encoder_key;
-
-static void set_selected_encoder_key(uint8_t idx) {
-    // make a copy from PROGMEM
-    memcpy_P (&selected_encoder_key, &encoder_keys[idx], sizeof selected_encoder_key);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case KC_ENC:
-            if (record->event.pressed) {
-                tap_code16(selected_encoder_key.keycode);
-            }
-        break;
-    }
-    return true;
-}
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [QWERT] = LAYOUT_all(
-                                                                                                                      KC_ENC,
-          TD(TD_TAB_ESC),   KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    DE_Z,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-          MO(FN_1), KC_A,   KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    DE_PLUS,          KC_ENT,
-          KC_LSFT, DE_LABK, DE_Y,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,           KC_RSFT,
-          KC_LCTL, KC_LGUI, KC_LALT,   LT(FN_2,KC_SPC),   LT(FN_2,KC_SPC),     LT(FN_2,KC_SPC),      KC_RALT, DE_MINS,          KC_RCTL ),
-
-    [FN_1] = LAYOUT_all(
-                                                                                                                       KC_MUTE,
-    	  QK_GESC,          _______, _______, _______, DE_LCBR, DE_RCBR, _______, DE_UDIA, KC_UP,    DE_ODIA, DE_QUES, KC_DEL,
-    	  _______,          DE_ADIA, DE_SS,   _______, DE_LPRN, DE_RPRN, _______, KC_LEFT, KC_DOWN, KC_RIGHT, DE_HASH, _______,
-    	  _______, _______, DE_CIRC, DE_ACUT, _______, DE_LBRC, DE_RBRC, KC_HOME, KC_END,  DE_QUOT,  DE_DQUO,          DE_EQL,
-    	  _______,   _______, _______,    MO(FN_MOUSE),   MO(FN_MOUSE),       MO(FN_MOUSE),          DE_BSLS, DE_SLSH,         DE_TILD ),
-
-    [FN_2] = LAYOUT_all(
-                                                                                                                      _______,
-    	  KC_F1,            KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_BSPC,
-    	  KC_1,             KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______, _______,
-    	  _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_COMM, KC_DOT,           _______,
-    	  _______, _______, _______,          _______, _______,          _______,          _______, _______,          _______ ),
-
-    [FN_MOUSE] = LAYOUT_all(
-                                                                                                                      _______,
-          _______,          _______, _______, _______, _______, _______, _______, KC_BTN1, KC_MS_U, KC_BTN2, KC_BTN3, _______,
-          _______,          _______, _______, _______, KC_ACL0, _______, KC_WH_U, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, _______,
-          _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,  _______,          _______,
-          _______,   _______, _______,        _______,   _______,        _______,          _______, _______,         _______ )
-};
-
-#ifdef ENCODER_ENABLE
-    bool encoder_update_user(uint8_t index, bool clockwise) {
-        if (clockwise) {
-            if (IS_LAYER_ON(QWERT) && selected_encoder_key_id  < NUMBER_OF_ENCODER_KEYS-1) {
-               selected_encoder_key_id ++;
-               set_selected_encoder_key(selected_encoder_key_id);
-            }
-            if (IS_LAYER_ON(FN_1)) {
-                tap_code16(KC_PGDN);
-            }
-            if (IS_LAYER_ON(FN_2)) {
-                tap_code(KC_VOLU);
-            }
-        } else {
-            if (IS_LAYER_ON(QWERT) && selected_encoder_key_id  > 0) {
-                selected_encoder_key_id --;
-                set_selected_encoder_key(selected_encoder_key_id);
-            }
-            if (IS_LAYER_ON(FN_1)) {
-                tap_code16(KC_PGUP);
-            }
-            if (IS_LAYER_ON(FN_2)) {
-                tap_code(KC_VOLD);
-            }
-        }
-        return false;
-    }
-#endif
-
-#ifdef OLED_ENABLE
-    oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-        set_selected_encoder_key(selected_encoder_key_id);
-
-        return OLED_ROTATION_180;  // flips the display 180 degrees
-    }
-
-    static void render_anim(void) {
-
-        // Idle animation
-        static const char PROGMEM idle[IDLE_FRAMES][ANIM_SIZE] = {
-
-            {
-                0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,16,8,8,4,4,4,8,48,64,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24,100,130,2,2,2,2,2,1,0,0,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,192,193,193,194,4,8,16,32,64,128,0,0,0,128,128,128,128,64,64,
-                64,64,32,32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,192,56,4,3,0,0,0,0,0,0,0,12,12,12,13,1,0,64,160,33,34,18,17,17,17,9,8,8,8,8,4,4,8,8,16,16,16,16,16,17,15,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,1,1,1,2,2,4,4,8,8,8,8,8,7,
-                0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-            },
-
-            {
-                0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,16,8,8,4,4,4,8,48,64,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24,100,130,2,2,2,2,2,1,0,0,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,192,193,193,194,4,8,16,32,64,128,0,0,0,128,128,128,128,64,64,
-                64,64,32,32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,192,56,4,3,0,0,0,0,0,0,0,12,12,12,13,1,0,64,160,33,34,18,17,17,17,9,8,8,8,8,4,4,8,8,16,16,16,16,16,17,15,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,1,1,1,2,2,4,4,8,8,8,8,8,
-                7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-            },
-
-            {
-                0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,64,64,64,64,32,32,32,32,16,8,4,2,2,4,24,96,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,60,194,1,1,2,2,4,4,2,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,96,96,0,129,130,130,132,8,16,32,64,128,0,0,0,0,128,128,128,128,64,64,64,64,32,
-                32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,112,25,6,0,0,0,0,0,0,0,24,24,24,27,3,0,64,160,34,36,20,18,18,18,11,8,8,8,8,5,5,9,9,16,16,16,16,16,17,15,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,1,1,1,2,2,4,4,8,8,8,8,8,7,0,0,0,
-                0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-            },
-
-            {
-                0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,8,4,2,1,1,2,12,48,64,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30,225,0,0,1,1,2,2,1,0,0,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,192,193,193,194,4,8,16,32,64,128,0,0,0,128,128,128,128,64,64,
-                64,64,32,32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,112,12,3,0,0,0,0,0,0,0,12,12,12,13,1,0,64,160,33,34,18,17,17,17,9,8,8,8,8,4,4,8,8,16,16,16,16,16,17,15,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,1,1,1,2,2,4,4,8,8,8,8,8,
-                7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-            },
-
-            {
-                0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,8,8,4,2,2,2,4,56,64,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,28,226,1,1,2,2,2,2,1,0,0,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,192,193,193,194,4,8,16,32,64,128,0,0,0,128,128,128,128,64,64,64,64,
-                32,32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,112,12,3,0,0,0,0,0,0,0,12,12,12,13,1,0,64,160,33,34,18,17,17,17,9,8,8,8,8,4,4,8,8,16,16,16,16,16,17,15,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,1,1,1,2,2,4,4,8,8,8,8,8,7,0,0,
-                0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-            }
-
-        };
-
-        // Prep animation
-        static const char PROGMEM prep[][ANIM_SIZE] = {
-
-            {
-                0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,8,4,2,1,1,2,12,48,64,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30,225,0,0,1,1,2,2,129,128,128,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,0,1,225,26,6,9,49,53,1,138,124,0,0,128,128,128,128,64,64,
-                64,64,32,32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,112,12,3,0,0,24,6,5,152,153,132,195,124,65,65,64,64,32,33,34,18,17,17,17,9,8,8,8,8,4,4,4,4,4,4,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,
-                0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-            }
-
-        };
-
-        // Typing animation
-        static const char PROGMEM tap[TAP_FRAMES][ANIM_SIZE] = {
-
-            {
-                0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,8,4,2,1,1,2,12,48,64,128,0,0,0,0,0,0,0,248,248,248,248,0,0,0,0,0,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30,225,0,0,1,1,2,2,129,128,128,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,0,1,1,2,4,8,16,32,67,135,7,1,0,184,188,190,159,
-                95,95,79,76,32,32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,112,12,3,0,0,24,6,5,152,153,132,67,124,65,65,64,64,32,33,34,18,17,17,17,9,8,8,8,8,4,4,8,8,16,16,16,16,16,17,15,1,61,124,252,252,252,252,252,60,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,
-                1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-            },
-
-            {
-                0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,8,4,2,1,1,2,12,48,64,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30,225,0,0,1,1,2,2,1,0,0,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,0,1,225,26,6,9,49,53,1,138,124,0,0,128,128,128,128,64,64,64,64,32,
-                32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,112,12,3,0,0,0,0,0,0,0,0,0,0,1,1,0,64,160,33,34,18,17,17,17,9,8,8,8,8,4,4,4,4,4,4,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,122,122,121,121,121,121,57,49,2,2,4,4,8,8,8,136,136,135,128,
-                0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-            }
-
-        };
-
-        void animation_phase(void) {
-            if (get_current_wpm() <= IDLE_SPEED) {
-                current_idle_frame = (current_idle_frame + 1) % IDLE_FRAMES;
-                oled_write_raw_P(idle[abs((IDLE_FRAMES-1)-current_idle_frame)], ANIM_SIZE);
-            }
-
-            if (get_current_wpm() > IDLE_SPEED && get_current_wpm() < TAP_SPEED) {
-                oled_write_raw_P(prep[0], ANIM_SIZE);
-            }
-
-            if (get_current_wpm() >= TAP_SPEED) {
-                current_tap_frame = (current_tap_frame + 1) % TAP_FRAMES;
-                oled_write_raw_P(tap[abs((TAP_FRAMES-1)-current_tap_frame)], ANIM_SIZE);
-            }
-        }
-
-        if (get_current_wpm() != 000) {
-            oled_on();
-
-            if (timer_elapsed32(anim_timer) > ANIM_FRAME_DURATION) {
-                anim_timer = timer_read32();
-                animation_phase();
-            }
-
-            anim_sleep = timer_read32();
-        } else {
-            if (timer_elapsed32(anim_sleep) > oled_timeout) {
-                oled_off();
-            } else {
-                if (timer_elapsed32(anim_timer) > ANIM_FRAME_DURATION) {
-                    anim_timer = timer_read32();
-                    animation_phase();
-                }
-            }
-        }
-    }
-
-    bool oled_task_user(void) {
-
-            render_anim();
-
-            oled_set_cursor(0,0);
-            oled_write(selected_encoder_key.label_top, false);
-
-            oled_set_cursor(0,1);
-            oled_write(selected_encoder_key.label_mid, false);
-
-            oled_set_cursor(0,2);
-            oled_write(selected_encoder_key.label_bottom, false);
-
-    /* hide wpm display for now
-            oled_set_cursor(13,3);
-            oled_write_P(PSTR("WPM: "), false);
-            oled_write(get_u8_str(get_current_wpm(), ' '), false);
-    */
-
-      return false;
-    }
-
-    void suspend_power_down_user(void) {
-          oled_off();
-    }
-#endif
diff --git a/keyboards/mechwild/mercutio/keymaps/fearless_spiff/readme.md b/keyboards/mechwild/mercutio/keymaps/fearless_spiff/readme.md
deleted file mode 100644
index 85b3490608a..00000000000
--- a/keyboards/mechwild/mercutio/keymaps/fearless_spiff/readme.md
+++ /dev/null
@@ -1,29 +0,0 @@
-Fearless Spiff's Custom Mercutio Keymap
-  - "Programmer"-centric and German layout based keymap
-  - Based on Bongocat and Jonavin keymap
-
-Features
-  - Fancy Bongocat! Yay! (borrowed from bongocat obviously)
-  - Encoder selectable key codes and displayed on OLED (borrowed and multi-line-enhanced from Jonavin)
-    - Change encoder_keys in keymap.c to assign your desired key selection
-  - Additional encoder functionality 
-    - While holding FN_1, page up and down
-    - While holding FN_2, volume up and down
-  - Mouse controls by holding Caps-Space
-  - Use my templates for your own layout overview at [Keyboard Layout Editor](http://www.keyboard-layout-editor.com) using my gist [here](https://gist.github.com/FearlessSpiff)
-  - Shout out to [KMonad](https://github.com/kmonad/kmonad) which enabled my laptop keyboard to behave like my Mercutio!
-
-QWERT Layer
-![image](https://user-images.githubusercontent.com/1927259/148683284-04932e15-a34d-451e-b657-335780033f36.png)
-
-FN_1 Layer
-![image](https://user-images.githubusercontent.com/1927259/157032746-8aa68e1c-27b9-4cf5-88ed-a071d8238f56.png)
-
-FN_2 layer
-![image](https://user-images.githubusercontent.com/1927259/148683306-364bc59c-b41b-4092-b93b-d7b4fc58567b.png)
-
-FN_MOUSE layer
-![image](https://user-images.githubusercontent.com/1927259/157032817-83922578-8932-42bf-a2d2-f785136b4d4e.png)
-
-
-
diff --git a/keyboards/mechwild/mercutio/keymaps/fearless_spiff/rules.mk b/keyboards/mechwild/mercutio/keymaps/fearless_spiff/rules.mk
deleted file mode 100644
index fc0ec281538..00000000000
--- a/keyboards/mechwild/mercutio/keymaps/fearless_spiff/rules.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-WPM_ENABLE = yes
-TAP_DANCE_ENABLE = yes
-VIA_ENABLE = no
-MOUSEKEY_ENABLE = yes
-EXTRAKEY_ENABLE = yes # Audio control and System control
-KEY_LOCK_ENABLE = no
-CONSOLE_ENABLE = no
diff --git a/keyboards/mechwild/mercutio/keymaps/fearless_spiff_en/config.h b/keyboards/mechwild/mercutio/keymaps/fearless_spiff_en/config.h
deleted file mode 100644
index 9d588ed8c08..00000000000
--- a/keyboards/mechwild/mercutio/keymaps/fearless_spiff_en/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2022 Fearless Spiff
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#define TAPPING_TERM 180
diff --git a/keyboards/mechwild/mercutio/keymaps/fearless_spiff_en/keymap.c b/keyboards/mechwild/mercutio/keymaps/fearless_spiff_en/keymap.c
deleted file mode 100644
index c79c00a707f..00000000000
--- a/keyboards/mechwild/mercutio/keymaps/fearless_spiff_en/keymap.c
+++ /dev/null
@@ -1,293 +0,0 @@
-/* Copyright 2021 Kyle McCreery
- * Copyright 2021 Jonavin Eng
- * Copyright 2022 Fearless Spiff
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-#include "keymap_german.h"
-
-// OLED setup for bongocat
-#define IDLE_FRAMES 5
-#define IDLE_SPEED 30
-#define TAP_FRAMES 2
-#define TAP_SPEED 40
-#define ANIM_FRAME_DURATION 200
-#define ANIM_SIZE 512
-
-#define LABEL_LENGTH 8
-
-#define KC_CAD	        LALT(LCTL(KC_DEL))
-#define KC_TEAMS_CAM	C(S(KC_O))
-#define KC_TEAMS_MUTE	C(S(KC_M))
-
-enum layers {
-  QWERT,
-  FN_1,
-  FN_2
-};
-
-enum custom_user_keycodes {
-  KC_ENC = SAFE_RANGE
-};
-
-static long int oled_timeout = 1800000; //  30 minutes
-bool gui_on = true;
-char wpm_str[10];
-uint32_t anim_timer = 0;
-uint32_t anim_sleep = 0;
-uint8_t current_idle_frame = 0;
-uint8_t current_tap_frame = 0;
-
-// Tap Dance declarations
-enum {
-    TD_TAB_ESC,
-};
-
-// Tap Dance definitions
-tap_dance_action_t tap_dance_actions[] = {
-    // Tap once for Tab, twice for Esc
-    [TD_TAB_ESC] = ACTION_TAP_DANCE_DOUBLE(KC_TAB, KC_ESC),
-};
-
-typedef struct {
-    char label_top[LABEL_LENGTH];
-    char label_mid[LABEL_LENGTH];
-    char label_bottom[LABEL_LENGTH];
-    uint16_t keycode;
-} encoder_key;
-
-static const encoder_key PROGMEM encoder_keys[] = {
-    // list of key codes that will be scrolled through by encoder and description
-    // Be aware that it only works when using one char less than defined. In this case 7 max. No idea why?
-    {"Teams", "Toggle", "Mic", KC_TEAMS_MUTE},
-    {"Teams", "Toggle", "Cam", KC_TEAMS_CAM},
-    {"Ctrl", "Alt", "Del", KC_CAD},
-    {"Caps", "Lock", "", KC_CAPS_LOCK},
-    {"Pause", "", "", KC_PAUSE},
-    {"PrtScr", "", "", KC_PSCR},
-    {"Insert", "", "", KC_INS},
-    {"Play", "", "", KC_MEDIA_PLAY_PAUSE}
-};
-
-#define NUMBER_OF_ENCODER_KEYS ARRAY_SIZE(encoder_keys)
-
-static uint8_t selected_encoder_key_id = 0;
-static encoder_key selected_encoder_key;
-
-static void set_selected_encoder_key(uint8_t idx) {
-    // make a copy from PROGMEM
-    memcpy_P (&selected_encoder_key, &encoder_keys[idx], sizeof selected_encoder_key);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case KC_ENC:
-            if (record->event.pressed) {
-                tap_code16(selected_encoder_key.keycode);
-            }
-        break;
-    }
-    return true;
-}
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [QWERT] = LAYOUT_all(
-                                                                                                                      KC_ENC,
-          TD(TD_TAB_ESC),   KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-          LT(1,KC_CAPS),   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_PLUS,          KC_ENT,
-          KC_LSFT, KC_LABK, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,           KC_RSFT,
-          KC_LCTL, KC_LGUI, LT(2,KC_LALT),   KC_SPC,  KC_SPC,   KC_SPC,        KC_RALT, MO(2),          KC_RCTL ),
-
-    [FN_1] = LAYOUT_all(
-                                                                                                                       KC_MUTE,
-    	  QK_GESC,          _______, KC_UP, _______, KC_LCBR, KC_RCBR, _______, _______, KC_UP,    _______, KC_QUES, KC_DEL,
-    	  _______,          KC_LEFT, KC_DOWN,   KC_RIGHT, KC_LPRN, KC_RPRN, KC_QUES, KC_LEFT, KC_DOWN, KC_LABK, KC_RABK, _______,
-    	  _______, KC_BSLS, KC_SLSH, KC_PIPE, _______, KC_LBRC, KC_RBRC, KC_HOME, KC_END,  KC_QUOT,  KC_DQUO,          KC_EQL,
-    	  _______,   _______, _______,          _______, _______,          _______,          KC_BSLS, KC_SLSH,         KC_TILD ),
-
-    [FN_2] = LAYOUT_all(
-                                                                                                                      _______,
-    	  KC_ESC,            KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,  KC_0,  KC_BSPC,
-    	  _______,             KC_EXLM,    KC_AT,    KC_HASH,    KC_DLR,    KC_AMPR,    KC_PERC,    KC_ASTR,    KC_LPRN,    KC_RPRN,  _______, _______,
-    	  _______, _______, KC_MINS, KC_PLUS, KC_BSLS, KC_SLSH, KC_SCLN, KC_COLN, KC_QUES, KC_LBRC, KC_RBRC, KC_DOT,
-    	  KC_DQUO, KC_QUOT, KC_DQUO,          _______, _______,          _______,          _______, _______,          KC_PIPE )
-};
-
-#ifdef ENCODER_ENABLE
-    bool encoder_update_user(uint8_t index, bool clockwise) {
-        if (clockwise) {
-            if (IS_LAYER_ON(QWERT) && selected_encoder_key_id  < NUMBER_OF_ENCODER_KEYS-1) {
-               selected_encoder_key_id ++;
-               set_selected_encoder_key(selected_encoder_key_id);
-            }
-            if (IS_LAYER_ON(FN_1)) {
-                tap_code16(KC_PGDN);
-            }
-            if (IS_LAYER_ON(FN_2)) {
-                tap_code(KC_VOLU);
-            }
-        } else {
-            if (IS_LAYER_ON(QWERT) && selected_encoder_key_id  > 0) {
-                selected_encoder_key_id --;
-                set_selected_encoder_key(selected_encoder_key_id);
-            }
-            if (IS_LAYER_ON(FN_1)) {
-                tap_code16(KC_PGUP);
-            }
-            if (IS_LAYER_ON(FN_2)) {
-                tap_code(KC_VOLD);
-            }
-        }
-        return false;
-    }
-#endif
-
-#ifdef OLED_ENABLE
-    oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-        set_selected_encoder_key(selected_encoder_key_id);
-
-        return OLED_ROTATION_180;  // flips the display 180 degrees
-    }
-
-    static void render_anim(void) {
-
-        // Idle animation
-        static const char PROGMEM idle[IDLE_FRAMES][ANIM_SIZE] = {
-
-            {
-                0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,16,8,8,4,4,4,8,48,64,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24,100,130,2,2,2,2,2,1,0,0,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,192,193,193,194,4,8,16,32,64,128,0,0,0,128,128,128,128,64,64,
-                64,64,32,32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,192,56,4,3,0,0,0,0,0,0,0,12,12,12,13,1,0,64,160,33,34,18,17,17,17,9,8,8,8,8,4,4,8,8,16,16,16,16,16,17,15,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,1,1,1,2,2,4,4,8,8,8,8,8,7,
-                0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-            },
-
-            {
-                0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,16,8,8,4,4,4,8,48,64,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24,100,130,2,2,2,2,2,1,0,0,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,192,193,193,194,4,8,16,32,64,128,0,0,0,128,128,128,128,64,64,
-                64,64,32,32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,192,56,4,3,0,0,0,0,0,0,0,12,12,12,13,1,0,64,160,33,34,18,17,17,17,9,8,8,8,8,4,4,8,8,16,16,16,16,16,17,15,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,1,1,1,2,2,4,4,8,8,8,8,8,
-                7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-            },
-
-            {
-                0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,64,64,64,64,32,32,32,32,16,8,4,2,2,4,24,96,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,60,194,1,1,2,2,4,4,2,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,96,96,0,129,130,130,132,8,16,32,64,128,0,0,0,0,128,128,128,128,64,64,64,64,32,
-                32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,112,25,6,0,0,0,0,0,0,0,24,24,24,27,3,0,64,160,34,36,20,18,18,18,11,8,8,8,8,5,5,9,9,16,16,16,16,16,17,15,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,1,1,1,2,2,4,4,8,8,8,8,8,7,0,0,0,
-                0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-            },
-
-            {
-                0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,8,4,2,1,1,2,12,48,64,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30,225,0,0,1,1,2,2,1,0,0,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,192,193,193,194,4,8,16,32,64,128,0,0,0,128,128,128,128,64,64,
-                64,64,32,32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,112,12,3,0,0,0,0,0,0,0,12,12,12,13,1,0,64,160,33,34,18,17,17,17,9,8,8,8,8,4,4,8,8,16,16,16,16,16,17,15,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,1,1,1,2,2,4,4,8,8,8,8,8,
-                7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-            },
-
-            {
-                0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,8,8,4,2,2,2,4,56,64,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,28,226,1,1,2,2,2,2,1,0,0,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,192,193,193,194,4,8,16,32,64,128,0,0,0,128,128,128,128,64,64,64,64,
-                32,32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,112,12,3,0,0,0,0,0,0,0,12,12,12,13,1,0,64,160,33,34,18,17,17,17,9,8,8,8,8,4,4,8,8,16,16,16,16,16,17,15,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,1,1,1,2,2,4,4,8,8,8,8,8,7,0,0,
-                0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-            }
-
-        };
-
-        // Prep animation
-        static const char PROGMEM prep[][ANIM_SIZE] = {
-
-            {
-                0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,8,4,2,1,1,2,12,48,64,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30,225,0,0,1,1,2,2,129,128,128,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,0,1,225,26,6,9,49,53,1,138,124,0,0,128,128,128,128,64,64,
-                64,64,32,32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,112,12,3,0,0,24,6,5,152,153,132,195,124,65,65,64,64,32,33,34,18,17,17,17,9,8,8,8,8,4,4,4,4,4,4,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,
-                0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-            }
-
-        };
-
-        // Typing animation
-        static const char PROGMEM tap[TAP_FRAMES][ANIM_SIZE] = {
-
-            {
-                0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,8,4,2,1,1,2,12,48,64,128,0,0,0,0,0,0,0,248,248,248,248,0,0,0,0,0,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30,225,0,0,1,1,2,2,129,128,128,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,0,1,1,2,4,8,16,32,67,135,7,1,0,184,188,190,159,
-                95,95,79,76,32,32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,112,12,3,0,0,24,6,5,152,153,132,67,124,65,65,64,64,32,33,34,18,17,17,17,9,8,8,8,8,4,4,8,8,16,16,16,16,16,17,15,1,61,124,252,252,252,252,252,60,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,
-                1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-            },
-
-            {
-                0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,8,4,2,1,1,2,12,48,64,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30,225,0,0,1,1,2,2,1,0,0,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,0,1,225,26,6,9,49,53,1,138,124,0,0,128,128,128,128,64,64,64,64,32,
-                32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,112,12,3,0,0,0,0,0,0,0,0,0,0,1,1,0,64,160,33,34,18,17,17,17,9,8,8,8,8,4,4,4,4,4,4,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,122,122,121,121,121,121,57,49,2,2,4,4,8,8,8,136,136,135,128,
-                0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-            }
-
-        };
-
-        void animation_phase(void) {
-            if (get_current_wpm() <= IDLE_SPEED) {
-                current_idle_frame = (current_idle_frame + 1) % IDLE_FRAMES;
-                oled_write_raw_P(idle[abs((IDLE_FRAMES-1)-current_idle_frame)], ANIM_SIZE);
-            }
-
-            if (get_current_wpm() > IDLE_SPEED && get_current_wpm() < TAP_SPEED) {
-                oled_write_raw_P(prep[0], ANIM_SIZE);
-            }
-
-            if (get_current_wpm() >= TAP_SPEED) {
-                current_tap_frame = (current_tap_frame + 1) % TAP_FRAMES;
-                oled_write_raw_P(tap[abs((TAP_FRAMES-1)-current_tap_frame)], ANIM_SIZE);
-            }
-        }
-
-        if (get_current_wpm() != 000) {
-            oled_on();
-
-            if (timer_elapsed32(anim_timer) > ANIM_FRAME_DURATION) {
-                anim_timer = timer_read32();
-                animation_phase();
-            }
-
-            anim_sleep = timer_read32();
-        } else {
-            if (timer_elapsed32(anim_sleep) > oled_timeout) {
-                oled_off();
-            } else {
-                if (timer_elapsed32(anim_timer) > ANIM_FRAME_DURATION) {
-                    anim_timer = timer_read32();
-                    animation_phase();
-                }
-            }
-        }
-    }
-
-    bool oled_task_user(void) {
-
-            render_anim();
-
-            oled_set_cursor(0,0);
-            oled_write(selected_encoder_key.label_top, false);
-
-            oled_set_cursor(0,1);
-            oled_write(selected_encoder_key.label_mid, false);
-
-            oled_set_cursor(0,2);
-            oled_write(selected_encoder_key.label_bottom, false);
-
-    /* hide wpm display for now
-            oled_set_cursor(13,3);
-            oled_write_P(PSTR("WPM: "), false);
-            oled_write(get_u8_str(get_current_wpm(), ' '), false);
-    */
-
-      return false;
-    }
-
-    void suspend_power_down_user(void) {
-          oled_off();
-    }
-#endif
diff --git a/keyboards/mechwild/mercutio/keymaps/fearless_spiff_en/readme.md b/keyboards/mechwild/mercutio/keymaps/fearless_spiff_en/readme.md
deleted file mode 100644
index dea71bf358c..00000000000
--- a/keyboards/mechwild/mercutio/keymaps/fearless_spiff_en/readme.md
+++ /dev/null
@@ -1,22 +0,0 @@
-Fearless Spiff's Custom Mercutio Keymap
-  - "Programmer"-centric and German layout based keymap
-  - Based on Bongocat and Jonavin keymap
-
-Features
-  - Fancy Bongocat! Yay! (borrowed from bongocat obviously)
-  - Encoder selectable key codes and displayed on OLED (borrowed and multi-line-enhanced from Jonavin)
-    - Change encoder_keys in keymap.c to assign your desired key selection
-  - Additional encoder functionality 
-    - While holding FN_1, page up and down
-    - While holding FN_2, volume up and down
-  - Use my templates for your own layout overview at [Keyboard Layout Editor](http://www.keyboard-layout-editor.com) using my gist [here](https://gist.github.com/FearlessSpiff)
-
-QWERT Layer
-![image](https://user-images.githubusercontent.com/1927259/148683284-04932e15-a34d-451e-b657-335780033f36.png)
-
-FN_1 Layer
-![image](https://user-images.githubusercontent.com/1927259/148683299-f2c80403-3f29-4ba8-9fc4-957729f30b05.png)
-
-FN_2 layer
-![image](https://user-images.githubusercontent.com/1927259/148683306-364bc59c-b41b-4092-b93b-d7b4fc58567b.png)
-
diff --git a/keyboards/mechwild/mercutio/keymaps/fearless_spiff_en/rules.mk b/keyboards/mechwild/mercutio/keymaps/fearless_spiff_en/rules.mk
deleted file mode 100644
index 4775e0e11d0..00000000000
--- a/keyboards/mechwild/mercutio/keymaps/fearless_spiff_en/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-WPM_ENABLE = yes
-TAP_DANCE_ENABLE = yes
-MOUSEKEY_ENABLE = no
diff --git a/keyboards/mechwild/mokulua/standard/keymaps/silly/config.h b/keyboards/mechwild/mokulua/standard/keymaps/silly/config.h
deleted file mode 100644
index 271ab552924..00000000000
--- a/keyboards/mechwild/mokulua/standard/keymaps/silly/config.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 2022 Kyle McCreery (@kylemccreery)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#define RGBLIGHT_LAYERS
\ No newline at end of file
diff --git a/keyboards/mechwild/mokulua/standard/keymaps/silly/keymap.c b/keyboards/mechwild/mokulua/standard/keymaps/silly/keymap.c
deleted file mode 100644
index d7fcf0f221b..00000000000
--- a/keyboards/mechwild/mokulua/standard/keymaps/silly/keymap.c
+++ /dev/null
@@ -1,128 +0,0 @@
-// Copyright 2022 Kyle McCreery (@kylemccreery)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-
-#define FN1_SPC     LT(1, KC_SPC)
-#define FN2_SPC     LT(2, KC_SPC)
-#define HSV_SILLY_PURPLE 180, 255, 255
-
-// Defines names for use in layer keycodes and the keymap
-enum layer_names {
-    _BASE,
-    _FN1,
-    _FN2,
-    _RS3
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {    
-    [_BASE] = LAYOUT(
-        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,                         KC_MINS,  KC_7,    KC_8,    KC_9,    KC_0,   _______, KC_BSPC,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,                             KC_Y,    KC_U,    KC_I,    KC_O,       KC_P,      KC_BSLS,
-        MO(1),   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,                         KC_SCLN, KC_H,    KC_J,    KC_K,    KC_L,    KC_QUOT, KC_ENT,
-        KC_LSFT, _______, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    TG(_RS3),   KC_MUTE, KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_UP,   KC_RSFT,
-        KC_LCTL, KC_LGUI, KC_LALT, MO(2),      FN1_SPC, FN2_SPC,       RGB_RMOD,   RGB_MOD,       FN2_SPC, FN1_SPC,  MO(2),   KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-    [_FN1] = LAYOUT(
-        KC_F12,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                        _______,   KC_F7,   KC_F8,   KC_F9, KC_F10,  _______, KC_DEL, 
-        _______, _______, _______, _______, _______, _______, _______,                         _______, _______, _______,  KC_LBRC,    KC_RBRC,   _______,
-        _______, _______, _______, _______, _______, _______, _______,                      _______, _______, _______, _______, _______, KC_SCLN, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______, _______, _______, KC_SLSH, KC_PGUP, _______,
-        _______, _______, _______, _______,     _______, _______,      _______,    _______,    _______, _______,     _______, KC_HOME, KC_PGDN, KC_END
-    ),
-    [_FN2] = LAYOUT(                                                                                   
-        _______, KC_F11,  KC_F12,  _______, _______, _______, _______,                      _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, QK_BOOT, _______, _______,                         _______, _______, _______,  _______,    _______,   _______,
-        _______, _______, _______, _______, _______, _______, _______,                      _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______,     _______, _______,      _______,    _______,      _______, _______,     _______, _______, _______, _______
-    ),
-    [_RS3] = LAYOUT(                                                                                   
-        KC_PAST, _______, _______, _______, _______, _______, _______,                      _______, _______, _______, _______, _______, _______, _______,
-        KC_PSLS, _______, _______, _______, _______, _______, _______,                         _______, _______, _______,  _______,    _______,   _______,
-        KC_PPLS, _______, _______, _______, _______, _______, _______,                      _______, _______, _______, _______, _______, _______, _______,
-        KC_PMNS, _______, _______, _______, _______, _______, _______, TG(_RS3),   _______, _______, _______, _______, _______, _______, _______, _______,
-        KC_HOME, KC_END,  KC_PGUP, KC_K,        KC_L,    KC_M,         KC_PGDN,    _______,      KC_F1,   KC_F2,       KC_F3,   _______, _______, _______
-    )
-};
-
-#ifdef OLED_ENABLE
-     static void render_logo(void) {     // Render MechWild "MW" Logo
-          static const char PROGMEM logo_1[] = {0x8A, 0x8B, 0x8C, 0x8D, 0x00};
-          static const char PROGMEM logo_2[] = {0xAA, 0xAB, 0xAC, 0xAD, 0xAE, 0x00};
-          static const char PROGMEM logo_3[] = {0xCA, 0xCB, 0xCC, 0xCD, 0x00};
-          static const char PROGMEM logo_4[] = {0x20, 0x8E, 0x8F, 0x90, 0x00};
-          oled_set_cursor(0,0);
-          oled_write_P(logo_1, false);
-          oled_set_cursor(0,1);
-          oled_write_P(logo_2, false);
-          oled_set_cursor(0,2);
-          oled_write_P(logo_3, false);
-          oled_set_cursor(0,3);
-          oled_write_P(logo_4, false);
-     }
-    bool oled_task_user(void) {
-        render_logo();
-        oled_set_cursor(0,6);
-
-        oled_write_ln_P(PSTR("Layer"), false);
-
-    switch (get_highest_layer(layer_state)) {
-        case 0:
-            oled_write_ln_P(PSTR("Base"), false);
-            break;
-        case 1:
-            oled_write_ln_P(PSTR("FN 1"), false);
-            break;
-        case 2:
-            oled_write_ln_P(PSTR("FN 2"), false);
-            break;
-        case 3:
-            oled_write_ln_P(PSTR("RS3"), false);
-            break;
-        default:
-            oled_write_ln_P(PSTR("Undef"), false);
-    }
-    oled_write_ln_P(PSTR(""), false);
-    // Host Keyboard LED Status
-    led_t led_state = host_keyboard_led_state();
-    oled_write_ln_P(led_state.num_lock ? PSTR("NUM ") : PSTR("    "), false);
-    oled_write_ln_P(led_state.caps_lock ? PSTR("CAP ") : PSTR("    "), false);
-    oled_write_ln_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR("    "), false);
-    return false;
-    }
-#endif
-
-#ifdef RGBLIGHT_ENABLE
-    // Optional RGB Light Mapping Zones {LED Posiiton, Number of LEDs, Colour}
-    const rgblight_segment_t PROGMEM _rgb_fn1[] = RGBLIGHT_LAYER_SEGMENTS(
-        {4, 3, HSV_GREEN},
-        {12, 3, HSV_GREEN}
-    );
-    // Light LEDs 9 & 10 in cyan when keyboard layer 1 is active
-    const rgblight_segment_t PROGMEM _rgb_fn2[] = RGBLIGHT_LAYER_SEGMENTS(
-        {4, 3, HSV_GREEN},
-        {12, 3, HSV_GREEN}
-    );
-    const rgblight_segment_t PROGMEM _rgb_rs3[] = RGBLIGHT_LAYER_SEGMENTS(
-        {0, 16, HSV_SILLY_PURPLE}
-    );
-    const rgblight_segment_t* const PROGMEM _rgb_layers[] = RGBLIGHT_LAYERS_LIST(
-        _rgb_fn1,
-        _rgb_fn2,
-        _rgb_rs3
-    );
-    layer_state_t layer_state_set_user(layer_state_t state) {
-        rgblight_set_layer_state(0, layer_state_cmp(state, _FN1));
-        rgblight_set_layer_state(1, layer_state_cmp(state, _FN2));
-        rgblight_set_layer_state(2, layer_state_cmp(state, _RS3));
-        return state;
-    }
-#endif // RGBLIGHT_ENABLE
-
-void keyboard_post_init_user(void) {
-    // Enable the LED layers
-    #ifdef RGBLIGHT_ENABLE
-        rgblight_layers = _rgb_layers;
-    #endif // RGBLIGHT_ENABLE
-    }
\ No newline at end of file
diff --git a/keyboards/mechwild/mokulua/standard/keymaps/silly/readme.md b/keyboards/mechwild/mokulua/standard/keymaps/silly/readme.md
deleted file mode 100644
index 4659a3aaeb8..00000000000
--- a/keyboards/mechwild/mokulua/standard/keymaps/silly/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# A keymap customized for use by Silly. Makes use of RGB Layer indication and a remapped layer for use in specific video games.
diff --git a/keyboards/mechwild/mokulua/standard/keymaps/silly/rules.mk b/keyboards/mechwild/mokulua/standard/keymaps/silly/rules.mk
deleted file mode 100644
index 36b7ba9cbc9..00000000000
--- a/keyboards/mechwild/mokulua/standard/keymaps/silly/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-VIA_ENABLE = yes
-LTO_ENABLE = yes
diff --git a/keyboards/mechwild/sugarglider/matrix.c b/keyboards/mechwild/sugarglider/matrix.c
index 96a16df542a..c76a8345d3b 100644
--- a/keyboards/mechwild/sugarglider/matrix.c
+++ b/keyboards/mechwild/sugarglider/matrix.c
@@ -50,7 +50,7 @@ static void select_row(uint8_t row) {
         //wait_us(100);
         return;
     }
-    
+
     if (row > 1) {
         mcp23018_errors += !mcp23018_set_config(I2C_ADDR, mcp23018_PORTB, ALL_INPUT);
         mcp23018_errors += !mcp23018_set_config(I2C_ADDR, mcp23018_PORTA, ~(row_pos[row]));
@@ -87,8 +87,10 @@ bool matrix_scan_custom(matrix_row_t current_matrix[]) {
     bool changed = false;
     for (uint8_t current_row = 0; current_row < MATRIX_ROWS; current_row++) {
         changed |= read_cols_on_row(current_matrix, current_row);
+
 #ifdef ENCODER_ENABLE
-        encoder_read();
+        // Need to frequently read the encoder pins while scanning because the I/O expander takes a long time in comparison.
+        encoder_driver_task();
 #endif
     }
     return changed;
diff --git a/keyboards/meetlab/kalice/config.h b/keyboards/meetlab/kalice/config.h
index 80bae79fd8e..052bfa4bdfd 100644
--- a/keyboards/meetlab/kalice/config.h
+++ b/keyboards/meetlab/kalice/config.h
@@ -19,5 +19,5 @@
 #define WS2812_PWM_DRIVER PWMD1
 #define WS2812_PWM_CHANNEL 2
 #define WS2812_PWM_COMPLEMENTARY_OUTPUT
-#define WS2812_DMA_STREAM STM32_DMA1_STREAM5
-#define WS2812_DMA_CHANNEL 5
\ No newline at end of file
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM5
+#define WS2812_PWM_DMA_CHANNEL 5
\ No newline at end of file
diff --git a/keyboards/meetlab/rena/config.h b/keyboards/meetlab/rena/config.h
index ef8715e3842..6a6a4a2caec 100644
--- a/keyboards/meetlab/rena/config.h
+++ b/keyboards/meetlab/rena/config.h
@@ -18,5 +18,5 @@
 
 #define WS2812_PWM_DRIVER PWMD2
 #define WS2812_PWM_CHANNEL 3
-#define WS2812_DMA_STREAM STM32_DMA1_STREAM2
-#define WS2812_DMA_CHANNEL 2
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM2
+#define WS2812_PWM_DMA_CHANNEL 2
diff --git a/keyboards/mehkee96/keymaps/johann/keymap.c b/keyboards/mehkee96/keymaps/johann/keymap.c
deleted file mode 100644
index 30fdb742c41..00000000000
--- a/keyboards/mehkee96/keymaps/johann/keymap.c
+++ /dev/null
@@ -1,80 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /* Layer 0, default layer
-____________________________________________________________________________________________________________________________________________________________________________
-|        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
-| ESC*   |   F1   |   F2   |   F3   |   F4   |   F5   |   F6   |   F7   |   F8   |   F9   |  F10   |  F11   |  F12   | P SCN  |  HOME  |   DEL  | INSERT |  P Up  | P Down |
-|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|
-|        |        |        |        |        |        |        |        |        |        |        |        |        |        | BACK   |  NUM   |        |        | Play   |
-|  ~`    |   1    |   2    |   3    |   4    |   5    |   6    |   7    |   8    |   9    |   0    |  _ -   | =  +   |   \    | SPACE  |  LOCK  |   /    |  *     | Pause  |
-|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|
-|            |        |        |        |        |        |        |        |        |        |        |  [     |   ]    |             |        |        |        |        |
-|    TAB     |   Q    |   W    |   E    |   R    |   T    |   Y    |   U    |   I    |   O    |   P    |  {     |   }    |  |   \      |   7    |   8    |   9    |  Next  |
-|____________|________|________|________|________|________|________|________|________|________|________|________|________|_____________|________|________|________|________|
-|              |        |        |        |        |        |        |        |        |        |   ;    |   '    |                    |        |        |        |        |
-|   CAPS LOCK  |   A    |   S    |   D    |   F    |   G    |   H    |   J    |   K    |   L    |   :    |   "    |       ENTER        |   4    |   5    |   6    |   -    |
-|______________|________|________|________|________|________|________|________|________|________|________|________|____________________|________|________|________|________|
-|                  |        |        |        |        |        |        |        |   ,    |    .   |   /    |                |        |        |        |        |        |
-|  SHIFT           |   Z    |   X    |   C    |   V    |   B    |   N    |   M    |   <    |    >   |   ?    |       SHIFT    |   UP   |   1    |   2    |   3    |   +    |
-|__________________|________|________|________|________|________|________|________|________|________|________|________________|________|________|________|________|________|
-|          |          |          |                                                        |        |        |   MO   |        |        |        |        |        |        |
-| CTRL     |   LGUI   | L ALT    |                      SPACE                             | R ALT  |  RGUI  |  _FN   |  LEFT  |  DOWN  | RIGHT  |   0    |   .    | ENTER  |
-|__________|__________|__________|________________________________________________________|________|________|________|________|________|________|________|________|________|
-*/
-
-
-
-	LAYOUT(
-    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_HOME, KC_DEL,  KC_INS,  KC_PGUP, KC_PGDN,
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,           KC_BSPC, KC_NUM,  KC_PSLS, KC_PAST, KC_MPLY,
-    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_BSLS, KC_P7,   KC_P8,   KC_P9,   KC_MNXT,
-    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,                    KC_P4,   KC_P5,   KC_P6,   KC_PMNS,
-    KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   KC_P1,   KC_P2,   KC_P3,   KC_PPLS,
-    KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT, KC_P0,   KC_PDOT, KC_PENT),
-
-
-
-  /* Layer 1, function layer
-____________________________________________________________________________________________________________________________________________________________________________
-|        |        |        |        |        |        |        |        |        |        |        |        |        |        |  VOL   |  VOL   |        |        |        |
-| QK_BOOT  |        |        |        |        |        |        |        |        |        |        |        |        | MUTE   |  DOWN  |   UP   |        |        |        |
-|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|
-|        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
-|        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
-|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|
-|            |  RGB   |        |  RGB   |  HUE   |  HUE   | SATUR. | SATUR. | VALUE  | VALUE  |        |        |        |             |        |        |        |        |
-|            | TOGGLE |        |  MODE  |INCREASE| DCRSE  |INCREASE| DCRSE  |INCREASE| DCRSE  |        |        |        |             |        |        |        |        |
-|____________|________|________|________|________|________|________|________|________|________|________|________|________|_____________|________|________|________|________|
-| BACKLIGHT    |        |        |        |        |        |        |        |        |        |        |        |                    |        |        |        |        |
-| TOGGLE       |        |        |        |        |        |        |        |        |        |        |        |                    |        |        |        |        |
-|______________|________|________|________|________|________|________|________|________|________|________|________|____________________|________|________|________|________|
-|         |        |        |        |BACKLHT |BACKLHT |BACKLHT |        |        |        |        |        |                |        |        |        |        |        |
-|         |        |        |        | DCRSE  |TOGGLE  |INCREASE|        |        |        |        |        |                |        |        |        |        |        |
-|_________|________|________|________|________|________|________|________|________|________|________|________|________________|________|________|________|________|________|
-|          |          |          |                                                        |        |        |        |        |        |        |        |        |        |
-|          |          |          |                                                        |        |        |        |        |        |        |        |        |        |
-|__________|__________|__________|________________________________________________________|________|________|________|________|________|________|________|________|________|
-BL_TOGG, BL_DOWN,BL_UP changes the in-switch LEDs
-*/
-
-
-	LAYOUT(
-    QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______,
-    _______, RGB_TOG, _______, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______,          _______, _______, _______, _______,
-    BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______,
-    _______         , _______, _______, BL_DOWN, BL_TOGG, BL_UP,   _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______,
-    _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______, _______, _______, _______),
-};
-
-void matrix_init_user(void) {
-}
-
-void matrix_scan_user(void) {
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-	return true;
-}
diff --git a/keyboards/melgeek/mach80/rev1/rev1.c b/keyboards/melgeek/mach80/rev1/rev1.c
index 630b399e210..a4b49610cc2 100755
--- a/keyboards/melgeek/mach80/rev1/rev1.c
+++ b/keyboards/melgeek/mach80/rev1/rev1.c
@@ -20,103 +20,103 @@
 
 
 const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
-    {0, CS9_SW1,  CS8_SW1,  CS7_SW1},  /* RGB1 */
-    {0, CS9_SW2,  CS8_SW2,  CS7_SW2},  /* RGB2 */
-    {0, CS9_SW3,  CS8_SW3,  CS7_SW3},  /* RGB3 */
-    {0, CS9_SW4,  CS8_SW4,  CS7_SW4},  /* RGB4 */
-    {0, CS9_SW5,  CS8_SW5,  CS7_SW5},  /* RGB5 */
-    {0, CS9_SW6,  CS8_SW6,  CS7_SW6},  /* RGB6 */
-    {0, CS9_SW7,  CS8_SW7,  CS7_SW7},  /* RGB7 */
-    {0, CS9_SW8,  CS8_SW8,  CS7_SW8},  /* RGB8 */
-    {0, CS9_SW9,  CS8_SW9,  CS7_SW9},  /* RGB9 */
-    {0, CS27_SW1, CS26_SW1, CS25_SW1}, /* RGB65 */
-    {0, CS27_SW2, CS26_SW2, CS25_SW2}, /* RGB56 */
-    {0, CS27_SW3, CS26_SW3, CS25_SW3}, /* RGB57 */
-    {0, CS27_SW4, CS26_SW4, CS25_SW4}, /* RGB58 */
-    {0, CS27_SW5, CS26_SW5, CS25_SW5}, /* RGB59 */
-    {0, CS27_SW6, CS26_SW6, CS25_SW6}, /* RGB67 */
-    {0, CS27_SW7, CS26_SW7, CS25_SW7}, /* RGB68 */
-    {0, CS12_SW1, CS11_SW1, CS10_SW1}, /* RGB10 */
-	{0, CS12_SW2, CS11_SW2, CS10_SW2}, /* RGB11 */
-    {0, CS12_SW3, CS11_SW3, CS10_SW3}, /* RGB12 */
-	{0, CS12_SW4, CS11_SW4, CS10_SW4}, /* RGB13 */
-	{0, CS12_SW5, CS11_SW5, CS10_SW5}, /* RGB14 */
-    {0, CS12_SW6, CS11_SW6, CS10_SW6}, /* RGB15 */
-    {0, CS12_SW7, CS11_SW7, CS10_SW7}, /* RGB16 */
-    {0, CS12_SW8, CS11_SW8, CS10_SW8}, /* RGB17 */
-    {0, CS12_SW9, CS11_SW9, CS10_SW9}, /* RGB18 */
-    {0, CS27_SW8, CS26_SW8, CS25_SW8}, /* RGB69 */
-    {0, CS27_SW9, CS26_SW9, CS25_SW9}, /* RGB70 */
-    {0, CS30_SW1, CS29_SW1, CS28_SW1}, /* RGB64 */
-    {0, CS30_SW2, CS29_SW2, CS28_SW2}, /* RGB55 */
-    {0, CS30_SW3, CS29_SW3, CS28_SW3}, /* RGB71 */
-    {0, CS30_SW4, CS29_SW4, CS28_SW4}, /* RGB72 */
-    {0, CS30_SW5, CS29_SW5, CS28_SW5}, /* RGB66 */
-    {0, CS30_SW6, CS29_SW6, CS28_SW6}, /* RGB60 */
-    {0, CS30_SW7, CS29_SW7, CS28_SW7}, /* RGB61 */
-    {0, CS30_SW8, CS29_SW8, CS28_SW8}, /* RGB73 */
-    {0, CS15_SW1, CS14_SW1, CS13_SW1}, /* RGB19 */
-    {0, CS15_SW2, CS14_SW2, CS13_SW2}, /* RGB20 */
-    {0, CS15_SW3, CS14_SW3, CS13_SW3}, /* RGB21 */
-    {0, CS15_SW4, CS14_SW4, CS13_SW4}, /* RGB22 */
-    {0, CS15_SW5, CS14_SW5, CS13_SW5}, /* RGB23 */
-    {0, CS15_SW6, CS14_SW6, CS13_SW6}, /* RGB24 */
-    {0, CS15_SW7, CS14_SW7, CS13_SW7}, /* RGB25 */
-    {0, CS15_SW8, CS14_SW8, CS13_SW8}, /* RGB26 */
-    {0, CS15_SW9, CS14_SW9, CS13_SW9}, /* RGB27 */
-    {0, CS30_SW9, CS29_SW9, CS28_SW9}, /* RGB74 */
-	{0, CS33_SW1, CS32_SW1, CS31_SW1}, /* RGB75 */
-    {0, CS33_SW2, CS32_SW2, CS31_SW2}, /* RGB76 */
-    {0, CS33_SW3, CS32_SW3, CS31_SW3}, /* RGB77 */
-    {0, CS33_SW4, CS32_SW4, CS31_SW4}, /* RGB78 */
-    {0, CS33_SW5, CS32_SW5, CS31_SW5}, /* RGB79 */
-    {0, CS33_SW6, CS32_SW6, CS31_SW6}, /* RGB80 */
-    {0, CS33_SW7, CS32_SW7, CS31_SW7}, /* RGB83 */
-    {0, CS18_SW1, CS17_SW1, CS16_SW1}, /* RGB28 */
-    {0, CS18_SW2, CS17_SW2, CS16_SW2}, /* RGB29 */
-	{0, CS18_SW3, CS17_SW3, CS16_SW3}, /* RGB30 */
-    {0, CS18_SW4, CS17_SW4, CS16_SW4}, /* RGB31 */
-    {0, CS18_SW5, CS17_SW5, CS16_SW5}, /* RGB32 */
-    {0, CS18_SW6, CS17_SW6, CS16_SW6}, /* RGB33 */
-    {0, CS18_SW7, CS17_SW7, CS16_SW7}, /* RGB34 */
-    {0, CS18_SW8, CS17_SW8, CS16_SW8}, /* RGB35 */
-    {0, CS18_SW9, CS17_SW9, CS16_SW9}, /* RGB36 */
-    {0, CS33_SW8, CS32_SW8, CS31_SW8}, /* RGB81 */
-    {0, CS33_SW9, CS32_SW9, CS31_SW9}, /* RGB82 */
-    {0, CS36_SW1, CS35_SW1, CS34_SW1}, /* RGB89 */
-    {0, CS36_SW2, CS35_SW2, CS34_SW2}, /* RGB90 */
-    {0, CS36_SW3, CS35_SW3, CS34_SW3}, /* RGB91 */
-    {0, CS36_SW4, CS35_SW4, CS34_SW4}, /* RGB92 */
-    {0, CS21_SW1, CS20_SW1, CS19_SW1}, /* RGB37 */
-    {0, CS21_SW2, CS20_SW2, CS19_SW2}, /* RGB38 */
-    {0, CS21_SW3, CS20_SW3, CS19_SW3}, /* RGB39 */
-    {0, CS21_SW4, CS20_SW4, CS19_SW4}, /* RGB40 */
-    {0, CS21_SW5, CS20_SW5, CS19_SW5}, /* RGB41 */
-    {0, CS21_SW6, CS20_SW6, CS19_SW6}, /* RGB42 */
-    {0, CS21_SW7, CS20_SW7, CS19_SW7}, /* RGB43 */
-    {0, CS21_SW8, CS20_SW8, CS19_SW8}, /* RGB44 */
-    {0, CS21_SW9, CS20_SW9, CS19_SW9}, /* RGB45 */
-    {0, CS36_SW5, CS35_SW5, CS34_SW5}, /* RGB84 */
-    {0, CS36_SW6, CS35_SW6, CS34_SW6}, /* RGB85 */
-    {0, CS36_SW7, CS35_SW7, CS34_SW7}, /* RGB88 */
-    {0, CS36_SW8, CS35_SW8, CS34_SW8}, /* RGB86 */
-    {0, CS36_SW9, CS35_SW9, CS34_SW9}, /* RGB87 */
-    {0, CS39_SW1, CS38_SW1, CS37_SW1}, /* RGB98 */
-    {0, CS39_SW2, CS38_SW2, CS37_SW2}, /* RGB99 */
-    {0, CS39_SW3, CS38_SW3, CS37_SW3}, /* RGB100 */
-    {0, CS24_SW1, CS23_SW1, CS22_SW1}, /* RGB46 */
-    {0, CS24_SW2, CS23_SW2, CS22_SW2}, /* RGB47 */
-    {0, CS24_SW3, CS23_SW3, CS22_SW3}, /* RGB48 */
-    {0, CS24_SW4, CS23_SW4, CS22_SW4}, /* RGB49 */
-    {0, CS24_SW5, CS23_SW5, CS22_SW5}, /* RGB50 */
-    {0, CS24_SW6, CS23_SW6, CS22_SW6}, /* RGB51 */
-    {0, CS24_SW7, CS23_SW7, CS22_SW7}, /* RGB52 */
-    {0, CS24_SW8, CS23_SW8, CS22_SW8}, /* RGB53 */
-    {0, CS24_SW9, CS23_SW9, CS22_SW9}, /* RGB54 */
-    {0, CS39_SW4, CS38_SW4, CS37_SW4}, /* RGB101 */
-    {0, CS39_SW5, CS38_SW5, CS37_SW5}, /* RGB110 */
-    {0, CS39_SW6, CS38_SW6, CS37_SW6}, /* RGB111 */
-    {0, CS39_SW7, CS38_SW7, CS37_SW7}, /* RGB112 */
+    {0, SW1_CS9,  SW1_CS8,  SW1_CS7},  /* RGB1 */
+    {0, SW2_CS9,  SW2_CS8,  SW2_CS7},  /* RGB2 */
+    {0, SW3_CS9,  SW3_CS8,  SW3_CS7},  /* RGB3 */
+    {0, SW4_CS9,  SW4_CS8,  SW4_CS7},  /* RGB4 */
+    {0, SW5_CS9,  SW5_CS8,  SW5_CS7},  /* RGB5 */
+    {0, SW6_CS9,  SW6_CS8,  SW6_CS7},  /* RGB6 */
+    {0, SW7_CS9,  SW7_CS8,  SW7_CS7},  /* RGB7 */
+    {0, SW8_CS9,  SW8_CS8,  SW8_CS7},  /* RGB8 */
+    {0, SW9_CS9,  SW9_CS8,  SW9_CS7},  /* RGB9 */
+    {0, SW1_CS27, SW1_CS26, SW1_CS25}, /* RGB65 */
+    {0, SW2_CS27, SW2_CS26, SW2_CS25}, /* RGB56 */
+    {0, SW3_CS27, SW3_CS26, SW3_CS25}, /* RGB57 */
+    {0, SW4_CS27, SW4_CS26, SW4_CS25}, /* RGB58 */
+    {0, SW5_CS27, SW5_CS26, SW5_CS25}, /* RGB59 */
+    {0, SW6_CS27, SW6_CS26, SW6_CS25}, /* RGB67 */
+    {0, SW7_CS27, SW7_CS26, SW7_CS25}, /* RGB68 */
+    {0, SW1_CS12, SW1_CS11, SW1_CS10}, /* RGB10 */
+	{0, SW2_CS12, SW2_CS11, SW2_CS10}, /* RGB11 */
+    {0, SW3_CS12, SW3_CS11, SW3_CS10}, /* RGB12 */
+	{0, SW4_CS12, SW4_CS11, SW4_CS10}, /* RGB13 */
+	{0, SW5_CS12, SW5_CS11, SW5_CS10}, /* RGB14 */
+    {0, SW6_CS12, SW6_CS11, SW6_CS10}, /* RGB15 */
+    {0, SW7_CS12, SW7_CS11, SW7_CS10}, /* RGB16 */
+    {0, SW8_CS12, SW8_CS11, SW8_CS10}, /* RGB17 */
+    {0, SW9_CS12, SW9_CS11, SW9_CS10}, /* RGB18 */
+    {0, SW8_CS27, SW8_CS26, SW8_CS25}, /* RGB69 */
+    {0, SW9_CS27, SW9_CS26, SW9_CS25}, /* RGB70 */
+    {0, SW1_CS30, SW1_CS29, SW1_CS28}, /* RGB64 */
+    {0, SW2_CS30, SW2_CS29, SW2_CS28}, /* RGB55 */
+    {0, SW3_CS30, SW3_CS29, SW3_CS28}, /* RGB71 */
+    {0, SW4_CS30, SW4_CS29, SW4_CS28}, /* RGB72 */
+    {0, SW5_CS30, SW5_CS29, SW5_CS28}, /* RGB66 */
+    {0, SW6_CS30, SW6_CS29, SW6_CS28}, /* RGB60 */
+    {0, SW7_CS30, SW7_CS29, SW7_CS28}, /* RGB61 */
+    {0, SW8_CS30, SW8_CS29, SW8_CS28}, /* RGB73 */
+    {0, SW1_CS15, SW1_CS14, SW1_CS13}, /* RGB19 */
+    {0, SW2_CS15, SW2_CS14, SW2_CS13}, /* RGB20 */
+    {0, SW3_CS15, SW3_CS14, SW3_CS13}, /* RGB21 */
+    {0, SW4_CS15, SW4_CS14, SW4_CS13}, /* RGB22 */
+    {0, SW5_CS15, SW5_CS14, SW5_CS13}, /* RGB23 */
+    {0, SW6_CS15, SW6_CS14, SW6_CS13}, /* RGB24 */
+    {0, SW7_CS15, SW7_CS14, SW7_CS13}, /* RGB25 */
+    {0, SW8_CS15, SW8_CS14, SW8_CS13}, /* RGB26 */
+    {0, SW9_CS15, SW9_CS14, SW9_CS13}, /* RGB27 */
+    {0, SW9_CS30, SW9_CS29, SW9_CS28}, /* RGB74 */
+	{0, SW1_CS33, SW1_CS32, SW1_CS31}, /* RGB75 */
+    {0, SW2_CS33, SW2_CS32, SW2_CS31}, /* RGB76 */
+    {0, SW3_CS33, SW3_CS32, SW3_CS31}, /* RGB77 */
+    {0, SW4_CS33, SW4_CS32, SW4_CS31}, /* RGB78 */
+    {0, SW5_CS33, SW5_CS32, SW5_CS31}, /* RGB79 */
+    {0, SW6_CS33, SW6_CS32, SW6_CS31}, /* RGB80 */
+    {0, SW7_CS33, SW7_CS32, SW7_CS31}, /* RGB83 */
+    {0, SW1_CS18, SW1_CS17, SW1_CS16}, /* RGB28 */
+    {0, SW2_CS18, SW2_CS17, SW2_CS16}, /* RGB29 */
+	{0, SW3_CS18, SW3_CS17, SW3_CS16}, /* RGB30 */
+    {0, SW4_CS18, SW4_CS17, SW4_CS16}, /* RGB31 */
+    {0, SW5_CS18, SW5_CS17, SW5_CS16}, /* RGB32 */
+    {0, SW6_CS18, SW6_CS17, SW6_CS16}, /* RGB33 */
+    {0, SW7_CS18, SW7_CS17, SW7_CS16}, /* RGB34 */
+    {0, SW8_CS18, SW8_CS17, SW8_CS16}, /* RGB35 */
+    {0, SW9_CS18, SW9_CS17, SW9_CS16}, /* RGB36 */
+    {0, SW8_CS33, SW8_CS32, SW8_CS31}, /* RGB81 */
+    {0, SW9_CS33, SW9_CS32, SW9_CS31}, /* RGB82 */
+    {0, SW1_CS36, SW1_CS35, SW1_CS34}, /* RGB89 */
+    {0, SW2_CS36, SW2_CS35, SW2_CS34}, /* RGB90 */
+    {0, SW3_CS36, SW3_CS35, SW3_CS34}, /* RGB91 */
+    {0, SW4_CS36, SW4_CS35, SW4_CS34}, /* RGB92 */
+    {0, SW1_CS21, SW1_CS20, SW1_CS19}, /* RGB37 */
+    {0, SW2_CS21, SW2_CS20, SW2_CS19}, /* RGB38 */
+    {0, SW3_CS21, SW3_CS20, SW3_CS19}, /* RGB39 */
+    {0, SW4_CS21, SW4_CS20, SW4_CS19}, /* RGB40 */
+    {0, SW5_CS21, SW5_CS20, SW5_CS19}, /* RGB41 */
+    {0, SW6_CS21, SW6_CS20, SW6_CS19}, /* RGB42 */
+    {0, SW7_CS21, SW7_CS20, SW7_CS19}, /* RGB43 */
+    {0, SW8_CS21, SW8_CS20, SW8_CS19}, /* RGB44 */
+    {0, SW9_CS21, SW9_CS20, SW9_CS19}, /* RGB45 */
+    {0, SW5_CS36, SW5_CS35, SW5_CS34}, /* RGB84 */
+    {0, SW6_CS36, SW6_CS35, SW6_CS34}, /* RGB85 */
+    {0, SW7_CS36, SW7_CS35, SW7_CS34}, /* RGB88 */
+    {0, SW8_CS36, SW8_CS35, SW8_CS34}, /* RGB86 */
+    {0, SW9_CS36, SW9_CS35, SW9_CS34}, /* RGB87 */
+    {0, SW1_CS39, SW1_CS38, SW1_CS37}, /* RGB98 */
+    {0, SW2_CS39, SW2_CS38, SW2_CS37}, /* RGB99 */
+    {0, SW3_CS39, SW3_CS38, SW3_CS37}, /* RGB100 */
+    {0, SW1_CS24, SW1_CS23, SW1_CS22}, /* RGB46 */
+    {0, SW2_CS24, SW2_CS23, SW2_CS22}, /* RGB47 */
+    {0, SW3_CS24, SW3_CS23, SW3_CS22}, /* RGB48 */
+    {0, SW4_CS24, SW4_CS23, SW4_CS22}, /* RGB49 */
+    {0, SW5_CS24, SW5_CS23, SW5_CS22}, /* RGB50 */
+    {0, SW6_CS24, SW6_CS23, SW6_CS22}, /* RGB51 */
+    {0, SW7_CS24, SW7_CS23, SW7_CS22}, /* RGB52 */
+    {0, SW8_CS24, SW8_CS23, SW8_CS22}, /* RGB53 */
+    {0, SW9_CS24, SW9_CS23, SW9_CS22}, /* RGB54 */
+    {0, SW4_CS39, SW4_CS38, SW4_CS37}, /* RGB101 */
+    {0, SW5_CS39, SW5_CS38, SW5_CS37}, /* RGB110 */
+    {0, SW6_CS39, SW6_CS38, SW6_CS37}, /* RGB111 */
+    {0, SW7_CS39, SW7_CS38, SW7_CS37}, /* RGB112 */
 };
 led_config_t g_led_config = {
 	{
@@ -145,9 +145,9 @@ led_config_t g_led_config = {
 };
 
 const is31fl3741_led_t g_is31_indicator_leds[3] = {
-    {0, CS6_SW1, CS5_SW1, CS4_SW1}, /* RGB107 */
-    {0, CS6_SW2, CS5_SW2, CS4_SW2}, /* RGB108 */
-    {0, CS6_SW3, CS5_SW3, CS4_SW3}, /* RGB109 */
+    {0, SW1_CS6, SW1_CS5, SW1_CS4}, /* RGB107 */
+    {0, SW2_CS6, SW2_CS5, SW2_CS4}, /* RGB108 */
+    {0, SW3_CS6, SW3_CS5, SW3_CS4}, /* RGB109 */
 };
 
 bool led_update_kb(led_t led_state) {
diff --git a/keyboards/melgeek/mach80/rev2/rev2.c b/keyboards/melgeek/mach80/rev2/rev2.c
index 5cea55620b1..1a759f38c60 100755
--- a/keyboards/melgeek/mach80/rev2/rev2.c
+++ b/keyboards/melgeek/mach80/rev2/rev2.c
@@ -20,100 +20,100 @@
 
 
 const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
-    {0, CS9_SW1,  CS8_SW1,  CS7_SW1},  /* RGB1 */
-    {0, CS9_SW2,  CS8_SW2,  CS7_SW2},  /* RGB2 */
-    {0, CS9_SW3,  CS8_SW3,  CS7_SW3},  /* RGB3 */
-    {0, CS9_SW4,  CS8_SW4,  CS7_SW4},  /* RGB4 */
-    {0, CS9_SW5,  CS8_SW5,  CS7_SW5},  /* RGB5 */
-    {0, CS9_SW6,  CS8_SW6,  CS7_SW6},  /* RGB6 */
-    {0, CS9_SW7,  CS8_SW7,  CS7_SW7},  /* RGB7 */
-    {0, CS9_SW8,  CS8_SW8,  CS7_SW8},  /* RGB8 */
-    {0, CS9_SW9,  CS8_SW9,  CS7_SW9},  /* RGB9 */
-    {0, CS27_SW1, CS26_SW1, CS25_SW1}, /* RGB65 */
-    {0, CS27_SW2, CS26_SW2, CS25_SW2}, /* RGB56 */
-    {0, CS27_SW3, CS26_SW3, CS25_SW3}, /* RGB57 */
-    {0, CS27_SW4, CS26_SW4, CS25_SW4}, /* RGB58 */
-    {0, CS27_SW5, CS26_SW5, CS25_SW5}, /* RGB59 */
-    {0, CS27_SW6, CS26_SW6, CS25_SW6}, /* RGB67 */
-    {0, CS27_SW7, CS26_SW7, CS25_SW7}, /* RGB68 */
-    {0, CS12_SW1, CS11_SW1, CS10_SW1}, /* RGB10 */
-	{0, CS12_SW2, CS11_SW2, CS10_SW2}, /* RGB11 */
-    {0, CS12_SW3, CS11_SW3, CS10_SW3}, /* RGB12 */
-	{0, CS12_SW4, CS11_SW4, CS10_SW4}, /* RGB13 */
-	{0, CS12_SW5, CS11_SW5, CS10_SW5}, /* RGB14 */
-    {0, CS12_SW6, CS11_SW6, CS10_SW6}, /* RGB15 */
-    {0, CS12_SW7, CS11_SW7, CS10_SW7}, /* RGB16 */
-    {0, CS12_SW8, CS11_SW8, CS10_SW8}, /* RGB17 */
-    {0, CS12_SW9, CS11_SW9, CS10_SW9}, /* RGB18 */
-    {0, CS27_SW8, CS26_SW8, CS25_SW8}, /* RGB69 */
-    {0, CS27_SW9, CS26_SW9, CS25_SW9}, /* RGB70 */
-    {0, CS30_SW1, CS29_SW1, CS28_SW1}, /* RGB64 */
-    {0, CS30_SW2, CS29_SW2, CS28_SW2}, /* RGB55 */
-    {0, CS30_SW3, CS29_SW3, CS28_SW3}, /* RGB71 */
-    {0, CS30_SW4, CS29_SW4, CS28_SW4}, /* RGB72 */
-    {0, CS30_SW5, CS29_SW5, CS28_SW5}, /* RGB66 */
-    {0, CS30_SW6, CS29_SW6, CS28_SW6}, /* RGB60 */
-    {0, CS30_SW7, CS29_SW7, CS28_SW7}, /* RGB61 */
-    {0, CS30_SW8, CS29_SW8, CS28_SW8}, /* RGB73 */
-    {0, CS15_SW1, CS14_SW1, CS13_SW1}, /* RGB19 */
-    {0, CS15_SW2, CS14_SW2, CS13_SW2}, /* RGB20 */
-    {0, CS15_SW3, CS14_SW3, CS13_SW3}, /* RGB21 */
-    {0, CS15_SW4, CS14_SW4, CS13_SW4}, /* RGB22 */
-    {0, CS15_SW5, CS14_SW5, CS13_SW5}, /* RGB23 */
-    {0, CS15_SW6, CS14_SW6, CS13_SW6}, /* RGB24 */
-    {0, CS15_SW7, CS14_SW7, CS13_SW7}, /* RGB25 */
-    {0, CS15_SW8, CS14_SW8, CS13_SW8}, /* RGB26 */
-    {0, CS15_SW9, CS14_SW9, CS13_SW9}, /* RGB27 */
-    {0, CS30_SW9, CS29_SW9, CS28_SW9}, /* RGB74 */
-	{0, CS33_SW1, CS32_SW1, CS31_SW1}, /* RGB75 */
-    {0, CS33_SW2, CS32_SW2, CS31_SW2}, /* RGB76 */
-    {0, CS33_SW3, CS32_SW3, CS31_SW3}, /* RGB77 */
-    {0, CS33_SW4, CS32_SW4, CS31_SW4}, /* RGB78 */
-    {0, CS33_SW5, CS32_SW5, CS31_SW5}, /* RGB79 */
-    {0, CS33_SW6, CS32_SW6, CS31_SW6}, /* RGB80 */
-    {0, CS33_SW7, CS32_SW7, CS31_SW7}, /* RGB83 */
-    {0, CS18_SW1, CS17_SW1, CS16_SW1}, /* RGB28 */
-    {0, CS18_SW2, CS17_SW2, CS16_SW2}, /* RGB29 */
-	{0, CS18_SW3, CS17_SW3, CS16_SW3}, /* RGB30 */
-    {0, CS18_SW4, CS17_SW4, CS16_SW4}, /* RGB31 */
-    {0, CS18_SW5, CS17_SW5, CS16_SW5}, /* RGB32 */
-    {0, CS18_SW6, CS17_SW6, CS16_SW6}, /* RGB33 */
-    {0, CS18_SW7, CS17_SW7, CS16_SW7}, /* RGB34 */
-    {0, CS18_SW8, CS17_SW8, CS16_SW8}, /* RGB35 */
-    {0, CS18_SW9, CS17_SW9, CS16_SW9}, /* RGB36 */
-    {0, CS33_SW8, CS32_SW8, CS31_SW8}, /* RGB81 */
-    {0, CS33_SW9, CS32_SW9, CS31_SW9}, /* RGB82 */
-    {0, CS36_SW1, CS35_SW1, CS34_SW1}, /* RGB89 */
-    {0, CS36_SW2, CS35_SW2, CS34_SW2}, /* RGB90 */
-    {0, CS36_SW3, CS35_SW3, CS34_SW3}, /* RGB91 */
-    {0, CS36_SW4, CS35_SW4, CS34_SW4}, /* RGB92 */
-    {0, CS21_SW1, CS20_SW1, CS19_SW1}, /* RGB37 */
-    {0, CS21_SW2, CS20_SW2, CS19_SW2}, /* RGB38 */
-    {0, CS21_SW3, CS20_SW3, CS19_SW3}, /* RGB39 */
-    {0, CS21_SW4, CS20_SW4, CS19_SW4}, /* RGB40 */
-    {0, CS21_SW5, CS20_SW5, CS19_SW5}, /* RGB41 */
-    {0, CS21_SW6, CS20_SW6, CS19_SW6}, /* RGB42 */
-    {0, CS21_SW7, CS20_SW7, CS19_SW7}, /* RGB43 */
-    {0, CS21_SW8, CS20_SW8, CS19_SW8}, /* RGB44 */
-    {0, CS21_SW9, CS20_SW9, CS19_SW9}, /* RGB45 */
-    {0, CS36_SW5, CS35_SW5, CS34_SW5}, /* RGB84 */
-    {0, CS36_SW6, CS35_SW6, CS34_SW6}, /* RGB85 */
-    {0, CS36_SW7, CS35_SW7, CS34_SW7}, /* RGB88 */
-    {0, CS36_SW8, CS35_SW8, CS34_SW8}, /* RGB86 */
-    {0, CS36_SW9, CS35_SW9, CS34_SW9}, /* RGB87 */
-    {0, CS39_SW1, CS38_SW1, CS37_SW1}, /* RGB98 */
-    {0, CS39_SW2, CS38_SW2, CS37_SW2}, /* RGB99 */
-    {0, CS39_SW3, CS38_SW3, CS37_SW3}, /* RGB100 */
-    {0, CS24_SW1, CS23_SW1, CS22_SW1}, /* RGB46 */
-    {0, CS24_SW2, CS23_SW2, CS22_SW2}, /* RGB47 */
-    {0, CS24_SW3, CS23_SW3, CS22_SW3}, /* RGB48 */
-    {0, CS24_SW4, CS23_SW4, CS22_SW4}, /* RGB49 */
-    {0, CS24_SW5, CS23_SW5, CS22_SW5}, /* RGB50 */
-    {0, CS24_SW6, CS23_SW6, CS22_SW6}, /* RGB51 */
-    {0, CS24_SW7, CS23_SW7, CS22_SW7}, /* RGB52 */
-    {0, CS24_SW8, CS23_SW8, CS22_SW8}, /* RGB53 */
-    {0, CS24_SW9, CS23_SW9, CS22_SW9}, /* RGB54 */
-    {0, CS39_SW4, CS38_SW4, CS37_SW4}, /* RGB101 */
+    {0, SW1_CS9,  SW1_CS8,  SW1_CS7},  /* RGB1 */
+    {0, SW2_CS9,  SW2_CS8,  SW2_CS7},  /* RGB2 */
+    {0, SW3_CS9,  SW3_CS8,  SW3_CS7},  /* RGB3 */
+    {0, SW4_CS9,  SW4_CS8,  SW4_CS7},  /* RGB4 */
+    {0, SW5_CS9,  SW5_CS8,  SW5_CS7},  /* RGB5 */
+    {0, SW6_CS9,  SW6_CS8,  SW6_CS7},  /* RGB6 */
+    {0, SW7_CS9,  SW7_CS8,  SW7_CS7},  /* RGB7 */
+    {0, SW8_CS9,  SW8_CS8,  SW8_CS7},  /* RGB8 */
+    {0, SW9_CS9,  SW9_CS8,  SW9_CS7},  /* RGB9 */
+    {0, SW1_CS27, SW1_CS26, SW1_CS25}, /* RGB65 */
+    {0, SW2_CS27, SW2_CS26, SW2_CS25}, /* RGB56 */
+    {0, SW3_CS27, SW3_CS26, SW3_CS25}, /* RGB57 */
+    {0, SW4_CS27, SW4_CS26, SW4_CS25}, /* RGB58 */
+    {0, SW5_CS27, SW5_CS26, SW5_CS25}, /* RGB59 */
+    {0, SW6_CS27, SW6_CS26, SW6_CS25}, /* RGB67 */
+    {0, SW7_CS27, SW7_CS26, SW7_CS25}, /* RGB68 */
+    {0, SW1_CS12, SW1_CS11, SW1_CS10}, /* RGB10 */
+	{0, SW2_CS12, SW2_CS11, SW2_CS10}, /* RGB11 */
+    {0, SW3_CS12, SW3_CS11, SW3_CS10}, /* RGB12 */
+	{0, SW4_CS12, SW4_CS11, SW4_CS10}, /* RGB13 */
+	{0, SW5_CS12, SW5_CS11, SW5_CS10}, /* RGB14 */
+    {0, SW6_CS12, SW6_CS11, SW6_CS10}, /* RGB15 */
+    {0, SW7_CS12, SW7_CS11, SW7_CS10}, /* RGB16 */
+    {0, SW8_CS12, SW8_CS11, SW8_CS10}, /* RGB17 */
+    {0, SW9_CS12, SW9_CS11, SW9_CS10}, /* RGB18 */
+    {0, SW8_CS27, SW8_CS26, SW8_CS25}, /* RGB69 */
+    {0, SW9_CS27, SW9_CS26, SW9_CS25}, /* RGB70 */
+    {0, SW1_CS30, SW1_CS29, SW1_CS28}, /* RGB64 */
+    {0, SW2_CS30, SW2_CS29, SW2_CS28}, /* RGB55 */
+    {0, SW3_CS30, SW3_CS29, SW3_CS28}, /* RGB71 */
+    {0, SW4_CS30, SW4_CS29, SW4_CS28}, /* RGB72 */
+    {0, SW5_CS30, SW5_CS29, SW5_CS28}, /* RGB66 */
+    {0, SW6_CS30, SW6_CS29, SW6_CS28}, /* RGB60 */
+    {0, SW7_CS30, SW7_CS29, SW7_CS28}, /* RGB61 */
+    {0, SW8_CS30, SW8_CS29, SW8_CS28}, /* RGB73 */
+    {0, SW1_CS15, SW1_CS14, SW1_CS13}, /* RGB19 */
+    {0, SW2_CS15, SW2_CS14, SW2_CS13}, /* RGB20 */
+    {0, SW3_CS15, SW3_CS14, SW3_CS13}, /* RGB21 */
+    {0, SW4_CS15, SW4_CS14, SW4_CS13}, /* RGB22 */
+    {0, SW5_CS15, SW5_CS14, SW5_CS13}, /* RGB23 */
+    {0, SW6_CS15, SW6_CS14, SW6_CS13}, /* RGB24 */
+    {0, SW7_CS15, SW7_CS14, SW7_CS13}, /* RGB25 */
+    {0, SW8_CS15, SW8_CS14, SW8_CS13}, /* RGB26 */
+    {0, SW9_CS15, SW9_CS14, SW9_CS13}, /* RGB27 */
+    {0, SW9_CS30, SW9_CS29, SW9_CS28}, /* RGB74 */
+	{0, SW1_CS33, SW1_CS32, SW1_CS31}, /* RGB75 */
+    {0, SW2_CS33, SW2_CS32, SW2_CS31}, /* RGB76 */
+    {0, SW3_CS33, SW3_CS32, SW3_CS31}, /* RGB77 */
+    {0, SW4_CS33, SW4_CS32, SW4_CS31}, /* RGB78 */
+    {0, SW5_CS33, SW5_CS32, SW5_CS31}, /* RGB79 */
+    {0, SW6_CS33, SW6_CS32, SW6_CS31}, /* RGB80 */
+    {0, SW7_CS33, SW7_CS32, SW7_CS31}, /* RGB83 */
+    {0, SW1_CS18, SW1_CS17, SW1_CS16}, /* RGB28 */
+    {0, SW2_CS18, SW2_CS17, SW2_CS16}, /* RGB29 */
+	{0, SW3_CS18, SW3_CS17, SW3_CS16}, /* RGB30 */
+    {0, SW4_CS18, SW4_CS17, SW4_CS16}, /* RGB31 */
+    {0, SW5_CS18, SW5_CS17, SW5_CS16}, /* RGB32 */
+    {0, SW6_CS18, SW6_CS17, SW6_CS16}, /* RGB33 */
+    {0, SW7_CS18, SW7_CS17, SW7_CS16}, /* RGB34 */
+    {0, SW8_CS18, SW8_CS17, SW8_CS16}, /* RGB35 */
+    {0, SW9_CS18, SW9_CS17, SW9_CS16}, /* RGB36 */
+    {0, SW8_CS33, SW8_CS32, SW8_CS31}, /* RGB81 */
+    {0, SW9_CS33, SW9_CS32, SW9_CS31}, /* RGB82 */
+    {0, SW1_CS36, SW1_CS35, SW1_CS34}, /* RGB89 */
+    {0, SW2_CS36, SW2_CS35, SW2_CS34}, /* RGB90 */
+    {0, SW3_CS36, SW3_CS35, SW3_CS34}, /* RGB91 */
+    {0, SW4_CS36, SW4_CS35, SW4_CS34}, /* RGB92 */
+    {0, SW1_CS21, SW1_CS20, SW1_CS19}, /* RGB37 */
+    {0, SW2_CS21, SW2_CS20, SW2_CS19}, /* RGB38 */
+    {0, SW3_CS21, SW3_CS20, SW3_CS19}, /* RGB39 */
+    {0, SW4_CS21, SW4_CS20, SW4_CS19}, /* RGB40 */
+    {0, SW5_CS21, SW5_CS20, SW5_CS19}, /* RGB41 */
+    {0, SW6_CS21, SW6_CS20, SW6_CS19}, /* RGB42 */
+    {0, SW7_CS21, SW7_CS20, SW7_CS19}, /* RGB43 */
+    {0, SW8_CS21, SW8_CS20, SW8_CS19}, /* RGB44 */
+    {0, SW9_CS21, SW9_CS20, SW9_CS19}, /* RGB45 */
+    {0, SW5_CS36, SW5_CS35, SW5_CS34}, /* RGB84 */
+    {0, SW6_CS36, SW6_CS35, SW6_CS34}, /* RGB85 */
+    {0, SW7_CS36, SW7_CS35, SW7_CS34}, /* RGB88 */
+    {0, SW8_CS36, SW8_CS35, SW8_CS34}, /* RGB86 */
+    {0, SW9_CS36, SW9_CS35, SW9_CS34}, /* RGB87 */
+    {0, SW1_CS39, SW1_CS38, SW1_CS37}, /* RGB98 */
+    {0, SW2_CS39, SW2_CS38, SW2_CS37}, /* RGB99 */
+    {0, SW3_CS39, SW3_CS38, SW3_CS37}, /* RGB100 */
+    {0, SW1_CS24, SW1_CS23, SW1_CS22}, /* RGB46 */
+    {0, SW2_CS24, SW2_CS23, SW2_CS22}, /* RGB47 */
+    {0, SW3_CS24, SW3_CS23, SW3_CS22}, /* RGB48 */
+    {0, SW4_CS24, SW4_CS23, SW4_CS22}, /* RGB49 */
+    {0, SW5_CS24, SW5_CS23, SW5_CS22}, /* RGB50 */
+    {0, SW6_CS24, SW6_CS23, SW6_CS22}, /* RGB51 */
+    {0, SW7_CS24, SW7_CS23, SW7_CS22}, /* RGB52 */
+    {0, SW8_CS24, SW8_CS23, SW8_CS22}, /* RGB53 */
+    {0, SW9_CS24, SW9_CS23, SW9_CS22}, /* RGB54 */
+    {0, SW4_CS39, SW4_CS38, SW4_CS37}, /* RGB101 */
 };
 led_config_t g_led_config = {
 	{
@@ -143,9 +143,9 @@ led_config_t g_led_config = {
 };
 
 const is31fl3741_led_t g_is31_indicator_leds[3] = {
-    {0, CS6_SW1, CS5_SW1, CS4_SW1}, /* RGB107 */
-    {0, CS6_SW2, CS5_SW2, CS4_SW2}, /* RGB108 */
-    {0, CS6_SW3, CS5_SW3, CS4_SW3}, /* RGB109 */
+    {0, SW1_CS6, SW1_CS5, SW1_CS4}, /* RGB107 */
+    {0, SW2_CS6, SW2_CS5, SW2_CS4}, /* RGB108 */
+    {0, SW3_CS6, SW3_CS5, SW3_CS4}, /* RGB109 */
 };
 
 bool led_update_kb(led_t led_state) {
diff --git a/keyboards/melgeek/mj61/rev1/rev1.c b/keyboards/melgeek/mj61/rev1/rev1.c
index 227d8c32aa2..3ee0da5183b 100644
--- a/keyboards/melgeek/mj61/rev1/rev1.c
+++ b/keyboards/melgeek/mj61/rev1/rev1.c
@@ -18,69 +18,69 @@
 
 #ifdef RGB_MATRIX_ENABLE
 const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
-    {0, CS12_SW1, CS11_SW1, CS10_SW1}, /* RGB1 */
-    {0, CS12_SW2, CS11_SW2, CS10_SW2}, /* RGB2 */
-    {0, CS12_SW3, CS11_SW3, CS10_SW3}, /* RGB3 */
-    {0, CS12_SW4, CS11_SW4, CS10_SW4}, /* RGB4 */
-    {0, CS12_SW5, CS11_SW5, CS10_SW5}, /* RGB5 */
-    {0, CS12_SW6, CS11_SW6, CS10_SW6}, /* RGB6 */
-    {0, CS12_SW7, CS11_SW7, CS10_SW7}, /* RGB7 */
-    {0, CS12_SW8, CS11_SW8, CS10_SW8}, /* RGB8 */
-    {0, CS12_SW9, CS11_SW9, CS10_SW9}, /* RGB9 */
-    {0, CS15_SW1, CS14_SW1, CS13_SW1}, /* RGB10 */
-    {0, CS15_SW2, CS14_SW2, CS13_SW2}, /* RGB11 */
-    {0, CS15_SW3, CS14_SW3, CS13_SW3}, /* RGB12 */
-    {0, CS15_SW4, CS14_SW4, CS13_SW4}, /* RGB13 */
-    {0, CS15_SW5, CS14_SW5, CS13_SW5}, /* RGB14 */
-    {0, CS15_SW6, CS14_SW6, CS13_SW6}, /* RGB15 */
-    {0, CS15_SW7, CS14_SW7, CS13_SW7}, /* RGB16 */
-    {0, CS15_SW8, CS14_SW8, CS13_SW8}, /* RGB17 */
-    {0, CS15_SW9, CS14_SW9, CS13_SW9}, /* RGB18 */
-    {0, CS18_SW1, CS17_SW1, CS16_SW1}, /* RGB19 */
-    {0, CS18_SW2, CS17_SW2, CS16_SW2}, /* RGB20 */
-    {0, CS18_SW3, CS17_SW3, CS16_SW3}, /* RGB21 */
-    {0, CS18_SW4, CS17_SW4, CS16_SW4}, /* RGB22 */
-    {0, CS18_SW5, CS17_SW5, CS16_SW5}, /* RGB23 */
-    {0, CS18_SW6, CS17_SW6, CS16_SW6}, /* RGB24 */
-    {0, CS18_SW7, CS17_SW7, CS16_SW7}, /* RGB25 */
-    {0, CS18_SW8, CS17_SW8, CS16_SW8}, /* RGB26 */
-    {0, CS18_SW9, CS17_SW9, CS16_SW9}, /* RGB27 */
-    {0, CS21_SW1, CS20_SW1, CS19_SW1}, /* RGB28 */
-    {0, CS21_SW2, CS20_SW2, CS19_SW2}, /* RGB29 */
-    {0, CS21_SW3, CS20_SW3, CS19_SW3}, /* RGB30 */
-    {0, CS21_SW4, CS20_SW4, CS19_SW4}, /* RGB31 */
-    {0, CS21_SW5, CS20_SW5, CS19_SW5}, /* RGB32 */
-    {0, CS21_SW6, CS20_SW6, CS19_SW6}, /* RGB33 */
-    {0, CS21_SW7, CS20_SW7, CS19_SW7}, /* RGB34 */
-    {0, CS21_SW8, CS20_SW8, CS19_SW8}, /* RGB35 */
-    {0, CS21_SW9, CS20_SW9, CS19_SW9}, /* RGB36 */
-    {0, CS24_SW1, CS23_SW1, CS22_SW1}, /* RGB37 */
-    {0, CS24_SW2, CS23_SW2, CS22_SW2}, /* RGB38 */
-    {0, CS24_SW3, CS23_SW3, CS22_SW3}, /* RGB39 */
-    {0, CS24_SW4, CS23_SW4, CS22_SW4}, /* RGB40 */
-    {0, CS24_SW5, CS23_SW5, CS22_SW5}, /* RGB41 */
-    {0, CS24_SW6, CS23_SW6, CS22_SW6}, /* RGB42 */
-    {0, CS24_SW7, CS23_SW7, CS22_SW7}, /* RGB43 */
-    {0, CS24_SW8, CS23_SW8, CS22_SW8}, /* RGB44 */
-    {0, CS24_SW9, CS23_SW9, CS22_SW9}, /* RGB45 */
-    {0, CS27_SW1, CS26_SW1, CS25_SW1}, /* RGB46 */
-	{0, CS27_SW2, CS26_SW2, CS25_SW2}, /* RGB47 */
-    {0, CS27_SW3, CS26_SW3, CS25_SW3}, /* RGB48 */
-	{0, CS27_SW4, CS26_SW4, CS25_SW4}, /* RGB49 */
-	{0, CS27_SW5, CS26_SW5, CS25_SW5}, /* RGB50 */
-    {0, CS27_SW6, CS26_SW6, CS25_SW6}, /* RGB51 */
-    {0, CS27_SW7, CS26_SW7, CS25_SW7}, /* RGB52 */
-    {0, CS27_SW8, CS26_SW8, CS25_SW8}, /* RGB53 */
-    {0, CS27_SW9, CS26_SW9, CS25_SW9}, /* RGB54 */
-    {0, CS30_SW1, CS29_SW1, CS28_SW1}, /* RGB55 */
-    {0, CS30_SW2, CS29_SW2, CS28_SW2}, /* RGB56 */
-	{0, CS30_SW3, CS29_SW3, CS28_SW3}, /* RGB57 */
-    {0, CS30_SW4, CS29_SW4, CS28_SW4}, /* RGB58 */
-    {0, CS30_SW5, CS29_SW5, CS28_SW5}, /* RGB59 */
-    {0, CS30_SW6, CS29_SW6, CS28_SW6}, /* RGB60 */
-    {0, CS30_SW7, CS29_SW7, CS28_SW7}, /* RGB61 */
-    {0, CS30_SW8, CS29_SW8, CS28_SW8}, /* RGB62 */
-    {0, CS30_SW9, CS29_SW9, CS28_SW9}, /* RGB63 */
+    {0, SW1_CS12, SW1_CS11, SW1_CS10}, /* RGB1 */
+    {0, SW2_CS12, SW2_CS11, SW2_CS10}, /* RGB2 */
+    {0, SW3_CS12, SW3_CS11, SW3_CS10}, /* RGB3 */
+    {0, SW4_CS12, SW4_CS11, SW4_CS10}, /* RGB4 */
+    {0, SW5_CS12, SW5_CS11, SW5_CS10}, /* RGB5 */
+    {0, SW6_CS12, SW6_CS11, SW6_CS10}, /* RGB6 */
+    {0, SW7_CS12, SW7_CS11, SW7_CS10}, /* RGB7 */
+    {0, SW8_CS12, SW8_CS11, SW8_CS10}, /* RGB8 */
+    {0, SW9_CS12, SW9_CS11, SW9_CS10}, /* RGB9 */
+    {0, SW1_CS15, SW1_CS14, SW1_CS13}, /* RGB10 */
+    {0, SW2_CS15, SW2_CS14, SW2_CS13}, /* RGB11 */
+    {0, SW3_CS15, SW3_CS14, SW3_CS13}, /* RGB12 */
+    {0, SW4_CS15, SW4_CS14, SW4_CS13}, /* RGB13 */
+    {0, SW5_CS15, SW5_CS14, SW5_CS13}, /* RGB14 */
+    {0, SW6_CS15, SW6_CS14, SW6_CS13}, /* RGB15 */
+    {0, SW7_CS15, SW7_CS14, SW7_CS13}, /* RGB16 */
+    {0, SW8_CS15, SW8_CS14, SW8_CS13}, /* RGB17 */
+    {0, SW9_CS15, SW9_CS14, SW9_CS13}, /* RGB18 */
+    {0, SW1_CS18, SW1_CS17, SW1_CS16}, /* RGB19 */
+    {0, SW2_CS18, SW2_CS17, SW2_CS16}, /* RGB20 */
+    {0, SW3_CS18, SW3_CS17, SW3_CS16}, /* RGB21 */
+    {0, SW4_CS18, SW4_CS17, SW4_CS16}, /* RGB22 */
+    {0, SW5_CS18, SW5_CS17, SW5_CS16}, /* RGB23 */
+    {0, SW6_CS18, SW6_CS17, SW6_CS16}, /* RGB24 */
+    {0, SW7_CS18, SW7_CS17, SW7_CS16}, /* RGB25 */
+    {0, SW8_CS18, SW8_CS17, SW8_CS16}, /* RGB26 */
+    {0, SW9_CS18, SW9_CS17, SW9_CS16}, /* RGB27 */
+    {0, SW1_CS21, SW1_CS20, SW1_CS19}, /* RGB28 */
+    {0, SW2_CS21, SW2_CS20, SW2_CS19}, /* RGB29 */
+    {0, SW3_CS21, SW3_CS20, SW3_CS19}, /* RGB30 */
+    {0, SW4_CS21, SW4_CS20, SW4_CS19}, /* RGB31 */
+    {0, SW5_CS21, SW5_CS20, SW5_CS19}, /* RGB32 */
+    {0, SW6_CS21, SW6_CS20, SW6_CS19}, /* RGB33 */
+    {0, SW7_CS21, SW7_CS20, SW7_CS19}, /* RGB34 */
+    {0, SW8_CS21, SW8_CS20, SW8_CS19}, /* RGB35 */
+    {0, SW9_CS21, SW9_CS20, SW9_CS19}, /* RGB36 */
+    {0, SW1_CS24, SW1_CS23, SW1_CS22}, /* RGB37 */
+    {0, SW2_CS24, SW2_CS23, SW2_CS22}, /* RGB38 */
+    {0, SW3_CS24, SW3_CS23, SW3_CS22}, /* RGB39 */
+    {0, SW4_CS24, SW4_CS23, SW4_CS22}, /* RGB40 */
+    {0, SW5_CS24, SW5_CS23, SW5_CS22}, /* RGB41 */
+    {0, SW6_CS24, SW6_CS23, SW6_CS22}, /* RGB42 */
+    {0, SW7_CS24, SW7_CS23, SW7_CS22}, /* RGB43 */
+    {0, SW8_CS24, SW8_CS23, SW8_CS22}, /* RGB44 */
+    {0, SW9_CS24, SW9_CS23, SW9_CS22}, /* RGB45 */
+    {0, SW1_CS27, SW1_CS26, SW1_CS25}, /* RGB46 */
+	{0, SW2_CS27, SW2_CS26, SW2_CS25}, /* RGB47 */
+    {0, SW3_CS27, SW3_CS26, SW3_CS25}, /* RGB48 */
+	{0, SW4_CS27, SW4_CS26, SW4_CS25}, /* RGB49 */
+	{0, SW5_CS27, SW5_CS26, SW5_CS25}, /* RGB50 */
+    {0, SW6_CS27, SW6_CS26, SW6_CS25}, /* RGB51 */
+    {0, SW7_CS27, SW7_CS26, SW7_CS25}, /* RGB52 */
+    {0, SW8_CS27, SW8_CS26, SW8_CS25}, /* RGB53 */
+    {0, SW9_CS27, SW9_CS26, SW9_CS25}, /* RGB54 */
+    {0, SW1_CS30, SW1_CS29, SW1_CS28}, /* RGB55 */
+    {0, SW2_CS30, SW2_CS29, SW2_CS28}, /* RGB56 */
+	{0, SW3_CS30, SW3_CS29, SW3_CS28}, /* RGB57 */
+    {0, SW4_CS30, SW4_CS29, SW4_CS28}, /* RGB58 */
+    {0, SW5_CS30, SW5_CS29, SW5_CS28}, /* RGB59 */
+    {0, SW6_CS30, SW6_CS29, SW6_CS28}, /* RGB60 */
+    {0, SW7_CS30, SW7_CS29, SW7_CS28}, /* RGB61 */
+    {0, SW8_CS30, SW8_CS29, SW8_CS28}, /* RGB62 */
+    {0, SW9_CS30, SW9_CS29, SW9_CS28}, /* RGB63 */
 };
 
 led_config_t g_led_config = {
diff --git a/keyboards/melgeek/mj61/rev2/rev2.c b/keyboards/melgeek/mj61/rev2/rev2.c
index 5c797a58225..71d41c16b3f 100644
--- a/keyboards/melgeek/mj61/rev2/rev2.c
+++ b/keyboards/melgeek/mj61/rev2/rev2.c
@@ -20,77 +20,77 @@
 
 
 const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
-    {0, CS9_SW1,  CS8_SW1,  CS7_SW1},  /* RGB1 */
-    {0, CS9_SW2,  CS8_SW2,  CS7_SW2},  /* RGB3 */
-    {0, CS9_SW3,  CS8_SW3,  CS7_SW3},  /* RGB4 */
-    {0, CS9_SW4,  CS8_SW4,  CS7_SW4},  /* RGB5 */
-    {0, CS9_SW5,  CS8_SW5,  CS7_SW5},  /* RGB6 */
-    {0, CS9_SW6,  CS8_SW6,  CS7_SW6},  /* RGB7 */
-    {0, CS9_SW7,  CS8_SW7,  CS7_SW7},  /* RGB2 */
-    {0, CS9_SW8,  CS8_SW8,  CS7_SW8},  /* RGB8 */
-    {0, CS9_SW9,  CS8_SW9,  CS7_SW9},  /* RGB9 */
-    {0, CS24_SW1, CS23_SW1, CS22_SW1}, /* RGB48 */
-	{0, CS24_SW2, CS23_SW2, CS22_SW2}, /* RGB46 */
-    {0, CS24_SW3, CS23_SW3, CS22_SW3}, /* RGB49 */
-	{0, CS24_SW4, CS23_SW4, CS22_SW4}, /* RGB50 */
-	{0, CS24_SW5, CS23_SW5, CS22_SW5}, /* RGB51 */
-    {0, CS24_SW6, CS23_SW6, CS22_SW6}, /* RGB52 */
-    {0, CS24_SW7, CS23_SW7, CS22_SW7}, /* RGB53 */
-    {0, CS12_SW1, CS11_SW1, CS10_SW1}, /* RGB10 */
-    {0, CS12_SW2, CS11_SW2, CS10_SW2}, /* RGB11 */
-    {0, CS12_SW3, CS11_SW3, CS10_SW3}, /* RGB16 */
-    {0, CS12_SW4, CS11_SW4, CS10_SW4}, /* RGB12 */
-    {0, CS12_SW5, CS11_SW5, CS10_SW5}, /* RGB17 */
-    {0, CS12_SW6, CS11_SW6, CS10_SW6}, /* RGB13 */
-    {0, CS12_SW7, CS11_SW7, CS10_SW7}, /* RGB14 */
-    {0, CS12_SW8, CS11_SW8, CS10_SW8}, /* RGB18 */
-    {0, CS12_SW9, CS11_SW9, CS10_SW9}, /* RGB15 */
-    {0, CS24_SW8, CS23_SW8, CS22_SW8}, /* RGB47 */
-    {0, CS24_SW9, CS23_SW9, CS22_SW9}, /* RGB54 */
-    {0, CS27_SW1, CS26_SW1, CS25_SW1}, /* RGB55 */
-    {0, CS27_SW2, CS26_SW2, CS25_SW2}, /* RGB60 */
-	{0, CS27_SW3, CS26_SW3, CS25_SW3}, /* RGB61 */
-    {0, CS15_SW1, CS14_SW1, CS13_SW1}, /* RGB21 */
-    {0, CS15_SW2, CS14_SW2, CS13_SW2}, /* RGB19 */
-    {0, CS15_SW3, CS14_SW3, CS13_SW3}, /* RGB22 */
-    {0, CS15_SW4, CS14_SW4, CS13_SW4}, /* RGB26 */
-    {0, CS15_SW5, CS14_SW5, CS13_SW5}, /* RGB20 */
-    {0, CS15_SW6, CS14_SW6, CS13_SW6}, /* RGB23 */
-    {0, CS15_SW7, CS14_SW7, CS13_SW7}, /* RGB24 */
-    {0, CS15_SW8, CS14_SW8, CS13_SW8}, /* RGB25 */
-    {0, CS15_SW9, CS14_SW9, CS13_SW9}, /* RGB27 */
-    {0, CS27_SW4, CS26_SW4, CS25_SW4}, /* RGB56 */
-    {0, CS27_SW5, CS26_SW5, CS25_SW5}, /* RGB57 */
-    {0, CS27_SW6, CS26_SW6, CS25_SW6}, /* RGB62 */
-    {0, CS27_SW7, CS26_SW7, CS25_SW7}, /* RGB58 */
-    {0, CS27_SW8, CS26_SW8, CS25_SW8}, /* RGB63 */
-    {0, CS27_SW9, CS26_SW9, CS25_SW9}, /* RGB59 */
-    {0, CS18_SW1, CS17_SW1, CS16_SW1}, /* RGB28 */
-    {0, CS18_SW2, CS17_SW2, CS16_SW2}, /* RGB29 */
-    {0, CS18_SW3, CS17_SW3, CS16_SW3}, /* RGB30 */
-    {0, CS18_SW4, CS17_SW4, CS16_SW4}, /* RGB31 */
-    {0, CS18_SW5, CS17_SW5, CS16_SW5}, /* RGB35 */
-    {0, CS18_SW6, CS17_SW6, CS16_SW6}, /* RGB32 */
-    {0, CS18_SW7, CS17_SW7, CS16_SW7}, /* RGB33 */
-    {0, CS18_SW8, CS17_SW8, CS16_SW8}, /* RGB34 */
-    {0, CS18_SW9, CS17_SW9, CS16_SW9}, /* RGB36 */
-    {0, CS30_SW1, CS29_SW1, CS28_SW1}, /* RGB64 */
-    {0, CS30_SW2, CS29_SW2, CS28_SW2}, /* RGB65 */
-    {0, CS30_SW3, CS29_SW3, CS28_SW3}, /* RGB66 */
-    {0, CS30_SW4, CS29_SW4, CS28_SW4}, /* RGB67 */
-    {0, CS30_SW5, CS29_SW5, CS28_SW5}, /* RGB68 */
-    {0, CS30_SW6, CS29_SW6, CS28_SW6}, /* RGB69 */
-    {0, CS30_SW7, CS29_SW7, CS28_SW7}, /* RGB70 */
-    {0, CS21_SW1, CS20_SW1, CS19_SW1}, /* RGB37 */
-    {0, CS21_SW2, CS20_SW2, CS19_SW2}, /* RGB40 */
-    {0, CS21_SW3, CS20_SW3, CS19_SW3}, /* RGB43 */
-    {0, CS21_SW4, CS20_SW4, CS19_SW4}, /* RGB38 */
-    {0, CS21_SW5, CS20_SW5, CS19_SW5}, /* RGB41 */
-    {0, CS21_SW6, CS20_SW6, CS19_SW6}, /* RGB44 */
-    {0, CS21_SW7, CS20_SW7, CS19_SW7}, /* RGB45 */
-    {0, CS21_SW8, CS20_SW8, CS19_SW8}, /* RGB39 */
-    {0, CS21_SW9, CS20_SW9, CS19_SW9}, /* RGB42 */
-    {0, CS30_SW8, CS29_SW8, CS28_SW8}, /* RGB71 */
+    {0, SW1_CS9,  SW1_CS8,  SW1_CS7},  /* RGB1 */
+    {0, SW2_CS9,  SW2_CS8,  SW2_CS7},  /* RGB3 */
+    {0, SW3_CS9,  SW3_CS8,  SW3_CS7},  /* RGB4 */
+    {0, SW4_CS9,  SW4_CS8,  SW4_CS7},  /* RGB5 */
+    {0, SW5_CS9,  SW5_CS8,  SW5_CS7},  /* RGB6 */
+    {0, SW6_CS9,  SW6_CS8,  SW6_CS7},  /* RGB7 */
+    {0, SW7_CS9,  SW7_CS8,  SW7_CS7},  /* RGB2 */
+    {0, SW8_CS9,  SW8_CS8,  SW8_CS7},  /* RGB8 */
+    {0, SW9_CS9,  SW9_CS8,  SW9_CS7},  /* RGB9 */
+    {0, SW1_CS24, SW1_CS23, SW1_CS22}, /* RGB48 */
+	{0, SW2_CS24, SW2_CS23, SW2_CS22}, /* RGB46 */
+    {0, SW3_CS24, SW3_CS23, SW3_CS22}, /* RGB49 */
+	{0, SW4_CS24, SW4_CS23, SW4_CS22}, /* RGB50 */
+	{0, SW5_CS24, SW5_CS23, SW5_CS22}, /* RGB51 */
+    {0, SW6_CS24, SW6_CS23, SW6_CS22}, /* RGB52 */
+    {0, SW7_CS24, SW7_CS23, SW7_CS22}, /* RGB53 */
+    {0, SW1_CS12, SW1_CS11, SW1_CS10}, /* RGB10 */
+    {0, SW2_CS12, SW2_CS11, SW2_CS10}, /* RGB11 */
+    {0, SW3_CS12, SW3_CS11, SW3_CS10}, /* RGB16 */
+    {0, SW4_CS12, SW4_CS11, SW4_CS10}, /* RGB12 */
+    {0, SW5_CS12, SW5_CS11, SW5_CS10}, /* RGB17 */
+    {0, SW6_CS12, SW6_CS11, SW6_CS10}, /* RGB13 */
+    {0, SW7_CS12, SW7_CS11, SW7_CS10}, /* RGB14 */
+    {0, SW8_CS12, SW8_CS11, SW8_CS10}, /* RGB18 */
+    {0, SW9_CS12, SW9_CS11, SW9_CS10}, /* RGB15 */
+    {0, SW8_CS24, SW8_CS23, SW8_CS22}, /* RGB47 */
+    {0, SW9_CS24, SW9_CS23, SW9_CS22}, /* RGB54 */
+    {0, SW1_CS27, SW1_CS26, SW1_CS25}, /* RGB55 */
+    {0, SW2_CS27, SW2_CS26, SW2_CS25}, /* RGB60 */
+	{0, SW3_CS27, SW3_CS26, SW3_CS25}, /* RGB61 */
+    {0, SW1_CS15, SW1_CS14, SW1_CS13}, /* RGB21 */
+    {0, SW2_CS15, SW2_CS14, SW2_CS13}, /* RGB19 */
+    {0, SW3_CS15, SW3_CS14, SW3_CS13}, /* RGB22 */
+    {0, SW4_CS15, SW4_CS14, SW4_CS13}, /* RGB26 */
+    {0, SW5_CS15, SW5_CS14, SW5_CS13}, /* RGB20 */
+    {0, SW6_CS15, SW6_CS14, SW6_CS13}, /* RGB23 */
+    {0, SW7_CS15, SW7_CS14, SW7_CS13}, /* RGB24 */
+    {0, SW8_CS15, SW8_CS14, SW8_CS13}, /* RGB25 */
+    {0, SW9_CS15, SW9_CS14, SW9_CS13}, /* RGB27 */
+    {0, SW4_CS27, SW4_CS26, SW4_CS25}, /* RGB56 */
+    {0, SW5_CS27, SW5_CS26, SW5_CS25}, /* RGB57 */
+    {0, SW6_CS27, SW6_CS26, SW6_CS25}, /* RGB62 */
+    {0, SW7_CS27, SW7_CS26, SW7_CS25}, /* RGB58 */
+    {0, SW8_CS27, SW8_CS26, SW8_CS25}, /* RGB63 */
+    {0, SW9_CS27, SW9_CS26, SW9_CS25}, /* RGB59 */
+    {0, SW1_CS18, SW1_CS17, SW1_CS16}, /* RGB28 */
+    {0, SW2_CS18, SW2_CS17, SW2_CS16}, /* RGB29 */
+    {0, SW3_CS18, SW3_CS17, SW3_CS16}, /* RGB30 */
+    {0, SW4_CS18, SW4_CS17, SW4_CS16}, /* RGB31 */
+    {0, SW5_CS18, SW5_CS17, SW5_CS16}, /* RGB35 */
+    {0, SW6_CS18, SW6_CS17, SW6_CS16}, /* RGB32 */
+    {0, SW7_CS18, SW7_CS17, SW7_CS16}, /* RGB33 */
+    {0, SW8_CS18, SW8_CS17, SW8_CS16}, /* RGB34 */
+    {0, SW9_CS18, SW9_CS17, SW9_CS16}, /* RGB36 */
+    {0, SW1_CS30, SW1_CS29, SW1_CS28}, /* RGB64 */
+    {0, SW2_CS30, SW2_CS29, SW2_CS28}, /* RGB65 */
+    {0, SW3_CS30, SW3_CS29, SW3_CS28}, /* RGB66 */
+    {0, SW4_CS30, SW4_CS29, SW4_CS28}, /* RGB67 */
+    {0, SW5_CS30, SW5_CS29, SW5_CS28}, /* RGB68 */
+    {0, SW6_CS30, SW6_CS29, SW6_CS28}, /* RGB69 */
+    {0, SW7_CS30, SW7_CS29, SW7_CS28}, /* RGB70 */
+    {0, SW1_CS21, SW1_CS20, SW1_CS19}, /* RGB37 */
+    {0, SW2_CS21, SW2_CS20, SW2_CS19}, /* RGB40 */
+    {0, SW3_CS21, SW3_CS20, SW3_CS19}, /* RGB43 */
+    {0, SW4_CS21, SW4_CS20, SW4_CS19}, /* RGB38 */
+    {0, SW5_CS21, SW5_CS20, SW5_CS19}, /* RGB41 */
+    {0, SW6_CS21, SW6_CS20, SW6_CS19}, /* RGB44 */
+    {0, SW7_CS21, SW7_CS20, SW7_CS19}, /* RGB45 */
+    {0, SW8_CS21, SW8_CS20, SW8_CS19}, /* RGB39 */
+    {0, SW9_CS21, SW9_CS20, SW9_CS19}, /* RGB42 */
+    {0, SW8_CS30, SW8_CS29, SW8_CS28}, /* RGB71 */
 };
 
 led_config_t g_led_config = {
diff --git a/keyboards/melgeek/mj63/rev1/rev1.c b/keyboards/melgeek/mj63/rev1/rev1.c
index 78e12b3f73c..e3baf32de7c 100644
--- a/keyboards/melgeek/mj63/rev1/rev1.c
+++ b/keyboards/melgeek/mj63/rev1/rev1.c
@@ -20,71 +20,71 @@
 #ifdef RGB_MATRIX_ENABLE
 
 const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
-    {0,  CS9_SW1, CS8_SW1, CS7_SW1},   /* RGB1 */
-    {0,  CS9_SW2, CS8_SW2, CS7_SW2},   /* RGB2 */
-    {0,  CS9_SW3, CS8_SW3, CS7_SW3},   /* RGB3 */
-    {0,  CS9_SW4, CS8_SW4, CS7_SW4},   /* RGB4 */
-    {0,  CS9_SW5, CS8_SW5, CS7_SW5},   /* RGB5 */
-    {0,  CS9_SW6, CS8_SW6, CS7_SW6},   /* RGB6 */
-    {0,  CS9_SW7, CS8_SW7, CS7_SW7},   /* RGB7 */
-    {0,  CS9_SW8, CS8_SW8, CS7_SW8},   /* RGB8 */
-    {0,  CS9_SW9, CS8_SW9, CS7_SW9},   /* RGB9 */
-    {0, CS12_SW1, CS11_SW1, CS10_SW1}, /* RGB10 */
-    {0, CS12_SW2, CS11_SW2, CS10_SW2}, /* RGB11 */
-    {0, CS12_SW3, CS11_SW3, CS10_SW3}, /* RGB12 */
-    {0, CS12_SW4, CS11_SW4, CS10_SW4}, /* RGB13 */
-    {0, CS12_SW5, CS11_SW5, CS10_SW5}, /* RGB14 */
-    {0, CS12_SW6, CS11_SW6, CS10_SW6}, /* RGB15 */
-    {0, CS12_SW7, CS11_SW7, CS10_SW7}, /* RGB16 */
-    {0, CS12_SW8, CS11_SW8, CS10_SW8}, /* RGB17 */
-    {0, CS12_SW9, CS11_SW9, CS10_SW9}, /* RGB18 */
-    {0, CS15_SW1, CS14_SW1, CS13_SW1}, /* RGB19 */
-    {0, CS15_SW2, CS14_SW2, CS13_SW2}, /* RGB20 */
-    {0, CS15_SW3, CS14_SW3, CS13_SW3}, /* RGB21 */
-    {0, CS15_SW4, CS14_SW4, CS13_SW4}, /* RGB22 */
-    {0, CS15_SW5, CS14_SW5, CS13_SW5}, /* RGB23 */
-    {0, CS15_SW6, CS14_SW6, CS13_SW6}, /* RGB24 */
-    {0, CS15_SW7, CS14_SW7, CS13_SW7}, /* RGB25 */
-    {0, CS15_SW8, CS14_SW8, CS13_SW8}, /* RGB26 */
-    {0, CS15_SW9, CS14_SW9, CS13_SW9}, /* RGB27 */
-    {0, CS18_SW1, CS17_SW1, CS16_SW1}, /* RGB28 */
-    {0, CS18_SW2, CS17_SW2, CS16_SW2}, /* RGB29 */
-    {0, CS18_SW3, CS17_SW3, CS16_SW3}, /* RGB30 */
-    {0, CS18_SW4, CS17_SW4, CS16_SW4}, /* RGB31 */
-    {0, CS18_SW5, CS17_SW5, CS16_SW5}, /* RGB32 */
-    {0, CS18_SW6, CS17_SW6, CS16_SW6}, /* RGB33 */
-    {0, CS18_SW7, CS17_SW7, CS16_SW7}, /* RGB34 */
-    {0, CS18_SW8, CS17_SW8, CS16_SW8}, /* RGB35 */
-    {0, CS18_SW9, CS17_SW9, CS16_SW9}, /* RGB36 */
-    {0, CS21_SW1, CS20_SW1, CS19_SW1}, /* RGB37 */
-    {0, CS21_SW2, CS20_SW2, CS19_SW2}, /* RGB38 */
-    {0, CS21_SW3, CS20_SW3, CS19_SW3}, /* RGB39 */
-    {0, CS21_SW4, CS20_SW4, CS19_SW4}, /* RGB40 */
-    {0, CS21_SW5, CS20_SW5, CS19_SW5}, /* RGB41 */
-    {0, CS21_SW6, CS20_SW6, CS19_SW6}, /* RGB42 */
-    {0, CS21_SW7, CS20_SW7, CS19_SW7}, /* RGB43 */
-    {0, CS21_SW8, CS20_SW8, CS19_SW8}, /* RGB44 */
-    {0, CS24_SW1, CS23_SW1, CS22_SW1}, /* RGB46 */
-	{0, CS24_SW2, CS23_SW2, CS22_SW2}, /* RGB47 */
-    {0, CS24_SW3, CS23_SW3, CS22_SW3}, /* RGB48 */
-	{0, CS24_SW4, CS23_SW4, CS22_SW4}, /* RGB49 */
-	{0, CS24_SW5, CS23_SW5, CS22_SW5}, /* RGB50 */
-    {0, CS24_SW6, CS23_SW6, CS22_SW6}, /* RGB51 */
-    {0, CS24_SW7, CS23_SW7, CS22_SW7}, /* RGB52 */
-    {0, CS24_SW8, CS23_SW8, CS22_SW8}, /* RGB53 */
-    {0, CS24_SW9, CS23_SW9, CS22_SW9}, /* RGB54 */
-    {0, CS30_SW2, CS29_SW2, CS28_SW2}, /* RGB55 */
-    {0, CS27_SW2, CS26_SW2, CS25_SW2}, /* RGB56 */
-	{0, CS27_SW3, CS26_SW3, CS25_SW3}, /* RGB57 */
-    {0, CS27_SW4, CS26_SW4, CS25_SW4}, /* RGB58 */
-    {0, CS27_SW5, CS26_SW5, CS25_SW5}, /* RGB59 */
-    {0, CS27_SW6, CS26_SW6, CS25_SW6}, /* RGB60 */
-    {0, CS30_SW7, CS29_SW7, CS28_SW7}, /* RGB61 */
-    {0, CS30_SW8, CS29_SW8, CS28_SW8}, /* RGB62 */
-    {0, CS30_SW9, CS29_SW9, CS28_SW9}, /* RGB63 */
-    {0, CS30_SW1, CS29_SW1, CS28_SW1}, /* RGB64 */
-    {0, CS27_SW1, CS26_SW1, CS25_SW1}, /* RGB65 */
-    {0, CS30_SW5, CS29_SW5, CS28_SW5}, /* RGB66 */
+    {0,  SW1_CS9, SW1_CS8, SW1_CS7},   /* RGB1 */
+    {0,  SW2_CS9, SW2_CS8, SW2_CS7},   /* RGB2 */
+    {0,  SW3_CS9, SW3_CS8, SW3_CS7},   /* RGB3 */
+    {0,  SW4_CS9, SW4_CS8, SW4_CS7},   /* RGB4 */
+    {0,  SW5_CS9, SW5_CS8, SW5_CS7},   /* RGB5 */
+    {0,  SW6_CS9, SW6_CS8, SW6_CS7},   /* RGB6 */
+    {0,  SW7_CS9, SW7_CS8, SW7_CS7},   /* RGB7 */
+    {0,  SW8_CS9, SW8_CS8, SW8_CS7},   /* RGB8 */
+    {0,  SW9_CS9, SW9_CS8, SW9_CS7},   /* RGB9 */
+    {0, SW1_CS12, SW1_CS11, SW1_CS10}, /* RGB10 */
+    {0, SW2_CS12, SW2_CS11, SW2_CS10}, /* RGB11 */
+    {0, SW3_CS12, SW3_CS11, SW3_CS10}, /* RGB12 */
+    {0, SW4_CS12, SW4_CS11, SW4_CS10}, /* RGB13 */
+    {0, SW5_CS12, SW5_CS11, SW5_CS10}, /* RGB14 */
+    {0, SW6_CS12, SW6_CS11, SW6_CS10}, /* RGB15 */
+    {0, SW7_CS12, SW7_CS11, SW7_CS10}, /* RGB16 */
+    {0, SW8_CS12, SW8_CS11, SW8_CS10}, /* RGB17 */
+    {0, SW9_CS12, SW9_CS11, SW9_CS10}, /* RGB18 */
+    {0, SW1_CS15, SW1_CS14, SW1_CS13}, /* RGB19 */
+    {0, SW2_CS15, SW2_CS14, SW2_CS13}, /* RGB20 */
+    {0, SW3_CS15, SW3_CS14, SW3_CS13}, /* RGB21 */
+    {0, SW4_CS15, SW4_CS14, SW4_CS13}, /* RGB22 */
+    {0, SW5_CS15, SW5_CS14, SW5_CS13}, /* RGB23 */
+    {0, SW6_CS15, SW6_CS14, SW6_CS13}, /* RGB24 */
+    {0, SW7_CS15, SW7_CS14, SW7_CS13}, /* RGB25 */
+    {0, SW8_CS15, SW8_CS14, SW8_CS13}, /* RGB26 */
+    {0, SW9_CS15, SW9_CS14, SW9_CS13}, /* RGB27 */
+    {0, SW1_CS18, SW1_CS17, SW1_CS16}, /* RGB28 */
+    {0, SW2_CS18, SW2_CS17, SW2_CS16}, /* RGB29 */
+    {0, SW3_CS18, SW3_CS17, SW3_CS16}, /* RGB30 */
+    {0, SW4_CS18, SW4_CS17, SW4_CS16}, /* RGB31 */
+    {0, SW5_CS18, SW5_CS17, SW5_CS16}, /* RGB32 */
+    {0, SW6_CS18, SW6_CS17, SW6_CS16}, /* RGB33 */
+    {0, SW7_CS18, SW7_CS17, SW7_CS16}, /* RGB34 */
+    {0, SW8_CS18, SW8_CS17, SW8_CS16}, /* RGB35 */
+    {0, SW9_CS18, SW9_CS17, SW9_CS16}, /* RGB36 */
+    {0, SW1_CS21, SW1_CS20, SW1_CS19}, /* RGB37 */
+    {0, SW2_CS21, SW2_CS20, SW2_CS19}, /* RGB38 */
+    {0, SW3_CS21, SW3_CS20, SW3_CS19}, /* RGB39 */
+    {0, SW4_CS21, SW4_CS20, SW4_CS19}, /* RGB40 */
+    {0, SW5_CS21, SW5_CS20, SW5_CS19}, /* RGB41 */
+    {0, SW6_CS21, SW6_CS20, SW6_CS19}, /* RGB42 */
+    {0, SW7_CS21, SW7_CS20, SW7_CS19}, /* RGB43 */
+    {0, SW8_CS21, SW8_CS20, SW8_CS19}, /* RGB44 */
+    {0, SW1_CS24, SW1_CS23, SW1_CS22}, /* RGB46 */
+	{0, SW2_CS24, SW2_CS23, SW2_CS22}, /* RGB47 */
+    {0, SW3_CS24, SW3_CS23, SW3_CS22}, /* RGB48 */
+	{0, SW4_CS24, SW4_CS23, SW4_CS22}, /* RGB49 */
+	{0, SW5_CS24, SW5_CS23, SW5_CS22}, /* RGB50 */
+    {0, SW6_CS24, SW6_CS23, SW6_CS22}, /* RGB51 */
+    {0, SW7_CS24, SW7_CS23, SW7_CS22}, /* RGB52 */
+    {0, SW8_CS24, SW8_CS23, SW8_CS22}, /* RGB53 */
+    {0, SW9_CS24, SW9_CS23, SW9_CS22}, /* RGB54 */
+    {0, SW2_CS30, SW2_CS29, SW2_CS28}, /* RGB55 */
+    {0, SW2_CS27, SW2_CS26, SW2_CS25}, /* RGB56 */
+	{0, SW3_CS27, SW3_CS26, SW3_CS25}, /* RGB57 */
+    {0, SW4_CS27, SW4_CS26, SW4_CS25}, /* RGB58 */
+    {0, SW5_CS27, SW5_CS26, SW5_CS25}, /* RGB59 */
+    {0, SW6_CS27, SW6_CS26, SW6_CS25}, /* RGB60 */
+    {0, SW7_CS30, SW7_CS29, SW7_CS28}, /* RGB61 */
+    {0, SW8_CS30, SW8_CS29, SW8_CS28}, /* RGB62 */
+    {0, SW9_CS30, SW9_CS29, SW9_CS28}, /* RGB63 */
+    {0, SW1_CS30, SW1_CS29, SW1_CS28}, /* RGB64 */
+    {0, SW1_CS27, SW1_CS26, SW1_CS25}, /* RGB65 */
+    {0, SW5_CS30, SW5_CS29, SW5_CS28}, /* RGB66 */
 };
 
 led_config_t g_led_config = {
diff --git a/keyboards/melgeek/mj63/rev2/rev2.c b/keyboards/melgeek/mj63/rev2/rev2.c
index d452661c45c..418092ec9f6 100644
--- a/keyboards/melgeek/mj63/rev2/rev2.c
+++ b/keyboards/melgeek/mj63/rev2/rev2.c
@@ -20,77 +20,77 @@
 #ifdef RGB_MATRIX_ENABLE
 
 const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
-    {0,  CS9_SW1, CS8_SW1, CS7_SW1},   /* RGB1 */
-    {0,  CS9_SW2, CS8_SW2, CS7_SW2},   /* RGB3 */
-    {0,  CS9_SW3, CS8_SW3, CS7_SW3},   /* RGB4 */
-    {0,  CS9_SW4, CS8_SW4, CS7_SW4},   /* RGB5 */
-    {0,  CS9_SW5, CS8_SW5, CS7_SW5},   /* RGB6 */
-    {0,  CS9_SW6, CS8_SW6, CS7_SW6},   /* RGB7 */
-    {0,  CS9_SW7, CS8_SW7, CS7_SW7},   /* RGB2 */
-    {0,  CS9_SW8, CS8_SW8, CS7_SW8},   /* RGB8 */
-    {0,  CS9_SW9, CS8_SW9, CS7_SW9},   /* RGB9 */
-    {0, CS24_SW1, CS23_SW1, CS22_SW1}, /* RGB48 */
-	{0, CS24_SW2, CS23_SW2, CS22_SW2}, /* RGB46 */
-    {0, CS24_SW3, CS23_SW3, CS22_SW3}, /* RGB49 */
-	{0, CS24_SW4, CS23_SW4, CS22_SW4}, /* RGB50 */
-	{0, CS24_SW5, CS23_SW5, CS22_SW5}, /* RGB51 */
-    {0, CS24_SW6, CS23_SW6, CS22_SW6}, /* RGB52 */
-    {0, CS24_SW7, CS23_SW7, CS22_SW7}, /* RGB53 */
-    {0, CS12_SW1, CS11_SW1, CS10_SW1}, /* RGB10 */
-    {0, CS12_SW2, CS11_SW2, CS10_SW2}, /* RGB11 */
-    {0, CS12_SW3, CS11_SW3, CS10_SW3}, /* RGB16 */
-    {0, CS12_SW4, CS11_SW4, CS10_SW4}, /* RGB12 */
-    {0, CS12_SW5, CS11_SW5, CS10_SW5}, /* RGB17 */
-    {0, CS12_SW6, CS11_SW6, CS10_SW6}, /* RGB13 */
-    {0, CS12_SW7, CS11_SW7, CS10_SW7}, /* RGB14 */
-    {0, CS12_SW8, CS11_SW8, CS10_SW8}, /* RGB18 */
-    {0, CS12_SW9, CS11_SW9, CS10_SW9}, /* RGB15 */
-    {0, CS24_SW8, CS23_SW8, CS22_SW8}, /* RGB47 */
-    {0, CS24_SW9, CS23_SW9, CS22_SW9}, /* RGB54 */
-    {0, CS27_SW1, CS26_SW1, CS25_SW1}, /* RGB55 */
-    {0, CS27_SW2, CS26_SW2, CS25_SW2}, /* RGB60 */
-	{0, CS27_SW3, CS26_SW3, CS25_SW3}, /* RGB61 */
-    {0, CS15_SW1, CS14_SW1, CS13_SW1}, /* RGB21 */
-    {0, CS15_SW2, CS14_SW2, CS13_SW2}, /* RGB19 */
-    {0, CS15_SW3, CS14_SW3, CS13_SW3}, /* RGB22 */
-    {0, CS15_SW4, CS14_SW4, CS13_SW4}, /* RGB26 */
-    {0, CS15_SW5, CS14_SW5, CS13_SW5}, /* RGB20 */
-    {0, CS15_SW6, CS14_SW6, CS13_SW6}, /* RGB23 */
-    {0, CS15_SW7, CS14_SW7, CS13_SW7}, /* RGB24 */
-    {0, CS15_SW8, CS14_SW8, CS13_SW8}, /* RGB25 */
-    {0, CS15_SW9, CS14_SW9, CS13_SW9}, /* RGB27 */
-    {0, CS27_SW4, CS26_SW4, CS25_SW4}, /* RGB56 */
-    {0, CS27_SW5, CS26_SW5, CS25_SW5}, /* RGB57 */
-    {0, CS27_SW6, CS26_SW6, CS25_SW6}, /* RGB62 */
-    {0, CS27_SW7, CS26_SW7, CS25_SW7}, /* RGB58 */
-    {0, CS27_SW8, CS26_SW8, CS25_SW8}, /* RGB63 */
-    {0, CS27_SW9, CS26_SW9, CS25_SW9}, /* RGB59 */
-    {0, CS18_SW1, CS17_SW1, CS16_SW1}, /* RGB28 */
-    {0, CS18_SW2, CS17_SW2, CS16_SW2}, /* RGB29 */
-    {0, CS18_SW3, CS17_SW3, CS16_SW3}, /* RGB30 */
-    {0, CS18_SW4, CS17_SW4, CS16_SW4}, /* RGB31 */
-    {0, CS18_SW5, CS17_SW5, CS16_SW5}, /* RGB35 */
-    {0, CS18_SW6, CS17_SW6, CS16_SW6}, /* RGB32 */
-    {0, CS18_SW7, CS17_SW7, CS16_SW7}, /* RGB33 */
-    {0, CS18_SW8, CS17_SW8, CS16_SW8}, /* RGB34 */
-    {0, CS18_SW9, CS17_SW9, CS16_SW9}, /* RGB36 */
-    {0, CS30_SW1, CS29_SW1, CS28_SW1}, /* RGB64 */
-    {0, CS30_SW2, CS29_SW2, CS28_SW2}, /* RGB65 */
-    {0, CS30_SW3, CS29_SW3, CS28_SW3}, /* RGB66 */
-    {0, CS30_SW5, CS29_SW5, CS28_SW5}, /* RGB68 */
-    {0, CS30_SW6, CS29_SW6, CS28_SW6}, /* RGB69 */
-    {0, CS30_SW7, CS29_SW7, CS28_SW7}, /* RGB70 */
-    {0, CS21_SW1, CS20_SW1, CS19_SW1}, /* RGB37 */
-    {0, CS21_SW2, CS20_SW2, CS19_SW2}, /* RGB40 */
-    {0, CS21_SW3, CS20_SW3, CS19_SW3}, /* RGB43 */
-    {0, CS21_SW4, CS20_SW4, CS19_SW4}, /* RGB38 */
-    {0, CS21_SW5, CS20_SW5, CS19_SW5}, /* RGB41 */
-    {0, CS21_SW6, CS20_SW6, CS19_SW6}, /* RGB44 */
-    {0, CS21_SW7, CS20_SW7, CS19_SW7}, /* RGB45 */
-    {0, CS21_SW8, CS20_SW8, CS19_SW8}, /* RGB39 */
-    {0, CS21_SW9, CS20_SW9, CS19_SW9}, /* RGB42 */
-    {0, CS30_SW8, CS29_SW8, CS28_SW8}, /* RGB71 */
-    {0, CS30_SW9, CS29_SW9, CS28_SW9}, /* RGB72 */
+    {0,  SW1_CS9, SW1_CS8, SW1_CS7},   /* RGB1 */
+    {0,  SW2_CS9, SW2_CS8, SW2_CS7},   /* RGB3 */
+    {0,  SW3_CS9, SW3_CS8, SW3_CS7},   /* RGB4 */
+    {0,  SW4_CS9, SW4_CS8, SW4_CS7},   /* RGB5 */
+    {0,  SW5_CS9, SW5_CS8, SW5_CS7},   /* RGB6 */
+    {0,  SW6_CS9, SW6_CS8, SW6_CS7},   /* RGB7 */
+    {0,  SW7_CS9, SW7_CS8, SW7_CS7},   /* RGB2 */
+    {0,  SW8_CS9, SW8_CS8, SW8_CS7},   /* RGB8 */
+    {0,  SW9_CS9, SW9_CS8, SW9_CS7},   /* RGB9 */
+    {0, SW1_CS24, SW1_CS23, SW1_CS22}, /* RGB48 */
+	{0, SW2_CS24, SW2_CS23, SW2_CS22}, /* RGB46 */
+    {0, SW3_CS24, SW3_CS23, SW3_CS22}, /* RGB49 */
+	{0, SW4_CS24, SW4_CS23, SW4_CS22}, /* RGB50 */
+	{0, SW5_CS24, SW5_CS23, SW5_CS22}, /* RGB51 */
+    {0, SW6_CS24, SW6_CS23, SW6_CS22}, /* RGB52 */
+    {0, SW7_CS24, SW7_CS23, SW7_CS22}, /* RGB53 */
+    {0, SW1_CS12, SW1_CS11, SW1_CS10}, /* RGB10 */
+    {0, SW2_CS12, SW2_CS11, SW2_CS10}, /* RGB11 */
+    {0, SW3_CS12, SW3_CS11, SW3_CS10}, /* RGB16 */
+    {0, SW4_CS12, SW4_CS11, SW4_CS10}, /* RGB12 */
+    {0, SW5_CS12, SW5_CS11, SW5_CS10}, /* RGB17 */
+    {0, SW6_CS12, SW6_CS11, SW6_CS10}, /* RGB13 */
+    {0, SW7_CS12, SW7_CS11, SW7_CS10}, /* RGB14 */
+    {0, SW8_CS12, SW8_CS11, SW8_CS10}, /* RGB18 */
+    {0, SW9_CS12, SW9_CS11, SW9_CS10}, /* RGB15 */
+    {0, SW8_CS24, SW8_CS23, SW8_CS22}, /* RGB47 */
+    {0, SW9_CS24, SW9_CS23, SW9_CS22}, /* RGB54 */
+    {0, SW1_CS27, SW1_CS26, SW1_CS25}, /* RGB55 */
+    {0, SW2_CS27, SW2_CS26, SW2_CS25}, /* RGB60 */
+	{0, SW3_CS27, SW3_CS26, SW3_CS25}, /* RGB61 */
+    {0, SW1_CS15, SW1_CS14, SW1_CS13}, /* RGB21 */
+    {0, SW2_CS15, SW2_CS14, SW2_CS13}, /* RGB19 */
+    {0, SW3_CS15, SW3_CS14, SW3_CS13}, /* RGB22 */
+    {0, SW4_CS15, SW4_CS14, SW4_CS13}, /* RGB26 */
+    {0, SW5_CS15, SW5_CS14, SW5_CS13}, /* RGB20 */
+    {0, SW6_CS15, SW6_CS14, SW6_CS13}, /* RGB23 */
+    {0, SW7_CS15, SW7_CS14, SW7_CS13}, /* RGB24 */
+    {0, SW8_CS15, SW8_CS14, SW8_CS13}, /* RGB25 */
+    {0, SW9_CS15, SW9_CS14, SW9_CS13}, /* RGB27 */
+    {0, SW4_CS27, SW4_CS26, SW4_CS25}, /* RGB56 */
+    {0, SW5_CS27, SW5_CS26, SW5_CS25}, /* RGB57 */
+    {0, SW6_CS27, SW6_CS26, SW6_CS25}, /* RGB62 */
+    {0, SW7_CS27, SW7_CS26, SW7_CS25}, /* RGB58 */
+    {0, SW8_CS27, SW8_CS26, SW8_CS25}, /* RGB63 */
+    {0, SW9_CS27, SW9_CS26, SW9_CS25}, /* RGB59 */
+    {0, SW1_CS18, SW1_CS17, SW1_CS16}, /* RGB28 */
+    {0, SW2_CS18, SW2_CS17, SW2_CS16}, /* RGB29 */
+    {0, SW3_CS18, SW3_CS17, SW3_CS16}, /* RGB30 */
+    {0, SW4_CS18, SW4_CS17, SW4_CS16}, /* RGB31 */
+    {0, SW5_CS18, SW5_CS17, SW5_CS16}, /* RGB35 */
+    {0, SW6_CS18, SW6_CS17, SW6_CS16}, /* RGB32 */
+    {0, SW7_CS18, SW7_CS17, SW7_CS16}, /* RGB33 */
+    {0, SW8_CS18, SW8_CS17, SW8_CS16}, /* RGB34 */
+    {0, SW9_CS18, SW9_CS17, SW9_CS16}, /* RGB36 */
+    {0, SW1_CS30, SW1_CS29, SW1_CS28}, /* RGB64 */
+    {0, SW2_CS30, SW2_CS29, SW2_CS28}, /* RGB65 */
+    {0, SW3_CS30, SW3_CS29, SW3_CS28}, /* RGB66 */
+    {0, SW5_CS30, SW5_CS29, SW5_CS28}, /* RGB68 */
+    {0, SW6_CS30, SW6_CS29, SW6_CS28}, /* RGB69 */
+    {0, SW7_CS30, SW7_CS29, SW7_CS28}, /* RGB70 */
+    {0, SW1_CS21, SW1_CS20, SW1_CS19}, /* RGB37 */
+    {0, SW2_CS21, SW2_CS20, SW2_CS19}, /* RGB40 */
+    {0, SW3_CS21, SW3_CS20, SW3_CS19}, /* RGB43 */
+    {0, SW4_CS21, SW4_CS20, SW4_CS19}, /* RGB38 */
+    {0, SW5_CS21, SW5_CS20, SW5_CS19}, /* RGB41 */
+    {0, SW6_CS21, SW6_CS20, SW6_CS19}, /* RGB44 */
+    {0, SW7_CS21, SW7_CS20, SW7_CS19}, /* RGB45 */
+    {0, SW8_CS21, SW8_CS20, SW8_CS19}, /* RGB39 */
+    {0, SW9_CS21, SW9_CS20, SW9_CS19}, /* RGB42 */
+    {0, SW8_CS30, SW8_CS29, SW8_CS28}, /* RGB71 */
+    {0, SW9_CS30, SW9_CS29, SW9_CS28}, /* RGB72 */
 };
 
 led_config_t g_led_config = {
diff --git a/keyboards/melgeek/mj64/rev1/rev1.c b/keyboards/melgeek/mj64/rev1/rev1.c
index efc9637db81..b9609cad1e8 100644
--- a/keyboards/melgeek/mj64/rev1/rev1.c
+++ b/keyboards/melgeek/mj64/rev1/rev1.c
@@ -19,70 +19,70 @@
 #ifdef RGB_MATRIX_ENABLE
 
 const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
-    {0, CS9_SW1,  CS8_SW1,  CS7_SW1}, /* RGB1 */
-    {0, CS9_SW2,  CS8_SW2,  CS7_SW2}, /* RGB2 */
-    {0, CS9_SW3,  CS8_SW3,  CS7_SW3}, /* RGB3 */
-    {0, CS9_SW4,  CS8_SW4,  CS7_SW4}, /* RGB4 */
-    {0, CS9_SW5,  CS8_SW5,  CS7_SW5}, /* RGB5 */
-    {0, CS9_SW6,  CS8_SW6,  CS7_SW6}, /* RGB6 */
-    {0, CS9_SW7,  CS8_SW7,  CS7_SW7}, /* RGB7 */
-    {0, CS9_SW8,  CS8_SW8,  CS7_SW8}, /* RGB8 */
-    {0, CS9_SW9,  CS8_SW9,  CS7_SW9}, /* RGB9 */
-    {0, CS12_SW1, CS11_SW1, CS10_SW1}, /* RGB10 */
-    {0, CS12_SW2, CS11_SW2, CS10_SW2}, /* RGB11 */
-    {0, CS12_SW3, CS11_SW3, CS10_SW3}, /* RGB12 */
-    {0, CS12_SW4, CS11_SW4, CS10_SW4}, /* RGB13 */
-    {0, CS12_SW5, CS11_SW5, CS10_SW5}, /* RGB14 */
-    {0, CS12_SW6, CS11_SW6, CS10_SW6}, /* RGB15 */
-    {0, CS12_SW7, CS11_SW7, CS10_SW7}, /* RGB16 */
-    {0, CS12_SW8, CS11_SW8, CS10_SW8}, /* RGB17 */
-    {0, CS12_SW9, CS11_SW9, CS10_SW9}, /* RGB18 */
-    {0, CS15_SW1, CS14_SW1, CS13_SW1}, /* RGB19 */
-    {0, CS15_SW2, CS14_SW2, CS13_SW2}, /* RGB20 */
-    {0, CS15_SW3, CS14_SW3, CS13_SW3}, /* RGB21 */
-    {0, CS15_SW4, CS14_SW4, CS13_SW4}, /* RGB22 */
-    {0, CS15_SW5, CS14_SW5, CS13_SW5}, /* RGB23 */
-    {0, CS15_SW6, CS14_SW6, CS13_SW6}, /* RGB24 */
-    {0, CS15_SW7, CS14_SW7, CS13_SW7}, /* RGB25 */
-    {0, CS15_SW8, CS14_SW8, CS13_SW8}, /* RGB26 */
-    {0, CS15_SW9, CS14_SW9, CS13_SW9}, /* RGB27 */
-    {0, CS18_SW1, CS17_SW1, CS16_SW1}, /* RGB28 */
-    {0, CS18_SW2, CS17_SW2, CS16_SW2}, /* RGB29 */
-    {0, CS18_SW3, CS17_SW3, CS16_SW3}, /* RGB30 */
-    {0, CS18_SW4, CS17_SW4, CS16_SW4}, /* RGB31 */
-    {0, CS18_SW5, CS17_SW5, CS16_SW5}, /* RGB32 */
-    {0, CS18_SW6, CS17_SW6, CS16_SW6}, /* RGB33 */
-    {0, CS18_SW7, CS17_SW7, CS16_SW7}, /* RGB34 */
-    {0, CS18_SW8, CS17_SW8, CS16_SW8}, /* RGB35 */
-    {0, CS18_SW9, CS17_SW9, CS16_SW9}, /* RGB36 */
-    {0, CS21_SW1, CS20_SW1, CS19_SW1}, /* RGB37 */
-    {0, CS21_SW2, CS20_SW2, CS19_SW2}, /* RGB38 */
-    {0, CS21_SW3, CS20_SW3, CS19_SW3}, /* RGB39 */
-    {0, CS21_SW4, CS20_SW4, CS19_SW4}, /* RGB40 */
-    {0, CS21_SW5, CS20_SW5, CS19_SW5}, /* RGB41 */
-    {0, CS21_SW6, CS20_SW6, CS19_SW6}, /* RGB42 */
-    {0, CS21_SW7, CS20_SW7, CS19_SW7}, /* RGB43 */
-    {0, CS21_SW8, CS20_SW8, CS19_SW8}, /* RGB44 */
-    {0, CS21_SW9, CS20_SW9, CS19_SW9}, /* RGB45 */
-    {0, CS24_SW1, CS23_SW1, CS22_SW1}, /* RGB46 */
-    {0, CS24_SW2, CS23_SW2, CS22_SW2}, /* RGB47 */
-    {0, CS24_SW3, CS23_SW3, CS22_SW3}, /* RGB48 */
-    {0, CS24_SW4, CS23_SW4, CS22_SW4}, /* RGB49 */
-    {0, CS24_SW5, CS23_SW5, CS22_SW5}, /* RGB50 */
-    {0, CS24_SW6, CS23_SW6, CS22_SW6}, /* RGB51 */
-    {0, CS24_SW7, CS23_SW7, CS22_SW7}, /* RGB52 */
-    {0, CS24_SW8, CS23_SW8, CS22_SW8}, /* RGB53 */
-    {0, CS24_SW9, CS23_SW9, CS22_SW9}, /* RGB54 */
-    {0, CS27_SW1, CS26_SW1, CS25_SW1}, /* RGB55 */
-    {0, CS27_SW2, CS26_SW2, CS25_SW2}, /* RGB56 */
-    {0, CS27_SW3, CS26_SW3, CS25_SW3}, /* RGB57 */
-    {0, CS27_SW4, CS26_SW4, CS25_SW4}, /* RGB58 */
-    {0, CS27_SW5, CS26_SW5, CS25_SW5}, /* RGB59 */
-    {0, CS27_SW6, CS26_SW6, CS25_SW6}, /* RGB60 */
-    {0, CS27_SW7, CS26_SW7, CS25_SW7}, /* RGB61 */
-    {0, CS27_SW8, CS26_SW8, CS25_SW8}, /* RGB62 */
-    {0, CS27_SW9, CS26_SW9, CS25_SW9}, /* RGB63 */
-    {0, CS30_SW1, CS29_SW1, CS28_SW1}, /* RGB64 */
+    {0, SW1_CS9,  SW1_CS8,  SW1_CS7}, /* RGB1 */
+    {0, SW2_CS9,  SW2_CS8,  SW2_CS7}, /* RGB2 */
+    {0, SW3_CS9,  SW3_CS8,  SW3_CS7}, /* RGB3 */
+    {0, SW4_CS9,  SW4_CS8,  SW4_CS7}, /* RGB4 */
+    {0, SW5_CS9,  SW5_CS8,  SW5_CS7}, /* RGB5 */
+    {0, SW6_CS9,  SW6_CS8,  SW6_CS7}, /* RGB6 */
+    {0, SW7_CS9,  SW7_CS8,  SW7_CS7}, /* RGB7 */
+    {0, SW8_CS9,  SW8_CS8,  SW8_CS7}, /* RGB8 */
+    {0, SW9_CS9,  SW9_CS8,  SW9_CS7}, /* RGB9 */
+    {0, SW1_CS12, SW1_CS11, SW1_CS10}, /* RGB10 */
+    {0, SW2_CS12, SW2_CS11, SW2_CS10}, /* RGB11 */
+    {0, SW3_CS12, SW3_CS11, SW3_CS10}, /* RGB12 */
+    {0, SW4_CS12, SW4_CS11, SW4_CS10}, /* RGB13 */
+    {0, SW5_CS12, SW5_CS11, SW5_CS10}, /* RGB14 */
+    {0, SW6_CS12, SW6_CS11, SW6_CS10}, /* RGB15 */
+    {0, SW7_CS12, SW7_CS11, SW7_CS10}, /* RGB16 */
+    {0, SW8_CS12, SW8_CS11, SW8_CS10}, /* RGB17 */
+    {0, SW9_CS12, SW9_CS11, SW9_CS10}, /* RGB18 */
+    {0, SW1_CS15, SW1_CS14, SW1_CS13}, /* RGB19 */
+    {0, SW2_CS15, SW2_CS14, SW2_CS13}, /* RGB20 */
+    {0, SW3_CS15, SW3_CS14, SW3_CS13}, /* RGB21 */
+    {0, SW4_CS15, SW4_CS14, SW4_CS13}, /* RGB22 */
+    {0, SW5_CS15, SW5_CS14, SW5_CS13}, /* RGB23 */
+    {0, SW6_CS15, SW6_CS14, SW6_CS13}, /* RGB24 */
+    {0, SW7_CS15, SW7_CS14, SW7_CS13}, /* RGB25 */
+    {0, SW8_CS15, SW8_CS14, SW8_CS13}, /* RGB26 */
+    {0, SW9_CS15, SW9_CS14, SW9_CS13}, /* RGB27 */
+    {0, SW1_CS18, SW1_CS17, SW1_CS16}, /* RGB28 */
+    {0, SW2_CS18, SW2_CS17, SW2_CS16}, /* RGB29 */
+    {0, SW3_CS18, SW3_CS17, SW3_CS16}, /* RGB30 */
+    {0, SW4_CS18, SW4_CS17, SW4_CS16}, /* RGB31 */
+    {0, SW5_CS18, SW5_CS17, SW5_CS16}, /* RGB32 */
+    {0, SW6_CS18, SW6_CS17, SW6_CS16}, /* RGB33 */
+    {0, SW7_CS18, SW7_CS17, SW7_CS16}, /* RGB34 */
+    {0, SW8_CS18, SW8_CS17, SW8_CS16}, /* RGB35 */
+    {0, SW9_CS18, SW9_CS17, SW9_CS16}, /* RGB36 */
+    {0, SW1_CS21, SW1_CS20, SW1_CS19}, /* RGB37 */
+    {0, SW2_CS21, SW2_CS20, SW2_CS19}, /* RGB38 */
+    {0, SW3_CS21, SW3_CS20, SW3_CS19}, /* RGB39 */
+    {0, SW4_CS21, SW4_CS20, SW4_CS19}, /* RGB40 */
+    {0, SW5_CS21, SW5_CS20, SW5_CS19}, /* RGB41 */
+    {0, SW6_CS21, SW6_CS20, SW6_CS19}, /* RGB42 */
+    {0, SW7_CS21, SW7_CS20, SW7_CS19}, /* RGB43 */
+    {0, SW8_CS21, SW8_CS20, SW8_CS19}, /* RGB44 */
+    {0, SW9_CS21, SW9_CS20, SW9_CS19}, /* RGB45 */
+    {0, SW1_CS24, SW1_CS23, SW1_CS22}, /* RGB46 */
+    {0, SW2_CS24, SW2_CS23, SW2_CS22}, /* RGB47 */
+    {0, SW3_CS24, SW3_CS23, SW3_CS22}, /* RGB48 */
+    {0, SW4_CS24, SW4_CS23, SW4_CS22}, /* RGB49 */
+    {0, SW5_CS24, SW5_CS23, SW5_CS22}, /* RGB50 */
+    {0, SW6_CS24, SW6_CS23, SW6_CS22}, /* RGB51 */
+    {0, SW7_CS24, SW7_CS23, SW7_CS22}, /* RGB52 */
+    {0, SW8_CS24, SW8_CS23, SW8_CS22}, /* RGB53 */
+    {0, SW9_CS24, SW9_CS23, SW9_CS22}, /* RGB54 */
+    {0, SW1_CS27, SW1_CS26, SW1_CS25}, /* RGB55 */
+    {0, SW2_CS27, SW2_CS26, SW2_CS25}, /* RGB56 */
+    {0, SW3_CS27, SW3_CS26, SW3_CS25}, /* RGB57 */
+    {0, SW4_CS27, SW4_CS26, SW4_CS25}, /* RGB58 */
+    {0, SW5_CS27, SW5_CS26, SW5_CS25}, /* RGB59 */
+    {0, SW6_CS27, SW6_CS26, SW6_CS25}, /* RGB60 */
+    {0, SW7_CS27, SW7_CS26, SW7_CS25}, /* RGB61 */
+    {0, SW8_CS27, SW8_CS26, SW8_CS25}, /* RGB62 */
+    {0, SW9_CS27, SW9_CS26, SW9_CS25}, /* RGB63 */
+    {0, SW1_CS30, SW1_CS29, SW1_CS28}, /* RGB64 */
 };
 
 led_config_t g_led_config = {
diff --git a/keyboards/melgeek/mj64/rev2/rev2.c b/keyboards/melgeek/mj64/rev2/rev2.c
index 2f11cc95baf..16c8e1f6125 100644
--- a/keyboards/melgeek/mj64/rev2/rev2.c
+++ b/keyboards/melgeek/mj64/rev2/rev2.c
@@ -19,72 +19,72 @@
 #ifdef RGB_MATRIX_ENABLE
 
 const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
-    {0, CS9_SW1,  CS8_SW1,  CS7_SW1},  /* RGB1 */
-    {0, CS9_SW2,  CS8_SW2,  CS7_SW2},  /* RGB2 */
-    {0, CS9_SW3,  CS8_SW3,  CS7_SW3},  /* RGB3 */
-    {0, CS9_SW4,  CS8_SW4,  CS7_SW4},  /* RGB4 */
-    {0, CS9_SW5,  CS8_SW5,  CS7_SW5},  /* RGB5 */
-    {0, CS9_SW6,  CS8_SW6,  CS7_SW6},  /* RGB6 */
-    {0, CS9_SW7,  CS8_SW7,  CS7_SW7},  /* RGB7 */
-    {0, CS9_SW8,  CS8_SW8,  CS7_SW8},  /* RGB8 */
-    {0, CS9_SW9,  CS8_SW9,  CS7_SW9},  /* RGB9 */
-    {0, CS12_SW1, CS11_SW1, CS10_SW1}, /* RGB10 */
-    {0, CS12_SW2, CS11_SW2, CS10_SW2}, /* RGB11 */
-    {0, CS12_SW3, CS11_SW3, CS10_SW3}, /* RGB12 */
-    {0, CS12_SW4, CS11_SW4, CS10_SW4}, /* RGB13 */
-    {0, CS12_SW5, CS11_SW5, CS10_SW5}, /* RGB14 */
-    {0, CS12_SW6, CS11_SW6, CS10_SW6}, /* RGB15 */
-    {0, CS12_SW7, CS11_SW7, CS10_SW7}, /* RGB16 */
-    {0, CS12_SW8, CS11_SW8, CS10_SW8}, /* RGB17 */
-    {0, CS12_SW9, CS11_SW9, CS10_SW9}, /* RGB18 */
-    {0, CS15_SW1, CS14_SW1, CS13_SW1}, /* RGB19 */
-    {0, CS15_SW2, CS14_SW2, CS13_SW2}, /* RGB20 */
-    {0, CS15_SW3, CS14_SW3, CS13_SW3}, /* RGB21 */
-    {0, CS15_SW4, CS14_SW4, CS13_SW4}, /* RGB22 */
-    {0, CS15_SW5, CS14_SW5, CS13_SW5}, /* RGB23 */
-    {0, CS15_SW6, CS14_SW6, CS13_SW6}, /* RGB24 */
-    {0, CS15_SW7, CS14_SW7, CS13_SW7}, /* RGB25 */
-    {0, CS15_SW8, CS14_SW8, CS13_SW8}, /* RGB26 */
-    {0, CS15_SW9, CS14_SW9, CS13_SW9}, /* RGB27 */
-    {0, CS18_SW1, CS17_SW1, CS16_SW1}, /* RGB28 */
-    {0, CS18_SW2, CS17_SW2, CS16_SW2}, /* RGB29 */
-    {0, CS18_SW3, CS17_SW3, CS16_SW3}, /* RGB30 */
-    {0, CS18_SW4, CS17_SW4, CS16_SW4}, /* RGB31 */
-    {0, CS18_SW5, CS17_SW5, CS16_SW5}, /* RGB32 */
-    {0, CS18_SW6, CS17_SW6, CS16_SW6}, /* RGB33 */
-    {0, CS18_SW7, CS17_SW7, CS16_SW7}, /* RGB34 */
-    {0, CS18_SW8, CS17_SW8, CS16_SW8}, /* RGB35 */
-    {0, CS18_SW9, CS17_SW9, CS16_SW9}, /* RGB36 */
-    {0, CS21_SW1, CS20_SW1, CS19_SW1}, /* RGB37 */
-    {0, CS21_SW2, CS20_SW2, CS19_SW2}, /* RGB38 */
-    {0, CS21_SW3, CS20_SW3, CS19_SW3}, /* RGB39 */
-    {0, CS21_SW4, CS20_SW4, CS19_SW4}, /* RGB40 */
-    {0, CS21_SW5, CS20_SW5, CS19_SW5}, /* RGB41 */
-    {0, CS21_SW6, CS20_SW6, CS19_SW6}, /* RGB42 */
-    {0, CS21_SW7, CS20_SW7, CS19_SW7}, /* RGB43 */
-    {0, CS21_SW8, CS20_SW8, CS19_SW8}, /* RGB44 */
-    {0, CS21_SW9, CS20_SW9, CS19_SW9}, /* RGB45 */
-    {0, CS24_SW1, CS23_SW1, CS22_SW1}, /* RGB46 */
-	{0, CS24_SW2, CS23_SW2, CS22_SW2}, /* RGB47 */
-    {0, CS24_SW3, CS23_SW3, CS22_SW3}, /* RGB48 */
-	{0, CS24_SW4, CS23_SW4, CS22_SW4}, /* RGB49 */
-	{0, CS24_SW5, CS23_SW5, CS22_SW5}, /* RGB50 */
-    {0, CS24_SW6, CS23_SW6, CS22_SW6}, /* RGB51 */
-    {0, CS24_SW7, CS23_SW7, CS22_SW7}, /* RGB52 */
-    {0, CS24_SW8, CS23_SW8, CS22_SW8}, /* RGB53 */
-    {0, CS24_SW9, CS23_SW9, CS22_SW9}, /* RGB54 */
-    {0, CS30_SW2, CS29_SW2, CS28_SW2}, /* RGB55 */
-    {0, CS27_SW2, CS26_SW2, CS25_SW2}, /* RGB56 */
-	{0, CS27_SW3, CS26_SW3, CS25_SW3}, /* RGB57 */
-    {0, CS27_SW4, CS26_SW4, CS25_SW4}, /* RGB58 */
-    {0, CS27_SW5, CS26_SW5, CS25_SW5}, /* RGB59 */
-    {0, CS27_SW6, CS26_SW6, CS25_SW6}, /* RGB60 */
-    {0, CS30_SW7, CS29_SW7, CS28_SW7}, /* RGB61 */
-    {0, CS30_SW8, CS29_SW8, CS28_SW8}, /* RGB62 */
-    {0, CS30_SW9, CS29_SW9, CS28_SW9}, /* RGB63 */
-    {0, CS30_SW1, CS29_SW1, CS28_SW1}, /* RGB64 */
-    {0, CS27_SW1, CS26_SW1, CS25_SW1}, /* RGB65 */
-    {0, CS30_SW5, CS29_SW5, CS28_SW5}, /* RGB66 */
+    {0, SW1_CS9,  SW1_CS8,  SW1_CS7},  /* RGB1 */
+    {0, SW2_CS9,  SW2_CS8,  SW2_CS7},  /* RGB2 */
+    {0, SW3_CS9,  SW3_CS8,  SW3_CS7},  /* RGB3 */
+    {0, SW4_CS9,  SW4_CS8,  SW4_CS7},  /* RGB4 */
+    {0, SW5_CS9,  SW5_CS8,  SW5_CS7},  /* RGB5 */
+    {0, SW6_CS9,  SW6_CS8,  SW6_CS7},  /* RGB6 */
+    {0, SW7_CS9,  SW7_CS8,  SW7_CS7},  /* RGB7 */
+    {0, SW8_CS9,  SW8_CS8,  SW8_CS7},  /* RGB8 */
+    {0, SW9_CS9,  SW9_CS8,  SW9_CS7},  /* RGB9 */
+    {0, SW1_CS12, SW1_CS11, SW1_CS10}, /* RGB10 */
+    {0, SW2_CS12, SW2_CS11, SW2_CS10}, /* RGB11 */
+    {0, SW3_CS12, SW3_CS11, SW3_CS10}, /* RGB12 */
+    {0, SW4_CS12, SW4_CS11, SW4_CS10}, /* RGB13 */
+    {0, SW5_CS12, SW5_CS11, SW5_CS10}, /* RGB14 */
+    {0, SW6_CS12, SW6_CS11, SW6_CS10}, /* RGB15 */
+    {0, SW7_CS12, SW7_CS11, SW7_CS10}, /* RGB16 */
+    {0, SW8_CS12, SW8_CS11, SW8_CS10}, /* RGB17 */
+    {0, SW9_CS12, SW9_CS11, SW9_CS10}, /* RGB18 */
+    {0, SW1_CS15, SW1_CS14, SW1_CS13}, /* RGB19 */
+    {0, SW2_CS15, SW2_CS14, SW2_CS13}, /* RGB20 */
+    {0, SW3_CS15, SW3_CS14, SW3_CS13}, /* RGB21 */
+    {0, SW4_CS15, SW4_CS14, SW4_CS13}, /* RGB22 */
+    {0, SW5_CS15, SW5_CS14, SW5_CS13}, /* RGB23 */
+    {0, SW6_CS15, SW6_CS14, SW6_CS13}, /* RGB24 */
+    {0, SW7_CS15, SW7_CS14, SW7_CS13}, /* RGB25 */
+    {0, SW8_CS15, SW8_CS14, SW8_CS13}, /* RGB26 */
+    {0, SW9_CS15, SW9_CS14, SW9_CS13}, /* RGB27 */
+    {0, SW1_CS18, SW1_CS17, SW1_CS16}, /* RGB28 */
+    {0, SW2_CS18, SW2_CS17, SW2_CS16}, /* RGB29 */
+    {0, SW3_CS18, SW3_CS17, SW3_CS16}, /* RGB30 */
+    {0, SW4_CS18, SW4_CS17, SW4_CS16}, /* RGB31 */
+    {0, SW5_CS18, SW5_CS17, SW5_CS16}, /* RGB32 */
+    {0, SW6_CS18, SW6_CS17, SW6_CS16}, /* RGB33 */
+    {0, SW7_CS18, SW7_CS17, SW7_CS16}, /* RGB34 */
+    {0, SW8_CS18, SW8_CS17, SW8_CS16}, /* RGB35 */
+    {0, SW9_CS18, SW9_CS17, SW9_CS16}, /* RGB36 */
+    {0, SW1_CS21, SW1_CS20, SW1_CS19}, /* RGB37 */
+    {0, SW2_CS21, SW2_CS20, SW2_CS19}, /* RGB38 */
+    {0, SW3_CS21, SW3_CS20, SW3_CS19}, /* RGB39 */
+    {0, SW4_CS21, SW4_CS20, SW4_CS19}, /* RGB40 */
+    {0, SW5_CS21, SW5_CS20, SW5_CS19}, /* RGB41 */
+    {0, SW6_CS21, SW6_CS20, SW6_CS19}, /* RGB42 */
+    {0, SW7_CS21, SW7_CS20, SW7_CS19}, /* RGB43 */
+    {0, SW8_CS21, SW8_CS20, SW8_CS19}, /* RGB44 */
+    {0, SW9_CS21, SW9_CS20, SW9_CS19}, /* RGB45 */
+    {0, SW1_CS24, SW1_CS23, SW1_CS22}, /* RGB46 */
+	{0, SW2_CS24, SW2_CS23, SW2_CS22}, /* RGB47 */
+    {0, SW3_CS24, SW3_CS23, SW3_CS22}, /* RGB48 */
+	{0, SW4_CS24, SW4_CS23, SW4_CS22}, /* RGB49 */
+	{0, SW5_CS24, SW5_CS23, SW5_CS22}, /* RGB50 */
+    {0, SW6_CS24, SW6_CS23, SW6_CS22}, /* RGB51 */
+    {0, SW7_CS24, SW7_CS23, SW7_CS22}, /* RGB52 */
+    {0, SW8_CS24, SW8_CS23, SW8_CS22}, /* RGB53 */
+    {0, SW9_CS24, SW9_CS23, SW9_CS22}, /* RGB54 */
+    {0, SW2_CS30, SW2_CS29, SW2_CS28}, /* RGB55 */
+    {0, SW2_CS27, SW2_CS26, SW2_CS25}, /* RGB56 */
+	{0, SW3_CS27, SW3_CS26, SW3_CS25}, /* RGB57 */
+    {0, SW4_CS27, SW4_CS26, SW4_CS25}, /* RGB58 */
+    {0, SW5_CS27, SW5_CS26, SW5_CS25}, /* RGB59 */
+    {0, SW6_CS27, SW6_CS26, SW6_CS25}, /* RGB60 */
+    {0, SW7_CS30, SW7_CS29, SW7_CS28}, /* RGB61 */
+    {0, SW8_CS30, SW8_CS29, SW8_CS28}, /* RGB62 */
+    {0, SW9_CS30, SW9_CS29, SW9_CS28}, /* RGB63 */
+    {0, SW1_CS30, SW1_CS29, SW1_CS28}, /* RGB64 */
+    {0, SW1_CS27, SW1_CS26, SW1_CS25}, /* RGB65 */
+    {0, SW5_CS30, SW5_CS29, SW5_CS28}, /* RGB66 */
 };
 
 led_config_t g_led_config = {
diff --git a/keyboards/melgeek/mj64/rev3/rev3.c b/keyboards/melgeek/mj64/rev3/rev3.c
index d797301b0a7..7af80c7388f 100644
--- a/keyboards/melgeek/mj64/rev3/rev3.c
+++ b/keyboards/melgeek/mj64/rev3/rev3.c
@@ -19,78 +19,78 @@
 #ifdef RGB_MATRIX_ENABLE
 
 const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
-    {0, CS9_SW1,  CS8_SW1,  CS7_SW1},  /* RGB1 */
-    {0, CS9_SW2,  CS8_SW2,  CS7_SW2},  /* RGB3 */
-    {0, CS9_SW3,  CS8_SW3,  CS7_SW3},  /* RGB4 */
-    {0, CS9_SW4,  CS8_SW4,  CS7_SW4},  /* RGB5 */
-    {0, CS9_SW5,  CS8_SW5,  CS7_SW5},  /* RGB6 */
-    {0, CS9_SW6,  CS8_SW6,  CS7_SW6},  /* RGB7 */
-    {0, CS9_SW7,  CS8_SW7,  CS7_SW7},  /* RGB2 */
-    {0, CS9_SW8,  CS8_SW8,  CS7_SW8},  /* RGB8 */
-    {0, CS9_SW9,  CS8_SW9,  CS7_SW9},  /* RGB9 */
-    {0, CS24_SW1, CS23_SW1, CS22_SW1}, /* RGB48 */
-	{0, CS24_SW2, CS23_SW2, CS22_SW2}, /* RGB46 */
-    {0, CS24_SW3, CS23_SW3, CS22_SW3}, /* RGB49 */
-	{0, CS24_SW4, CS23_SW4, CS22_SW4}, /* RGB50 */
-	{0, CS24_SW5, CS23_SW5, CS22_SW5}, /* RGB51 */
-    {0, CS24_SW6, CS23_SW6, CS22_SW6}, /* RGB52 */
-    {0, CS24_SW7, CS23_SW7, CS22_SW7}, /* RGB53 */
-    {0, CS12_SW1, CS11_SW1, CS10_SW1}, /* RGB10 */
-    {0, CS12_SW2, CS11_SW2, CS10_SW2}, /* RGB11 */
-    {0, CS12_SW3, CS11_SW3, CS10_SW3}, /* RGB16 */
-    {0, CS12_SW4, CS11_SW4, CS10_SW4}, /* RGB12 */
-    {0, CS12_SW5, CS11_SW5, CS10_SW5}, /* RGB17 */
-    {0, CS12_SW6, CS11_SW6, CS10_SW6}, /* RGB13 */
-    {0, CS12_SW7, CS11_SW7, CS10_SW7}, /* RGB14 */
-    {0, CS12_SW8, CS11_SW8, CS10_SW8}, /* RGB18 */
-    {0, CS12_SW9, CS11_SW9, CS10_SW9}, /* RGB15 */
-    {0, CS24_SW8, CS23_SW8, CS22_SW8}, /* RGB47 */
-    {0, CS24_SW9, CS23_SW9, CS22_SW9}, /* RGB54 */
-    {0, CS27_SW1, CS26_SW1, CS25_SW1}, /* RGB55 */
-    {0, CS27_SW2, CS26_SW2, CS25_SW2}, /* RGB60 */
-	{0, CS27_SW3, CS26_SW3, CS25_SW3}, /* RGB61 */
-    {0, CS15_SW1, CS14_SW1, CS13_SW1}, /* RGB21 */
-    {0, CS15_SW2, CS14_SW2, CS13_SW2}, /* RGB19 */
-    {0, CS15_SW3, CS14_SW3, CS13_SW3}, /* RGB22 */
-    {0, CS15_SW4, CS14_SW4, CS13_SW4}, /* RGB26 */
-    {0, CS15_SW5, CS14_SW5, CS13_SW5}, /* RGB20 */
-    {0, CS15_SW6, CS14_SW6, CS13_SW6}, /* RGB23 */
-    {0, CS15_SW7, CS14_SW7, CS13_SW7}, /* RGB24 */
-    {0, CS15_SW8, CS14_SW8, CS13_SW8}, /* RGB25 */
-    {0, CS15_SW9, CS14_SW9, CS13_SW9}, /* RGB27 */
-    {0, CS27_SW4, CS26_SW4, CS25_SW4}, /* RGB56 */
-    {0, CS27_SW5, CS26_SW5, CS25_SW5}, /* RGB57 */
-    {0, CS27_SW6, CS26_SW6, CS25_SW6}, /* RGB62 */
-    {0, CS27_SW7, CS26_SW7, CS25_SW7}, /* RGB58 */
-    {0, CS27_SW8, CS26_SW8, CS25_SW8}, /* RGB63 */
-    {0, CS27_SW9, CS26_SW9, CS25_SW9}, /* RGB59 */
-    {0, CS18_SW1, CS17_SW1, CS16_SW1}, /* RGB28 */
-    {0, CS18_SW2, CS17_SW2, CS16_SW2}, /* RGB29 */
-    {0, CS18_SW3, CS17_SW3, CS16_SW3}, /* RGB30 */
-    {0, CS18_SW4, CS17_SW4, CS16_SW4}, /* RGB31 */
-    {0, CS18_SW5, CS17_SW5, CS16_SW5}, /* RGB35 */
-    {0, CS18_SW6, CS17_SW6, CS16_SW6}, /* RGB32 */
-    {0, CS18_SW7, CS17_SW7, CS16_SW7}, /* RGB33 */
-    {0, CS18_SW8, CS17_SW8, CS16_SW8}, /* RGB34 */
-    {0, CS18_SW9, CS17_SW9, CS16_SW9}, /* RGB36 */
-    {0, CS30_SW1, CS29_SW1, CS28_SW1}, /* RGB64 */
-    {0, CS30_SW2, CS29_SW2, CS28_SW2}, /* RGB65 */
-    {0, CS30_SW3, CS29_SW3, CS28_SW3}, /* RGB66 */
-    {0, CS30_SW4, CS29_SW4, CS28_SW4}, /* RGB67 */
-    {0, CS30_SW5, CS29_SW5, CS28_SW5}, /* RGB68 */
-    {0, CS30_SW6, CS29_SW6, CS28_SW6}, /* RGB69 */
-    {0, CS30_SW7, CS29_SW7, CS28_SW7}, /* RGB70 */
-    {0, CS21_SW1, CS20_SW1, CS19_SW1}, /* RGB37 */
-    {0, CS21_SW2, CS20_SW2, CS19_SW2}, /* RGB40 */
-    {0, CS21_SW3, CS20_SW3, CS19_SW3}, /* RGB43 */
-    {0, CS21_SW4, CS20_SW4, CS19_SW4}, /* RGB38 */
-    {0, CS21_SW5, CS20_SW5, CS19_SW5}, /* RGB41 */
-    {0, CS21_SW6, CS20_SW6, CS19_SW6}, /* RGB44 */
-    {0, CS21_SW7, CS20_SW7, CS19_SW7}, /* RGB45 */
-    {0, CS21_SW8, CS20_SW8, CS19_SW8}, /* RGB39 */
-    {0, CS21_SW9, CS20_SW9, CS19_SW9}, /* RGB42 */
-    {0, CS30_SW8, CS29_SW8, CS28_SW8}, /* RGB71 */
-    {0, CS30_SW9, CS29_SW9, CS28_SW9}, /* RGB72 */
+    {0, SW1_CS9,  SW1_CS8,  SW1_CS7},  /* RGB1 */
+    {0, SW2_CS9,  SW2_CS8,  SW2_CS7},  /* RGB3 */
+    {0, SW3_CS9,  SW3_CS8,  SW3_CS7},  /* RGB4 */
+    {0, SW4_CS9,  SW4_CS8,  SW4_CS7},  /* RGB5 */
+    {0, SW5_CS9,  SW5_CS8,  SW5_CS7},  /* RGB6 */
+    {0, SW6_CS9,  SW6_CS8,  SW6_CS7},  /* RGB7 */
+    {0, SW7_CS9,  SW7_CS8,  SW7_CS7},  /* RGB2 */
+    {0, SW8_CS9,  SW8_CS8,  SW8_CS7},  /* RGB8 */
+    {0, SW9_CS9,  SW9_CS8,  SW9_CS7},  /* RGB9 */
+    {0, SW1_CS24, SW1_CS23, SW1_CS22}, /* RGB48 */
+	{0, SW2_CS24, SW2_CS23, SW2_CS22}, /* RGB46 */
+    {0, SW3_CS24, SW3_CS23, SW3_CS22}, /* RGB49 */
+	{0, SW4_CS24, SW4_CS23, SW4_CS22}, /* RGB50 */
+	{0, SW5_CS24, SW5_CS23, SW5_CS22}, /* RGB51 */
+    {0, SW6_CS24, SW6_CS23, SW6_CS22}, /* RGB52 */
+    {0, SW7_CS24, SW7_CS23, SW7_CS22}, /* RGB53 */
+    {0, SW1_CS12, SW1_CS11, SW1_CS10}, /* RGB10 */
+    {0, SW2_CS12, SW2_CS11, SW2_CS10}, /* RGB11 */
+    {0, SW3_CS12, SW3_CS11, SW3_CS10}, /* RGB16 */
+    {0, SW4_CS12, SW4_CS11, SW4_CS10}, /* RGB12 */
+    {0, SW5_CS12, SW5_CS11, SW5_CS10}, /* RGB17 */
+    {0, SW6_CS12, SW6_CS11, SW6_CS10}, /* RGB13 */
+    {0, SW7_CS12, SW7_CS11, SW7_CS10}, /* RGB14 */
+    {0, SW8_CS12, SW8_CS11, SW8_CS10}, /* RGB18 */
+    {0, SW9_CS12, SW9_CS11, SW9_CS10}, /* RGB15 */
+    {0, SW8_CS24, SW8_CS23, SW8_CS22}, /* RGB47 */
+    {0, SW9_CS24, SW9_CS23, SW9_CS22}, /* RGB54 */
+    {0, SW1_CS27, SW1_CS26, SW1_CS25}, /* RGB55 */
+    {0, SW2_CS27, SW2_CS26, SW2_CS25}, /* RGB60 */
+	{0, SW3_CS27, SW3_CS26, SW3_CS25}, /* RGB61 */
+    {0, SW1_CS15, SW1_CS14, SW1_CS13}, /* RGB21 */
+    {0, SW2_CS15, SW2_CS14, SW2_CS13}, /* RGB19 */
+    {0, SW3_CS15, SW3_CS14, SW3_CS13}, /* RGB22 */
+    {0, SW4_CS15, SW4_CS14, SW4_CS13}, /* RGB26 */
+    {0, SW5_CS15, SW5_CS14, SW5_CS13}, /* RGB20 */
+    {0, SW6_CS15, SW6_CS14, SW6_CS13}, /* RGB23 */
+    {0, SW7_CS15, SW7_CS14, SW7_CS13}, /* RGB24 */
+    {0, SW8_CS15, SW8_CS14, SW8_CS13}, /* RGB25 */
+    {0, SW9_CS15, SW9_CS14, SW9_CS13}, /* RGB27 */
+    {0, SW4_CS27, SW4_CS26, SW4_CS25}, /* RGB56 */
+    {0, SW5_CS27, SW5_CS26, SW5_CS25}, /* RGB57 */
+    {0, SW6_CS27, SW6_CS26, SW6_CS25}, /* RGB62 */
+    {0, SW7_CS27, SW7_CS26, SW7_CS25}, /* RGB58 */
+    {0, SW8_CS27, SW8_CS26, SW8_CS25}, /* RGB63 */
+    {0, SW9_CS27, SW9_CS26, SW9_CS25}, /* RGB59 */
+    {0, SW1_CS18, SW1_CS17, SW1_CS16}, /* RGB28 */
+    {0, SW2_CS18, SW2_CS17, SW2_CS16}, /* RGB29 */
+    {0, SW3_CS18, SW3_CS17, SW3_CS16}, /* RGB30 */
+    {0, SW4_CS18, SW4_CS17, SW4_CS16}, /* RGB31 */
+    {0, SW5_CS18, SW5_CS17, SW5_CS16}, /* RGB35 */
+    {0, SW6_CS18, SW6_CS17, SW6_CS16}, /* RGB32 */
+    {0, SW7_CS18, SW7_CS17, SW7_CS16}, /* RGB33 */
+    {0, SW8_CS18, SW8_CS17, SW8_CS16}, /* RGB34 */
+    {0, SW9_CS18, SW9_CS17, SW9_CS16}, /* RGB36 */
+    {0, SW1_CS30, SW1_CS29, SW1_CS28}, /* RGB64 */
+    {0, SW2_CS30, SW2_CS29, SW2_CS28}, /* RGB65 */
+    {0, SW3_CS30, SW3_CS29, SW3_CS28}, /* RGB66 */
+    {0, SW4_CS30, SW4_CS29, SW4_CS28}, /* RGB67 */
+    {0, SW5_CS30, SW5_CS29, SW5_CS28}, /* RGB68 */
+    {0, SW6_CS30, SW6_CS29, SW6_CS28}, /* RGB69 */
+    {0, SW7_CS30, SW7_CS29, SW7_CS28}, /* RGB70 */
+    {0, SW1_CS21, SW1_CS20, SW1_CS19}, /* RGB37 */
+    {0, SW2_CS21, SW2_CS20, SW2_CS19}, /* RGB40 */
+    {0, SW3_CS21, SW3_CS20, SW3_CS19}, /* RGB43 */
+    {0, SW4_CS21, SW4_CS20, SW4_CS19}, /* RGB38 */
+    {0, SW5_CS21, SW5_CS20, SW5_CS19}, /* RGB41 */
+    {0, SW6_CS21, SW6_CS20, SW6_CS19}, /* RGB44 */
+    {0, SW7_CS21, SW7_CS20, SW7_CS19}, /* RGB45 */
+    {0, SW8_CS21, SW8_CS20, SW8_CS19}, /* RGB39 */
+    {0, SW9_CS21, SW9_CS20, SW9_CS19}, /* RGB42 */
+    {0, SW8_CS30, SW8_CS29, SW8_CS28}, /* RGB71 */
+    {0, SW9_CS30, SW9_CS29, SW9_CS28}, /* RGB72 */
 };
 
 led_config_t g_led_config = {
diff --git a/keyboards/melgeek/mj65/rev3/rev3.c b/keyboards/melgeek/mj65/rev3/rev3.c
index 39eb0431641..1392d5af4e5 100644
--- a/keyboards/melgeek/mj65/rev3/rev3.c
+++ b/keyboards/melgeek/mj65/rev3/rev3.c
@@ -19,82 +19,82 @@
 #ifdef RGB_MATRIX_ENABLE
 
 const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
-    {0, CS9_SW1,  CS8_SW1,  CS7_SW1},  /* RGB1 */
-    {0, CS9_SW2,  CS8_SW2,  CS7_SW2},  /* RGB2 */
-    {0, CS9_SW3,  CS8_SW3,  CS7_SW3},  /* RGB3 */
-    {0, CS9_SW4,  CS8_SW4,  CS7_SW4},  /* RGB4 */
-    {0, CS9_SW5,  CS8_SW5,  CS7_SW5},  /* RGB5 */
-    {0, CS9_SW6,  CS8_SW6,  CS7_SW6},  /* RGB6 */
-    {0, CS9_SW7,  CS8_SW7,  CS7_SW7},  /* RGB7 */
-    {0, CS9_SW8,  CS8_SW8,  CS7_SW8},  /* RGB8 */
-    {0, CS9_SW9,  CS8_SW9,  CS7_SW9},  /* RGB9 */
-    {0, CS24_SW1, CS23_SW1, CS22_SW1}, /* RGB46 */
-	{0, CS24_SW2, CS23_SW2, CS22_SW2}, /* RGB47 */
-    {0, CS24_SW3, CS23_SW3, CS22_SW3}, /* RGB48 */
-	{0, CS24_SW4, CS23_SW4, CS22_SW4}, /* RGB49 */
-	{0, CS24_SW5, CS23_SW5, CS22_SW5}, /* RGB50 */
-    {0, CS24_SW6, CS23_SW6, CS22_SW6}, /* RGB51 */
-    {0, CS24_SW7, CS23_SW7, CS22_SW7}, /* RGB52 */
-    {0, CS24_SW8, CS23_SW8, CS22_SW8}, /* RGB53 */
-    {0, CS12_SW1, CS11_SW1, CS10_SW1}, /* RGB10 */
-    {0, CS12_SW2, CS11_SW2, CS10_SW2}, /* RGB11 */
-    {0, CS12_SW3, CS11_SW3, CS10_SW3}, /* RGB12 */
-    {0, CS12_SW4, CS11_SW4, CS10_SW4}, /* RGB13 */
-    {0, CS12_SW5, CS11_SW5, CS10_SW5}, /* RGB14 */
-    {0, CS12_SW6, CS11_SW6, CS10_SW6}, /* RGB15 */
-    {0, CS12_SW7, CS11_SW7, CS10_SW7}, /* RGB16 */
-    {0, CS12_SW8, CS11_SW8, CS10_SW8}, /* RGB17 */
-    {0, CS12_SW9, CS11_SW9, CS10_SW9}, /* RGB18 */
-    {0, CS24_SW9, CS23_SW9, CS22_SW9}, /* RGB54 */
-    {0, CS27_SW1, CS26_SW1, CS25_SW1}, /* RGB55 */
-    {0, CS27_SW2, CS26_SW2, CS25_SW2}, /* RGB56 */
-	{0, CS27_SW3, CS26_SW3, CS25_SW3}, /* RGB57 */
-    {0, CS27_SW4, CS26_SW4, CS25_SW4}, /* RGB58 */
-    {0, CS27_SW5, CS26_SW5, CS25_SW5}, /* RGB59 */
-    {0, CS15_SW1, CS14_SW1, CS13_SW1}, /* RGB19 */
-    {0, CS15_SW2, CS14_SW2, CS13_SW2}, /* RGB20 */
-    {0, CS15_SW3, CS14_SW3, CS13_SW3}, /* RGB21 */
-    {0, CS15_SW4, CS14_SW4, CS13_SW4}, /* RGB22 */
-    {0, CS15_SW5, CS14_SW5, CS13_SW5}, /* RGB23 */
-    {0, CS15_SW6, CS14_SW6, CS13_SW6}, /* RGB24 */
-    {0, CS15_SW7, CS14_SW7, CS13_SW7}, /* RGB25 */
-    {0, CS15_SW8, CS14_SW8, CS13_SW8}, /* RGB26 */
-    {0, CS15_SW9, CS14_SW9, CS13_SW9}, /* RGB27 */
-    {0, CS27_SW6, CS26_SW6, CS25_SW6}, /* RGB60 */
-    {0, CS27_SW7, CS26_SW7, CS25_SW7}, /* RGB61 */
-    {0, CS27_SW8, CS26_SW8, CS25_SW8}, /* RGB62 */
-    {0, CS27_SW9, CS26_SW9, CS25_SW9}, /* RGB63 */
-    {0, CS30_SW1, CS29_SW1, CS28_SW1}, /* RGB64 */
-    {0, CS30_SW2, CS29_SW2, CS28_SW2}, /* RGB65 */
-    {0, CS30_SW3, CS29_SW3, CS28_SW3}, /* RGB66 */
-    {0, CS18_SW1, CS17_SW1, CS16_SW1}, /* RGB28 */
-    {0, CS18_SW2, CS17_SW2, CS16_SW2}, /* RGB29 */
-    {0, CS18_SW3, CS17_SW3, CS16_SW3}, /* RGB30 */
-    {0, CS18_SW4, CS17_SW4, CS16_SW4}, /* RGB31 */
-    {0, CS18_SW5, CS17_SW5, CS16_SW5}, /* RGB32 */
-    {0, CS18_SW6, CS17_SW6, CS16_SW6}, /* RGB33 */
-    {0, CS18_SW7, CS17_SW7, CS16_SW7}, /* RGB34 */
-    {0, CS18_SW8, CS17_SW8, CS16_SW8}, /* RGB35 */
-    {0, CS18_SW9, CS17_SW9, CS16_SW9}, /* RGB36 */
-    {0, CS30_SW4, CS29_SW4, CS28_SW4}, /* RGB67 */
-    {0, CS30_SW5, CS29_SW5, CS28_SW5}, /* RGB68 */
-    {0, CS30_SW6, CS29_SW6, CS28_SW6}, /* RGB69 */
-    {0, CS30_SW7, CS29_SW7, CS28_SW7}, /* RGB70 */
-    {0, CS30_SW8, CS29_SW8, CS28_SW8}, /* RGB71 */
-    {0, CS30_SW9, CS29_SW9, CS28_SW9}, /* RGB72 */
-    {0, CS33_SW1, CS32_SW1, CS31_SW1}, /* RGB73 */
-    {0, CS21_SW1, CS20_SW1, CS19_SW1}, /* RGB37 */
-    {0, CS21_SW2, CS20_SW2, CS19_SW2}, /* RGB38 */
-    {0, CS21_SW3, CS20_SW3, CS19_SW3}, /* RGB39 */
-    {0, CS21_SW4, CS20_SW4, CS19_SW4}, /* RGB40 */
-    {0, CS21_SW5, CS20_SW5, CS19_SW5}, /* RGB41 */
-    {0, CS21_SW6, CS20_SW6, CS19_SW6}, /* RGB42 */
-    {0, CS21_SW7, CS20_SW7, CS19_SW7}, /* RGB43 */
-    {0, CS21_SW8, CS20_SW8, CS19_SW8}, /* RGB44 */
-    {0, CS21_SW9, CS20_SW9, CS19_SW9}, /* RGB45 */
-    {0, CS33_SW2, CS32_SW2, CS31_SW2}, /* RGB74 */
-    {0, CS33_SW3, CS32_SW3, CS31_SW3}, /* RGB75 */
-    {0, CS33_SW4, CS32_SW4, CS31_SW4}, /* RGB76 */
+    {0, SW1_CS9,  SW1_CS8,  SW1_CS7},  /* RGB1 */
+    {0, SW2_CS9,  SW2_CS8,  SW2_CS7},  /* RGB2 */
+    {0, SW3_CS9,  SW3_CS8,  SW3_CS7},  /* RGB3 */
+    {0, SW4_CS9,  SW4_CS8,  SW4_CS7},  /* RGB4 */
+    {0, SW5_CS9,  SW5_CS8,  SW5_CS7},  /* RGB5 */
+    {0, SW6_CS9,  SW6_CS8,  SW6_CS7},  /* RGB6 */
+    {0, SW7_CS9,  SW7_CS8,  SW7_CS7},  /* RGB7 */
+    {0, SW8_CS9,  SW8_CS8,  SW8_CS7},  /* RGB8 */
+    {0, SW9_CS9,  SW9_CS8,  SW9_CS7},  /* RGB9 */
+    {0, SW1_CS24, SW1_CS23, SW1_CS22}, /* RGB46 */
+	{0, SW2_CS24, SW2_CS23, SW2_CS22}, /* RGB47 */
+    {0, SW3_CS24, SW3_CS23, SW3_CS22}, /* RGB48 */
+	{0, SW4_CS24, SW4_CS23, SW4_CS22}, /* RGB49 */
+	{0, SW5_CS24, SW5_CS23, SW5_CS22}, /* RGB50 */
+    {0, SW6_CS24, SW6_CS23, SW6_CS22}, /* RGB51 */
+    {0, SW7_CS24, SW7_CS23, SW7_CS22}, /* RGB52 */
+    {0, SW8_CS24, SW8_CS23, SW8_CS22}, /* RGB53 */
+    {0, SW1_CS12, SW1_CS11, SW1_CS10}, /* RGB10 */
+    {0, SW2_CS12, SW2_CS11, SW2_CS10}, /* RGB11 */
+    {0, SW3_CS12, SW3_CS11, SW3_CS10}, /* RGB12 */
+    {0, SW4_CS12, SW4_CS11, SW4_CS10}, /* RGB13 */
+    {0, SW5_CS12, SW5_CS11, SW5_CS10}, /* RGB14 */
+    {0, SW6_CS12, SW6_CS11, SW6_CS10}, /* RGB15 */
+    {0, SW7_CS12, SW7_CS11, SW7_CS10}, /* RGB16 */
+    {0, SW8_CS12, SW8_CS11, SW8_CS10}, /* RGB17 */
+    {0, SW9_CS12, SW9_CS11, SW9_CS10}, /* RGB18 */
+    {0, SW9_CS24, SW9_CS23, SW9_CS22}, /* RGB54 */
+    {0, SW1_CS27, SW1_CS26, SW1_CS25}, /* RGB55 */
+    {0, SW2_CS27, SW2_CS26, SW2_CS25}, /* RGB56 */
+	{0, SW3_CS27, SW3_CS26, SW3_CS25}, /* RGB57 */
+    {0, SW4_CS27, SW4_CS26, SW4_CS25}, /* RGB58 */
+    {0, SW5_CS27, SW5_CS26, SW5_CS25}, /* RGB59 */
+    {0, SW1_CS15, SW1_CS14, SW1_CS13}, /* RGB19 */
+    {0, SW2_CS15, SW2_CS14, SW2_CS13}, /* RGB20 */
+    {0, SW3_CS15, SW3_CS14, SW3_CS13}, /* RGB21 */
+    {0, SW4_CS15, SW4_CS14, SW4_CS13}, /* RGB22 */
+    {0, SW5_CS15, SW5_CS14, SW5_CS13}, /* RGB23 */
+    {0, SW6_CS15, SW6_CS14, SW6_CS13}, /* RGB24 */
+    {0, SW7_CS15, SW7_CS14, SW7_CS13}, /* RGB25 */
+    {0, SW8_CS15, SW8_CS14, SW8_CS13}, /* RGB26 */
+    {0, SW9_CS15, SW9_CS14, SW9_CS13}, /* RGB27 */
+    {0, SW6_CS27, SW6_CS26, SW6_CS25}, /* RGB60 */
+    {0, SW7_CS27, SW7_CS26, SW7_CS25}, /* RGB61 */
+    {0, SW8_CS27, SW8_CS26, SW8_CS25}, /* RGB62 */
+    {0, SW9_CS27, SW9_CS26, SW9_CS25}, /* RGB63 */
+    {0, SW1_CS30, SW1_CS29, SW1_CS28}, /* RGB64 */
+    {0, SW2_CS30, SW2_CS29, SW2_CS28}, /* RGB65 */
+    {0, SW3_CS30, SW3_CS29, SW3_CS28}, /* RGB66 */
+    {0, SW1_CS18, SW1_CS17, SW1_CS16}, /* RGB28 */
+    {0, SW2_CS18, SW2_CS17, SW2_CS16}, /* RGB29 */
+    {0, SW3_CS18, SW3_CS17, SW3_CS16}, /* RGB30 */
+    {0, SW4_CS18, SW4_CS17, SW4_CS16}, /* RGB31 */
+    {0, SW5_CS18, SW5_CS17, SW5_CS16}, /* RGB32 */
+    {0, SW6_CS18, SW6_CS17, SW6_CS16}, /* RGB33 */
+    {0, SW7_CS18, SW7_CS17, SW7_CS16}, /* RGB34 */
+    {0, SW8_CS18, SW8_CS17, SW8_CS16}, /* RGB35 */
+    {0, SW9_CS18, SW9_CS17, SW9_CS16}, /* RGB36 */
+    {0, SW4_CS30, SW4_CS29, SW4_CS28}, /* RGB67 */
+    {0, SW5_CS30, SW5_CS29, SW5_CS28}, /* RGB68 */
+    {0, SW6_CS30, SW6_CS29, SW6_CS28}, /* RGB69 */
+    {0, SW7_CS30, SW7_CS29, SW7_CS28}, /* RGB70 */
+    {0, SW8_CS30, SW8_CS29, SW8_CS28}, /* RGB71 */
+    {0, SW9_CS30, SW9_CS29, SW9_CS28}, /* RGB72 */
+    {0, SW1_CS33, SW1_CS32, SW1_CS31}, /* RGB73 */
+    {0, SW1_CS21, SW1_CS20, SW1_CS19}, /* RGB37 */
+    {0, SW2_CS21, SW2_CS20, SW2_CS19}, /* RGB38 */
+    {0, SW3_CS21, SW3_CS20, SW3_CS19}, /* RGB39 */
+    {0, SW4_CS21, SW4_CS20, SW4_CS19}, /* RGB40 */
+    {0, SW5_CS21, SW5_CS20, SW5_CS19}, /* RGB41 */
+    {0, SW6_CS21, SW6_CS20, SW6_CS19}, /* RGB42 */
+    {0, SW7_CS21, SW7_CS20, SW7_CS19}, /* RGB43 */
+    {0, SW8_CS21, SW8_CS20, SW8_CS19}, /* RGB44 */
+    {0, SW9_CS21, SW9_CS20, SW9_CS19}, /* RGB45 */
+    {0, SW2_CS33, SW2_CS32, SW2_CS31}, /* RGB74 */
+    {0, SW3_CS33, SW3_CS32, SW3_CS31}, /* RGB75 */
+    {0, SW4_CS33, SW4_CS32, SW4_CS31}, /* RGB76 */
 };
 
 led_config_t g_led_config = {
diff --git a/keyboards/melgeek/mojo68/rev1/rev1.c b/keyboards/melgeek/mojo68/rev1/rev1.c
index 0490acd7dcd..af17d96c6d9 100755
--- a/keyboards/melgeek/mojo68/rev1/rev1.c
+++ b/keyboards/melgeek/mojo68/rev1/rev1.c
@@ -19,74 +19,74 @@
 #ifdef RGB_MATRIX_ENABLE
 
 const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
-    {0, CS9_SW1, CS8_SW1, CS7_SW1},    /* RGB1 */
-    {0, CS9_SW2, CS8_SW2, CS7_SW2},    /* RGB2 */
-    {0, CS9_SW3, CS8_SW3, CS7_SW3},    /* RGB3 */
-    {0, CS9_SW4, CS8_SW4, CS7_SW4},    /* RGB4 */
-    {0, CS9_SW5, CS8_SW5, CS7_SW5},    /* RGB5 */
-    {0, CS9_SW6, CS8_SW6, CS7_SW6},    /* RGB6 */
-    {0, CS9_SW7, CS8_SW7, CS7_SW7},    /* RGB7 */
-    {0, CS9_SW8, CS8_SW8, CS7_SW8},    /* RGB8 */
-    {0, CS9_SW9, CS8_SW9, CS7_SW9},    /* RGB9 */
-    {0, CS24_SW1, CS23_SW1, CS22_SW1}, /* RGB46 */
-    {0, CS24_SW2, CS23_SW2, CS22_SW2}, /* RGB47 */
-    {0, CS24_SW3, CS23_SW3, CS22_SW3}, /* RGB48 */
-    {0, CS24_SW4, CS23_SW4, CS22_SW4}, /* RGB49 */
-    {0, CS24_SW5, CS23_SW5, CS22_SW5}, /* RGB50 */
-    {0, CS24_SW6, CS23_SW6, CS22_SW6}, /* RGB51 */
-    {0, CS12_SW1, CS11_SW1, CS10_SW1}, /* RGB10 */
-    {0, CS12_SW2, CS11_SW2, CS10_SW2}, /* RGB11 */
-    {0, CS12_SW3, CS11_SW3, CS10_SW3}, /* RGB12 */
-    {0, CS12_SW4, CS11_SW4, CS10_SW4}, /* RGB13 */
-    {0, CS12_SW5, CS11_SW5, CS10_SW5}, /* RGB14 */
-    {0, CS12_SW6, CS11_SW6, CS10_SW6}, /* RGB15 */
-    {0, CS12_SW7, CS11_SW7, CS10_SW7}, /* RGB16 */
-    {0, CS12_SW8, CS11_SW8, CS10_SW8}, /* RGB17 */
-    {0, CS12_SW9, CS11_SW9, CS10_SW9}, /* RGB18 */
-    {0, CS24_SW7, CS23_SW7, CS22_SW7}, /* RGB52 */
-    {0, CS24_SW8, CS23_SW8, CS22_SW8}, /* RGB53 */
-    {0, CS24_SW9, CS23_SW9, CS22_SW9}, /* RGB54 */
-    {0, CS27_SW1, CS26_SW1, CS25_SW1}, /* RGB55 */
-    {0, CS27_SW2, CS26_SW2, CS25_SW2}, /* RGB56 */
-    {0, CS27_SW3, CS26_SW3, CS25_SW3}, /* RGB57 */
-    {0, CS15_SW1, CS14_SW1, CS13_SW1}, /* RGB19 */
-    {0, CS15_SW2, CS14_SW2, CS13_SW2}, /* RGB20 */
-    {0, CS15_SW3, CS14_SW3, CS13_SW3}, /* RGB21 */
-    {0, CS15_SW4, CS14_SW4, CS13_SW4}, /* RGB22 */
-    {0, CS15_SW5, CS14_SW5, CS13_SW5}, /* RGB23 */
-    {0, CS15_SW6, CS14_SW6, CS13_SW6}, /* RGB24 */
-    {0, CS15_SW7, CS14_SW7, CS13_SW7}, /* RGB25 */
-    {0, CS15_SW8, CS14_SW8, CS13_SW8}, /* RGB26 */
-    {0, CS15_SW9, CS14_SW9, CS13_SW9}, /* RGB27 */
-    {0, CS27_SW4, CS26_SW4, CS25_SW4}, /* RGB58 */
-    {0, CS27_SW5, CS26_SW5, CS25_SW5}, /* RGB59 */
-    {0, CS27_SW6, CS26_SW6, CS25_SW6}, /* RGB60 */
-    {0, CS27_SW7, CS26_SW7, CS25_SW7}, /* RGB61 */
-    {0, CS27_SW8, CS26_SW8, CS25_SW8}, /* RGB62 */
-    {0, CS18_SW1, CS17_SW1, CS16_SW1}, /* RGB28 */
-    {0, CS18_SW2, CS17_SW2, CS16_SW2}, /* RGB29 */
-    {0, CS18_SW3, CS17_SW3, CS16_SW3}, /* RGB30 */
-    {0, CS18_SW4, CS17_SW4, CS16_SW4}, /* RGB31 */
-    {0, CS18_SW5, CS17_SW5, CS16_SW5}, /* RGB32 */
-    {0, CS18_SW6, CS17_SW6, CS16_SW6}, /* RGB33 */
-    {0, CS18_SW7, CS17_SW7, CS16_SW7}, /* RGB34 */
-    {0, CS18_SW8, CS17_SW8, CS16_SW8}, /* RGB35 */
-    {0, CS18_SW9, CS17_SW9, CS16_SW9}, /* RGB36 */
-    {0, CS27_SW9, CS26_SW9, CS25_SW9}, /* RGB63 */
-    {0, CS30_SW1, CS29_SW1, CS28_SW1}, /* RGB64 */
-    {0, CS30_SW2, CS29_SW2, CS28_SW2}, /* RGB65 */
-    {0, CS30_SW3, CS29_SW3, CS28_SW3}, /* RGB66 */
-    {0, CS30_SW4, CS29_SW4, CS28_SW4}, /* RGB67 */
-    {0, CS21_SW1, CS20_SW1, CS19_SW1}, /* RGB37 */
-    {0, CS21_SW2, CS20_SW2, CS19_SW2}, /* RGB38 */
-    {0, CS21_SW3, CS20_SW3, CS19_SW3}, /* RGB39 */
-    {0, CS21_SW4, CS20_SW4, CS19_SW4}, /* RGB40 */
-    {0, CS21_SW5, CS20_SW5, CS19_SW5}, /* RGB41 */
-    {0, CS21_SW6, CS20_SW6, CS19_SW6}, /* RGB42 */
-    {0, CS21_SW7, CS20_SW7, CS19_SW7}, /* RGB43 */
-    {0, CS21_SW8, CS20_SW8, CS19_SW8}, /* RGB44 */
-    {0, CS21_SW9, CS20_SW9, CS19_SW9}, /* RGB45 */
-    {0, CS30_SW5, CS29_SW5, CS28_SW5}, /* RGB68 */
+    {0, SW1_CS9, SW1_CS8, SW1_CS7},    /* RGB1 */
+    {0, SW2_CS9, SW2_CS8, SW2_CS7},    /* RGB2 */
+    {0, SW3_CS9, SW3_CS8, SW3_CS7},    /* RGB3 */
+    {0, SW4_CS9, SW4_CS8, SW4_CS7},    /* RGB4 */
+    {0, SW5_CS9, SW5_CS8, SW5_CS7},    /* RGB5 */
+    {0, SW6_CS9, SW6_CS8, SW6_CS7},    /* RGB6 */
+    {0, SW7_CS9, SW7_CS8, SW7_CS7},    /* RGB7 */
+    {0, SW8_CS9, SW8_CS8, SW8_CS7},    /* RGB8 */
+    {0, SW9_CS9, SW9_CS8, SW9_CS7},    /* RGB9 */
+    {0, SW1_CS24, SW1_CS23, SW1_CS22}, /* RGB46 */
+    {0, SW2_CS24, SW2_CS23, SW2_CS22}, /* RGB47 */
+    {0, SW3_CS24, SW3_CS23, SW3_CS22}, /* RGB48 */
+    {0, SW4_CS24, SW4_CS23, SW4_CS22}, /* RGB49 */
+    {0, SW5_CS24, SW5_CS23, SW5_CS22}, /* RGB50 */
+    {0, SW6_CS24, SW6_CS23, SW6_CS22}, /* RGB51 */
+    {0, SW1_CS12, SW1_CS11, SW1_CS10}, /* RGB10 */
+    {0, SW2_CS12, SW2_CS11, SW2_CS10}, /* RGB11 */
+    {0, SW3_CS12, SW3_CS11, SW3_CS10}, /* RGB12 */
+    {0, SW4_CS12, SW4_CS11, SW4_CS10}, /* RGB13 */
+    {0, SW5_CS12, SW5_CS11, SW5_CS10}, /* RGB14 */
+    {0, SW6_CS12, SW6_CS11, SW6_CS10}, /* RGB15 */
+    {0, SW7_CS12, SW7_CS11, SW7_CS10}, /* RGB16 */
+    {0, SW8_CS12, SW8_CS11, SW8_CS10}, /* RGB17 */
+    {0, SW9_CS12, SW9_CS11, SW9_CS10}, /* RGB18 */
+    {0, SW7_CS24, SW7_CS23, SW7_CS22}, /* RGB52 */
+    {0, SW8_CS24, SW8_CS23, SW8_CS22}, /* RGB53 */
+    {0, SW9_CS24, SW9_CS23, SW9_CS22}, /* RGB54 */
+    {0, SW1_CS27, SW1_CS26, SW1_CS25}, /* RGB55 */
+    {0, SW2_CS27, SW2_CS26, SW2_CS25}, /* RGB56 */
+    {0, SW3_CS27, SW3_CS26, SW3_CS25}, /* RGB57 */
+    {0, SW1_CS15, SW1_CS14, SW1_CS13}, /* RGB19 */
+    {0, SW2_CS15, SW2_CS14, SW2_CS13}, /* RGB20 */
+    {0, SW3_CS15, SW3_CS14, SW3_CS13}, /* RGB21 */
+    {0, SW4_CS15, SW4_CS14, SW4_CS13}, /* RGB22 */
+    {0, SW5_CS15, SW5_CS14, SW5_CS13}, /* RGB23 */
+    {0, SW6_CS15, SW6_CS14, SW6_CS13}, /* RGB24 */
+    {0, SW7_CS15, SW7_CS14, SW7_CS13}, /* RGB25 */
+    {0, SW8_CS15, SW8_CS14, SW8_CS13}, /* RGB26 */
+    {0, SW9_CS15, SW9_CS14, SW9_CS13}, /* RGB27 */
+    {0, SW4_CS27, SW4_CS26, SW4_CS25}, /* RGB58 */
+    {0, SW5_CS27, SW5_CS26, SW5_CS25}, /* RGB59 */
+    {0, SW6_CS27, SW6_CS26, SW6_CS25}, /* RGB60 */
+    {0, SW7_CS27, SW7_CS26, SW7_CS25}, /* RGB61 */
+    {0, SW8_CS27, SW8_CS26, SW8_CS25}, /* RGB62 */
+    {0, SW1_CS18, SW1_CS17, SW1_CS16}, /* RGB28 */
+    {0, SW2_CS18, SW2_CS17, SW2_CS16}, /* RGB29 */
+    {0, SW3_CS18, SW3_CS17, SW3_CS16}, /* RGB30 */
+    {0, SW4_CS18, SW4_CS17, SW4_CS16}, /* RGB31 */
+    {0, SW5_CS18, SW5_CS17, SW5_CS16}, /* RGB32 */
+    {0, SW6_CS18, SW6_CS17, SW6_CS16}, /* RGB33 */
+    {0, SW7_CS18, SW7_CS17, SW7_CS16}, /* RGB34 */
+    {0, SW8_CS18, SW8_CS17, SW8_CS16}, /* RGB35 */
+    {0, SW9_CS18, SW9_CS17, SW9_CS16}, /* RGB36 */
+    {0, SW9_CS27, SW9_CS26, SW9_CS25}, /* RGB63 */
+    {0, SW1_CS30, SW1_CS29, SW1_CS28}, /* RGB64 */
+    {0, SW2_CS30, SW2_CS29, SW2_CS28}, /* RGB65 */
+    {0, SW3_CS30, SW3_CS29, SW3_CS28}, /* RGB66 */
+    {0, SW4_CS30, SW4_CS29, SW4_CS28}, /* RGB67 */
+    {0, SW1_CS21, SW1_CS20, SW1_CS19}, /* RGB37 */
+    {0, SW2_CS21, SW2_CS20, SW2_CS19}, /* RGB38 */
+    {0, SW3_CS21, SW3_CS20, SW3_CS19}, /* RGB39 */
+    {0, SW4_CS21, SW4_CS20, SW4_CS19}, /* RGB40 */
+    {0, SW5_CS21, SW5_CS20, SW5_CS19}, /* RGB41 */
+    {0, SW6_CS21, SW6_CS20, SW6_CS19}, /* RGB42 */
+    {0, SW7_CS21, SW7_CS20, SW7_CS19}, /* RGB43 */
+    {0, SW8_CS21, SW8_CS20, SW8_CS19}, /* RGB44 */
+    {0, SW9_CS21, SW9_CS20, SW9_CS19}, /* RGB45 */
+    {0, SW5_CS30, SW5_CS29, SW5_CS28}, /* RGB68 */
 };
 
 led_config_t g_led_config = {
@@ -113,9 +113,9 @@ led_config_t g_led_config = {
 };
 
 const is31fl3741_led_t g_is31_indicator_leds[3] = {
-    {0, CS6_SW1, CS5_SW1, CS4_SW1}, /* RGB124 */
-    {0, CS6_SW2, CS5_SW2, CS4_SW2}, /* RGB125 */
-    {0, CS6_SW3, CS5_SW3, CS4_SW3}, /* RGB126 */
+    {0, SW1_CS6, SW1_CS5, SW1_CS4}, /* RGB124 */
+    {0, SW2_CS6, SW2_CS5, SW2_CS4}, /* RGB125 */
+    {0, SW3_CS6, SW3_CS5, SW3_CS4}, /* RGB126 */
 };
 
 bool led_update_kb(led_t led_state) {
diff --git a/keyboards/melgeek/mojo75/rev1/rev1.c b/keyboards/melgeek/mojo75/rev1/rev1.c
index 7a8e3cb2d3f..18daafebf8d 100644
--- a/keyboards/melgeek/mojo75/rev1/rev1.c
+++ b/keyboards/melgeek/mojo75/rev1/rev1.c
@@ -19,98 +19,98 @@
 #ifdef RGB_MATRIX_ENABLE
 
 const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
-    {0,  CS6_SW1,  CS5_SW1,  CS4_SW1}, /* RGB1 */
-    {0,  CS6_SW2,  CS5_SW2,  CS4_SW2}, /* RGB2 */
-    {0,  CS6_SW3,  CS5_SW3,  CS4_SW3}, /* RGB3 */
-    {0,  CS6_SW4,  CS5_SW4,  CS4_SW4}, /* RGB4 */
-    {0,  CS6_SW5,  CS5_SW5,  CS4_SW5}, /* RGB5 */
-    {0,  CS6_SW6,  CS5_SW6,  CS4_SW6}, /* RGB6 */
-    {0,  CS6_SW7,  CS5_SW7,  CS4_SW7}, /* RGB7 */
-    {0,  CS6_SW8,  CS5_SW8,  CS4_SW8}, /* RGB8 */
-    {0,  CS6_SW9,  CS5_SW9,  CS4_SW9}, /* RGB9 */
-    {0, CS24_SW1, CS23_SW1, CS22_SW1}, /* RGB55 */
-    {0, CS24_SW2, CS23_SW2, CS22_SW2}, /* RGB56 */
-	{0, CS24_SW3, CS23_SW3, CS22_SW3}, /* RGB57 */
-    {0, CS24_SW4, CS23_SW4, CS22_SW4}, /* RGB58 */
-    {0, CS24_SW5, CS23_SW5, CS22_SW5}, /* RGB59 */
-    {0, CS24_SW6, CS23_SW6, CS22_SW6}, /* RGB60 */
-    {0, CS24_SW7, CS23_SW7, CS22_SW7}, /* RGB61 */
-    {0,  CS9_SW1,  CS8_SW1,  CS7_SW1}, /* RGB10 */
-    {0,  CS9_SW2,  CS8_SW2,  CS7_SW2}, /* RGB11 */
-    {0,  CS9_SW3,  CS8_SW3,  CS7_SW3}, /* RGB12 */
-    {0,  CS9_SW4,  CS8_SW4,  CS7_SW4}, /* RGB13 */
-    {0,  CS9_SW5,  CS8_SW5,  CS7_SW5}, /* RGB14 */
-    {0,  CS9_SW6,  CS8_SW6,  CS7_SW6}, /* RGB15 */
-    {0,  CS9_SW7,  CS8_SW7,  CS7_SW7}, /* RGB16 */
-    {0,  CS9_SW8,  CS8_SW8,  CS7_SW8}, /* RGB17 */
-    {0,  CS9_SW9,  CS8_SW9,  CS7_SW9}, /* RGB18 */
-    {0, CS24_SW8, CS23_SW8, CS22_SW8}, /* RGB62 */
-    {0, CS24_SW9, CS23_SW9, CS22_SW9}, /* RGB63 */
-    {0, CS27_SW1, CS26_SW1, CS25_SW1}, /* RGB64 */
-    {0, CS27_SW2, CS26_SW2, CS25_SW2}, /* RGB65 */
-	{0, CS27_SW3, CS26_SW3, CS25_SW3}, /* RGB66 */
-    {0, CS27_SW4, CS26_SW4, CS25_SW4}, /* RGB67 */
-    {0, CS27_SW5, CS26_SW5, CS25_SW5}, /* RGB68 */
-    {0, CS27_SW6, CS26_SW6, CS25_SW6}, /* RGB69 */
-    {0, CS12_SW1, CS11_SW1, CS10_SW1}, /* RGB19 */
-    {0, CS12_SW2, CS11_SW2, CS10_SW2}, /* RGB20 */
-    {0, CS12_SW3, CS11_SW3, CS10_SW3}, /* RGB21 */
-    {0, CS12_SW4, CS11_SW4, CS10_SW4}, /* RGB22 */
-    {0, CS12_SW5, CS11_SW5, CS10_SW5}, /* RGB23 */
-    {0, CS12_SW6, CS11_SW6, CS10_SW6}, /* RGB24 */
-    {0, CS12_SW7, CS11_SW7, CS10_SW7}, /* RGB25 */
-    {0, CS12_SW8, CS11_SW8, CS10_SW8}, /* RGB26 */
-    {0, CS12_SW9, CS11_SW9, CS10_SW9}, /* RGB27 */
-    {0, CS27_SW7, CS26_SW7, CS25_SW7}, /* RGB70 */
-    {0, CS27_SW8, CS26_SW8, CS25_SW8}, /* RGB71 */
-    {0, CS27_SW9, CS26_SW9, CS25_SW9}, /* RGB72 */
-    {0, CS30_SW1, CS29_SW1, CS28_SW1}, /* RGB86 */
-    {0, CS30_SW2, CS29_SW2, CS28_SW2}, /* RGB73 */
-    {0, CS30_SW3, CS29_SW3, CS28_SW3}, /* RGB74 */
-    {0, CS15_SW1, CS14_SW1, CS13_SW1}, /* RGB28 */
-    {0, CS15_SW2, CS14_SW2, CS13_SW2}, /* RGB29 */
-    {0, CS15_SW3, CS14_SW3, CS13_SW3}, /* RGB30 */
-    {0, CS15_SW4, CS14_SW4, CS13_SW4}, /* RGB31 */
-    {0, CS15_SW5, CS14_SW5, CS13_SW5}, /* RGB32 */
-    {0, CS15_SW6, CS14_SW6, CS13_SW6}, /* RGB33 */
-    {0, CS15_SW7, CS14_SW7, CS13_SW7}, /* RGB34 */
-    {0, CS15_SW8, CS14_SW8, CS13_SW8}, /* RGB35 */
-    {0, CS15_SW9, CS14_SW9, CS13_SW9}, /* RGB36 */
-    {0, CS30_SW4, CS29_SW4, CS28_SW4}, /* RGB75 */
-    {0, CS30_SW5, CS29_SW5, CS28_SW5}, /* RGB76 */
-    {0, CS30_SW6, CS29_SW6, CS28_SW6}, /* RGB77 */
-    {0, CS30_SW7, CS29_SW7, CS28_SW7}, /* RGB78 */
-    {0, CS30_SW8, CS29_SW8, CS28_SW8}, /* RGB79 */
-    {0, CS30_SW9, CS29_SW9, CS28_SW9}, /* RGB80 */
-    {0, CS39_SW1, CS38_SW1, CS37_SW1}, /* RGB91 */
-    {0, CS18_SW1, CS17_SW1, CS16_SW1}, /* RGB37 */
-    {0, CS18_SW2, CS17_SW2, CS16_SW2}, /* RGB38 */
-    {0, CS18_SW3, CS17_SW3, CS16_SW3}, /* RGB39 */
-    {0, CS18_SW4, CS17_SW4, CS16_SW4}, /* RGB40 */
-    {0, CS18_SW5, CS17_SW5, CS16_SW5}, /* RGB41 */
-    {0, CS18_SW6, CS17_SW6, CS16_SW6}, /* RGB42 */
-    {0, CS18_SW7, CS17_SW7, CS16_SW7}, /* RGB43 */
-    {0, CS18_SW8, CS17_SW8, CS16_SW8}, /* RGB44 */
-    {0, CS18_SW9, CS17_SW9, CS16_SW9}, /* RGB45 */
-    {0, CS36_SW3, CS35_SW3, CS34_SW3}, /* RGB84 */
-    {0, CS36_SW4, CS35_SW4, CS34_SW4}, /* RGB83 */
-    {0, CS36_SW2, CS35_SW2, CS34_SW2}, /* RGB82 */
-    {0, CS36_SW6, CS35_SW6, CS34_SW6}, /* RGB85 */
-    {0, CS36_SW1, CS35_SW1, CS34_SW1}, /* RGB81 */
-    {0, CS39_SW2, CS38_SW2, CS37_SW2}, /* RGB87 */
-    {0, CS39_SW3, CS38_SW3, CS37_SW3}, /* RGB89 */
-    {0, CS21_SW1, CS20_SW1, CS19_SW1}, /* RGB46 */
-	{0, CS21_SW2, CS20_SW2, CS19_SW2}, /* RGB47 */
-    {0, CS21_SW3, CS20_SW3, CS19_SW3}, /* RGB48 */
-	{0, CS21_SW4, CS20_SW4, CS19_SW4}, /* RGB49 */
-	{0, CS21_SW5, CS20_SW5, CS19_SW5}, /* RGB50 */
-    {0, CS21_SW6, CS20_SW6, CS19_SW6}, /* RGB51 */
-    {0, CS21_SW7, CS20_SW7, CS19_SW7}, /* RGB52 */
-    {0, CS21_SW8, CS20_SW8, CS19_SW8}, /* RGB53 */
-    {0, CS21_SW9, CS20_SW9, CS19_SW9}, /* RGB54 */
-    {0, CS39_SW4, CS38_SW4, CS37_SW4}, /* RGB88 */
-    {0, CS39_SW5, CS38_SW5, CS37_SW5}, /* RGB92 */
-    {0, CS39_SW6, CS38_SW6, CS37_SW6}, /* RGB90 */
+    {0,  SW1_CS6,  SW1_CS5,  SW1_CS4}, /* RGB1 */
+    {0,  SW2_CS6,  SW2_CS5,  SW2_CS4}, /* RGB2 */
+    {0,  SW3_CS6,  SW3_CS5,  SW3_CS4}, /* RGB3 */
+    {0,  SW4_CS6,  SW4_CS5,  SW4_CS4}, /* RGB4 */
+    {0,  SW5_CS6,  SW5_CS5,  SW5_CS4}, /* RGB5 */
+    {0,  SW6_CS6,  SW6_CS5,  SW6_CS4}, /* RGB6 */
+    {0,  SW7_CS6,  SW7_CS5,  SW7_CS4}, /* RGB7 */
+    {0,  SW8_CS6,  SW8_CS5,  SW8_CS4}, /* RGB8 */
+    {0,  SW9_CS6,  SW9_CS5,  SW9_CS4}, /* RGB9 */
+    {0, SW1_CS24, SW1_CS23, SW1_CS22}, /* RGB55 */
+    {0, SW2_CS24, SW2_CS23, SW2_CS22}, /* RGB56 */
+	{0, SW3_CS24, SW3_CS23, SW3_CS22}, /* RGB57 */
+    {0, SW4_CS24, SW4_CS23, SW4_CS22}, /* RGB58 */
+    {0, SW5_CS24, SW5_CS23, SW5_CS22}, /* RGB59 */
+    {0, SW6_CS24, SW6_CS23, SW6_CS22}, /* RGB60 */
+    {0, SW7_CS24, SW7_CS23, SW7_CS22}, /* RGB61 */
+    {0,  SW1_CS9,  SW1_CS8,  SW1_CS7}, /* RGB10 */
+    {0,  SW2_CS9,  SW2_CS8,  SW2_CS7}, /* RGB11 */
+    {0,  SW3_CS9,  SW3_CS8,  SW3_CS7}, /* RGB12 */
+    {0,  SW4_CS9,  SW4_CS8,  SW4_CS7}, /* RGB13 */
+    {0,  SW5_CS9,  SW5_CS8,  SW5_CS7}, /* RGB14 */
+    {0,  SW6_CS9,  SW6_CS8,  SW6_CS7}, /* RGB15 */
+    {0,  SW7_CS9,  SW7_CS8,  SW7_CS7}, /* RGB16 */
+    {0,  SW8_CS9,  SW8_CS8,  SW8_CS7}, /* RGB17 */
+    {0,  SW9_CS9,  SW9_CS8,  SW9_CS7}, /* RGB18 */
+    {0, SW8_CS24, SW8_CS23, SW8_CS22}, /* RGB62 */
+    {0, SW9_CS24, SW9_CS23, SW9_CS22}, /* RGB63 */
+    {0, SW1_CS27, SW1_CS26, SW1_CS25}, /* RGB64 */
+    {0, SW2_CS27, SW2_CS26, SW2_CS25}, /* RGB65 */
+	{0, SW3_CS27, SW3_CS26, SW3_CS25}, /* RGB66 */
+    {0, SW4_CS27, SW4_CS26, SW4_CS25}, /* RGB67 */
+    {0, SW5_CS27, SW5_CS26, SW5_CS25}, /* RGB68 */
+    {0, SW6_CS27, SW6_CS26, SW6_CS25}, /* RGB69 */
+    {0, SW1_CS12, SW1_CS11, SW1_CS10}, /* RGB19 */
+    {0, SW2_CS12, SW2_CS11, SW2_CS10}, /* RGB20 */
+    {0, SW3_CS12, SW3_CS11, SW3_CS10}, /* RGB21 */
+    {0, SW4_CS12, SW4_CS11, SW4_CS10}, /* RGB22 */
+    {0, SW5_CS12, SW5_CS11, SW5_CS10}, /* RGB23 */
+    {0, SW6_CS12, SW6_CS11, SW6_CS10}, /* RGB24 */
+    {0, SW7_CS12, SW7_CS11, SW7_CS10}, /* RGB25 */
+    {0, SW8_CS12, SW8_CS11, SW8_CS10}, /* RGB26 */
+    {0, SW9_CS12, SW9_CS11, SW9_CS10}, /* RGB27 */
+    {0, SW7_CS27, SW7_CS26, SW7_CS25}, /* RGB70 */
+    {0, SW8_CS27, SW8_CS26, SW8_CS25}, /* RGB71 */
+    {0, SW9_CS27, SW9_CS26, SW9_CS25}, /* RGB72 */
+    {0, SW1_CS30, SW1_CS29, SW1_CS28}, /* RGB86 */
+    {0, SW2_CS30, SW2_CS29, SW2_CS28}, /* RGB73 */
+    {0, SW3_CS30, SW3_CS29, SW3_CS28}, /* RGB74 */
+    {0, SW1_CS15, SW1_CS14, SW1_CS13}, /* RGB28 */
+    {0, SW2_CS15, SW2_CS14, SW2_CS13}, /* RGB29 */
+    {0, SW3_CS15, SW3_CS14, SW3_CS13}, /* RGB30 */
+    {0, SW4_CS15, SW4_CS14, SW4_CS13}, /* RGB31 */
+    {0, SW5_CS15, SW5_CS14, SW5_CS13}, /* RGB32 */
+    {0, SW6_CS15, SW6_CS14, SW6_CS13}, /* RGB33 */
+    {0, SW7_CS15, SW7_CS14, SW7_CS13}, /* RGB34 */
+    {0, SW8_CS15, SW8_CS14, SW8_CS13}, /* RGB35 */
+    {0, SW9_CS15, SW9_CS14, SW9_CS13}, /* RGB36 */
+    {0, SW4_CS30, SW4_CS29, SW4_CS28}, /* RGB75 */
+    {0, SW5_CS30, SW5_CS29, SW5_CS28}, /* RGB76 */
+    {0, SW6_CS30, SW6_CS29, SW6_CS28}, /* RGB77 */
+    {0, SW7_CS30, SW7_CS29, SW7_CS28}, /* RGB78 */
+    {0, SW8_CS30, SW8_CS29, SW8_CS28}, /* RGB79 */
+    {0, SW9_CS30, SW9_CS29, SW9_CS28}, /* RGB80 */
+    {0, SW1_CS39, SW1_CS38, SW1_CS37}, /* RGB91 */
+    {0, SW1_CS18, SW1_CS17, SW1_CS16}, /* RGB37 */
+    {0, SW2_CS18, SW2_CS17, SW2_CS16}, /* RGB38 */
+    {0, SW3_CS18, SW3_CS17, SW3_CS16}, /* RGB39 */
+    {0, SW4_CS18, SW4_CS17, SW4_CS16}, /* RGB40 */
+    {0, SW5_CS18, SW5_CS17, SW5_CS16}, /* RGB41 */
+    {0, SW6_CS18, SW6_CS17, SW6_CS16}, /* RGB42 */
+    {0, SW7_CS18, SW7_CS17, SW7_CS16}, /* RGB43 */
+    {0, SW8_CS18, SW8_CS17, SW8_CS16}, /* RGB44 */
+    {0, SW9_CS18, SW9_CS17, SW9_CS16}, /* RGB45 */
+    {0, SW3_CS36, SW3_CS35, SW3_CS34}, /* RGB84 */
+    {0, SW4_CS36, SW4_CS35, SW4_CS34}, /* RGB83 */
+    {0, SW2_CS36, SW2_CS35, SW2_CS34}, /* RGB82 */
+    {0, SW6_CS36, SW6_CS35, SW6_CS34}, /* RGB85 */
+    {0, SW1_CS36, SW1_CS35, SW1_CS34}, /* RGB81 */
+    {0, SW2_CS39, SW2_CS38, SW2_CS37}, /* RGB87 */
+    {0, SW3_CS39, SW3_CS38, SW3_CS37}, /* RGB89 */
+    {0, SW1_CS21, SW1_CS20, SW1_CS19}, /* RGB46 */
+	{0, SW2_CS21, SW2_CS20, SW2_CS19}, /* RGB47 */
+    {0, SW3_CS21, SW3_CS20, SW3_CS19}, /* RGB48 */
+	{0, SW4_CS21, SW4_CS20, SW4_CS19}, /* RGB49 */
+	{0, SW5_CS21, SW5_CS20, SW5_CS19}, /* RGB50 */
+    {0, SW6_CS21, SW6_CS20, SW6_CS19}, /* RGB51 */
+    {0, SW7_CS21, SW7_CS20, SW7_CS19}, /* RGB52 */
+    {0, SW8_CS21, SW8_CS20, SW8_CS19}, /* RGB53 */
+    {0, SW9_CS21, SW9_CS20, SW9_CS19}, /* RGB54 */
+    {0, SW4_CS39, SW4_CS38, SW4_CS37}, /* RGB88 */
+    {0, SW5_CS39, SW5_CS38, SW5_CS37}, /* RGB92 */
+    {0, SW6_CS39, SW6_CS38, SW6_CS37}, /* RGB90 */
 };
 
 led_config_t g_led_config = {
diff --git a/keyboards/melgeek/tegic/rev1/rev1.c b/keyboards/melgeek/tegic/rev1/rev1.c
index eacbebf94c1..b087264919c 100755
--- a/keyboards/melgeek/tegic/rev1/rev1.c
+++ b/keyboards/melgeek/tegic/rev1/rev1.c
@@ -20,102 +20,102 @@
 
 
 const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
-    {0, CS9_SW1,  CS8_SW1,  CS7_SW1},  /* RGB1 */
-    {0, CS9_SW2,  CS8_SW2,  CS7_SW2},  /* RGB2 */
-    {0, CS9_SW3,  CS8_SW3,  CS7_SW3},  /* RGB3 */
-    {0, CS9_SW4,  CS8_SW4,  CS7_SW4},  /* RGB4 */
-    {0, CS9_SW5,  CS8_SW5,  CS7_SW5},  /* RGB5 */
-    {0, CS9_SW6,  CS8_SW6,  CS7_SW6},  /* RGB6 */
-    {0, CS9_SW7,  CS8_SW7,  CS7_SW7},  /* RGB7 */
-    {0, CS9_SW8,  CS8_SW8,  CS7_SW8},  /* RGB8 */
-    {0, CS9_SW9,  CS8_SW9,  CS7_SW9},  /* RGB9 */
-    {0, CS27_SW1, CS26_SW1, CS25_SW1}, /* RGB55 */
-    {0, CS27_SW2, CS26_SW2, CS25_SW2}, /* RGB56 */
-    {0, CS27_SW3, CS26_SW3, CS25_SW3}, /* RGB57 */
-    {0, CS27_SW4, CS26_SW4, CS25_SW4}, /* RGB58 */
-    {0, CS27_SW5, CS26_SW5, CS25_SW5}, /* RGB59 */
-    {0, CS27_SW6, CS26_SW6, CS25_SW6}, /* RGB60 */
+    {0, SW1_CS9,  SW1_CS8,  SW1_CS7},  /* RGB1 */
+    {0, SW2_CS9,  SW2_CS8,  SW2_CS7},  /* RGB2 */
+    {0, SW3_CS9,  SW3_CS8,  SW3_CS7},  /* RGB3 */
+    {0, SW4_CS9,  SW4_CS8,  SW4_CS7},  /* RGB4 */
+    {0, SW5_CS9,  SW5_CS8,  SW5_CS7},  /* RGB5 */
+    {0, SW6_CS9,  SW6_CS8,  SW6_CS7},  /* RGB6 */
+    {0, SW7_CS9,  SW7_CS8,  SW7_CS7},  /* RGB7 */
+    {0, SW8_CS9,  SW8_CS8,  SW8_CS7},  /* RGB8 */
+    {0, SW9_CS9,  SW9_CS8,  SW9_CS7},  /* RGB9 */
+    {0, SW1_CS27, SW1_CS26, SW1_CS25}, /* RGB55 */
+    {0, SW2_CS27, SW2_CS26, SW2_CS25}, /* RGB56 */
+    {0, SW3_CS27, SW3_CS26, SW3_CS25}, /* RGB57 */
+    {0, SW4_CS27, SW4_CS26, SW4_CS25}, /* RGB58 */
+    {0, SW5_CS27, SW5_CS26, SW5_CS25}, /* RGB59 */
+    {0, SW6_CS27, SW6_CS26, SW6_CS25}, /* RGB60 */
 
-    {0, CS12_SW1, CS11_SW1, CS10_SW1}, /* RGB10 */
-	{0, CS12_SW2, CS11_SW2, CS10_SW2}, /* RGB11 */
-    {0, CS12_SW3, CS11_SW3, CS10_SW3}, /* RGB12 */
-	{0, CS12_SW4, CS11_SW4, CS10_SW4}, /* RGB13 */
-	{0, CS12_SW5, CS11_SW5, CS10_SW5}, /* RGB14 */
-    {0, CS12_SW6, CS11_SW6, CS10_SW6}, /* RGB15 */
-    {0, CS12_SW7, CS11_SW7, CS10_SW7}, /* RGB16 */
-    {0, CS12_SW8, CS11_SW8, CS10_SW8}, /* RGB17 */
-    {0, CS12_SW9, CS11_SW9, CS10_SW9}, /* RGB18 */
-    {0, CS27_SW7, CS26_SW7, CS25_SW7}, /* RGB61 */
-    {0, CS27_SW8, CS26_SW8, CS25_SW8}, /* RGB62 */
-    {0, CS27_SW9, CS26_SW9, CS25_SW9}, /* RGB63 */
-    {0, CS30_SW1, CS29_SW1, CS28_SW1}, /* RGB64 */
-    {0, CS30_SW2, CS29_SW2, CS28_SW2}, /* RGB65 */
-    {0, CS30_SW3, CS29_SW3, CS28_SW3}, /* RGB66 */
-    {0, CS30_SW4, CS29_SW4, CS28_SW4}, /* RGB67 */
-    {0, CS30_SW5, CS29_SW5, CS28_SW5}, /* RGB68 */
+    {0, SW1_CS12, SW1_CS11, SW1_CS10}, /* RGB10 */
+	{0, SW2_CS12, SW2_CS11, SW2_CS10}, /* RGB11 */
+    {0, SW3_CS12, SW3_CS11, SW3_CS10}, /* RGB12 */
+	{0, SW4_CS12, SW4_CS11, SW4_CS10}, /* RGB13 */
+	{0, SW5_CS12, SW5_CS11, SW5_CS10}, /* RGB14 */
+    {0, SW6_CS12, SW6_CS11, SW6_CS10}, /* RGB15 */
+    {0, SW7_CS12, SW7_CS11, SW7_CS10}, /* RGB16 */
+    {0, SW8_CS12, SW8_CS11, SW8_CS10}, /* RGB17 */
+    {0, SW9_CS12, SW9_CS11, SW9_CS10}, /* RGB18 */
+    {0, SW7_CS27, SW7_CS26, SW7_CS25}, /* RGB61 */
+    {0, SW8_CS27, SW8_CS26, SW8_CS25}, /* RGB62 */
+    {0, SW9_CS27, SW9_CS26, SW9_CS25}, /* RGB63 */
+    {0, SW1_CS30, SW1_CS29, SW1_CS28}, /* RGB64 */
+    {0, SW2_CS30, SW2_CS29, SW2_CS28}, /* RGB65 */
+    {0, SW3_CS30, SW3_CS29, SW3_CS28}, /* RGB66 */
+    {0, SW4_CS30, SW4_CS29, SW4_CS28}, /* RGB67 */
+    {0, SW5_CS30, SW5_CS29, SW5_CS28}, /* RGB68 */
 
-    {0, CS15_SW1, CS14_SW1, CS13_SW1}, /* RGB19 */
-    {0, CS15_SW2, CS14_SW2, CS13_SW2}, /* RGB20 */
-    {0, CS15_SW3, CS14_SW3, CS13_SW3}, /* RGB21 */
-    {0, CS15_SW4, CS14_SW4, CS13_SW4}, /* RGB22 */
-    {0, CS15_SW5, CS14_SW5, CS13_SW5}, /* RGB23 */
-    {0, CS15_SW6, CS14_SW6, CS13_SW6}, /* RGB24 */
-    {0, CS15_SW7, CS14_SW7, CS13_SW7}, /* RGB25 */
-    {0, CS15_SW8, CS14_SW8, CS13_SW8}, /* RGB26 */
-    {0, CS15_SW9, CS14_SW9, CS13_SW9}, /* RGB27 */
-    {0, CS30_SW6, CS29_SW6, CS28_SW6}, /* RGB127 */
-    {0, CS30_SW7, CS29_SW7, CS28_SW7}, /* RGB128 */
-    {0, CS30_SW8, CS29_SW8, CS28_SW8}, /* RGB129 */
-    {0, CS30_SW9, CS29_SW9, CS28_SW9}, /* RGB130 */
-	{0, CS33_SW1, CS32_SW1, CS31_SW1}, /* RGB136 */
-    {0, CS33_SW2, CS32_SW2, CS31_SW2}, /* RGB135 */
+    {0, SW1_CS15, SW1_CS14, SW1_CS13}, /* RGB19 */
+    {0, SW2_CS15, SW2_CS14, SW2_CS13}, /* RGB20 */
+    {0, SW3_CS15, SW3_CS14, SW3_CS13}, /* RGB21 */
+    {0, SW4_CS15, SW4_CS14, SW4_CS13}, /* RGB22 */
+    {0, SW5_CS15, SW5_CS14, SW5_CS13}, /* RGB23 */
+    {0, SW6_CS15, SW6_CS14, SW6_CS13}, /* RGB24 */
+    {0, SW7_CS15, SW7_CS14, SW7_CS13}, /* RGB25 */
+    {0, SW8_CS15, SW8_CS14, SW8_CS13}, /* RGB26 */
+    {0, SW9_CS15, SW9_CS14, SW9_CS13}, /* RGB27 */
+    {0, SW6_CS30, SW6_CS29, SW6_CS28}, /* RGB127 */
+    {0, SW7_CS30, SW7_CS29, SW7_CS28}, /* RGB128 */
+    {0, SW8_CS30, SW8_CS29, SW8_CS28}, /* RGB129 */
+    {0, SW9_CS30, SW9_CS29, SW9_CS28}, /* RGB130 */
+	{0, SW1_CS33, SW1_CS32, SW1_CS31}, /* RGB136 */
+    {0, SW2_CS33, SW2_CS32, SW2_CS31}, /* RGB135 */
 
-    {0, CS18_SW1, CS17_SW1, CS16_SW1}, /* RGB28 */
-    {0, CS18_SW2, CS17_SW2, CS16_SW2}, /* RGB29 */
-	{0, CS18_SW3, CS17_SW3, CS16_SW3}, /* RGB30 */
-    {0, CS18_SW4, CS17_SW4, CS16_SW4}, /* RGB31 */
-    {0, CS18_SW5, CS17_SW5, CS16_SW5}, /* RGB32 */
-    {0, CS18_SW6, CS17_SW6, CS16_SW6}, /* RGB33 */
-    {0, CS18_SW7, CS17_SW7, CS16_SW7}, /* RGB34 */
-    {0, CS18_SW8, CS17_SW8, CS16_SW8}, /* RGB35 */
-    {0, CS18_SW9, CS17_SW9, CS16_SW9}, /* RGB36 */
-    {0, CS33_SW3, CS32_SW3, CS31_SW3}, /* RGB138 */
-    {0, CS33_SW4, CS32_SW4, CS31_SW4}, /* RGB139 */
-    {0, CS33_SW5, CS32_SW5, CS31_SW5}, /* RGB137 */
-    {0, CS33_SW6, CS32_SW6, CS31_SW6}, /* RGB131 */
-    {0, CS33_SW7, CS32_SW7, CS31_SW7}, /* RGB132 */
-    {0, CS33_SW8, CS32_SW8, CS31_SW8}, /* RGB133*/
+    {0, SW1_CS18, SW1_CS17, SW1_CS16}, /* RGB28 */
+    {0, SW2_CS18, SW2_CS17, SW2_CS16}, /* RGB29 */
+	{0, SW3_CS18, SW3_CS17, SW3_CS16}, /* RGB30 */
+    {0, SW4_CS18, SW4_CS17, SW4_CS16}, /* RGB31 */
+    {0, SW5_CS18, SW5_CS17, SW5_CS16}, /* RGB32 */
+    {0, SW6_CS18, SW6_CS17, SW6_CS16}, /* RGB33 */
+    {0, SW7_CS18, SW7_CS17, SW7_CS16}, /* RGB34 */
+    {0, SW8_CS18, SW8_CS17, SW8_CS16}, /* RGB35 */
+    {0, SW9_CS18, SW9_CS17, SW9_CS16}, /* RGB36 */
+    {0, SW3_CS33, SW3_CS32, SW3_CS31}, /* RGB138 */
+    {0, SW4_CS33, SW4_CS32, SW4_CS31}, /* RGB139 */
+    {0, SW5_CS33, SW5_CS32, SW5_CS31}, /* RGB137 */
+    {0, SW6_CS33, SW6_CS32, SW6_CS31}, /* RGB131 */
+    {0, SW7_CS33, SW7_CS32, SW7_CS31}, /* RGB132 */
+    {0, SW8_CS33, SW8_CS32, SW8_CS31}, /* RGB133*/
 
-    {0, CS21_SW1, CS20_SW1, CS19_SW1}, /* RGB37 */
-    {0, CS21_SW2, CS20_SW2, CS19_SW2}, /* RGB38 */
-    {0, CS21_SW3, CS20_SW3, CS19_SW3}, /* RGB39 */
-    {0, CS21_SW4, CS20_SW4, CS19_SW4}, /* RGB40 */
-    {0, CS21_SW5, CS20_SW5, CS19_SW5}, /* RGB41 */
-    {0, CS21_SW6, CS20_SW6, CS19_SW6}, /* RGB42 */
-    {0, CS21_SW7, CS20_SW7, CS19_SW7}, /* RGB43 */
-    {0, CS21_SW8, CS20_SW8, CS19_SW8}, /* RGB44 */
-    {0, CS21_SW9, CS20_SW9, CS19_SW9}, /* RGB45 */
-    {0, CS33_SW9, CS32_SW9, CS31_SW9}, /* RGB134 */
-    {0, CS36_SW1, CS35_SW1, CS34_SW1}, /* RGB145 */
-    {0, CS36_SW2, CS35_SW2, CS34_SW2}, /* RGB144*/
-    {0, CS36_SW3, CS35_SW3, CS34_SW3}, /* RGB148 */
-    {0, CS36_SW4, CS35_SW4, CS34_SW4}, /* RGB147 */
-    {0, CS36_SW5, CS35_SW5, CS34_SW5}, /* RGB146 */
-    {0, CS36_SW6, CS35_SW6, CS34_SW6}, /* RGB140 */
-    {0, CS36_SW7, CS35_SW7, CS34_SW7}, /* RGB141 */
+    {0, SW1_CS21, SW1_CS20, SW1_CS19}, /* RGB37 */
+    {0, SW2_CS21, SW2_CS20, SW2_CS19}, /* RGB38 */
+    {0, SW3_CS21, SW3_CS20, SW3_CS19}, /* RGB39 */
+    {0, SW4_CS21, SW4_CS20, SW4_CS19}, /* RGB40 */
+    {0, SW5_CS21, SW5_CS20, SW5_CS19}, /* RGB41 */
+    {0, SW6_CS21, SW6_CS20, SW6_CS19}, /* RGB42 */
+    {0, SW7_CS21, SW7_CS20, SW7_CS19}, /* RGB43 */
+    {0, SW8_CS21, SW8_CS20, SW8_CS19}, /* RGB44 */
+    {0, SW9_CS21, SW9_CS20, SW9_CS19}, /* RGB45 */
+    {0, SW9_CS33, SW9_CS32, SW9_CS31}, /* RGB134 */
+    {0, SW1_CS36, SW1_CS35, SW1_CS34}, /* RGB145 */
+    {0, SW2_CS36, SW2_CS35, SW2_CS34}, /* RGB144*/
+    {0, SW3_CS36, SW3_CS35, SW3_CS34}, /* RGB148 */
+    {0, SW4_CS36, SW4_CS35, SW4_CS34}, /* RGB147 */
+    {0, SW5_CS36, SW5_CS35, SW5_CS34}, /* RGB146 */
+    {0, SW6_CS36, SW6_CS35, SW6_CS34}, /* RGB140 */
+    {0, SW7_CS36, SW7_CS35, SW7_CS34}, /* RGB141 */
 
-    {0, CS24_SW1, CS23_SW1, CS22_SW1}, /* RGB46 */
-    {0, CS24_SW2, CS23_SW2, CS22_SW2}, /* RGB47 */
-    {0, CS24_SW3, CS23_SW3, CS22_SW3}, /* RGB48 */
-    {0, CS24_SW4, CS23_SW4, CS22_SW4}, /* RGB49 */
-    {0, CS24_SW5, CS23_SW5, CS22_SW5}, /* RGB50 */
-    {0, CS24_SW6, CS23_SW6, CS22_SW6}, /* RGB51 */
-    {0, CS24_SW7, CS23_SW7, CS22_SW7}, /* RGB52 */
-    {0, CS24_SW8, CS23_SW8, CS22_SW8}, /* RGB53 */
-    {0, CS24_SW9, CS23_SW9, CS22_SW9}, /* RGB54 */
-    {0, CS36_SW8, CS35_SW8, CS34_SW8}, /* RGB142 */
-    {0, CS36_SW9, CS35_SW9, CS34_SW9}, /* RGB143 */
-    {0, CS39_SW1, CS38_SW1, CS37_SW1}, /* RGB149 */
+    {0, SW1_CS24, SW1_CS23, SW1_CS22}, /* RGB46 */
+    {0, SW2_CS24, SW2_CS23, SW2_CS22}, /* RGB47 */
+    {0, SW3_CS24, SW3_CS23, SW3_CS22}, /* RGB48 */
+    {0, SW4_CS24, SW4_CS23, SW4_CS22}, /* RGB49 */
+    {0, SW5_CS24, SW5_CS23, SW5_CS22}, /* RGB50 */
+    {0, SW6_CS24, SW6_CS23, SW6_CS22}, /* RGB51 */
+    {0, SW7_CS24, SW7_CS23, SW7_CS22}, /* RGB52 */
+    {0, SW8_CS24, SW8_CS23, SW8_CS22}, /* RGB53 */
+    {0, SW9_CS24, SW9_CS23, SW9_CS22}, /* RGB54 */
+    {0, SW8_CS36, SW8_CS35, SW8_CS34}, /* RGB142 */
+    {0, SW9_CS36, SW9_CS35, SW9_CS34}, /* RGB143 */
+    {0, SW1_CS39, SW1_CS38, SW1_CS37}, /* RGB149 */
 };
 led_config_t g_led_config = {
 	{
diff --git a/keyboards/melgeek/z70ultra/z70ultra.c b/keyboards/melgeek/z70ultra/z70ultra.c
index 51827ab15ed..1cb46df643a 100644
--- a/keyboards/melgeek/z70ultra/z70ultra.c
+++ b/keyboards/melgeek/z70ultra/z70ultra.c
@@ -19,77 +19,77 @@
 
 #ifdef RGB_MATRIX_ENABLE
 const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
-    {0, CS28_SW1, CS30_SW1, CS29_SW1}, /* RGB10 */
-    {0, CS28_SW2, CS30_SW2, CS29_SW2}, /* RGB11 */
-    {0, CS28_SW3, CS30_SW3, CS29_SW3}, /* RGB12 */
-    {0, CS28_SW4, CS30_SW4, CS29_SW4}, /* RGB13 */
-    {0, CS28_SW5, CS30_SW5, CS29_SW5}, /* RGB14 */
-    {0, CS28_SW6, CS30_SW6, CS29_SW6}, /* RGB15 */
-    {0, CS28_SW7, CS30_SW7, CS29_SW7}, /* RGB16 */
-    {0, CS28_SW8, CS30_SW8, CS29_SW8}, /* RGB17 */
-    {0, CS28_SW9, CS30_SW9, CS29_SW9}, /* RGB18 */
-    {0, CS31_SW1, CS33_SW1, CS32_SW1}, /* RGB28 */
-    {0, CS31_SW2, CS33_SW2, CS32_SW2}, /* RGB29 */
-    {0, CS31_SW3, CS33_SW3, CS32_SW3}, /* RGB30 */
-    {0, CS31_SW4, CS33_SW4, CS32_SW4}, /* RGB31 */
-    {0, CS31_SW5, CS33_SW5, CS32_SW5}, /* RGB32 */
-    {0, CS31_SW6, CS33_SW6, CS32_SW6}, /* RGB33 */
-    {0, CS25_SW1, CS27_SW1, CS26_SW1}, /* RGB1 */
-    {0, CS25_SW2, CS27_SW2, CS26_SW2}, /* RGB2 */
-    {0, CS25_SW3, CS27_SW3, CS26_SW3}, /* RGB3 */
-    {0, CS25_SW4, CS27_SW4, CS26_SW4}, /* RGB4 */
-    {0, CS25_SW5, CS27_SW5, CS26_SW5}, /* RGB5 */
-    {0, CS25_SW6, CS27_SW6, CS26_SW6}, /* RGB6 */
-    {0, CS25_SW7, CS27_SW7, CS26_SW7}, /* RGB7 */
-    {0, CS25_SW8, CS27_SW8, CS26_SW8}, /* RGB8 */
-    {0, CS25_SW9, CS27_SW9, CS26_SW9}, /* RGB9 */
-    {0, CS34_SW1, CS36_SW1, CS35_SW1}, /* RGB46 */
-    {0, CS34_SW2, CS36_SW2, CS35_SW2}, /* RGB47 */
-    {0, CS34_SW3, CS36_SW3, CS35_SW3}, /* RGB48 */
-    {0, CS34_SW4, CS36_SW4, CS35_SW4}, /* RGB49 */
-    {0, CS34_SW5, CS36_SW5, CS35_SW5}, /* RGB50 */
-    {0, CS31_SW7, CS33_SW7, CS32_SW7}, /* RGB34 */
-    {0, CS22_SW1, CS24_SW1, CS23_SW1}, /* RGB37 */
-    {0, CS22_SW2, CS24_SW2, CS23_SW2}, /* RGB38 */
-    {0, CS22_SW3, CS24_SW3, CS23_SW3}, /* RGB39 */
-    {0, CS22_SW4, CS24_SW4, CS23_SW4}, /* RGB40 */
-    {0, CS22_SW5, CS24_SW5, CS23_SW5}, /* RGB41 */
-    {0, CS22_SW6, CS24_SW6, CS23_SW6}, /* RGB42 */
-    {0, CS22_SW7, CS24_SW7, CS23_SW7}, /* RGB43 */
-    {0, CS22_SW8, CS24_SW8, CS23_SW8}, /* RGB44 */
-    {0, CS22_SW9, CS24_SW9, CS23_SW9}, /* RGB45 */
-    {0, CS34_SW9, CS36_SW9, CS35_SW9}, /* RGB54 */
-    {0, CS34_SW8, CS36_SW8, CS35_SW8}, /* RGB53 */
-    {0, CS34_SW7, CS36_SW7, CS35_SW7}, /* RGB52 */
-    {0, CS34_SW6, CS36_SW6, CS35_SW6}, /* RGB51 */
-    {0, CS31_SW8, CS33_SW8, CS32_SW8}, /* RGB35 */
-    {0, CS19_SW2, CS21_SW2, CS20_SW2}, /* RGB56 */
-    {0, CS19_SW4, CS21_SW4, CS20_SW4}, /* RGB60 */
-    {0, CS19_SW5, CS21_SW5, CS20_SW5}, /* RGB59 */
-    {0, CS19_SW6, CS21_SW6, CS20_SW6}, /* RGB60 */
-    {0, CS19_SW7, CS21_SW7, CS20_SW7}, /* RGB61 */
-    {0, CS19_SW8, CS21_SW8, CS20_SW8}, /* RGB62 */
-    {0, CS19_SW9, CS21_SW9, CS20_SW9}, /* RGB63 */
-    {0, CS19_SW3, CS21_SW3, CS20_SW3}, /* RGB57 */
-    {0, CS19_SW1, CS21_SW1, CS20_SW1}, /* RGB55 */
-    {0, CS37_SW5, CS39_SW5, CS38_SW5}, /* RGB23 */
-    {0, CS37_SW6, CS39_SW6, CS38_SW6}, /* RGB24 */
-    {0, CS37_SW7, CS39_SW7, CS38_SW7}, /* RGB25 */
-    {0, CS37_SW8, CS39_SW8, CS38_SW8}, /* RGB26 */
-    {0, CS31_SW9, CS33_SW9, CS32_SW9}, /* RGB36 */
+    {0, SW1_CS28, SW1_CS30, SW1_CS29}, /* RGB10 */
+    {0, SW2_CS28, SW2_CS30, SW2_CS29}, /* RGB11 */
+    {0, SW3_CS28, SW3_CS30, SW3_CS29}, /* RGB12 */
+    {0, SW4_CS28, SW4_CS30, SW4_CS29}, /* RGB13 */
+    {0, SW5_CS28, SW5_CS30, SW5_CS29}, /* RGB14 */
+    {0, SW6_CS28, SW6_CS30, SW6_CS29}, /* RGB15 */
+    {0, SW7_CS28, SW7_CS30, SW7_CS29}, /* RGB16 */
+    {0, SW8_CS28, SW8_CS30, SW8_CS29}, /* RGB17 */
+    {0, SW9_CS28, SW9_CS30, SW9_CS29}, /* RGB18 */
+    {0, SW1_CS31, SW1_CS33, SW1_CS32}, /* RGB28 */
+    {0, SW2_CS31, SW2_CS33, SW2_CS32}, /* RGB29 */
+    {0, SW3_CS31, SW3_CS33, SW3_CS32}, /* RGB30 */
+    {0, SW4_CS31, SW4_CS33, SW4_CS32}, /* RGB31 */
+    {0, SW5_CS31, SW5_CS33, SW5_CS32}, /* RGB32 */
+    {0, SW6_CS31, SW6_CS33, SW6_CS32}, /* RGB33 */
+    {0, SW1_CS25, SW1_CS27, SW1_CS26}, /* RGB1 */
+    {0, SW2_CS25, SW2_CS27, SW2_CS26}, /* RGB2 */
+    {0, SW3_CS25, SW3_CS27, SW3_CS26}, /* RGB3 */
+    {0, SW4_CS25, SW4_CS27, SW4_CS26}, /* RGB4 */
+    {0, SW5_CS25, SW5_CS27, SW5_CS26}, /* RGB5 */
+    {0, SW6_CS25, SW6_CS27, SW6_CS26}, /* RGB6 */
+    {0, SW7_CS25, SW7_CS27, SW7_CS26}, /* RGB7 */
+    {0, SW8_CS25, SW8_CS27, SW8_CS26}, /* RGB8 */
+    {0, SW9_CS25, SW9_CS27, SW9_CS26}, /* RGB9 */
+    {0, SW1_CS34, SW1_CS36, SW1_CS35}, /* RGB46 */
+    {0, SW2_CS34, SW2_CS36, SW2_CS35}, /* RGB47 */
+    {0, SW3_CS34, SW3_CS36, SW3_CS35}, /* RGB48 */
+    {0, SW4_CS34, SW4_CS36, SW4_CS35}, /* RGB49 */
+    {0, SW5_CS34, SW5_CS36, SW5_CS35}, /* RGB50 */
+    {0, SW7_CS31, SW7_CS33, SW7_CS32}, /* RGB34 */
+    {0, SW1_CS22, SW1_CS24, SW1_CS23}, /* RGB37 */
+    {0, SW2_CS22, SW2_CS24, SW2_CS23}, /* RGB38 */
+    {0, SW3_CS22, SW3_CS24, SW3_CS23}, /* RGB39 */
+    {0, SW4_CS22, SW4_CS24, SW4_CS23}, /* RGB40 */
+    {0, SW5_CS22, SW5_CS24, SW5_CS23}, /* RGB41 */
+    {0, SW6_CS22, SW6_CS24, SW6_CS23}, /* RGB42 */
+    {0, SW7_CS22, SW7_CS24, SW7_CS23}, /* RGB43 */
+    {0, SW8_CS22, SW8_CS24, SW8_CS23}, /* RGB44 */
+    {0, SW9_CS22, SW9_CS24, SW9_CS23}, /* RGB45 */
+    {0, SW9_CS34, SW9_CS36, SW9_CS35}, /* RGB54 */
+    {0, SW8_CS34, SW8_CS36, SW8_CS35}, /* RGB53 */
+    {0, SW7_CS34, SW7_CS36, SW7_CS35}, /* RGB52 */
+    {0, SW6_CS34, SW6_CS36, SW6_CS35}, /* RGB51 */
+    {0, SW8_CS31, SW8_CS33, SW8_CS32}, /* RGB35 */
+    {0, SW2_CS19, SW2_CS21, SW2_CS20}, /* RGB56 */
+    {0, SW4_CS19, SW4_CS21, SW4_CS20}, /* RGB60 */
+    {0, SW5_CS19, SW5_CS21, SW5_CS20}, /* RGB59 */
+    {0, SW6_CS19, SW6_CS21, SW6_CS20}, /* RGB60 */
+    {0, SW7_CS19, SW7_CS21, SW7_CS20}, /* RGB61 */
+    {0, SW8_CS19, SW8_CS21, SW8_CS20}, /* RGB62 */
+    {0, SW9_CS19, SW9_CS21, SW9_CS20}, /* RGB63 */
+    {0, SW3_CS19, SW3_CS21, SW3_CS20}, /* RGB57 */
+    {0, SW1_CS19, SW1_CS21, SW1_CS20}, /* RGB55 */
+    {0, SW5_CS37, SW5_CS39, SW5_CS38}, /* RGB23 */
+    {0, SW6_CS37, SW6_CS39, SW6_CS38}, /* RGB24 */
+    {0, SW7_CS37, SW7_CS39, SW7_CS38}, /* RGB25 */
+    {0, SW8_CS37, SW8_CS39, SW8_CS38}, /* RGB26 */
+    {0, SW9_CS31, SW9_CS33, SW9_CS32}, /* RGB36 */
 
-    {0, CS6_SW1, CS8_SW1, CS7_SW1},    /* RGB64 */
-    {0, CS6_SW3, CS8_SW3, CS7_SW3},    /* RGB66 */
-    {0, CS6_SW4, CS8_SW4, CS7_SW4},    /* RGB67 */
-    {0, CS6_SW5, CS8_SW5, CS7_SW5},    /* RGB69 */
-    {0, CS6_SW6, CS8_SW6, CS7_SW6},    /* RGB70 */
-    {0, CS6_SW2, CS8_SW2, CS7_SW2},    /* RGB65 */
+    {0, SW1_CS6, SW1_CS8, SW1_CS7},    /* RGB64 */
+    {0, SW3_CS6, SW3_CS8, SW3_CS7},    /* RGB66 */
+    {0, SW4_CS6, SW4_CS8, SW4_CS7},    /* RGB67 */
+    {0, SW5_CS6, SW5_CS8, SW5_CS7},    /* RGB69 */
+    {0, SW6_CS6, SW6_CS8, SW6_CS7},    /* RGB70 */
+    {0, SW2_CS6, SW2_CS8, SW2_CS7},    /* RGB65 */
 
-    {0, CS37_SW1, CS39_SW1, CS38_SW1}, /* RGB19 */
-    {0, CS37_SW2, CS39_SW2, CS38_SW2}, /* RGB20 */
-    {0, CS37_SW3, CS39_SW3, CS38_SW3}, /* RGB21 */
-    {0, CS37_SW4, CS39_SW4, CS38_SW4}, /* RGB22 */
-    {0, CS37_SW9, CS39_SW9, CS38_SW9}, /* RGB27 */
+    {0, SW1_CS37, SW1_CS39, SW1_CS38}, /* RGB19 */
+    {0, SW2_CS37, SW2_CS39, SW2_CS38}, /* RGB20 */
+    {0, SW3_CS37, SW3_CS39, SW3_CS38}, /* RGB21 */
+    {0, SW4_CS37, SW4_CS39, SW4_CS38}, /* RGB22 */
+    {0, SW9_CS37, SW9_CS39, SW9_CS38}, /* RGB27 */
 };
 led_config_t g_led_config = {
 	{
@@ -118,12 +118,12 @@ led_config_t g_led_config = {
 };
 
 const is31fl3741_led_t g_is31_indicator_leds[6] = {
-    {0, CS5_SW1, CS3_SW1, CS4_SW1}, /* RGB71 */
-    {0, CS5_SW2, CS3_SW2, CS4_SW2}, /* RGB72 */
-    {0, CS5_SW3, CS3_SW3, CS4_SW3}, /* RGB73 */
-    {0, CS5_SW4, CS3_SW4, CS4_SW4}, /* RGB74 */
-    {0, CS5_SW5, CS3_SW5, CS4_SW5}, /* RGB75 */
-    {0, CS5_SW6, CS3_SW6, CS4_SW6}, /* RGB76 */
+    {0, SW1_CS5, SW1_CS3, SW1_CS4}, /* RGB71 */
+    {0, SW2_CS5, SW2_CS3, SW2_CS4}, /* RGB72 */
+    {0, SW3_CS5, SW3_CS3, SW3_CS4}, /* RGB73 */
+    {0, SW4_CS5, SW4_CS3, SW4_CS4}, /* RGB74 */
+    {0, SW5_CS5, SW5_CS3, SW5_CS4}, /* RGB75 */
+    {0, SW6_CS5, SW6_CS3, SW6_CS4}, /* RGB76 */
 };
 
 bool led_update_kb(led_t led_state) {
diff --git a/keyboards/miiiw/blackio83/info.json b/keyboards/miiiw/blackio83/info.json
index ef0e15efb95..24dc644405f 100644
--- a/keyboards/miiiw/blackio83/info.json
+++ b/keyboards/miiiw/blackio83/info.json
@@ -6,7 +6,6 @@
     "debounce": 3,
     "diode_direction": "COL2ROW",
     "features": {
-        "backlight": false,
         "bootmagic": true,
         "command": false,
         "console": false,
@@ -15,8 +14,7 @@
         "extrakey": true,
         "mousekey": true,
         "nkro": true,
-        "rgb_matrix": true,
-        "rgblight": false
+        "rgb_matrix": true
     },
     "indicators": {
         "caps_lock": "B2",
diff --git a/keyboards/miller/gm862/gm862.c b/keyboards/miller/gm862/gm862.c
index 3dcbe122fb1..534ef6cdc65 100644
--- a/keyboards/miller/gm862/gm862.c
+++ b/keyboards/miller/gm862/gm862.c
@@ -2,67 +2,67 @@
 
 #ifdef RGB_MATRIX_ENABLE
 const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
-    {0, B_1,    A_1,    C_1},
-    {0, B_2,    A_2,    C_2},
-    {0, B_3,    A_3,    C_3},
-    {0, B_4,    A_4,    C_4},
-    {0, B_5,    A_5,    C_5},
-    {0, B_6,    A_6,    C_6},
-    {0, B_7,    A_7,    C_7},
-    {0, B_8,    A_8,    C_8},
-    {0, B_9,    A_9,    C_9},
-    {0, B_10,   A_10,   C_10},
-    {0, B_11,   A_11,   C_11},
-    {0, B_12,   A_12,   C_12},
-    {0, B_13,   A_13,   C_13},
-    {0, B_14,   A_14,   C_14},
-    {0, E_1,    D_1,    F_1},
-    {0, E_2,    D_2,    F_2},
-    {0, E_3,    D_3,    F_3},
-    {0, E_4,    D_4,    F_4},
-    {0, E_5,    D_5,    F_5},
-    {0, E_6,    D_6,    F_6},
-    {0, E_7,    D_7,    F_7},
-    {0, E_8,    D_8,    F_8},
-    {0, E_9,    D_9,    F_9},
-    {0, E_10,   D_10,   F_10},
-    {0, E_11,   D_11,   F_11},
-    {0, E_12,   D_12,   F_12},
-    {0, E_13,   D_13,   F_13},
-    {0, E_14,   D_14,   F_14},
-    {0, H_1,    G_1,    I_1},
-    {0, H_2,    G_2,    I_2},
-    {0, H_3,    G_3,    I_3},
-    {0, H_4,    G_4,    I_4},
-    {0, H_5,    G_5,    I_5},
-    {0, H_6,    G_6,    I_6},
-    {0, H_7,    G_7,    I_7},
-    {0, H_8,    G_8,    I_8},
-    {0, H_9,    G_9,    I_9},
-    {0, H_10,   G_10,   I_10},
-    {0, H_11,   G_11,   I_11},
-    {0, H_12,   G_12,   I_12},
-    {0, H_13,   G_13,   I_13},
-    {0, K_1,    J_1,    L_1},
-    {0, K_2,    J_2,    L_2},
-    {0, K_3,    J_3,    L_3},
-    {0, K_4,    J_4,    L_4},
-    {0, K_5,    J_5,    L_5},
-    {0, K_6,    J_6,    L_6},
-    {0, K_7,    J_7,    L_7},
-    {0, K_8,    J_8,    L_8},
-    {0, K_9,    J_9,    L_9},
-    {0, K_10,   J_10,   L_10},
-    {0, K_11,   J_11,   L_11},
-    {0, K_14,   J_14,   L_14},
-    {0, B_16,   A_16,   C_16},
-    {0, E_16,   D_16,   F_16},
-    {0, H_16,   G_16,   I_16},
-    {0, K_16,   J_16,   L_16},
-    {0, K_15,   J_15,   L_15},
-    {0, K_12,   J_12,   L_12},
-    {0, K_13,   J_13,   L_13},
-    {0, H_14,   G_14,   I_14},
+    {0, SW2_CS1,    SW1_CS1,    SW3_CS1},
+    {0, SW2_CS2,    SW1_CS2,    SW3_CS2},
+    {0, SW2_CS3,    SW1_CS3,    SW3_CS3},
+    {0, SW2_CS4,    SW1_CS4,    SW3_CS4},
+    {0, SW2_CS5,    SW1_CS5,    SW3_CS5},
+    {0, SW2_CS6,    SW1_CS6,    SW3_CS6},
+    {0, SW2_CS7,    SW1_CS7,    SW3_CS7},
+    {0, SW2_CS8,    SW1_CS8,    SW3_CS8},
+    {0, SW2_CS9,    SW1_CS9,    SW3_CS9},
+    {0, SW2_CS10,   SW1_CS10,   SW3_CS10},
+    {0, SW2_CS11,   SW1_CS11,   SW3_CS11},
+    {0, SW2_CS12,   SW1_CS12,   SW3_CS12},
+    {0, SW2_CS13,   SW1_CS13,   SW3_CS13},
+    {0, SW2_CS14,   SW1_CS14,   SW3_CS14},
+    {0, SW5_CS1,    SW4_CS1,    SW6_CS1},
+    {0, SW5_CS2,    SW4_CS2,    SW6_CS2},
+    {0, SW5_CS3,    SW4_CS3,    SW6_CS3},
+    {0, SW5_CS4,    SW4_CS4,    SW6_CS4},
+    {0, SW5_CS5,    SW4_CS5,    SW6_CS5},
+    {0, SW5_CS6,    SW4_CS6,    SW6_CS6},
+    {0, SW5_CS7,    SW4_CS7,    SW6_CS7},
+    {0, SW5_CS8,    SW4_CS8,    SW6_CS8},
+    {0, SW5_CS9,    SW4_CS9,    SW6_CS9},
+    {0, SW5_CS10,   SW4_CS10,   SW6_CS10},
+    {0, SW5_CS11,   SW4_CS11,   SW6_CS11},
+    {0, SW5_CS12,   SW4_CS12,   SW6_CS12},
+    {0, SW5_CS13,   SW4_CS13,   SW6_CS13},
+    {0, SW5_CS14,   SW4_CS14,   SW6_CS14},
+    {0, SW8_CS1,    SW7_CS1,    SW9_CS1},
+    {0, SW8_CS2,    SW7_CS2,    SW9_CS2},
+    {0, SW8_CS3,    SW7_CS3,    SW9_CS3},
+    {0, SW8_CS4,    SW7_CS4,    SW9_CS4},
+    {0, SW8_CS5,    SW7_CS5,    SW9_CS5},
+    {0, SW8_CS6,    SW7_CS6,    SW9_CS6},
+    {0, SW8_CS7,    SW7_CS7,    SW9_CS7},
+    {0, SW8_CS8,    SW7_CS8,    SW9_CS8},
+    {0, SW8_CS9,    SW7_CS9,    SW9_CS9},
+    {0, SW8_CS10,   SW7_CS10,   SW9_CS10},
+    {0, SW8_CS11,   SW7_CS11,   SW9_CS11},
+    {0, SW8_CS12,   SW7_CS12,   SW9_CS12},
+    {0, SW8_CS13,   SW7_CS13,   SW9_CS13},
+    {0, SW11_CS1,    SW10_CS1,    SW12_CS1},
+    {0, SW11_CS2,    SW10_CS2,    SW12_CS2},
+    {0, SW11_CS3,    SW10_CS3,    SW12_CS3},
+    {0, SW11_CS4,    SW10_CS4,    SW12_CS4},
+    {0, SW11_CS5,    SW10_CS5,    SW12_CS5},
+    {0, SW11_CS6,    SW10_CS6,    SW12_CS6},
+    {0, SW11_CS7,    SW10_CS7,    SW12_CS7},
+    {0, SW11_CS8,    SW10_CS8,    SW12_CS8},
+    {0, SW11_CS9,    SW10_CS9,    SW12_CS9},
+    {0, SW11_CS10,   SW10_CS10,   SW12_CS10},
+    {0, SW11_CS11,   SW10_CS11,   SW12_CS11},
+    {0, SW11_CS14,   SW10_CS14,   SW12_CS14},
+    {0, SW2_CS16,   SW1_CS16,   SW3_CS16},
+    {0, SW5_CS16,   SW4_CS16,   SW6_CS16},
+    {0, SW8_CS16,   SW7_CS16,   SW9_CS16},
+    {0, SW11_CS16,   SW10_CS16,   SW12_CS16},
+    {0, SW11_CS15,   SW10_CS15,   SW12_CS15},
+    {0, SW11_CS12,   SW10_CS12,   SW12_CS12},
+    {0, SW11_CS13,   SW10_CS13,   SW12_CS13},
+    {0, SW8_CS14,   SW7_CS14,   SW9_CS14},
 };
 
 led_config_t g_led_config = { {
diff --git a/keyboards/minimacro5/keymaps/kabraxcis/keymap.c b/keyboards/minimacro5/keymaps/kabraxcis/keymap.c
deleted file mode 100644
index 6b7026ce205..00000000000
--- a/keyboards/minimacro5/keymaps/kabraxcis/keymap.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/* Copyright 2020 dezlidezlidezli
-  *
-  * This program is free software: you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-  * the Free Software Foundation, either version 2 of the License, or
-  * (at your option) any later version.
-  *
-  * This program is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  * GNU General Public License for more details.
-  *
-  * You should have received a copy of the GNU General Public License
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */
-
-#include QMK_KEYBOARD_H
-
-enum layers {
-     _MAIN,
-};
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-  if (index == 0) { /* First encoder*/
-    if (clockwise) {
-      tap_code(KC_VOLU);
-    } else {
-      tap_code(KC_VOLD);
-    }
-  } else if (index == 1) { /* Second encoder*/
-    if (clockwise) {
-      tap_code(KC_3);
-    } else {
-      tap_code(KC_4);
-    }
-  } else if (index == 2) { /* Third encoder*/
-    if (clockwise) {
-      tap_code(KC_5);
-    } else {
-      tap_code(KC_6);
-    }
-  } else if (index == 3) { /* Fourth encoder*/
-    if (clockwise) {
-      tap_code(KC_7);
-    } else {
-      tap_code(KC_8);
-    }
-  } else if (index == 4) { /* Fifth encoder*/
-    if (clockwise) {
-      tap_code(KC_VOLU);
-    } else {
-      tap_code(KC_VOLD);
-    }
-  }
-    return true;
-}
-
-//
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_MAIN] = LAYOUT_ortho_1x5(
-     KC_CAPS, KC_MNXT, KC_MPLY, KC_MPRV, KC_CAPS
-  )
-};
diff --git a/keyboards/minimacro5/keymaps/voaraq/keymap.c b/keyboards/minimacro5/keymaps/voaraq/keymap.c
deleted file mode 100644
index 9af37167dc1..00000000000
--- a/keyboards/minimacro5/keymaps/voaraq/keymap.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/* Copyright 2020 dezlidezlidezli
-  *
-  * This program is free software: you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-  * the Free Software Foundation, either version 2 of the License, or
-  * (at your option) any later version.
-  *
-  * This program is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  * GNU General Public License for more details.
-  *
-  * You should have received a copy of the GNU General Public License
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */
-
-#include QMK_KEYBOARD_H
-
-enum layers {
-     _MAIN,
-};
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-  if (index == 0) { /* First encoder*/
-    if (clockwise) {
-      tap_code(KC_1);
-    } else {
-      tap_code(KC_2);
-    }
-  } else if (index == 1) { /* Second encoder*/
-    if (clockwise) {
-      tap_code(KC_3);
-    } else {
-      tap_code(KC_4);
-    }
-  } else if (index == 2) { /* Third encoder*/
-    if (clockwise) {
-      tap_code(KC_5);
-    } else {
-      tap_code(KC_6);
-    }
-  } else if (index == 3) { /* Fourth encoder*/
-    if (clockwise) {
-      tap_code(KC_7);
-    } else {
-      tap_code(KC_8);
-    }
-  } else if (index == 4) { /* Fifth encoder*/
-    if (clockwise) {
-      tap_code(KC_VOLU);
-    } else {
-      tap_code(KC_VOLD);
-    }
-  }
-    return true;
-}
-
-//
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //buttion closest to usb is first
-  [_MAIN] = LAYOUT_ortho_1x5(
-     KC_MSEL, KC_MPRV, KC_MNXT, KC_MPLY, KC_MUTE
-  )
-};
diff --git a/keyboards/misonoworks/karina/keymaps/voltex/keymap.c b/keyboards/misonoworks/karina/keymaps/voltex/keymap.c
deleted file mode 100644
index f06522f92a0..00000000000
--- a/keyboards/misonoworks/karina/keymaps/voltex/keymap.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
-Copyright 2020 MisonoWorks
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include QMK_KEYBOARD_H
-
-enum layers {
-    DEFAULT,
-    SUPER,
-    META,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    [DEFAULT] = LAYOUT(
-        KC_TRNS,                                                                                     KC_TRNS,
-                 KC_Q,      KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,     KC_P,
-        KC_TAB,  KC_A,      KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,     KC_ENT,
-        KC_LSFT, KC_Z,      KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,
-        KC_LALT, MO(SUPER),                   KC_SPC,  KC_BSPC,                            MO(META), KC_LCTL
-    ),
-
-    [SUPER] = LAYOUT(
-        KC_ESC,                                                                                   KC_TRNS,
-                 KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,
-        KC_MINS, KC_EQL,  KC_GRV,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_QUOT, KC_SCLN,
-        KC_LSFT, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SLSH, KC_BSLS,
-        KC_TRNS, KC_TRNS,                   KC_TRNS, KC_DEL,                             KC_TRNS, KC_TRNS
-    ),
-
-    [META] = LAYOUT(
-        KC_TRNS,                                                                                  KC_TRNS,
-                 KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,
-        KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC,
-        KC_LSFT, KC_LEFT, KC_DOWN, KC_RGHT, KC_PPLS, KC_P2,   KC_P0,   KC_P1,   KC_TRNS, KC_TRNS,
-        RGB_TOG, RGB_SAI,                   RGB_HUI, RGB_VAI,                            KC_TRNS, RGB_MOD
-    )
-
-};
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (index == 0) {
-        if (clockwise) {
-            tap_code(KC_MS_LEFT);
-        } else {
-            tap_code(KC_MS_RIGHT);
-        }
-    }
-    else if (index == 1) {
-        if (clockwise) {
-            tap_code(KC_MS_U);
-        } else {
-            tap_code(KC_MS_D);
-        }
-    }
-    return true;
-}
diff --git a/keyboards/misterknife/knife66/config.h b/keyboards/misterknife/knife66/config.h
index 7f7e1173032..2b8d7b8b9fe 100644
--- a/keyboards/misterknife/knife66/config.h
+++ b/keyboards/misterknife/knife66/config.h
@@ -20,5 +20,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #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
-#define WS2812_DMA_STREAM STM32_DMA1_STREAM5  // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
-#define WS2812_DMA_CHANNEL 5  // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM5  // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
+#define WS2812_PWM_DMA_CHANNEL 5  // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
diff --git a/keyboards/misterknife/knife66_iso/config.h b/keyboards/misterknife/knife66_iso/config.h
index cb847450baa..f9f0707ff18 100644
--- a/keyboards/misterknife/knife66_iso/config.h
+++ b/keyboards/misterknife/knife66_iso/config.h
@@ -20,5 +20,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #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
-#define WS2812_DMA_STREAM STM32_DMA1_STREAM5  // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
-#define WS2812_DMA_CHANNEL 5  // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM5  // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
+#define WS2812_PWM_DMA_CHANNEL 5  // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
diff --git a/keyboards/mitosis/keymaps/carvac_dv/keymap.c b/keyboards/mitosis/keymaps/carvac_dv/keymap.c
deleted file mode 100644
index 842556324f8..00000000000
--- a/keyboards/mitosis/keymaps/carvac_dv/keymap.c
+++ /dev/null
@@ -1,123 +0,0 @@
-// This is the Dvorak-friendly layout for the Mitosis by CarVac (/u/CarVac)
-// It features space on the left thumb, shift on the right thumb, a
-//  number layer with all the numbers on the home row, and a function layer
-//  that provides mouse keys among other things.
-
-#include QMK_KEYBOARD_H
-
-enum mitosis_layers
-{
-	_STD,
-	_NUM,
-	_FN
-};
-
-
-//Mousekeys
-#define MOUSEKEY_DELAY 300
-#define MOUSEKEY_INTERNAL 50
-#define MOUSEKEY_MAX_SPEED 20
-#define MOUSEKEY_TIME_TO_MAX 30
-#define MOUSEKEY_WHEEL_MAX_SPEED 8
-#define MOUSEKEY_WHEEL_TIME_TO_MAX 40
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /* QWERTY
-   * .--------------------------------------------..--------------------------------------------.
-   * | Q      | W      | E      | R      | T      || Y      | U      | I      | O      | P      |
-   * |--------+--------+--------+--------+--------||--------+--------+--------+--------+--------|
-   * | A      | S      | D      | F      | G      || J      | H      | K      | L      | ;      |
-   * |--------+--------+--------+--------+--------||--------+--------+--------+--------+--------|
-   * | Z      | X      | C      | V      | B      || N      | M      | ,      | .      | /      |
-   * '--------+--------+--------+--------+--------||--------+--------+--------+--------+--------'
-   *          | PGUP   | TAB    | LCTRL  | SPACE  || LSHIFT | ENTER  | UP     | PSCR   |
-   *          |--------+--------+--------+--------||--------+--------+--------+--------|
-   *          | PGDN   | LGUI   | LALT   | FN     || NUM    | LEFT   | DOWN   | RIGHT  |
-   *          '-----------------------------------''-----------------------------------'
-   */
-  [_STD] = LAYOUT( /* Standard; as compatible with dvorak and qwerty as possible */
-    KC_Q, KC_W,    KC_E,    KC_R,    KC_T,      KC_Y,      KC_U,    KC_I,    KC_O,    KC_P,
-    KC_A, KC_S,    KC_D,    KC_F,    KC_G,      KC_H,      KC_J,    KC_K,    KC_L,    KC_SCLN,
-    KC_Z, KC_X,    KC_C,    KC_V,    KC_B,      KC_N,      KC_M,    KC_COMM, KC_DOT,  KC_SLSH,
-          KC_PGUP, KC_TAB,  KC_LCTL, KC_SPC,    KC_LSFT,  KC_ENT,  KC_UP,   KC_PSCR,
-          KC_PGDN, KC_LGUI, KC_LALT, MO(_FN),   MO(_NUM), KC_LEFT, KC_DOWN, KC_RGHT
-  ),
-
-  /* Number layout, for data entry and programming purposes (Dvorak result in parens)
-   * .--------------------------------------------..--------------------------------------------.
-   * | TAB    |   (,<) |   (.>) | - ([{) | = (]}) || ] (=+) | pad *  | pad +  | pad -  | [ (/?) |
-   * |--------+--------+--------+--------+--------||--------+--------+--------+--------+--------|
-   * | 1      | 2      | 3      | 4      | 5      || 6      | 7      | 8      | 9      | 0      |
-   * |--------+--------+--------+--------+--------||--------+--------+--------+--------+--------|
-   * | F1     | F2     | F3     | F4     | F5     || F6     | F7     | F8     | F9     | F10    |
-   * '--------+--------+--------+--------+--------||--------+--------+--------+--------+--------'
-   *          | F11    | F12    |        |        ||        |        |        |        |
-   *          |--------+--------+--------+--------||--------+--------+--------+--------|
-   *          |        |        |        |        ||        |        |        |        |
-   *          '-----------------------------------''-----------------------------------'
-   */
-  [_NUM] = LAYOUT( /* Number layout along the home row for maximum speed*/
-    KC_TAB,  _______, _______, KC_MINS, KC_EQL,        KC_RBRC, KC_PAST, KC_PPLS, KC_PMNS, KC_LBRC,
-    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,          KC_6,    KC_7,    KC_8,    KC_9,    KC_0,
-    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,         KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,
-             KC_F11,  KC_F12,  _______, _______,       _______, _______, _______, _______,
-             _______, _______, _______, _______,       _______, _______, _______, _______
-  ),
-
-
-  /* Fn layout, for typing purposes (Dvorak result in parens)
-   * .--------------------------------------------..--------------------------------------------.
-   * | `      |        | MS_U   |        |        || WH_U   | WH_L   | BTN3   | WH_R   | [ (/?) |
-   * |--------+--------+--------+--------+--------||--------+--------+--------+--------+--------|
-   * | ESC    | MS_L   | MS_D   | MS_R   |        || WH_D   | BTN1   | BTN2   |        | ' (-_) |
-   * |--------+--------+--------+--------+--------||--------+--------+--------+--------+--------|
-   * | APP    | MPRV   | MPLY   | MSTP   | MNXT   ||        | BSPC   | DEL    | INS    | \      |
-   * '--------+--------+--------+--------+--------||--------+--------+--------+--------+--------'
-   *          | VOLU   |        |        |        ||        |        | PGUP   |        |
-   *          |--------+--------+--------+--------||--------+--------+--------+--------|
-   *          | VOLD   |        |        |        ||        | HOME   | PGDN   | END    |
-   *          '-----------------------------------''-----------------------------------'
-   */
-  [_FN] = LAYOUT( /* Function Layer, primary alternative layer featuring numpad on right hand,
-                                     cursor keys on left hand, and all symbols*/
-    KC_GRV,  _______, KC_MS_U, _______, _______,       KC_WH_U, KC_WH_L, KC_BTN3, KC_WH_R, KC_LBRC,
-    KC_ESC,  KC_MS_L, KC_MS_D, KC_MS_R, _______,       KC_WH_D, KC_BTN1, KC_BTN2, _______, KC_QUOT,
-    KC_APP,  KC_MPRV, KC_MPLY, KC_MSTP, KC_MNXT,       _______, KC_BSPC, KC_DEL,  KC_INS,  KC_BSLS,
-             KC_VOLU, _______, _______, _______,       _______, _______, KC_PGUP, _______,
-             KC_VOLD, _______, _______, _______,       _______, KC_HOME, KC_PGDN, KC_END
-  ),
-
-  /* blank key layout template
-   * .--------------------------------------------..--------------------------------------------.
-   * |        |        |        |        |        ||        |        |        |        |        |
-   * |--------+--------+--------+--------+--------||--------+--------+--------+--------+--------|
-   * |        |        |        |        |        ||        |        |        |        |        |
-   * |--------+--------+--------+--------+--------||--------+--------+--------+--------+--------|
-   * |        |        |        |        |        ||        |        |        |        |        |
-   * '--------+--------+--------+--------+--------||--------+--------+--------+--------+--------'
-   *          |        |        |        |        ||        |        |        |        |
-   *          |--------+--------+--------+--------||--------+--------+--------+--------|
-   *          |        |        |        |        ||        |        |        |        |
-   *          '-----------------------------------''-----------------------------------'
-   */
-
-};
-
-void matrix_scan_user(void) {
-    uint8_t layer = get_highest_layer(layer_state);
-
-    switch (layer) {
-    	case _STD:
-    		set_led_off;
-    		break;
-        case _FN:
-            set_led_blue;
-            break;
-        case _NUM:
-            set_led_red;
-            break;
-        default:
-            break;
-    }
-};
diff --git a/keyboards/mitosis/keymaps/carvac_dv/rules.mk b/keyboards/mitosis/keymaps/carvac_dv/rules.mk
deleted file mode 100644
index 6c605daecf5..00000000000
--- a/keyboards/mitosis/keymaps/carvac_dv/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-MOUSEKEY_ENABLE = yes
diff --git a/keyboards/mitosis/keymaps/nzen/keymap.c b/keyboards/mitosis/keymaps/nzen/keymap.c
deleted file mode 100644
index 07816067b42..00000000000
--- a/keyboards/mitosis/keymaps/nzen/keymap.c
+++ /dev/null
@@ -1,207 +0,0 @@
-
-
-#include QMK_KEYBOARD_H
-
-enum mitosis_layers
-{
-	_QWERTY,
-	_WORKMAN,
-	_NUMBERS,
-	_PUNCT,
-	_MOUSE,
-	_LAYERS,
-	_GAMING,
-	_UNICODE,
-	_NUMPAD
-};
-
-
-//Mousekeys
-#define MOUSEKEY_DELAY 300
-#define MOUSEKEY_INTERNAL 50
-#define MOUSEKEY_MAX_SPEED 20
-#define MOUSEKEY_TIME_TO_MAX 30
-#define MOUSEKEY_WHEEL_MAX_SPEED 8
-#define MOUSEKEY_WHEEL_TIME_TO_MAX 40
-
-// Fillers to make layering more clear
-#define XXX KC_NO
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  // https://github.com/nhou7/qmk_firmware_amj40/blob/master/doc/keycode.txt
-  /* QWERTY
-  ['Q', 'W', 'E', 'R', 'T',// 'Y', 'U', 'I', 'O', 'P' ],
-  ['A', 'S', 'D', 'F', 'G',// 'H', 'J', 'K', 'L', '; :' ],
-  ['Z', 'X', 'C', 'V', 'B',// 'N', 'M', ', <', '. >', '\' "' ],
-  [  'back', 'del', 'ctrl', 'L_n',// 'L_p', 'ctrl', 'ent', 'back',  ],
-  [  'alt', '0', 'shif', 'spac',// 'spac', 'shif', 'cap', 'alt',  ]
-   */
-  [_QWERTY] = LAYOUT(
-    KC_Q,      KC_W,      KC_E,      KC_R,      KC_T,     KC_Y,      KC_U,        KC_I,        KC_O,   KC_P,
-    KC_A,      KC_S,      KC_D,      KC_F,      KC_G,     KC_H,      KC_J,        KC_K,        KC_L,   KC_SCLN,
-    KC_Z,      KC_X,      KC_C,      KC_V,      KC_B,     KC_N,      KC_M,        KC_COMM,     KC_DOT, KC_QUOTE,
-               KC_BSPC,   KC_DELETE, KC_LCTL,   TG( 2 ),  TG( 3 ),   KC_RCTL,     KC_ENTER,    KC_BSPC,
-               KC_LALT,   KC_0,      KC_LSFT,   KC_SPACE, KC_SPACE,  KC_RSFT,     KC_CAPS,     KC_RALT
-  ),
-  /*
-  ['Q', 'D', 'R', 'W', 'B',/ ** / 'J', 'F', 'U', 'P', '; :' ],
-  ['A', 'S', 'H', 'T', 'G',/ ** / 'Y', 'N', 'E', 'O', 'I' ],
-  ['Z', 'X', 'M', 'C', 'V',/ ** / 'K', 'L', ', <', '. >', '\' "' ],
-  [ '', '', '', '',/ ** / '', '', '', '',  ],
-  [ '', '4', '', '',/ ** / '', '', '', '',  ]
-   */
-  [_WORKMAN] = LAYOUT(
-    KC_Q, KC_D,    KC_R,    KC_W,    KC_B,    KC_J,    KC_F,    KC_U,     KC_P,    KC_SCLN,
-    KC_A, KC_S,    KC_H,    KC_T,    KC_G,    KC_Y,    KC_N,    KC_E,     KC_O,    KC_I,
-    KC_Z, KC_X,    KC_M,    KC_C,    KC_V,    KC_K,    KC_L,    KC_COMMA, KC_DOT,  KC_QUOTE,
-          _______, _______, _______, _______, _______, _______, _______,  _______,
-          _______, KC_1,    _______, _______, _______, _______, _______,  _______
-  ),
-  /*
-  ['9', '8', '7', '6', '5',/ ** / 'F2', 'pDn', *up* /, '*tab* /, 'pUp' ],
-  [' 4', ' 3', ' 2', ' 1', ' 0',/ ** / 'home', *lf* /, '*dn* /, *rt* /, 'end' ],
-  ['undo', 'cut', 'copy', 'paste', 'os',/ ** / 'D', '_', ',', '-', '.' ],
-  // --
-  [ '', '', '', 'L_=6',/ ** / 'L_7', '', '', '',  ],
-  [ '', '6', '', '',/ ** / '', '', '', '',  ]
-   */
-  [_NUMBERS] = LAYOUT(
-    KC_9,       KC_8,       KC_7,       KC_6,       KC_5,    KC_F2,   KC_PGDN,       KC_UP,    KC_TAB,   KC_PGUP,
-    KC_4,       KC_3,       KC_2,       KC_1,       KC_0,    KC_HOME, KC_LEFT,       KC_DOWN,  KC_RIGHT, KC_END,
-    LCTL(KC_Z), LCTL(KC_X), LCTL(KC_C), LCTL(KC_V), KC_LGUI, KC_D,    KC_UNDERSCORE, KC_COMMA, KC_MINUS, KC_DOT,
-                _______,    _______,    _______,    TG( 2 ), TG( 3 ), _______,       _______,  _______,
-                _______,    KC_2,       _______,    _______, _______, _______,       _______,  _______
-  ),
-  /*
-  [ '#', '@', '&', '.', ';',/ ** / '_', ',', '|', '^', '%' ],
-  [ '*', '+', '{', '(', ':',/ ** / '"', ')', '}', '-', '=' ],
-  [ '\\', '?', '<', '[', '$',/ ** / '~', ']', '>', '!', '/' ],
-  // --
-  ['', '', '', 'L_8',/ ** / 'L_=7', '', '', '',  ],
-  ['', '7', '', '',/ ** / '', '', '', '',  ]
-   */
-  [_PUNCT] = LAYOUT(
-    KC_HASH,     KC_AT,       KC_AMPERSAND, KC_DOT,      KC_SCLN,   KC_UNDERSCORE, KC_COMMA,    KC_PIPE, KC_CIRCUMFLEX, KC_PERCENT,
-    KC_ASTERISK, KC_PLUS,     KC_LCBR,      KC_LPRN,     KC_COLON,  KC_DQUO,       KC_RPRN,     KC_RCBR, KC_MINUS,      KC_EQUAL,
-    KC_BSLS,     KC_QUESTION, KC_LT,        KC_LBRC,     KC_DOLLAR, KC_TILDE,      KC_RBRC,     KC_GT,   KC_EXCLAIM,    KC_SLASH,
-                 _______,     _______,      _______,     TG( 4 ),   TG( 3 ),       _______,     _______, _______,
-                 _______,     KC_3,         _______,     _______,   _______,       _______,     _______, _______
-  ),
-  /*
-  ['F6', 'F7', 'F8', 'F9', 'F10',/ ** / 'app', 'mb1', 'mmU', 'mb2', 'mwU' ],
-  ['F1', 'F2', 'F3', 'F4', 'F5',/ ** / 'mnu', 'mmL', 'mmD', 'mmR', 'mwD' ],
-  ['F11', 'F12', '`', 'mute', 'ESC',/ ** / 'prtSc', 'scrLk', 'mwL', 'mwR', 'mb3' ],
-  // --
-  [ '', '', '', 'L_=8',/ ** / 'L_9', '', '', '',  ],
-  [ '', '8', '', '',/ ** / '', '', '', '',  ]
-   */
-  [_MOUSE] = LAYOUT(
-    KC_F6,  KC_F7,   KC_F8,    KC_F9,    KC_F10,    KC_MENU,    KC_MS_BTN1, KC_MS_UP,      KC_MS_BTN2,     KC_MS_WH_UP,
-    KC_F1,  KC_F2,   KC_F3,    KC_F4,    KC_F5,     KC_MENU,    KC_MS_LEFT, KC_MS_DOWN,    KC_MS_RIGHT,    KC_MS_WH_DOWN,
-    KC_F11, KC_F12,  KC_GRAVE, KC_MUTE,  KC_ESCAPE, KC_PSCR,    KC_SCRL,    KC_MS_WH_LEFT, KC_MS_WH_RIGHT, KC_MS_BTN3,
-            _______, _______,  _______,  TG( 4 ),   TG( 5 ),    _______,    _______,       _______,
-            _______, KC_4,     _______,  _______,   _______,    _______,    _______,       _______
-  ),
-  /*
-  ['L_ma1', '!', 'L_dv2', '!', 'L_cl3',/ ** / 'L_wk4', '!', 'L_ar5', '!', '!' ],
-  ['!', '!', '!', '!', '!',/ ** / '!', '!', '!', '!', '!' ],
-  ['L_gmA', '!', 'L_ucB', '!', 'L_npC',/ ** / '!', '!', '!', '!', '!' ],
-  // --
-  [ '', '', '', 'L_=9',/ ** / 'L_=9', '', '', '',  ],
-  [ '', '9', '', '',/ ** / '', '', '', '',  ]
-   */
-  [_LAYERS] = LAYOUT(
-    KC_EXCLAIM, KC_EXCLAIM, KC_EXCLAIM, KC_EXCLAIM, KC_EXCLAIM, TG( 1 ),    KC_EXCLAIM, KC_EXCLAIM, KC_EXCLAIM, KC_EXCLAIM,
-    KC_EXCLAIM, KC_EXCLAIM, KC_EXCLAIM, KC_EXCLAIM, KC_EXCLAIM, KC_EXCLAIM, KC_EXCLAIM, KC_EXCLAIM, KC_EXCLAIM, KC_EXCLAIM,
-    TG( 6 ),    KC_EXCLAIM, TG( 7 ),    KC_EXCLAIM, TG( 8 ),    KC_EXCLAIM, KC_EXCLAIM, KC_EXCLAIM, KC_EXCLAIM, KC_EXCLAIM,
-                _______,    _______,    _______,    TG( 5 ),    TG( 5 ),    _______,    _______,    _______,
-                _______,    KC_5,       _______,    _______,    _______,    _______,    _______,    _______
-  ),
-  /*
-  ['Q', 'W', 'E', 'R', 'T',/ ** / 'P', 'Y', '\u2191'*up* /, 'K', '1' ],
-  ['A', 'S', 'D', 'F', 'G',/ ** / 'H', '\u2190'*lf* /, '\u2193'*dn* /, '\u2192'*rt* /, '2' ],
-  ['Z', 'X', 'C', 'V', 'B',/ ** / 'M', '*', '*', '*', '3' ],
-  // --
-  [ '', '', '', 'L_=A',/ ** / 'A', '', '', '',  ],
-  [ '', 'A', '', '',/ ** / '', '', '', '',  ]
-   */
-  [_GAMING] = LAYOUT(
-    KC_Q, KC_W,    KC_E,    KC_R,    KC_T,    KC_P,    KC_Y,        KC_UP,       KC_K,        KC_1,
-    KC_A, KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_LEFT,     KC_DOWN,     KC_RIGHT,    KC_2,
-    KC_Z, KC_X,    KC_C,    KC_V,    KC_B,    KC_M,    KC_ASTERISK, KC_ASTERISK, KC_ASTERISK, KC_3,
-          _______, _______, _______, TG( 6 ), KC_6,    _______,     _______,     _______,
-          _______, KC_6,    _______, _______, _______, _______,     _______,     _______
-  ),
-  /*
-  ['\u00a2'cent* /, '\u00bc'1/4* /, '\u00bd'1/2* /, '\u03a3'sum* /, '\u00d8'Oslash* /,/ ** / '\u250f'box ul* /, '\u2533'box um* /, '\u2513'box ur* /, '\u03bb'lambda* /, '\u2018'sm'dn* / ],
-  ['\u00F1'n~* /, '\u00a9'&copy* /, '\u00b0'degrees* /, '\u00b1'+-* /, '\u2b0f'arrow up* /,/ ** / '\u2523'box ml* /, '\u254B'box mm* /, '\u252B'box mr* /, '\u0394'delta* /, '\u2019'sm'up* / ],
-  ['\u00a1'down !* /, '\u00bf'down ?* /, '\u00d7'mult x* /, '\u00f7'div/ * /, '\u03c0'pi* /,/ ** / '\u2517'box ll* /, '\u253b'bos lm* /, '\u251b'box lr* /, '\u201c'sm"dn* /, '\u201d'sm"up* / ],
-  // --
-  [ '', '', '', 'L_=B',/ ** / 'B', '', '', '',  ],
-  [ '', 'B', '', '',/ ** / '', '', '', '',  ]
-   */
-  [_UNICODE] = LAYOUT(
-    UC(0x00A2), UC(0x00BC), UC(0x00BD), UC(0x03A3), UC(0x00D8), UC(0x250F), UC(0x2533), UC(0x2513), UC(0x03BB), UC(0x2018),
-    UC(0x00F1), UC(0x00A9), UC(0x00B0), UC(0x00B1), UC(0x2B0F), UC(0x2523), UC(0x254B), UC(0x252B), UC(0x0394), UC(0x2019),
-    UC(0x00A1), UC(0x00BF), UC(0x00D7), UC(0x00F7), UC(0x03C0), UC(0x2517), UC(0x253B), UC(0x251B), UC(0x201C), UC(0x201D),
-                _______,    _______,    _______,    TG( 7 ),    KC_7,       _______,    _______,    _______,
-                _______,    KC_7,       _______,    _______,    _______,    _______,    _______,    _______
-  ),
-  /*
-  ['n-.', 'n-7', 'n-8', 'n-9', 'n--',/ ** / 'n-=', 'volU', 'volD', 'volU', 'volD' ],
-  ['n-0', 'n-4', 'n-5', 'n-6', 'n-+',/ ** / 'N-lck', 'BACK', 'MUTE', 'RGUI', 'paus' ],
-  ['n -*', 'n-1', 'n-2', 'n-3', 'n-/',/ ** / 'n-ent', 'PLAY', 'PREV', 'NEXT', 'insr' ],
-  // --
-  [ '', '', '', 'L_=C',/ ** / 'C', '', '', '',  ],
-  [ '', 'C', '', '',/ ** / '', '', '', '',  ]
-   */
-  [_NUMPAD] = LAYOUT(
-    KC_KP_DOT,      KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_MINUS, KC_KP_EQUAL, KC_AUDIO_VOL_UP,     KC_AUDIO_VOL_DOWN,   KC_VOLU,             KC_VOLD,
-    KC_KP_0,        KC_KP_4, KC_KP_5, KC_KP_6, KC_KP_PLUS,  KC_NUM,      KC_WWW_BACK,         KC_AUDIO_MUTE,       KC_RGUI,             KC_PAUSE,
-    KC_KP_ASTERISK, KC_KP_1, KC_KP_2, KC_KP_3, KC_KP_SLASH, KC_KP_ENTER, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_PREV_TRACK, KC_MEDIA_NEXT_TRACK, KC_INSERT,
-                    _______, _______, _______, TG( 8 ),     KC_8,        _______,             _______,             _______,
-                    _______, KC_8,    _______, _______,     _______,     _______,             _______,             _______
-  )// ,
-  /*
-   * /
-  [_] = LAYOUT(
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-             _______, _______, _______, _______, _______, _______, _______, _______,
-             _______, _______, _______, _______, _______, _______, _______, _______
-  )
-   */
-};
-
-void matrix_scan_user(void) {
-    uint8_t layer = get_highest_layer(layer_state);
-
-    switch (layer) {
-    	case _QWERTY:
-    	case _WORKMAN:
-    		set_led_off;
-    		break;
-        case _NUMBERS:
-            set_led_blue;
-            break;
-        case _PUNCT:
-            set_led_red;
-            break;
-        case _MOUSE:
-            set_led_green;
-            break;
-        case _LAYERS:
-            set_led_yellow;
-            break;
-        case _UNICODE:
-            set_led_cyan;
-            break;
-        default:
-            break;
-   }
-};
-
-void matrix_init_user(void) {
-	set_unicode_input_mode(UNICODE_MODE_LINUX); // or UNICODE_MODE_WINCOMPOSE
-};
diff --git a/keyboards/mitosis/keymaps/nzen/readme.md b/keyboards/mitosis/keymaps/nzen/readme.md
deleted file mode 100644
index c11981bd4d5..00000000000
--- a/keyboards/mitosis/keymaps/nzen/readme.md
+++ /dev/null
@@ -1,75 +0,0 @@
-
-### personal layout: Nzen
-
-Levels
-
-* Qwerty, with quotes in place of slash question. 
-* Workman
-* Numbers and navigation, left and right hands respectively
-* Punctuation, mostly symmetric
-* Function and mouse, l/r respectively
-* Layer hub, to reach workman or upper layers
-* Gaming, qwert and arrows
-* Unicode, some numerics and one of the box styles
-* Numpad and media, l/r respectively
-
-Bottom cluster is the same on all levels and mostly symmetric. The 'ring fingers' differ between the two sides. N is a number corresponding to the current layer. Toggle layer will be one down and one up.
-
-* back del/enter ctrl toggle-layer
-* alt N/caps shift space
-
-You can preview the layout by cloning [this webpage](https://gitlab.com/Nzen/impatient-broth-nenem). The page imitates qmk's fallthrough.
-
-['Q', 'W', 'E', 'R', 'T',// 'Y', 'U', 'I', 'O', 'P'  
-['A', 'S', 'D', 'F', 'G',// 'H', 'J', 'K', 'L', '; :'  
-['Z', 'X', 'C', 'V', 'B',// 'N', 'M', ', <', '. >', '\' "'  
-[  'back', 'del', 'ctrl', 'L_n',// 'L_p', 'ctrl', 'ent', 'back',  
-[  'alt', '0', 'shif', 'spac',// 'spac', 'shif', 'cap', 'alt',  
-
-['Q', 'D', 'R', 'W', 'B',/ ** / 'J', 'F', 'U', 'P', '; :'  
-['A', 'S', 'H', 'T', 'G',/ ** / 'Y', 'N', 'E', 'O', 'I'  
-['Z', 'X', 'M', 'C', 'V',/ ** / 'K', 'L', ', <', '. >', '\' "'  
-[ '', '', '', '',/ ** / '', '', '', '',  
-[ '', '4', '', '',/ ** / '', '', '', '',  
-
-['9', '8', '7', '6', '5',/ ** / 'F2', 'pDn', *up* /, '*tab* /, 'pUp'  
-[' 4', ' 3', ' 2', ' 1', ' 0',/ ** / 'home', *lf* /, '*dn* /, *rt* /, 'end'  
-['undo', 'cut', 'copy', 'paste', 'os',/ ** / 'D', '_', ',', '-', '.'  
-[ '', '', '', 'L_=6',/ ** / 'L_7', '', '', '',  
-[ '', '6', '', '',/ ** / '', '', '', '',  
-
-[ '#', '@', '&', '.', ';',/ ** / '_', ',', '|', '^', '%'  
-[ '*', '+', '{', '(', ':',/ ** / '"', ')', '}', '-', '='  
-[ '\\', '?', '<', '[', '$',/ ** / '~', ']', '>', '!', '/'  
-['', '', '', 'L_8',/ ** / 'L_=7', '', '', '',  
-['', '7', '', '',/ ** / '', '', '', '',  
-
-['F6', 'F7', 'F8', 'F9', 'F10',/ ** / 'app', 'mb1', 'mmU', 'mb2', 'mwU'  
-['F1', 'F2', 'F3', 'F4', 'F5',/ ** / 'mnu', 'mmL', 'mmD', 'mmR', 'mwD'  
-['F11', 'F12', '`', 'mute', 'ESC',/ ** / 'prtSc', 'scrLk', 'mwL', 'mwR', 'mb3'  
-[ '', '', '', 'L_=8',/ ** / 'L_9', '', '', '',  
-[ '', '8', '', '',/ ** / '', '', '', '',  
-
-['L_ma1', '!', 'L_dv2', '!', 'L_cl3',/ ** / 'L_wk4', '!', 'L_ar5', '!', '!'  
-['!', '!', '!', '!', '!',/ ** / '!', '!', '!', '!', '!'  
-['L_gmA', '!', 'L_ucB', '!', 'L_npC',/ ** / '!', '!', '!', '!', '!'  
-[ '', '', '', 'L_=9',/ ** / 'L_=9', '', '', '',  
-[ '', '9', '', '',/ ** / '', '', '', '',  
-
-['Q', 'W', 'E', 'R', 'T',/ ** / 'P', 'Y', '\u2191'*up* /, 'K', '1'  
-['A', 'S', 'D', 'F', 'G',/ ** / 'H', '\u2190'*lf* /, '\u2193'*dn* /, '\u2192'*rt* /, '2'  
-['Z', 'X', 'C', 'V', 'B',/ ** / 'M', '*', '*', '*', '3'  
-[ '', '', '', 'L_=A',/ ** / 'A', '', '', '',  
-[ '', 'A', '', '',/ ** / '', '', '', '',  
-
-['\u00a2'cent* /, '\u00bc'1/4* /, '\u00bd'1/2* /, '\u03a3'sum* /, '\u00d8'Oslash* /,/ ** / '\u250f'box ul* /, '\u2533'box um* /, '\u2513'box ur* /, '\u03bb'lambda* /, '\u2018'sm'dn* / ],  
-['\u00F1'n~* /, '\u00a9'&copy* /, '\u00b0'degrees* /, '\u00b1'+-* /, '\u2b0f'arrow up* /,/ ** / '\u2523'box ml* /, '\u254B'box mm* /, '\u252B'box mr* /, '\u0394'delta* /, '\u2019'sm'up* / ],  
-['\u00a1'down !* /, '\u00bf'down ?* /, '\u00d7'mult x* /, '\u00f7'div/ * /, '\u03c0'pi* /,/ ** / '\u2517'box ll* /, '\u253b'bos lm* /, '\u251b'box lr* /, '\u201c'sm"dn* /, '\u201d'sm"up* /  
-[ '', '', '', 'L_=B',/ ** / 'B', '', '', '',  
-[ '', 'B', '', '',/ ** / '', '', '', '',  
-
-['n-.', 'n-7', 'n-8', 'n-9', 'n--',/ ** / 'n-=', 'volU', 'volD', 'volU', 'volD'  
-['n-0', 'n-4', 'n-5', 'n-6', 'n-+',/ ** / 'N-lck', 'BACK', 'MUTE', 'RGUI', 'paus'  
-['n -*', 'n-1', 'n-2', 'n-3', 'n-/',/ ** / 'n-ent', 'PLAY', 'PREV', 'NEXT', 'insr'  
-[ '', '', '', 'L_=C',/ ** / 'C', '', '', '',  
-[ '', 'C', '', '',/ ** / '', '', '', '',
diff --git a/keyboards/mitosis/keymaps/nzen/rules.mk b/keyboards/mitosis/keymaps/nzen/rules.mk
deleted file mode 100644
index eaba18db969..00000000000
--- a/keyboards/mitosis/keymaps/nzen/rules.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-CONSOLE_ENABLE = no	# Console for debug(+400)
-COMMAND_ENABLE = no   # Commands for debug and configuration
diff --git a/keyboards/miuni32/keymaps/adam-lee/config.h b/keyboards/miuni32/keymaps/adam-lee/config.h
deleted file mode 100644
index df06a262062..00000000000
--- a/keyboards/miuni32/keymaps/adam-lee/config.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-// place overrides here
-
-#endif
\ No newline at end of file
diff --git a/keyboards/miuni32/keymaps/adam-lee/keymap.c b/keyboards/miuni32/keymaps/adam-lee/keymap.c
deleted file mode 100644
index d6f5f40fddf..00000000000
--- a/keyboards/miuni32/keymaps/adam-lee/keymap.c
+++ /dev/null
@@ -1,60 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Level 0: Default Layer
-     * ,---------------------------------------------------------------------------------------.
-     * |   Q   |   W   |   E   |   R   |   T   |   Y   |   U   |   I   |   O   |   P   |  BSP  |
-     * |---------------------------------------------------------------------------------------|
-     * |   A   |   S   |   D   |   F   |   G   |   H   |   J   |   K   |   L   |  ENT  |LT(1|,)|
-     * |---------------------------------------------------------------------------------------|
-     * |LT(3|Z)|   X   |   C   |   V   |      SPC      |   B   |   N   |   M   |  RSFT |LT(2|.)|
-     * |---------------------------------------------------------------------------------------|
-     */
-  [0] = LAYOUT(
-    KC_Q,        KC_W, KC_E, KC_R, KC_T, KC_Y,   KC_U, KC_I, KC_O, KC_P,    KC_BSPC,
-    KC_A,        KC_S, KC_D, KC_F, KC_G, KC_H,   KC_J, KC_K, KC_L, KC_ENT,  LT(1, KC_COMMA),
-    LT(3, KC_Z), KC_X, KC_C, KC_V,       KC_SPC, KC_B, KC_N, KC_M, KC_RSFT, LT(2, KC_DOT)
-  ),
-  /* Level 1: Numbers Layer
-     * ,---------------------------------------------------------------------------------------.
-     * |  ESC  |   7   |   8   |   9   |   /   |   *   |   .   |   ,   |   (   |   )   |  DEL  |
-     * |---------------------------------------------------------------------------------------|
-     * |  TAB  |   4   |   5   |   6   |   -   |   +   |  HOME |   UP  |  END  |  PGUP |  TRNS |
-     * |---------------------------------------------------------------------------------------|
-     * |  LATL |   1   |   2   |   3   |   0           |  LEFT |  DOWN |  RGHT |  PGDN | RSHFT |
-     * |---------------------------------------------------------------------------------------|
-     */
-  [1] = LAYOUT(
-    KC_ESC,  KC_7, KC_8, KC_9, KC_SLSH, KC_ASTR, KC_DOT,  KC_COMM, KC_LPRN, KC_RPRN, KC_DEL,
-    KC_TAB,  KC_4, KC_5, KC_6, KC_MINS, KC_PLUS, KC_HOME, KC_UP,   KC_END,  KC_PGUP, _______,
-    KC_LALT, KC_1, KC_2, KC_3, KC_0,             KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_RSFT
-  ),
-  /* Level 2: Symbols Layer
-     * ,---------------------------------------------------------------------------------------.
-     * |   !   |   @   |   #   |   $   |   %   |   ^   |   &   |   *   |   -   |   +   |   =   |
-     * |---------------------------------------------------------------------------------------|
-     * |   {   |   }   |   [   |   ]   |  TRNS |  TRNS |   \   |   ;   |   :   |   `   |   ?   |
-     * |---------------------------------------------------------------------------------------|
-     * |  LSFT |  LCTL |   L   |   T   |      TAB      |   N   |  TRNS |  TRNS |  RCTL |  TRNS |
-     * |---------------------------------------------------------------------------------------|
-     */
-  [2] = LAYOUT(
-    KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_MINS, KC_PLUS, KC_EQL,
-    KC_LCBR, KC_RCBR, KC_LBRC, KC_RBRC, _______, _______, KC_BSLS, KC_SCLN, KC_COLN, KC_GRV,  KC_QUES,
-    KC_LSFT, KC_LCTL, KC_L,    KC_T,             KC_TAB,  KC_N,    _______, _______, KC_RCTL, _______
-  ),
-  /* Level 3: RGB Layer
-     * ,---------------------------------------------------------------------------------------.
-     * | QK_BOOT |  TRNS |  TRNS |  TRNS |  TRNS |   F1  |   F2  |   F3  |   F4  |   F5  |   F6  |
-     * |---------------------------------------------------------------------------------------|
-     * |RGB_TOG|RGB_MOD|RGB_HUI|RGB_HUD|   NO  |RGB_SAI|RGB_SAD|RGB_VAI|RGB_VAD|  TRNS |  TRNS |
-     * |---------------------------------------------------------------------------------------|
-     * |  TRNS |  TRNS |  TRNS |  TRNS |       F7      |   F8  |   F9  |  F10  |  F11  |  F12  |
-     * |---------------------------------------------------------------------------------------|
-     */
-  [3] = LAYOUT(
-    QK_BOOT, _______, _______, _______, _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,
-    RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, KC_NO,   RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______,
-    _______, _______, _______, _______,          KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12
-  )
-};
diff --git a/keyboards/miuni32/keymaps/adam-lee/readme.md b/keyboards/miuni32/keymaps/adam-lee/readme.md
deleted file mode 100644
index 4cff8ef5a3a..00000000000
--- a/keyboards/miuni32/keymaps/adam-lee/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The default keymap for miuni32
\ No newline at end of file
diff --git a/keyboards/miuni32/keymaps/adam-lee/rules.mk b/keyboards/miuni32/keymaps/adam-lee/rules.mk
deleted file mode 100644
index 1022078ba6c..00000000000
--- a/keyboards/miuni32/keymaps/adam-lee/rules.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = yes        # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/miuni32/keymaps/cassdelacruzmunoz/config.h b/keyboards/miuni32/keymaps/cassdelacruzmunoz/config.h
deleted file mode 100644
index d057ce4f34b..00000000000
--- a/keyboards/miuni32/keymaps/cassdelacruzmunoz/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2020 Cassandra de la Cruz-Munoz cassandra.delacruzmunoz@gmaill.com @cassdelacruzmunoz
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>
-*/
-
-#pragma once
-
-// place overrides here
-#define RGBLIGHT_LAYERS
-#define RGBLIGHT_SLEEP
-#define MIDI_ADVANCED
diff --git a/keyboards/miuni32/keymaps/cassdelacruzmunoz/keymap.c b/keyboards/miuni32/keymaps/cassdelacruzmunoz/keymap.c
deleted file mode 100644
index 7d347edb662..00000000000
--- a/keyboards/miuni32/keymaps/cassdelacruzmunoz/keymap.c
+++ /dev/null
@@ -1,173 +0,0 @@
-/* Copyright 2020 Cassandra de la Cruz-Munoz cassandra.delacruzmunoz@gmaill.com @cassdelacruzmunoz
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>
-*/
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Level 0: Default Layer
-     * ,---------------------------------------------------------------------------------------.
-     * |   Q   |   W   |   E   |   R   |   T   |   Y   |   U   |   I   |   O   |   P   |  BSP  |
-     * |---------------------------------------------------------------------------------------|
-     * |   A   |   S   |   D   |   F   |   G   |   H   |   J   |   K   |   L   |  ENT  |LT(1|,)|
-     * |---------------------------------------------------------------------------------------|
-     * |   Z   |   X   |   C   |   V   |      SPC      |   B   |   N   |   M   |  RSFT |   .   |
-     * |---------------------------------------------------------------------------------------|
-     */
-  [0] = LAYOUT(
-    KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y,   KC_U, KC_I, KC_O, KC_P,    KC_BSPC,
-    KC_A, KC_S, KC_D, KC_F, KC_G, KC_H,   KC_J, KC_K, KC_L, KC_ENT,  LT(1, KC_COMMA),
-    KC_Z, KC_X, KC_C, KC_V,       KC_SPC, KC_B, KC_N, KC_M, KC_RSFT, KC_DOT
-    ),
-    /* Level 1: Layers Layer
-     * ,---------------------------------------------------------------------------------------.
-     * | TO(2) | TO(3) | TO(4) | TO(5) | TO(6) | TO(7) | TO(8) | TO(9) | TO(10)| TO(11)| TO(12)|
-     * |---------------------------------------------------------------------------------------|
-     * | TO(13)| TO(14)| TO(15)| TO(16)| TO(17)| TO(18)| TO(19)| TO(20)| TO(21)| TO(22)|  TRNS |
-     * |---------------------------------------------------------------------------------------|
-     * | TO(23)| TO(24)| TO(25)| TO(26)|               | TO(27)| TO(28)| TO(29)| TO(30)| TO(31)|
-     * |---------------------------------------------------------------------------------------|
-     */
-  [1] = LAYOUT(
-    TO(2),  TO(3),  TO(4),  TO(5),  TO(6),//TO(7),  TO(8),  TO(9),  TO(10), TO(11), TO(12),
-                                            KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,
-  //TO(13), TO(14), TO(15), TO(16), TO(17), TO(18), TO(19), TO(20), TO(21), TO(22), _______,
-    KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  _______,
-  //TO(23), TO(24), TO(25), TO(26),         KC_NO,  TO(27), TO(28), TO(29), TO(30), TO(31)
-    KC_NO,  KC_NO,  KC_NO,  KC_NO,          KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO
-  ),
-  /* Level 2: Numbers Layer
-     * ,---------------------------------------------------------------------------------------.
-     * |  ESC  |   7   |   8   |   9   |   /   |   *   |   .   |   ,   |   (   |   )   |  DEL  |
-     * |---------------------------------------------------------------------------------------|
-     * |  TAB  |   4   |   5   |   6   |   -   |   +   |  HOME |   UP  |  END  |  PGUP | TG(2) |
-     * |---------------------------------------------------------------------------------------|
-     * |  LALT |   1   |   2   |   3   |   0           |  LEFT |  DOWN |  RGHT |  PGDN | RSHFT |
-     * |---------------------------------------------------------------------------------------|
-     */
-  [2] = LAYOUT(
-    KC_ESC,  KC_7, KC_8, KC_9, KC_SLSH, KC_ASTR, KC_DOT,  KC_COMM, KC_LPRN, KC_RPRN, KC_DEL,
-    KC_TAB,  KC_4, KC_5, KC_6, KC_MINS, KC_PLUS, KC_HOME, KC_UP,   KC_END,  KC_PGUP, TG(2),
-    KC_LALT, KC_1, KC_2, KC_3, KC_0,             KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_RSFT
-  ),
-  /* Level 3: Symbols Layer
-     * ,---------------------------------------------------------------------------------------.
-     * |   !   |   @   |   #   |   $   |   %   |   ^   |   &   |   *   |   -   |   +   |   =   |
-     * |---------------------------------------------------------------------------------------|
-     * |   {   |   }   |   [   |   ]   |   '   |       |   \   |   ;   |   :   |   `   | TG(3) |
-     * |---------------------------------------------------------------------------------------|
-     * |  LSFT |  LCTL |       |       |      TAB      |       |       |       |  RCTL |   ?   |
-     * |---------------------------------------------------------------------------------------|
-     */
-  [3] = LAYOUT(
-    KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_MINS, KC_PLUS, KC_EQL,
-    KC_LCBR, KC_RCBR, KC_LBRC, KC_RBRC, KC_QUOT, KC_NO,   KC_BSLS, KC_SCLN, KC_COLN, KC_GRV,  TG(3),
-    KC_LSFT, KC_LCTL, KC_NO,   KC_NO,            KC_TAB,  KC_NO,   KC_NO,   KC_NO,   KC_RCTL, KC_QUES
-  ),
-  /* Level 4: F-keys and Media Layer
-     * ,---------------------------------------------------------------------------------------.
-     * | QK_BOOT |  MUTE |  VOLU |  MPLY |  TRNS |   F1  |   F2  |   F3  |   F4  |   F5  |   F6  |
-     * |---------------------------------------------------------------------------------------|
-     * |  LGUI |  MPRV |  VOLD |  MNXT |  TRNS |  TRNS |  TRNS |  TRNS |  TRNS |  TRNS | TG(4) |
-     * |---------------------------------------------------------------------------------------|
-     * |  TRNS |  TRNS |  TRNS |  TRNS |       F7      |   F8  |   F9  |  F10  |  F11  |  F12  |
-     * |---------------------------------------------------------------------------------------|
-     */
-  [4] = LAYOUT(
-    QK_BOOT, KC_MUTE, KC_VOLU, KC_MPLY, KC_NO, KC_F1, KC_F2, KC_F3, KC_F4,  KC_F5,  KC_F6,
-    KC_LGUI, KC_MPRV, KC_VOLD, KC_MNXT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,  KC_NO,  TG(4),
-    KC_NO,   KC_NO,   KC_NO,   KC_NO,          KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12
-  ),
-  /* Level 5: Commands Layer
-     * ,---------------------------------------------------------------------------------------.
-     * |  CUT  |  PSCR |  BRIU |  PWR  |       |       |       |       |       |       |       |
-     * |---------------------------------------------------------------------------------------|
-     * |  COPY |  FIND |  BRID |  SLEP |       |       |       |       |       |       | TG(5) |
-     * |---------------------------------------------------------------------------------------|
-     * |  PSTE |       |       |  WAKE |               |       |       |       |       |       |
-     * |---------------------------------------------------------------------------------------|
-     */
-  [5] = LAYOUT(
-    KC_CUT,  KC_PSCR, KC_BRIU, KC_PWR,  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
-    KC_COPY, KC_FIND, KC_BRID, KC_SLEP, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, TG(5),
-    KC_PSTE, KC_NO,   KC_NO,   KC_WAKE,        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO
-  ),
-  /* Level 6: MIDI Layer
-     * ,---------------------------------------------------------------------------------------.
-     * |   C1  |   E1  |   G1  |   B1  |   D2  |   F2  |   A2  |   C3  |   E3  |   G3  |       |
-     * |---------------------------------------------------------------------------------------|
-     * |   D1  |   F1  |   A1  |   C2  |   E2  |   G2  |   B2  |   D3  |   F3  |   A3  | TG(6) |
-     * |---------------------------------------------------------------------------------------|
-     * |  OCTD |  OCTU | TRNSD | TRNSU |               |       |       |       |       |       |
-     * |---------------------------------------------------------------------------------------|
-     */
-  [6] = LAYOUT(
-    MI_C1,   MI_E1,   MI_G1,    MI_B1,    MI_D2,   MI_F2,  MI_A2,  MI_C3,  MI_E3,  MI_G3,  KC_NO,
-    MI_D1,   MI_F1,   MI_A1,    MI_C2,    MI_E2,   MI_G2,  MI_B2,  MI_D3,  MI_F3,  MI_A3,  TG(6),
-    MI_OCTD, MI_OCTU, MI_TRSD,  MI_TRSU,           KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO
-  )
-};
-
-// Light LEDs 0 through 16 in white when keyboard layer 0 is active
-const rgblight_segment_t PROGMEM my_layer0_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {0, 17, HSV_WHITE}
-);
-// Light LEDs 0 through 16 in blue when keyboard layer 1 is active
-const rgblight_segment_t PROGMEM my_layer1_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {0, 17, HSV_BLUE}
-);
-// Light LEDs 0 through 16 in green when keyboard layer 2 is active
-const rgblight_segment_t PROGMEM my_layer2_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {0, 17, HSV_GREEN}
-);
-// Light LEDs 0 through 16 in yellow when keyboard layer 3 is active
-const rgblight_segment_t PROGMEM my_layer3_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {0, 17, HSV_YELLOW}
-);
-// Light LEDs 0 through 16 in red when keyboard layer 4 is active
-const rgblight_segment_t PROGMEM my_layer4_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {0, 17, HSV_RED}
-);
-// Light LEDs 0 through 16 in cyan when keyboard layer 5 is active
-const rgblight_segment_t PROGMEM my_layer5_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {0, 17, HSV_CYAN}
-);
-// Light LEDs 0 through 16 in orange when keyboard layer 6 is active
-const rgblight_segment_t PROGMEM my_layer6_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-    {0, 17, HSV_ORANGE}
-);
-
-// Now define the array of layers. Later layers take precedence
-const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
-    my_layer0_layer,
-    my_layer1_layer,
-    my_layer2_layer,
-    my_layer3_layer,
-    my_layer4_layer,
-    my_layer5_layer,
-    my_layer6_layer
-);
-
-void keyboard_post_init_user(void) {
-    // Enable the LED layers
-    rgblight_layers = my_rgb_layers;
-}
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    for (int i = 0; i < 7; i++) {
-        rgblight_set_layer_state(i, layer_state_cmp(state, i));
-    }
-    return state;
-}
diff --git a/keyboards/miuni32/keymaps/cassdelacruzmunoz/readme.md b/keyboards/miuni32/keymaps/cassdelacruzmunoz/readme.md
deleted file mode 100644
index b9e42964cfd..00000000000
--- a/keyboards/miuni32/keymaps/cassdelacruzmunoz/readme.md
+++ /dev/null
@@ -1,19 +0,0 @@
-# Cass de la Cruz-Munoz's keymap for Miuni32
-
-7 layers:
-
-* QUERTY
-* Layer access
-* Numberpad, navigation keys
-* Symbols
-* Function and media keys
-* Assorted command keys
-* MIDI keys
-
-![QUERTY](https://imgur.com/0B3Xl2D.png)
-![Layers](https://imgur.com/Rb9KRgL.png)
-![Numberpad & Navigation](https://imgur.com/psq5U5o.png)
-![Symbols](https://imgur.com/nbxOjCG.png)
-![Function & Media](https://imgur.com/AZe6Vib.png)
-![Commands](https://imgur.com/Pl0NYbw.png)
-![MIDI](https://imgur.com/c6BcDe2.png)
diff --git a/keyboards/mk65/info.json b/keyboards/mk65/info.json
index 44a8e15f153..9135deaf199 100644
--- a/keyboards/mk65/info.json
+++ b/keyboards/mk65/info.json
@@ -30,10 +30,7 @@
         "console": false,
         "command": false,
         "nkro": true,
-        "backlight": false,
-        "rgblight": true,
-        "audio": false,
-        "key_lock": false
+        "rgblight": true
     },
     "rgblight": {
         "led_count": 7,
diff --git a/keyboards/mlego/m65/rev1/info.json b/keyboards/mlego/m65/rev1/info.json
index d8bb91de300..2f77137eec9 100644
--- a/keyboards/mlego/m65/rev1/info.json
+++ b/keyboards/mlego/m65/rev1/info.json
@@ -11,8 +11,6 @@
         ]
     },
     "features": {
-        "audio": false,
-        "backlight": false,
         "bootmagic": true,
         "command": false,
         "console": false,
diff --git a/keyboards/mlego/m65/rev2/info.json b/keyboards/mlego/m65/rev2/info.json
index e8575e23e85..00147673091 100644
--- a/keyboards/mlego/m65/rev2/info.json
+++ b/keyboards/mlego/m65/rev2/info.json
@@ -10,8 +10,6 @@
         ]
     },
     "features": {
-        "audio": false,
-        "backlight": false,
         "bootmagic": true,
         "command": true,
         "console": false,
diff --git a/keyboards/mlego/m65/rev3/info.json b/keyboards/mlego/m65/rev3/info.json
index d48d52d9d97..4b7980b63bf 100644
--- a/keyboards/mlego/m65/rev3/info.json
+++ b/keyboards/mlego/m65/rev3/info.json
@@ -11,8 +11,6 @@
         ]
     },
     "features": {
-        "audio": false,
-        "backlight": false,
         "bootmagic": true,
         "command": false,
         "console": false,
diff --git a/keyboards/mlego/m65/rev4/info.json b/keyboards/mlego/m65/rev4/info.json
index 56fed15317f..ab2a708ba88 100644
--- a/keyboards/mlego/m65/rev4/info.json
+++ b/keyboards/mlego/m65/rev4/info.json
@@ -11,8 +11,6 @@
         ]
     },
     "features": {
-        "audio": false,
-        "backlight": false,
         "bootmagic": true,
         "command": false,
         "console": true,
diff --git a/keyboards/mntre_v3/info.json b/keyboards/mntre_v3/info.json
index eeef7575ff1..d9cee6aede8 100644
--- a/keyboards/mntre_v3/info.json
+++ b/keyboards/mntre_v3/info.json
@@ -75,45 +75,45 @@
                 {"matrix": [2, 13], "x": 13.5, "y": 2},
 
                 {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
-                {"matrix": [3, 1], "x": 1, "y": 3},
-                {"matrix": [3, 2], "x": 2, "y": 3},
-                {"matrix": [3, 3], "x": 3, "y": 3},
-                {"matrix": [3, 4], "x": 4, "y": 3},
-                {"matrix": [3, 5], "x": 5, "y": 3},
-                {"matrix": [3, 6], "x": 6, "y": 3},
-                {"matrix": [3, 7], "x": 7, "y": 3},
-                {"matrix": [3, 8], "x": 8, "y": 3},
-                {"matrix": [3, 9], "x": 9, "y": 3},
-                {"matrix": [3, 10], "x": 10, "y": 3},
-                {"matrix": [3, 11], "x": 11, "y": 3},
-                {"matrix": [3, 12], "x": 12, "y": 3, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [3, 5], "x": 5.75, "y": 3},
+                {"matrix": [3, 6], "x": 6.75, "y": 3},
+                {"matrix": [3, 7], "x": 7.75, "y": 3},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "x": 11.75, "y": 3},
+                {"matrix": [3, 12], "x": 12.75, "y": 3, "w": 1.75},
 
                 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.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},
-                {"matrix": [4, 6], "x": 6.5, "y": 4},
-                {"matrix": [4, 7], "x": 7.5, "y": 4},
-                {"matrix": [4, 8], "x": 8.5, "y": 4},
-                {"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.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 12], "x": 12.25, "y": 4},
+                {"matrix": [4, 13], "x": 13.25, "y": 4, "w": 1.25},
 
                 {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
-                {"matrix": [5, 1], "x": 1.5, "y": 5, "w": 1.5},
-                {"matrix": [5, 2], "x": 3, "y": 5, "w": 1.5},
-                {"matrix": [5, 3], "x": 4.5, "y": 5, "w": 1.5},
-                {"matrix": [5, 4], "x": 6, "y": 5,"w": 2},
-                {"matrix": [5, 5], "x": 7, "y": 5,"w": 1.5},
-                {"matrix": [5, 6], "x": 8, "y": 5},
-                {"matrix": [5, 7], "x": 9.5, "y": 5},
-                {"matrix": [5, 8], "x": 10.5, "y": 5},
-                {"matrix": [5, 9], "x": 11.5, "y": 5},
-                {"matrix": [5, 10], "x": 12.5, "y": 5,"w": 1.25}
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.5},
+                {"matrix": [5, 2], "x": 2.75, "y": 5, "w": 1.5},
+                {"matrix": [5, 3], "x": 4.25, "y": 5, "w": 1.5},
+                {"matrix": [5, 4], "x": 5.75, "y": 5,"w": 2},
+                {"matrix": [5, 5], "x": 7.75, "y": 5,"w": 1.5},
+                {"matrix": [5, 6], "x": 9.25, "y": 5},
+                {"matrix": [5, 7], "x": 10.25, "y": 5},
+                {"matrix": [5, 8], "x": 11.25, "y": 5},
+                {"matrix": [5, 9], "x": 12.25, "y": 5},
+                {"matrix": [5, 10], "x": 13.25, "y": 5,"w": 1.25}
             ]
         }
     }
diff --git a/keyboards/mode/m256wh/config.h b/keyboards/mode/m256wh/config.h
index c976b6bcc5b..06f1658ea52 100644
--- a/keyboards/mode/m256wh/config.h
+++ b/keyboards/mode/m256wh/config.h
@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define WS2812_PWM_DRIVER PWMD1
 #define WS2812_PWM_CHANNEL 3
 #define WS2812_PWM_PAL_MODE 1
-#define WS2812_DMA_STREAM STM32_DMA2_STREAM5
-#define WS2812_DMA_CHANNEL 6
+#define WS2812_PWM_DMA_STREAM STM32_DMA2_STREAM5
+#define WS2812_PWM_DMA_CHANNEL 6
 
 #define EECONFIG_KB_DATA_SIZE (1)
diff --git a/keyboards/mode/m256ws/config.h b/keyboards/mode/m256ws/config.h
index c976b6bcc5b..06f1658ea52 100644
--- a/keyboards/mode/m256ws/config.h
+++ b/keyboards/mode/m256ws/config.h
@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define WS2812_PWM_DRIVER PWMD1
 #define WS2812_PWM_CHANNEL 3
 #define WS2812_PWM_PAL_MODE 1
-#define WS2812_DMA_STREAM STM32_DMA2_STREAM5
-#define WS2812_DMA_CHANNEL 6
+#define WS2812_PWM_DMA_STREAM STM32_DMA2_STREAM5
+#define WS2812_PWM_DMA_CHANNEL 6
 
 #define EECONFIG_KB_DATA_SIZE (1)
diff --git a/keyboards/mode/m60h/config.h b/keyboards/mode/m60h/config.h
index f984cf28de9..cde4ffdbc61 100644
--- a/keyboards/mode/m60h/config.h
+++ b/keyboards/mode/m60h/config.h
@@ -5,6 +5,6 @@
 
 #define WS2812_PWM_DRIVER PWMD4
 #define WS2812_PWM_CHANNEL 4
-#define WS2812_DMA_STREAM STM32_DMA1_STREAM6
-#define WS2812_DMA_CHANNEL 2
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM6
+#define WS2812_PWM_DMA_CHANNEL 2
 #define WS2812_PWM_TARGET_PERIOD 800000
\ No newline at end of file
diff --git a/keyboards/mode/m60h_f/config.h b/keyboards/mode/m60h_f/config.h
index f984cf28de9..cde4ffdbc61 100644
--- a/keyboards/mode/m60h_f/config.h
+++ b/keyboards/mode/m60h_f/config.h
@@ -5,6 +5,6 @@
 
 #define WS2812_PWM_DRIVER PWMD4
 #define WS2812_PWM_CHANNEL 4
-#define WS2812_DMA_STREAM STM32_DMA1_STREAM6
-#define WS2812_DMA_CHANNEL 2
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM6
+#define WS2812_PWM_DMA_CHANNEL 2
 #define WS2812_PWM_TARGET_PERIOD 800000
\ No newline at end of file
diff --git a/keyboards/mode/m60s/config.h b/keyboards/mode/m60s/config.h
index f984cf28de9..cde4ffdbc61 100644
--- a/keyboards/mode/m60s/config.h
+++ b/keyboards/mode/m60s/config.h
@@ -5,6 +5,6 @@
 
 #define WS2812_PWM_DRIVER PWMD4
 #define WS2812_PWM_CHANNEL 4
-#define WS2812_DMA_STREAM STM32_DMA1_STREAM6
-#define WS2812_DMA_CHANNEL 2
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM6
+#define WS2812_PWM_DMA_CHANNEL 2
 #define WS2812_PWM_TARGET_PERIOD 800000
\ No newline at end of file
diff --git a/keyboards/moky/moky88/config.h b/keyboards/moky/moky88/config.h
new file mode 100644
index 00000000000..a673a38069c
--- /dev/null
+++ b/keyboards/moky/moky88/config.h
@@ -0,0 +1,19 @@
+// Copyright 2023 VertorWang (@itarze)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+/* SPI */
+#define SPI_DRIVER SPIDQ
+#define SPI_SCK_PIN B3
+#define SPI_MOSI_PIN B5
+#define SPI_MISO_PIN B4
+
+/* Flash */
+#define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN C12
+
+/* RGB Driver */
+#define AW20216S_CS_PIN_1 D2
+#define AW20216S_CS_PIN_2 B8
+#define AW20216S_EN_PIN_1 B9
+#define AW20216S_EN_PIN_2 B9
diff --git a/keyboards/moky/moky88/halconf.h b/keyboards/moky/moky88/halconf.h
new file mode 100644
index 00000000000..0a59a1fcb8e
--- /dev/null
+++ b/keyboards/moky/moky88/halconf.h
@@ -0,0 +1,10 @@
+// Copyright 2023 VertorWang (@itarze)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define HAL_USE_SPI TRUE
+#define SPI_USE_WAIT TRUE
+#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
+
+#include_next <halconf.h>
diff --git a/keyboards/moky/moky88/info.json b/keyboards/moky/moky88/info.json
new file mode 100644
index 00000000000..38ed4dbd289
--- /dev/null
+++ b/keyboards/moky/moky88/info.json
@@ -0,0 +1,272 @@
+{
+  "manufacturer": "moky",
+  "keyboard_name": "moky88",
+  "url": "",
+  "processor": "WB32FQ95",
+  "bootloader": "wb32-dfu",
+  "usb": {
+      "device_version": "1.0.0",
+      "vid": "0xBB4F",
+      "pid": "0x0001",
+      "suspend_wakeup_delay": 1000
+  },
+  "diode_direction": "ROW2COL",
+  "features": {
+      "bootmagic": true,
+      "extrakey": true,
+      "mousekey": true,
+      "nkro": true,
+      "rgb_matrix": true,
+      "encoder": true
+  },
+  "matrix_pins": {
+      "cols": ["C0", "C1", "C2", "C3", "A6", "B10", "B11", "B12", "B13", "B14", "B15", "C6", "C7", "C8", "C9", "A8", "C4"],
+      "rows": ["A0", "A1", "A2", "A3", "A4", "C13"]
+  },
+  "eeprom": {
+      "wear_leveling": {
+          "backing_size": 4096,
+          "driver": "spi_flash"
+      }
+  },
+  "encoder": {
+      "rotary": [
+          {"pin_a": "B6", "pin_b": "B7"}
+      ]
+  },
+  "rgb_matrix": {
+      "driver": "aw20216s",
+      "max_brightness": 108,
+      "animations": {
+          "alphas_mods": true,
+          "gradient_up_down": true,
+          "gradient_left_right": true,
+          "breathing": true,
+          "band_sat": true,
+          "band_val": true,
+          "band_pinwheel_sat": true,
+          "band_pinwheel_val": true,
+          "band_spiral_sat": true,
+          "band_spiral_val": true,
+          "cycle_all": true,
+          "cycle_left_right": true,
+          "cycle_up_down": true,
+          "cycle_out_in": true,
+          "cycle_out_in_dual": true,
+          "rainbow_moving_chevron": true,
+          "cycle_pinwheel": true,
+          "cycle_spiral": true,
+          "dual_beacon": true,
+          "rainbow_beacon": true,
+          "rainbow_pinwheels": true,
+          "raindrops": true,
+          "jellybean_raindrops": true,
+          "hue_breathing": true,
+          "hue_pendulum": true,
+          "hue_wave": true,
+          "pixel_fractal": true,
+          "pixel_flow": true,
+          "pixel_rain": true,
+          "typing_heatmap": true,
+          "digital_rain": true,
+          "solid_reactive_simple": true,
+          "solid_reactive": true,
+          "solid_reactive_wide": true,
+          "solid_reactive_multiwide": true,
+          "solid_reactive_cross": true,
+          "solid_reactive_multicross": true,
+          "solid_reactive_nexus": true,
+          "solid_reactive_multinexus": true,
+          "splash": true,
+          "multisplash": true,
+          "solid_splash": true,
+          "solid_multisplash": true
+      },
+      "layout": [
+            {"flags": 4, "matrix": [0, 0], "x": 0  , "y":  0},
+            {"flags": 4, "matrix": [0, 1], "x": 14 , "y":  0},
+            {"flags": 4, "matrix": [0, 2], "x": 28 , "y":  0},
+            {"flags": 4, "matrix": [0, 3], "x": 42 , "y":  0},
+            {"flags": 4, "matrix": [0, 4], "x": 56 , "y":  0},
+            {"flags": 4, "matrix": [0, 5], "x": 70 , "y":  0},
+            {"flags": 4, "matrix": [0, 6], "x": 84 , "y":  0},
+            {"flags": 4, "matrix": [0, 7], "x": 98 , "y":  0},
+            {"flags": 4, "matrix": [0, 8], "x": 112, "y":  0},
+            {"flags": 4, "matrix": [0, 9], "x": 126, "y":  0},
+            {"flags": 4, "matrix": [0,10], "x": 140, "y":  0},
+            {"flags": 4, "matrix": [0,11], "x": 154, "y":  0},
+            {"flags": 4, "matrix": [0,12], "x": 168, "y":  0},
+            {"flags": 4, "matrix": [0,13], "x": 182, "y":  0},
+            {"flags": 4, "matrix": [0,14], "x": 196, "y":  0},
+            {"flags": 4, "matrix": [0,15], "x": 210, "y":  0},
+            {"flags": 4, "matrix": [0,16], "x": 224, "y":  0},
+            {"flags": 4, "matrix": [1, 0], "x": 0  , "y": 13},
+            {"flags": 4, "matrix": [1, 1], "x": 14 , "y": 13},
+            {"flags": 4, "matrix": [1, 2], "x": 28 , "y": 13},
+            {"flags": 4, "matrix": [1, 3], "x": 42 , "y": 13},
+            {"flags": 4, "matrix": [1, 4], "x": 56 , "y": 13},
+            {"flags": 4, "matrix": [1, 5], "x": 70 , "y": 13},
+            {"flags": 4, "matrix": [1, 6], "x": 84 , "y": 13},
+            {"flags": 4, "matrix": [1, 7], "x": 98 , "y": 13},
+            {"flags": 4, "matrix": [1, 8], "x": 112, "y": 13},
+            {"flags": 4, "matrix": [1, 9], "x": 126, "y": 13},
+            {"flags": 4, "matrix": [1,10], "x": 140, "y": 13},
+            {"flags": 4, "matrix": [1,11], "x": 154, "y": 13},
+            {"flags": 4, "matrix": [1,12], "x": 168, "y": 13},
+            {"flags": 4, "matrix": [1,13], "x": 182, "y": 13},
+            {"flags": 4, "matrix": [1,14], "x": 196, "y": 13},
+            {"flags": 4, "matrix": [1,15], "x": 210, "y": 13},
+            {"flags": 4, "matrix": [1,16], "x": 224, "y": 13},
+            {"flags": 4, "matrix": [2, 0], "x": 0  , "y": 26},
+            {"flags": 4, "matrix": [2, 1], "x": 14 , "y": 26},
+            {"flags": 4, "matrix": [2, 2], "x": 28 , "y": 26},
+            {"flags": 4, "matrix": [2, 3], "x": 42 , "y": 26},
+            {"flags": 4, "matrix": [2, 4], "x": 56 , "y": 26},
+            {"flags": 4, "matrix": [2, 5], "x": 70 , "y": 26},
+            {"flags": 4, "matrix": [2, 6], "x": 84 , "y": 26},
+            {"flags": 4, "matrix": [2, 7], "x": 98 , "y": 26},
+            {"flags": 4, "matrix": [2, 8], "x": 112, "y": 26},
+            {"flags": 4, "matrix": [2, 9], "x": 126, "y": 26},
+            {"flags": 4, "matrix": [2,10], "x": 140, "y": 26},
+            {"flags": 4, "matrix": [2,11], "x": 154, "y": 26},
+            {"flags": 4, "matrix": [2,12], "x": 168, "y": 26},
+            {"flags": 4, "matrix": [2,13], "x": 182, "y": 26},
+            {"flags": 4, "matrix": [2,14], "x": 196, "y": 26},
+            {"flags": 4, "matrix": [2,15], "x": 210, "y": 26},
+            {"flags": 4, "matrix": [2,16], "x": 224, "y": 26},
+            {"flags": 4, "matrix": [3, 0], "x": 0  , "y": 39},
+            {"flags": 4, "matrix": [3, 1], "x": 14 , "y": 39},
+            {"flags": 4, "matrix": [3, 2], "x": 28 , "y": 39},
+            {"flags": 4, "matrix": [3, 3], "x": 42 , "y": 39},
+            {"flags": 4, "matrix": [3, 4], "x": 56 , "y": 39},
+            {"flags": 4, "matrix": [3, 5], "x": 70 , "y": 39},
+            {"flags": 4, "matrix": [3, 6], "x": 84 , "y": 39},
+            {"flags": 4, "matrix": [3, 7], "x": 98 , "y": 39},
+            {"flags": 4, "matrix": [3, 8], "x": 112, "y": 39},
+            {"flags": 4, "matrix": [3, 9], "x": 126, "y": 39},
+            {"flags": 4, "matrix": [3,10], "x": 140, "y": 39},
+            {"flags": 4, "matrix": [3,11], "x": 154, "y": 39},
+            {"flags": 4, "matrix": [3,13], "x": 182, "y": 39},
+            {"flags": 4, "matrix": [4, 0], "x": 0  , "y": 52},
+            {"flags": 4, "matrix": [4, 2], "x": 28 , "y": 52},
+            {"flags": 4, "matrix": [4, 3], "x": 42 , "y": 52},
+            {"flags": 4, "matrix": [4, 4], "x": 56 , "y": 52},
+            {"flags": 4, "matrix": [4, 5], "x": 70 , "y": 52},
+            {"flags": 4, "matrix": [4, 6], "x": 84 , "y": 52},
+            {"flags": 4, "matrix": [4, 7], "x": 98 , "y": 52},
+            {"flags": 4, "matrix": [4, 8], "x": 112, "y": 52},
+            {"flags": 4, "matrix": [4, 9], "x": 126, "y": 52},
+            {"flags": 4, "matrix": [4,10], "x": 140, "y": 52},
+            {"flags": 4, "matrix": [4,11], "x": 154, "y": 52},
+            {"flags": 4, "matrix": [4,13], "x": 182, "y": 52},
+            {"flags": 4, "matrix": [4,15], "x": 210, "y": 52},
+            {"flags": 4, "matrix": [5, 0], "x": 0  , "y": 64},
+            {"flags": 4, "matrix": [5, 1], "x": 14 , "y": 64},
+            {"flags": 4, "matrix": [5, 2], "x": 28 , "y": 64},
+            {"flags": 4, "matrix": [5, 6], "x": 84 , "y": 64},
+            {"flags": 4, "matrix": [5,10], "x": 140, "y": 64},
+            {"flags": 4, "matrix": [5,11], "x": 154, "y": 64},
+            {"flags": 4, "matrix": [5,12], "x": 168, "y": 64},
+            {"flags": 4, "matrix": [5,13], "x": 182, "y": 64},
+            {"flags": 4, "matrix": [5,14], "x": 196, "y": 64},
+            {"flags": 4, "matrix": [5,15], "x": 210, "y": 64},
+            {"flags": 4, "matrix": [5,16], "x": 224, "y": 64}
+        ],
+        "sleep": true
+  },
+  "community_layouts": ["tkl_f13_ansi"],
+  "layouts": {
+      "LAYOUT_tkl_f13_ansi": {
+          "layout": [
+            {"matrix": [0,0], "x": 0, "y": 0 },
+            {"matrix": [0,1], "x": 1.5, "y": 0 },
+            {"matrix": [0,2], "x": 2.5, "y": 0 },
+            {"matrix": [0,3], "x": 3.5, "y": 0 },
+            {"matrix": [0,4], "x": 4.5, "y": 0 },
+            {"matrix": [0,5], "x": 5.75, "y": 0 },
+            {"matrix": [0,6], "x": 6.75, "y": 0 },
+            {"matrix": [0,7], "x": 7.75, "y": 0 },
+            {"matrix": [0,8], "x": 8.75, "y": 0 },
+            {"matrix": [0,9], "x": 10, "y": 0 },
+            {"matrix": [0,10], "x": 11, "y": 0 },
+            {"matrix": [0,11], "x": 12, "y": 0 },
+            {"matrix": [0,12], "x": 13, "y": 0 },
+            {"matrix": [0,13], "x": 14.25, "y": 0 },
+            {"matrix": [0,14], "x": 15.75, "y": 0 },
+            {"matrix": [0,15], "x": 16.75, "y": 0 },
+            {"matrix": [0,16], "x": 17.75, "y": 0 },
+            {"matrix": [1,0], "x": 0, "y": 1.25 },
+            {"matrix": [1,1], "x": 1, "y": 1.25 },
+            {"matrix": [1,2], "x": 2, "y": 1.25 },
+            {"matrix": [1,3], "x": 3, "y": 1.25 },
+            {"matrix": [1,4], "x": 4, "y": 1.25 },
+            {"matrix": [1,5], "x": 5, "y": 1.25 },
+            {"matrix": [1,6], "x": 6, "y": 1.25 },
+            {"matrix": [1,7], "x": 7, "y": 1.25 },
+            {"matrix": [1,8], "x": 8, "y": 1.25 },
+            {"matrix": [1,9], "x": 9, "y": 1.25 },
+            {"matrix": [1,10], "x": 10, "y": 1.25 },
+            {"matrix": [1,11], "x": 11, "y": 1.25 },
+            {"matrix": [1,12], "x": 12, "y": 1.25 },
+            {"matrix": [1,13], "x": 13, "y": 1.25, "w": 2.25 },
+            {"matrix": [1,14], "x": 15.75, "y": 1.25 },
+            {"matrix": [1,15], "x": 16.75, "y": 1.25 },
+            {"matrix": [1,16], "x": 17.75, "y": 1.25 },
+            {"matrix": [2,0], "x": 0, "y": 2.25, "w": 1.5 },
+            {"matrix": [2,1], "x": 1.5, "y": 2.25 },
+            {"matrix": [2,2], "x": 2.5, "y": 2.25 },
+            {"matrix": [2,3], "x": 3.5, "y": 2.25 },
+            {"matrix": [2,4], "x": 4.5, "y": 2.25 },
+            {"matrix": [2,5], "x": 5.5, "y": 2.25 },
+            {"matrix": [2,6], "x": 6.5, "y": 2.25 },
+            {"matrix": [2,7], "x": 7.5, "y": 2.25 },
+            {"matrix": [2,8], "x": 8.5, "y": 2.25 },
+            {"matrix": [2,9], "x": 9.5, "y": 2.25 },
+            {"matrix": [2,10], "x": 10.5, "y": 2.25 },
+            {"matrix": [2,11], "x": 11.5, "y": 2.25 },
+            {"matrix": [2,12], "x": 12.5, "y": 2.25 },
+            {"matrix": [2,13], "x": 13.5, "y": 2.25, "w": 1.75 },
+            {"matrix": [2,14], "x": 15.75, "y": 2.25 },
+            {"matrix": [2,15], "x": 16.75, "y": 2.25 },
+            {"matrix": [2,16], "x": 17.75, "y": 2.25 },
+            {"matrix": [3,0], "x": 0, "y": 3.25, "w": 1.75 },
+            {"matrix": [3,1], "x": 1.75, "y": 3.25 },
+            {"matrix": [3,2], "x": 2.75, "y": 3.25 },
+            {"matrix": [3,3], "x": 3.75, "y": 3.25 },
+            {"matrix": [3,4], "x": 4.75, "y": 3.25 },
+            {"matrix": [3,5], "x": 5.75, "y": 3.25 },
+            {"matrix": [3,6], "x": 6.75, "y": 3.25 },
+            {"matrix": [3,7], "x": 7.75, "y": 3.25 },
+            {"matrix": [3,8], "x": 8.75, "y": 3.25 },
+            {"matrix": [3,9], "x": 9.75, "y": 3.25 },
+            {"matrix": [3,10], "x": 10.75, "y": 3.25 },
+            {"matrix": [3,11], "x": 11.75, "y": 3.25 },
+            {"matrix": [3,13], "x": 12.75, "y": 3.25, "w": 2.5 },
+            {"matrix": [4,0], "x": 0, "y": 4.25, "w": 2.25 },
+            {"matrix": [4,2], "x": 2.25, "y": 4.25 },
+            {"matrix": [4,3], "x": 3.25, "y": 4.25 },
+            {"matrix": [4,4], "x": 4.25, "y": 4.25 },
+            {"matrix": [4,5], "x": 5.25, "y": 4.25 },
+            {"matrix": [4,6], "x": 6.25, "y": 4.25 },
+            {"matrix": [4,7], "x": 7.25, "y": 4.25 },
+            {"matrix": [4,8], "x": 8.25, "y": 4.25 },
+            {"matrix": [4,9], "x": 9.25, "y": 4.25 },
+            {"matrix": [4,10], "x": 10.25, "y": 4.25 },
+            {"matrix": [4,11], "x": 11.25, "y": 4.25 },
+            {"matrix": [4,13], "x": 12.25, "y": 4.25, "w": 3 },
+            {"matrix": [4,15], "x": 16.75, "y": 4.25 },
+            {"matrix": [5,0], "x": 0, "y": 5.25, "w": 1.25 },
+            {"matrix": [5,1], "x": 1.25, "y": 5.25, "w": 1.25 },
+            {"matrix": [5,2], "x": 2.5, "y": 5.25, "w": 1.25 },
+            {"matrix": [5,6], "x": 3.75, "y": 5.25, "w": 6.5 },
+            {"matrix": [5,10], "x": 10.25, "y": 5.25, "w": 1.25 },
+            {"matrix": [5,11], "x": 11.5, "y": 5.25, "w": 1.25 },
+            {"matrix": [5,12], "x": 12.75, "y": 5.25, "w": 1.25 },
+            {"matrix": [5,13], "x": 14, "y": 5.25, "w": 1.25 },
+            {"matrix": [5,14], "x": 15.75, "y": 5.25 },
+            {"matrix": [5,15], "x": 16.75, "y": 5.25 },
+            {"matrix": [5,16], "x": 17.75, "y": 5.25 }
+          ]
+      }
+  }
+}
diff --git a/keyboards/moky/moky88/keymaps/default/keymap.c b/keyboards/moky/moky88/keymaps/default/keymap.c
new file mode 100644
index 00000000000..5b86c306cfd
--- /dev/null
+++ b/keyboards/moky/moky88/keymaps/default/keymap.c
@@ -0,0 +1,73 @@
+// Copyright 2023 VertorWang (@itarze)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT_tkl_f13_ansi( /* Base */
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_MUTE, KC_PSCR, KC_SCRL, KC_PAUSE,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,                   KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),   KC_APP,  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+
+    [1] = LAYOUT_tkl_f13_ansi( /* Base */
+        _______, KC_MSEL, KC_VOLD, KC_VOLU, KC_MUTE, KC_MSTP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MAIL, KC_WHOM, KC_CALC, KC_WSCH, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, RGB_TOG, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_SAI, RGB_MOD, _______, _______, _______,
+        _______, TO(0),   TO(2),   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,                   RGB_VAI,
+        _______, GU_TOGG, _______,                            _______,                            _______, _______, _______, _______, RGB_HUD, RGB_VAD, RGB_HUI),
+
+    [2] = LAYOUT_tkl_f13_ansi(  /* Base */
+        KC_ESC,  KC_BRMD, KC_BRMU, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_MUTE, KC_PSCR, KC_SCRL, KC_PAUSE,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,                   KC_UP,
+        KC_LCTL, KC_LALT, KC_LGUI,                            KC_SPC,                             KC_RGUI, MO(3),   KC_APP,  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+
+    [3] = LAYOUT_tkl_f13_ansi(  /* FN */
+        _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_MUTE, KC_PSCR, KC_SCRL, KC_PAUSE,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, RGB_TOG, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_SAI, RGB_MOD, _______, _______, _______,
+        _______, TO(0),   TO(2),   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,                   RGB_VAI,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______, RGB_HUD, RGB_VAD, RGB_HUI),
+};
+
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+
+    [0] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD)},
+    [1] = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD)},
+    [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)},
+    [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)},
+};
+
+bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
+
+    if (get_highest_layer(default_layer_state | layer_state) == 1) {
+        rgb_matrix_set_color(52, RGB_WHITE);
+    } else if (get_highest_layer(default_layer_state | layer_state) == 3) {
+        rgb_matrix_set_color(53, RGB_WHITE);
+    }
+
+    if (host_keyboard_led_state().caps_lock) {
+        RGB_MATRIX_INDICATOR_SET_COLOR(51, RGB_MATRIX_MAXIMUM_BRIGHTNESS, RGB_MATRIX_MAXIMUM_BRIGHTNESS, RGB_MATRIX_MAXIMUM_BRIGHTNESS);
+    }
+    if (host_keyboard_led_state().scroll_lock) {
+        RGB_MATRIX_INDICATOR_SET_COLOR(15, RGB_MATRIX_MAXIMUM_BRIGHTNESS, RGB_MATRIX_MAXIMUM_BRIGHTNESS, RGB_MATRIX_MAXIMUM_BRIGHTNESS);
+    }
+    if (keymap_config.no_gui) {
+        if (get_highest_layer(default_layer_state) == 0) {
+            RGB_MATRIX_INDICATOR_SET_COLOR(80, RGB_MATRIX_MAXIMUM_BRIGHTNESS, RGB_MATRIX_MAXIMUM_BRIGHTNESS, RGB_MATRIX_MAXIMUM_BRIGHTNESS);
+        } else if (get_highest_layer(default_layer_state) == 2) {
+            RGB_MATRIX_INDICATOR_SET_COLOR(81, RGB_MATRIX_MAXIMUM_BRIGHTNESS, RGB_MATRIX_MAXIMUM_BRIGHTNESS, RGB_MATRIX_MAXIMUM_BRIGHTNESS);
+        }
+    }
+
+    return true;
+}
diff --git a/keyboards/moky/moky88/keymaps/default/rules.mk b/keyboards/moky/moky88/keymaps/default/rules.mk
new file mode 100644
index 00000000000..ee325681483
--- /dev/null
+++ b/keyboards/moky/moky88/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/moky/moky88/keymaps/via/keymap.c b/keyboards/moky/moky88/keymaps/via/keymap.c
new file mode 100644
index 00000000000..c67ded7b65b
--- /dev/null
+++ b/keyboards/moky/moky88/keymaps/via/keymap.c
@@ -0,0 +1,73 @@
+// Copyright 2023 VertorWang (@itarze)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT_tkl_f13_ansi( /* Base */
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_MUTE, KC_PSCR, KC_SCRL, KC_PAUSE,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,                   KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),   KC_APP,  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+
+    [1] = LAYOUT_tkl_f13_ansi( /* Base */
+        QK_BOOT, KC_MSEL, KC_VOLD, KC_VOLU, KC_MUTE, KC_MSTP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MAIL, KC_WHOM, KC_CALC, KC_WSCH, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, RGB_TOG, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_SAI, RGB_MOD, _______, _______, _______,
+        _______, TO(0),   TO(2),   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,                   RGB_VAI,
+        _______, GU_TOGG, _______,                            _______,                            _______, _______, _______, _______, RGB_HUD, RGB_VAD, RGB_HUI),
+
+    [2] = LAYOUT_tkl_f13_ansi(  /* Base */
+        KC_ESC,  KC_BRMD, KC_BRMU, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_MUTE, KC_PSCR, KC_SCRL, KC_PAUSE,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,                   KC_UP,
+        KC_LCTL, KC_LALT, KC_LGUI,                            KC_SPC,                             KC_RGUI, MO(3),   KC_APP,  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+
+    [3] = LAYOUT_tkl_f13_ansi(  /* FN */
+        QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_MUTE, KC_PSCR, KC_SCRL, KC_PAUSE,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, RGB_TOG, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_SAI, RGB_MOD, _______, _______, _______,
+        _______, TO(0),   TO(2),   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,                   RGB_VAI,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______, RGB_HUD, RGB_VAD, RGB_HUI),
+};
+
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+
+    [0] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD)},
+    [1] = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD)},
+    [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)},
+    [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)},
+};
+
+bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
+
+    if (get_highest_layer(default_layer_state | layer_state) == 1) {
+        rgb_matrix_set_color(52, RGB_WHITE);
+    } else if (get_highest_layer(default_layer_state | layer_state) == 3) {
+        rgb_matrix_set_color(53, RGB_WHITE);
+    }
+
+    if (host_keyboard_led_state().caps_lock) {
+        RGB_MATRIX_INDICATOR_SET_COLOR(51, RGB_MATRIX_MAXIMUM_BRIGHTNESS, RGB_MATRIX_MAXIMUM_BRIGHTNESS, RGB_MATRIX_MAXIMUM_BRIGHTNESS);
+    }
+    if (host_keyboard_led_state().scroll_lock) {
+        RGB_MATRIX_INDICATOR_SET_COLOR(15, RGB_MATRIX_MAXIMUM_BRIGHTNESS, RGB_MATRIX_MAXIMUM_BRIGHTNESS, RGB_MATRIX_MAXIMUM_BRIGHTNESS);
+    }
+    if (keymap_config.no_gui) {
+        if (get_highest_layer(default_layer_state) == 0) {
+            RGB_MATRIX_INDICATOR_SET_COLOR(80, RGB_MATRIX_MAXIMUM_BRIGHTNESS, RGB_MATRIX_MAXIMUM_BRIGHTNESS, RGB_MATRIX_MAXIMUM_BRIGHTNESS);
+        } else if (get_highest_layer(default_layer_state) == 2) {
+            RGB_MATRIX_INDICATOR_SET_COLOR(81, RGB_MATRIX_MAXIMUM_BRIGHTNESS, RGB_MATRIX_MAXIMUM_BRIGHTNESS, RGB_MATRIX_MAXIMUM_BRIGHTNESS);
+        }
+    }
+
+    return true;
+}
diff --git a/keyboards/keebio/sinc/keymaps/lickel/rules.mk b/keyboards/moky/moky88/keymaps/via/rules.mk
similarity index 71%
rename from keyboards/keebio/sinc/keymaps/lickel/rules.mk
rename to keyboards/moky/moky88/keymaps/via/rules.mk
index 1189f4ad192..715838ecc5d 100644
--- a/keyboards/keebio/sinc/keymaps/lickel/rules.mk
+++ b/keyboards/moky/moky88/keymaps/via/rules.mk
@@ -1,3 +1,2 @@
-VIA_ENABLE = yes
-LTO_ENABLE = yes
 ENCODER_MAP_ENABLE = yes
+VIA_ENABLE = yes
diff --git a/keyboards/keychron/q2/ansi/keymaps/ladduro/keymap_user.h b/keyboards/moky/moky88/mcuconf.h
similarity index 83%
rename from keyboards/keychron/q2/ansi/keymaps/ladduro/keymap_user.h
rename to keyboards/moky/moky88/mcuconf.h
index ded78ae1b8e..848f55377e5 100644
--- a/keyboards/keychron/q2/ansi/keymaps/ladduro/keymap_user.h
+++ b/keyboards/moky/moky88/mcuconf.h
@@ -1,4 +1,4 @@
-/* Copyright 2022 @ Ionut Micu
+/* Copyright (C) 2023 Westberry Technology Corp., Ltd
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,12 +16,7 @@
 
 #pragma once
 
-// clang-format off
+#include_next <mcuconf.h>
 
-enum layers{
-    MAC_BASE,
-    WIN_BASE,
-    _FN1,
-    _FN2,
-    _FN3,
-};
\ No newline at end of file
+#undef WB32_SPI_USE_QSPI
+#define WB32_SPI_USE_QSPI TRUE
diff --git a/keyboards/moky/moky88/moky88.c b/keyboards/moky/moky88/moky88.c
new file mode 100644
index 00000000000..3cbd6e14681
--- /dev/null
+++ b/keyboards/moky/moky88/moky88.c
@@ -0,0 +1,119 @@
+/* Copyright (C) 2023 Westberry Technology Corp., Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const aw20216s_led_t PROGMEM g_aw20216s_leds[AW20216S_LED_COUNT] = {
+/* Refer to IS31 manual for these locations
+ *   driver
+ *   |  R location
+ *   |  |          G location
+ *   |  |          |          B location
+ *   |  |          |          | */
+    {0, CS18_SW2,  CS17_SW2,  CS16_SW2   },  // 0  Esc
+    {0, CS18_SW3,  CS17_SW3,  CS16_SW3   },  // 1  F1
+    {0, CS18_SW4,  CS17_SW4,  CS16_SW4   },  // 2  F2
+    {0, CS18_SW5,  CS17_SW5,  CS16_SW5   },  // 3  F3
+    {0, CS18_SW6,  CS17_SW6,  CS16_SW6   },  // 4  F4
+    {0, CS18_SW7,  CS17_SW7,  CS16_SW7   },  // 5  F5
+    {0, CS18_SW8,  CS17_SW8,  CS16_SW8   },  // 6  F6
+    {0, CS18_SW9,  CS17_SW9,  CS16_SW9   },  // 7  F7
+    {0, CS18_SW10, CS17_SW10, CS16_SW10  },  // 8  F8
+    {0, CS18_SW11, CS17_SW11, CS16_SW11  },  // 9  F9
+    {0, CS18_SW12, CS17_SW12, CS16_SW12  },  // 10 F10
+    {1, CS18_SW1,  CS17_SW1,  CS16_SW1   },  // 11 F11
+    {1, CS18_SW2,  CS17_SW2,  CS16_SW2   },  // 12 F12
+    {1, CS18_SW3,  CS17_SW3,  CS16_SW3   },  // 13 MUTE
+    {1, CS18_SW4,  CS17_SW4,  CS16_SW4   },  // 14 PSCR
+    {1, CS18_SW5,  CS17_SW5,  CS16_SW5   },  // 15 SCRL
+    {1, CS18_SW6,  CS17_SW6,  CS16_SW6   },  // 16 PAUSE
+
+    {0, CS15_SW2,  CS14_SW2,  CS13_SW2   },  // 17 `~
+    {0, CS15_SW3,  CS14_SW3,  CS13_SW3   },  // 18 1
+    {0, CS15_SW4,  CS14_SW4,  CS13_SW4   },  // 19 2
+    {0, CS15_SW5,  CS14_SW5,  CS13_SW5   },  // 20 3
+    {0, CS15_SW6,  CS14_SW6,  CS13_SW6   },  // 21 4
+    {0, CS15_SW7,  CS14_SW7,  CS13_SW7   },  // 22 5
+    {0, CS15_SW8,  CS14_SW8,  CS13_SW8   },  // 23 6
+    {0, CS15_SW9,  CS14_SW9,  CS13_SW9   },  // 24 7
+    {0, CS15_SW10, CS14_SW10, CS13_SW10  },  // 25 8
+    {0, CS15_SW11, CS14_SW11, CS13_SW11  },  // 26 9
+    {0, CS15_SW12, CS14_SW12, CS13_SW12  },  // 27 0
+    {1, CS15_SW1,  CS14_SW1,  CS13_SW1   },  // 28 -_
+    {1, CS15_SW2,  CS14_SW2,  CS13_SW2   },  // 29 =+
+    {1, CS15_SW3,  CS14_SW3,  CS13_SW3   },  // 30 BSPC
+    {1, CS15_SW4,  CS14_SW4,  CS13_SW4   },  // 31 INS
+    {1, CS15_SW5,  CS14_SW5,  CS13_SW5   },  // 32 HOME
+    {1, CS15_SW6,  CS14_SW6,  CS13_SW6   },  // 33 PGUP
+
+    {0, CS12_SW2,  CS11_SW2,  CS10_SW2   },  // 34 Tab
+    {0, CS12_SW3,  CS11_SW3,  CS10_SW3   },  // 35 Q
+    {0, CS12_SW4,  CS11_SW4,  CS10_SW4   },  // 36 W
+    {0, CS12_SW5,  CS11_SW5,  CS10_SW5   },  // 37 E
+    {0, CS12_SW6,  CS11_SW6,  CS10_SW6   },  // 38 R
+    {0, CS12_SW7,  CS11_SW7,  CS10_SW7   },  // 39 T
+    {0, CS12_SW8,  CS11_SW8,  CS10_SW8   },  // 40 Y
+    {0, CS12_SW9,  CS11_SW9,  CS10_SW9   },  // 41 U
+    {0, CS12_SW10, CS11_SW10, CS10_SW10  },  // 42 I
+    {0, CS12_SW11, CS11_SW11, CS10_SW11  },  // 43 O
+    {0, CS12_SW12, CS11_SW12, CS10_SW12  },  // 44 P
+    {1, CS12_SW1,  CS11_SW1,  CS10_SW1   },  // 45 [{
+    {1, CS12_SW2,  CS11_SW2,  CS10_SW2   },  // 48 ]}
+    {1, CS12_SW3,  CS11_SW3,  CS10_SW3   },  // 47 \|
+    {1, CS12_SW4,  CS11_SW4,  CS10_SW4   },  // 48 Del
+    {1, CS12_SW5,  CS11_SW5,  CS10_SW5   },  // 49 End
+    {1, CS12_SW6,  CS11_SW6,  CS10_SW6   },  // 50 PGDN
+
+    {0, CS1_SW2,   CS2_SW2,   CS3_SW2    },  // 51 Caps
+    {0, CS1_SW3,   CS2_SW3,   CS3_SW3    },  // 52 A
+    {0, CS1_SW4,   CS2_SW4,   CS3_SW4    },  // 33 S
+    {0, CS1_SW5,   CS2_SW5,   CS3_SW5    },  // 54 D
+    {0, CS1_SW6,   CS2_SW6,   CS3_SW6    },  // 55 F
+    {0, CS1_SW7,   CS2_SW7,   CS3_SW7    },  // 56 G
+    {0, CS1_SW8,   CS2_SW8,   CS3_SW8    },  // 57 H
+    {0, CS1_SW9,   CS2_SW9,   CS3_SW9    },  // 58 J
+    {0, CS1_SW10,  CS2_SW10,  CS3_SW10   },  // 59 K
+    {0, CS1_SW11,  CS2_SW11,  CS3_SW11   },  // 60 L
+    {0, CS1_SW12,  CS2_SW12,  CS3_SW12   },  // 61 ;:
+    {1, CS1_SW1,   CS2_SW1,   CS3_SW1    },  // 62 '
+    {1, CS1_SW3,   CS2_SW3,   CS3_SW3    },  // 63 Enter
+
+    {0, CS4_SW2,   CS5_SW2,   CS6_SW2    },  // 64 Shift
+    {0, CS4_SW4,   CS5_SW4,   CS6_SW4    },  // 65 Z
+    {0, CS4_SW5,   CS5_SW5,   CS6_SW5    },  // 66 X
+    {0, CS4_SW6,   CS5_SW6,   CS6_SW6    },  // 67 C
+    {0, CS4_SW7,   CS5_SW7,   CS6_SW7    },  // 68 V
+    {0, CS4_SW8,   CS5_SW8,   CS6_SW8    },  // 69 B
+    {0, CS4_SW9,   CS5_SW9,   CS6_SW9    },  // 70 N
+    {0, CS4_SW10,  CS5_SW10,  CS6_SW10   },  // 71 M
+    {0, CS4_SW11,  CS5_SW11,  CS6_SW11   },  // 72 ,<
+    {0, CS4_SW12,  CS5_SW12,  CS6_SW12   },  // 73 .>
+    {1, CS4_SW1,   CS5_SW1,   CS6_SW1    },  // 74 ?
+    {1, CS4_SW3,   CS5_SW3,   CS6_SW3    },  // 75 Shift
+    {1, CS4_SW5,   CS5_SW5,   CS6_SW5    },  // 76 Up
+
+    {0, CS7_SW2,   CS8_SW2,   CS9_SW2    },  // 77 Ctrl_L
+    {0, CS7_SW3,   CS8_SW3,   CS9_SW3    },  // 78 Win_L
+    {0, CS7_SW4,   CS8_SW4,   CS9_SW4    },  // 79 ALT_L
+    {0, CS7_SW8,   CS8_SW8,   CS9_SW8    },  // 80 SPACE
+    {0, CS7_SW12,  CS8_SW12,  CS9_SW12   },  // 81 ALT_L
+    {1, CS7_SW1,   CS8_SW1,   CS9_SW1    },  // 82 Win_L
+    {1, CS7_SW2,   CS8_SW2,   CS9_SW2    },  // 83 Fn
+    {1, CS7_SW3,   CS8_SW3,   CS9_SW3    },  // 84 Ctrl_L
+    {1, CS7_SW4,   CS8_SW4,   CS9_SW4    },  // 85 Left
+    {1, CS7_SW5,   CS8_SW5,   CS9_SW5    },  // 86 Down
+    {1, CS7_SW6,   CS8_SW6,   CS9_SW6    },  // 87 Right
+};
diff --git a/keyboards/moky/moky88/readme.md b/keyboards/moky/moky88/readme.md
new file mode 100644
index 00000000000..62dc876eb2c
--- /dev/null
+++ b/keyboards/moky/moky88/readme.md
@@ -0,0 +1,26 @@
+# moky88
+![moky/moky88](https://i.imgur.com/lssV4bq.png)
+
+An in-switch RGB LED keyboard with RGB underglow.
+
+* Keyboard Maintainer: [Vertor](https://github.com/VertorWang)
+* Hardware Supported: moky88
+* Hardware Availability: Private GB 
+
+Make example for this keyboard (after setting up your build environment):
+
+    make moky/moky88:default
+
+Flashing example for this keyboard:
+
+    make moky/moky88:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/moky/moky88/rules.mk b/keyboards/moky/moky88/rules.mk
new file mode 100644
index 00000000000..7ff128fa692
--- /dev/null
+++ b/keyboards/moky/moky88/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/momokai/aurora/info.json b/keyboards/momokai/aurora/info.json
index 888398aa363..84ecbdeb4a1 100644
--- a/keyboards/momokai/aurora/info.json
+++ b/keyboards/momokai/aurora/info.json
@@ -43,6 +43,12 @@
         "pin": "C7"
     },
     "rgb_matrix": {
+        "default": {
+            "animation": "solid_color",
+            "hue": 0,
+            "sat": 0,
+            "val": 200
+        },
         "animations": {
             "gradient_up_down": true,
             "gradient_left_right": true,
diff --git a/keyboards/momokai/tap_duo/info.json b/keyboards/momokai/tap_duo/info.json
index 9a0a9a2e1d1..cbf5ce94d7d 100644
--- a/keyboards/momokai/tap_duo/info.json
+++ b/keyboards/momokai/tap_duo/info.json
@@ -12,6 +12,12 @@
         "pin": "F0"
     },
     "rgb_matrix": {
+        "default": {
+            "animation": "solid_color",
+            "hue": 0,
+            "sat": 0,
+            "val": 200
+        },
         "animations": {
             "gradient_left_right": true,
             "breathing": true,
diff --git a/keyboards/momokai/tap_trio/info.json b/keyboards/momokai/tap_trio/info.json
index f995501969c..c2ff9a5ff78 100644
--- a/keyboards/momokai/tap_trio/info.json
+++ b/keyboards/momokai/tap_trio/info.json
@@ -12,6 +12,12 @@
         "pin": "F0"
     },
     "rgb_matrix": {
+        "default": {
+            "animation": "solid_color",
+            "hue": 0,
+            "sat": 0,
+            "val": 200
+        },
         "animations": {
             "gradient_up_down": true,
             "gradient_left_right": true,
diff --git a/keyboards/monsgeek/m1/m1.c b/keyboards/monsgeek/m1/m1.c
index a0375b2c0f7..006eb66d7f9 100644
--- a/keyboards/monsgeek/m1/m1.c
+++ b/keyboards/monsgeek/m1/m1.c
@@ -24,121 +24,121 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {1, A_1,   B_1,   C_1},
-    {1, A_2,   B_2,   C_2},
-    {1, A_3,   B_3,   C_3},
-    {1, A_4,   B_4,   C_4},
-    {1, A_5,   B_5,   C_5},
-    {1, A_6,   B_6,   C_6},
-    {1, A_7,   B_7,   C_7},
-    {1, A_8,   B_8,   C_8},
-    {1, A_9,   B_9,   C_9},
-    {1, A_10,  B_10,  C_10},
-    {1, A_11,  B_11,  C_11},
-    {1, A_12,  B_12,  C_12},
-    {1, A_13,  B_13,  C_13},
-    {1, A_14,  B_14,  C_14},
+    {1, CB1_CA1,   CB2_CA1,   CB3_CA1},
+    {1, CB1_CA2,   CB2_CA2,   CB3_CA2},
+    {1, CB1_CA3,   CB2_CA3,   CB3_CA3},
+    {1, CB1_CA4,   CB2_CA4,   CB3_CA4},
+    {1, CB1_CA5,   CB2_CA5,   CB3_CA5},
+    {1, CB1_CA6,   CB2_CA6,   CB3_CA6},
+    {1, CB1_CA7,   CB2_CA7,   CB3_CA7},
+    {1, CB1_CA8,   CB2_CA8,   CB3_CA8},
+    {1, CB1_CA9,   CB2_CA9,   CB3_CA9},
+    {1, CB1_CA10,  CB2_CA10,  CB3_CA10},
+    {1, CB1_CA11,  CB2_CA11,  CB3_CA11},
+    {1, CB1_CA12,  CB2_CA12,  CB3_CA12},
+    {1, CB1_CA13,  CB2_CA13,  CB3_CA13},
+    {1, CB1_CA14,  CB2_CA14,  CB3_CA14},
 
-    {0, A_1,   B_1,   C_1},
-    {0, A_2,   B_2,   C_2},
-    {0, A_3,   B_3,   C_3},
-    {0, A_4,   B_4,   C_4},
-    {0, A_5,   B_5,   C_5},
-    {0, A_6,   B_6,   C_6},
-    {0, A_7,   B_7,   C_7},
-    {0, A_8,   B_8,   C_8},
-    {0, A_9,   B_9,   C_9},
-    {0, A_10,  B_10,  C_10},
-    {0, A_11,  B_11,  C_11},
-    {0, A_12,  B_12,  C_12},
-    {0, A_13,  B_13,  C_13},
-    {0, A_14,  B_14,  C_14},
-    {1, D_1,   E_1,   F_1},
+    {0, CB1_CA1,   CB2_CA1,   CB3_CA1},
+    {0, CB1_CA2,   CB2_CA2,   CB3_CA2},
+    {0, CB1_CA3,   CB2_CA3,   CB3_CA3},
+    {0, CB1_CA4,   CB2_CA4,   CB3_CA4},
+    {0, CB1_CA5,   CB2_CA5,   CB3_CA5},
+    {0, CB1_CA6,   CB2_CA6,   CB3_CA6},
+    {0, CB1_CA7,   CB2_CA7,   CB3_CA7},
+    {0, CB1_CA8,   CB2_CA8,   CB3_CA8},
+    {0, CB1_CA9,   CB2_CA9,   CB3_CA9},
+    {0, CB1_CA10,  CB2_CA10,  CB3_CA10},
+    {0, CB1_CA11,  CB2_CA11,  CB3_CA11},
+    {0, CB1_CA12,  CB2_CA12,  CB3_CA12},
+    {0, CB1_CA13,  CB2_CA13,  CB3_CA13},
+    {0, CB1_CA14,  CB2_CA14,  CB3_CA14},
+    {1, CB4_CA1,   CB5_CA1,   CB6_CA1},
 
-    {0, D_1,   E_1,   F_1},
-    {0, D_2,   E_2,   F_2},
-    {0, D_3,   E_3,   F_3},
-    {0, D_4,   E_4,   F_4},
-    {0, D_5,   E_5,   F_5},
-    {0, D_6,   E_6,   F_6},
-    {0, D_7,   E_7,   F_7},
-    {0, D_8,   E_8,   F_8},
-    {0, D_9,   E_9,   F_9},
-    {0, D_10,  E_10,  F_10},
-    {0, D_11,  E_11,  F_11},
-    {0, D_12,  E_12,  F_12},
-    {0, D_13,  E_13,  F_13},
-    {0, D_14,  E_14,  F_14},
-    {1, D_2,   E_2,   F_2},
+    {0, CB4_CA1,   CB5_CA1,   CB6_CA1},
+    {0, CB4_CA2,   CB5_CA2,   CB6_CA2},
+    {0, CB4_CA3,   CB5_CA3,   CB6_CA3},
+    {0, CB4_CA4,   CB5_CA4,   CB6_CA4},
+    {0, CB4_CA5,   CB5_CA5,   CB6_CA5},
+    {0, CB4_CA6,   CB5_CA6,   CB6_CA6},
+    {0, CB4_CA7,   CB5_CA7,   CB6_CA7},
+    {0, CB4_CA8,   CB5_CA8,   CB6_CA8},
+    {0, CB4_CA9,   CB5_CA9,   CB6_CA9},
+    {0, CB4_CA10,  CB5_CA10,  CB6_CA10},
+    {0, CB4_CA11,  CB5_CA11,  CB6_CA11},
+    {0, CB4_CA12,  CB5_CA12,  CB6_CA12},
+    {0, CB4_CA13,  CB5_CA13,  CB6_CA13},
+    {0, CB4_CA14,  CB5_CA14,  CB6_CA14},
+    {1, CB4_CA2,   CB5_CA2,   CB6_CA2},
 
-    {0, G_1,   H_1,   I_1},
-    {0, G_2,   H_2,   I_2},
-    {0, G_3,   H_3,   I_3},
-    {0, G_4,   H_4,   I_4},
-    {0, G_5,   H_5,   I_5},
-    {0, G_6,   H_6,   I_6},
-    {0, G_7,   H_7,   I_7},
-    {0, G_8,   H_8,   I_8},
-    {0, G_9,   H_9,   I_9},
-    {0, G_10,  H_10,  I_10},
-    {0, G_11,  H_11,  I_11},
-    {0, G_12,  H_12,  I_12},
-    {0, A_15,  B_15,  C_15},
-    {0, G_13,  H_13,  I_13},
-    {1, D_3,   E_3,   F_3},
+    {0, CB7_CA1,   CB8_CA1,   CB9_CA1},
+    {0, CB7_CA2,   CB8_CA2,   CB9_CA2},
+    {0, CB7_CA3,   CB8_CA3,   CB9_CA3},
+    {0, CB7_CA4,   CB8_CA4,   CB9_CA4},
+    {0, CB7_CA5,   CB8_CA5,   CB9_CA5},
+    {0, CB7_CA6,   CB8_CA6,   CB9_CA6},
+    {0, CB7_CA7,   CB8_CA7,   CB9_CA7},
+    {0, CB7_CA8,   CB8_CA8,   CB9_CA8},
+    {0, CB7_CA9,   CB8_CA9,   CB9_CA9},
+    {0, CB7_CA10,  CB8_CA10,  CB9_CA10},
+    {0, CB7_CA11,  CB8_CA11,  CB9_CA11},
+    {0, CB7_CA12,  CB8_CA12,  CB9_CA12},
+    {0, CB1_CA15,  CB2_CA15,  CB3_CA15},
+    {0, CB7_CA13,  CB8_CA13,  CB9_CA13},
+    {1, CB4_CA3,   CB5_CA3,   CB6_CA3},
 
-    {0, J_1,   K_1,   L_1},
-    {0, A_16,  B_16,  C_16},
-    {0, J_2,   K_2,   L_2},
-    {0, J_3,   K_3,   L_3},
-    {0, J_4,   K_4,   L_4},
-    {0, J_5,   K_5,   L_5},
-    {0, J_6,   K_6,   L_6},
-    {0, J_7,   K_7,   L_7},
-    {0, J_8,   K_8,   L_8},
-    {0, J_9,   K_9,   L_9},
-    {0, J_10,  K_10,  L_10},
-    {0, J_11,  K_11,  L_11},
-    {0, J_12,  K_12,  L_12},
-    {1, D_7,   E_7,   F_7},
-    {1, D_4,   E_4,   F_4},
+    {0, CB10_CA1,   CB11_CA1,   CB12_CA1},
+    {0, CB1_CA16,  CB2_CA16,  CB3_CA16},
+    {0, CB10_CA2,   CB11_CA2,   CB12_CA2},
+    {0, CB10_CA3,   CB11_CA3,   CB12_CA3},
+    {0, CB10_CA4,   CB11_CA4,   CB12_CA4},
+    {0, CB10_CA5,   CB11_CA5,   CB12_CA5},
+    {0, CB10_CA6,   CB11_CA6,   CB12_CA6},
+    {0, CB10_CA7,   CB11_CA7,   CB12_CA7},
+    {0, CB10_CA8,   CB11_CA8,   CB12_CA8},
+    {0, CB10_CA9,   CB11_CA9,   CB12_CA9},
+    {0, CB10_CA10,  CB11_CA10,  CB12_CA10},
+    {0, CB10_CA11,  CB11_CA11,  CB12_CA11},
+    {0, CB10_CA12,  CB11_CA12,  CB12_CA12},
+    {1, CB4_CA7,   CB5_CA7,   CB6_CA7},
+    {1, CB4_CA4,   CB5_CA4,   CB6_CA4},
 
-    {0, J_13,  K_13,  L_13},
-    {0, J_14,  K_14,  L_14},
-    {0, J_15,  K_15,  L_15},
-    {0, J_16,  K_16,  L_16},
+    {0, CB10_CA13,  CB11_CA13,  CB12_CA13},
+    {0, CB10_CA14,  CB11_CA14,  CB12_CA14},
+    {0, CB10_CA15,  CB11_CA15,  CB12_CA15},
+    {0, CB10_CA16,  CB11_CA16,  CB12_CA16},
 
-    {0, G_14,  H_14,  I_14},
-    {0, G_15,  H_15,  I_15},
-    {0, G_16,  H_16,  I_16},
+    {0, CB7_CA14,  CB8_CA14,  CB9_CA14},
+    {0, CB7_CA15,  CB8_CA15,  CB9_CA15},
+    {0, CB7_CA16,  CB8_CA16,  CB9_CA16},
 
-    {0, D_15,  E_15,  F_15},
-    {1, D_6,   E_6,   F_6},
-    {1, D_5,   E_5,   F_5},
+    {0, CB4_CA15,  CB5_CA15,  CB6_CA15},
+    {1, CB4_CA6,   CB5_CA6,   CB6_CA6},
+    {1, CB4_CA5,   CB5_CA5,   CB6_CA5},
 
-    {1, G_1,   H_1,   I_1},
-    {1, G_2,   H_2,   I_2},
-    {1, G_3,   H_3,   I_3},
-    {1, G_4,   H_4,   I_4},
-    {1, G_5,   H_5,   I_5},
-    {1, G_6,   H_6,   I_6},
-    {1, G_7,   H_7,   I_7},
-    {1, G_8,   H_8,   I_8},
-    {1, G_9,   H_9,   I_9},
-    {1, G_10,  H_10,  I_10},
-    {1, G_11,  H_11,  I_11},
+    {1, CB7_CA1,   CB8_CA1,   CB9_CA1},
+    {1, CB7_CA2,   CB8_CA2,   CB9_CA2},
+    {1, CB7_CA3,   CB8_CA3,   CB9_CA3},
+    {1, CB7_CA4,   CB8_CA4,   CB9_CA4},
+    {1, CB7_CA5,   CB8_CA5,   CB9_CA5},
+    {1, CB7_CA6,   CB8_CA6,   CB9_CA6},
+    {1, CB7_CA7,   CB8_CA7,   CB9_CA7},
+    {1, CB7_CA8,   CB8_CA8,   CB9_CA8},
+    {1, CB7_CA9,   CB8_CA9,   CB9_CA9},
+    {1, CB7_CA10,  CB8_CA10,  CB9_CA10},
+    {1, CB7_CA11,  CB8_CA11,  CB9_CA11},
 
-    {1, J_1,   K_1,   L_1},
-    {1, J_2,   K_2,   L_2},
-    {1, J_3,   K_3,   L_3},
-    {1, J_4,   K_4,   L_4},
-    {1, J_5,   K_5,   L_5},
-    {1, J_6,   K_6,   L_6},
-    {1, J_7,   K_7,   L_7},
-    {1, J_8,   K_8,   L_8},
-    {1, J_9,   K_9,   L_9},
-    {1, J_10,  K_10,  L_10},
-    {1, J_11,  K_11,  L_11},
+    {1, CB10_CA1,   CB11_CA1,   CB12_CA1},
+    {1, CB10_CA2,   CB11_CA2,   CB12_CA2},
+    {1, CB10_CA3,   CB11_CA3,   CB12_CA3},
+    {1, CB10_CA4,   CB11_CA4,   CB12_CA4},
+    {1, CB10_CA5,   CB11_CA5,   CB12_CA5},
+    {1, CB10_CA6,   CB11_CA6,   CB12_CA6},
+    {1, CB10_CA7,   CB11_CA7,   CB12_CA7},
+    {1, CB10_CA8,   CB11_CA8,   CB12_CA8},
+    {1, CB10_CA9,   CB11_CA9,   CB12_CA9},
+    {1, CB10_CA10,  CB11_CA10,  CB12_CA10},
+    {1, CB10_CA11,  CB11_CA11,  CB12_CA11},
 };
 
 // clang-format on
diff --git a/keyboards/monsgeek/m3/m3.c b/keyboards/monsgeek/m3/m3.c
index 2bdba9fa314..9a93a7d7d4e 100644
--- a/keyboards/monsgeek/m3/m3.c
+++ b/keyboards/monsgeek/m3/m3.c
@@ -25,103 +25,103 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       |       B location
  *   |  |       |       | */
     /*row0*/
-    {1, A_1,   B_1,   C_1},
-    {1, A_2,   B_2,   C_2},
-    {1, A_3,   B_3,   C_3},
-    {1, A_4,   B_4,   C_4},
-    {1, A_5,   B_5,   C_5},
-    {1, A_6,   B_6,   C_6},
-    {1, A_7,   B_7,   C_7},
-    {1, A_8,   B_8,   C_8},
-    {1, A_9,   B_9,   C_9},
-    {1, A_10,  B_10,  C_10},
-    {1, A_11,  B_11,  C_11},
-    {1, A_12,  B_12,  C_12},
-    {1, A_13,  B_13,  C_13},
-    {1, A_14,  B_14,  C_14},
-    {1, A_15,  B_15,  C_15},
-    {1, A_16,  B_16,  C_16},
+    {1, CB1_CA1,   CB2_CA1,   CB3_CA1},
+    {1, CB1_CA2,   CB2_CA2,   CB3_CA2},
+    {1, CB1_CA3,   CB2_CA3,   CB3_CA3},
+    {1, CB1_CA4,   CB2_CA4,   CB3_CA4},
+    {1, CB1_CA5,   CB2_CA5,   CB3_CA5},
+    {1, CB1_CA6,   CB2_CA6,   CB3_CA6},
+    {1, CB1_CA7,   CB2_CA7,   CB3_CA7},
+    {1, CB1_CA8,   CB2_CA8,   CB3_CA8},
+    {1, CB1_CA9,   CB2_CA9,   CB3_CA9},
+    {1, CB1_CA10,  CB2_CA10,  CB3_CA10},
+    {1, CB1_CA11,  CB2_CA11,  CB3_CA11},
+    {1, CB1_CA12,  CB2_CA12,  CB3_CA12},
+    {1, CB1_CA13,  CB2_CA13,  CB3_CA13},
+    {1, CB1_CA14,  CB2_CA14,  CB3_CA14},
+    {1, CB1_CA15,  CB2_CA15,  CB3_CA15},
+    {1, CB1_CA16,  CB2_CA16,  CB3_CA16},
 
     /*row1*/
-    {0, A_1,   B_1,   C_1},
-    {0, A_2,   B_2,   C_2},
-    {0, A_3,   B_3,   C_3},
-    {0, A_4,   B_4,   C_4},
-    {0, A_5,   B_5,   C_5},
-    {0, A_6,   B_6,   C_6},
-    {0, A_7,   B_7,   C_7},
-    {0, A_8,   B_8,   C_8},
-    {0, A_9,   B_9,   C_9},
-    {0, A_10,  B_10,  C_10},
-    {0, A_11,  B_11,  C_11},
-    {0, A_12,  B_12,  C_12},
-    {0, A_13,  B_13,  C_13},
-    {0, A_14,  B_14,  C_14},
-    {1, D_1,    E_1,   F_1},
-    {1, D_2,    E_2,   F_2},
-    {1, D_3,    E_3,   F_3},
+    {0, CB1_CA1,   CB2_CA1,   CB3_CA1},
+    {0, CB1_CA2,   CB2_CA2,   CB3_CA2},
+    {0, CB1_CA3,   CB2_CA3,   CB3_CA3},
+    {0, CB1_CA4,   CB2_CA4,   CB3_CA4},
+    {0, CB1_CA5,   CB2_CA5,   CB3_CA5},
+    {0, CB1_CA6,   CB2_CA6,   CB3_CA6},
+    {0, CB1_CA7,   CB2_CA7,   CB3_CA7},
+    {0, CB1_CA8,   CB2_CA8,   CB3_CA8},
+    {0, CB1_CA9,   CB2_CA9,   CB3_CA9},
+    {0, CB1_CA10,  CB2_CA10,  CB3_CA10},
+    {0, CB1_CA11,  CB2_CA11,  CB3_CA11},
+    {0, CB1_CA12,  CB2_CA12,  CB3_CA12},
+    {0, CB1_CA13,  CB2_CA13,  CB3_CA13},
+    {0, CB1_CA14,  CB2_CA14,  CB3_CA14},
+    {1, CB4_CA1,    CB5_CA1,   CB6_CA1},
+    {1, CB4_CA2,    CB5_CA2,   CB6_CA2},
+    {1, CB4_CA3,    CB5_CA3,   CB6_CA3},
 
     /*row2*/
-    {0, D_1,   E_1,   F_1},
-    {0, D_2,   E_2,   F_2},
-    {0, D_3,   E_3,   F_3},
-    {0, D_4,   E_4,   F_4},
-    {0, D_5,   E_5,   F_5},
-    {0, D_6,   E_6,   F_6},
-    {0, D_7,   E_7,   F_7},
-    {0, D_8,   E_8,   F_8},
-    {0, D_9,   E_9,   F_9},
-    {0, D_10,  E_10,  F_10},
-    {0, D_11,  E_11,  F_11},
-    {0, D_12,  E_12,  F_12},
-    {0, D_13,  E_13,  F_13},
-    {0, D_14,  E_14,  F_14},
-    {1, G_1,   H_1,   I_1},
-    {1, G_2,   H_2,   I_2},
-    {1, G_3,   H_3,   I_3},
+    {0, CB4_CA1,   CB5_CA1,   CB6_CA1},
+    {0, CB4_CA2,   CB5_CA2,   CB6_CA2},
+    {0, CB4_CA3,   CB5_CA3,   CB6_CA3},
+    {0, CB4_CA4,   CB5_CA4,   CB6_CA4},
+    {0, CB4_CA5,   CB5_CA5,   CB6_CA5},
+    {0, CB4_CA6,   CB5_CA6,   CB6_CA6},
+    {0, CB4_CA7,   CB5_CA7,   CB6_CA7},
+    {0, CB4_CA8,   CB5_CA8,   CB6_CA8},
+    {0, CB4_CA9,   CB5_CA9,   CB6_CA9},
+    {0, CB4_CA10,  CB5_CA10,  CB6_CA10},
+    {0, CB4_CA11,  CB5_CA11,  CB6_CA11},
+    {0, CB4_CA12,  CB5_CA12,  CB6_CA12},
+    {0, CB4_CA13,  CB5_CA13,  CB6_CA13},
+    {0, CB4_CA14,  CB5_CA14,  CB6_CA14},
+    {1, CB7_CA1,   CB8_CA1,   CB9_CA1},
+    {1, CB7_CA2,   CB8_CA2,   CB9_CA2},
+    {1, CB7_CA3,   CB8_CA3,   CB9_CA3},
 
     /*row3*/
-    {0, G_1,   H_1,   I_1},
-    {0, G_2,   H_2,   I_2},
-    {0, G_3,   H_3,   I_3},
-    {0, G_4,   H_4,   I_4},
-    {0, G_5,   H_5,   I_5},
-    {0, G_6,   H_6,   I_6},
-    {0, G_7,   H_7,   I_7},
-    {0, G_8,   H_8,   I_8},
-    {0, G_9,   H_9,   I_9},
-    {0, G_10,  H_10,  I_10},
-    {0, G_11,  H_11,  I_11},
-    {0, G_12,  H_12,  I_12},
-    {0, G_13,  H_13,  I_13},
+    {0, CB7_CA1,   CB8_CA1,   CB9_CA1},
+    {0, CB7_CA2,   CB8_CA2,   CB9_CA2},
+    {0, CB7_CA3,   CB8_CA3,   CB9_CA3},
+    {0, CB7_CA4,   CB8_CA4,   CB9_CA4},
+    {0, CB7_CA5,   CB8_CA5,   CB9_CA5},
+    {0, CB7_CA6,   CB8_CA6,   CB9_CA6},
+    {0, CB7_CA7,   CB8_CA7,   CB9_CA7},
+    {0, CB7_CA8,   CB8_CA8,   CB9_CA8},
+    {0, CB7_CA9,   CB8_CA9,   CB9_CA9},
+    {0, CB7_CA10,  CB8_CA10,  CB9_CA10},
+    {0, CB7_CA11,  CB8_CA11,  CB9_CA11},
+    {0, CB7_CA12,  CB8_CA12,  CB9_CA12},
+    {0, CB7_CA13,  CB8_CA13,  CB9_CA13},
 
     /*row4*/
-    {0, J_1,   K_1,   L_1},
-    {0, J_2,   K_2,   L_2},
-    {0, J_3,   K_3,   L_3},
-    {0, J_4,   K_4,   L_4},
-    {0, J_5,   K_5,   L_5},
-    {0, J_6,   K_6,   L_6},
-    {0, J_7,   K_7,   L_7},
-    {0, J_8,   K_8,   L_8},
-    {0, J_9,   K_9,   L_9},
-    {0, J_10,  K_10,  L_10},
-    {0, J_11,  K_11,  L_11},
-    {0, J_12,  K_12,  L_12},
-    {1,  J_4,   K_4,  L_4},
+    {0, CB10_CA1,   CB11_CA1,   CB12_CA1},
+    {0, CB10_CA2,   CB11_CA2,   CB12_CA2},
+    {0, CB10_CA3,   CB11_CA3,   CB12_CA3},
+    {0, CB10_CA4,   CB11_CA4,   CB12_CA4},
+    {0, CB10_CA5,   CB11_CA5,   CB12_CA5},
+    {0, CB10_CA6,   CB11_CA6,   CB12_CA6},
+    {0, CB10_CA7,   CB11_CA7,   CB12_CA7},
+    {0, CB10_CA8,   CB11_CA8,   CB12_CA8},
+    {0, CB10_CA9,   CB11_CA9,   CB12_CA9},
+    {0, CB10_CA10,  CB11_CA10,  CB12_CA10},
+    {0, CB10_CA11,  CB11_CA11,  CB12_CA11},
+    {0, CB10_CA12,  CB11_CA12,  CB12_CA12},
+    {1,  CB10_CA4,   CB11_CA4,  CB12_CA4},
 
     /*row5*/
-    {0, J_13,  K_13,  L_13},
-    {0, J_14,  K_14,  L_14},
-    {0, J_15,  K_15,  L_15},
-    {0, J_16,  K_16,  L_16},
-    {0, G_14,  H_14,  I_14},
-    {0, G_15,  H_15,  I_15},
-    {0, G_16,  H_16,  I_16},
-    {0, D_15,  E_15,  F_15},
-    {1,  J_1,   K_1,  L_1},
-    {1,  J_2,   K_2,  L_2},
-    {1,  J_3,   K_3,  L_3},
+    {0, CB10_CA13,  CB11_CA13,  CB12_CA13},
+    {0, CB10_CA14,  CB11_CA14,  CB12_CA14},
+    {0, CB10_CA15,  CB11_CA15,  CB12_CA15},
+    {0, CB10_CA16,  CB11_CA16,  CB12_CA16},
+    {0, CB7_CA14,  CB8_CA14,  CB9_CA14},
+    {0, CB7_CA15,  CB8_CA15,  CB9_CA15},
+    {0, CB7_CA16,  CB8_CA16,  CB9_CA16},
+    {0, CB4_CA15,  CB5_CA15,  CB6_CA15},
+    {1,  CB10_CA1,   CB11_CA1,  CB12_CA1},
+    {1,  CB10_CA2,   CB11_CA2,  CB12_CA2},
+    {1,  CB10_CA3,   CB11_CA3,  CB12_CA3},
 };
 #endif // RGB_MATRIX_ENABLE
 
diff --git a/keyboards/monsgeek/m5/m5.c b/keyboards/monsgeek/m5/m5.c
index 2e244542ef5..822214a05ca 100644
--- a/keyboards/monsgeek/m5/m5.c
+++ b/keyboards/monsgeek/m5/m5.c
@@ -25,125 +25,125 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       |       B location
  *   |  |       |       | */
     /*row0*/
-    {1, A_1,   B_1,   C_1},
-    {1, A_2,   B_2,   C_2},
-    {1, A_3,   B_3,   C_3},
-    {1, A_4,   B_4,   C_4},
-    {1, A_5,   B_5,   C_5},
-    {1, A_6,   B_6,   C_6},
-    {1, A_7,   B_7,   C_7},
-    {1, A_8,   B_8,   C_8},
-    {1, A_9,   B_9,   C_9},
-    {1, A_10,  B_10,  C_10},
-    {1, A_11,  B_11,  C_11},
-    {1, A_12,  B_12,  C_12},
-    {1, A_13,  B_13,  C_13},
-    {1, A_14,  B_14,  C_14},
-    {1, A_15,  B_15,  C_15},
-    {1, A_16,  B_16,  C_16},
-    {1, D_11,  E_11,  F_11},
-    {1, D_12,  E_12,  F_12},
-    {1, D_13,  E_13,  F_13},
-    {1, D_14,  E_14,  F_14},
+    {1, CB1_CA1,   CB2_CA1,   CB3_CA1},
+    {1, CB1_CA2,   CB2_CA2,   CB3_CA2},
+    {1, CB1_CA3,   CB2_CA3,   CB3_CA3},
+    {1, CB1_CA4,   CB2_CA4,   CB3_CA4},
+    {1, CB1_CA5,   CB2_CA5,   CB3_CA5},
+    {1, CB1_CA6,   CB2_CA6,   CB3_CA6},
+    {1, CB1_CA7,   CB2_CA7,   CB3_CA7},
+    {1, CB1_CA8,   CB2_CA8,   CB3_CA8},
+    {1, CB1_CA9,   CB2_CA9,   CB3_CA9},
+    {1, CB1_CA10,  CB2_CA10,  CB3_CA10},
+    {1, CB1_CA11,  CB2_CA11,  CB3_CA11},
+    {1, CB1_CA12,  CB2_CA12,  CB3_CA12},
+    {1, CB1_CA13,  CB2_CA13,  CB3_CA13},
+    {1, CB1_CA14,  CB2_CA14,  CB3_CA14},
+    {1, CB1_CA15,  CB2_CA15,  CB3_CA15},
+    {1, CB1_CA16,  CB2_CA16,  CB3_CA16},
+    {1, CB4_CA11,  CB5_CA11,  CB6_CA11},
+    {1, CB4_CA12,  CB5_CA12,  CB6_CA12},
+    {1, CB4_CA13,  CB5_CA13,  CB6_CA13},
+    {1, CB4_CA14,  CB5_CA14,  CB6_CA14},
 
     /*row1*/
-    {0, A_1,   B_1,   C_1},
-    {0, A_2,   B_2,   C_2},
-    {0, A_3,   B_3,   C_3},
-    {0, A_4,   B_4,   C_4},
-    {0, A_5,   B_5,   C_5},
-    {0, A_6,   B_6,   C_6},
-    {0, A_7,   B_7,   C_7},
-    {0, A_8,   B_8,   C_8},
-    {0, A_9,   B_9,   C_9},
-    {0, A_10,  B_10,  C_10},
-    {0, A_11,  B_11,  C_11},
-    {0, A_12,  B_12,  C_12},
-    {0, A_13,  B_13,  C_13},
-    {0, A_14,  B_14,  C_14},
-    {1, D_1,   E_1,   F_1 },
-    {1, D_2,   E_2,   F_2},
-    {1, D_3,   E_3,   F_3},
-    {1, D_4,   E_4,   F_4},
-    {1, D_5,   E_5,   F_5},
-    {1, D_6,   E_6,   F_6},
-    {1, D_7,   E_7,   F_7},
+    {0, CB1_CA1,   CB2_CA1,   CB3_CA1},
+    {0, CB1_CA2,   CB2_CA2,   CB3_CA2},
+    {0, CB1_CA3,   CB2_CA3,   CB3_CA3},
+    {0, CB1_CA4,   CB2_CA4,   CB3_CA4},
+    {0, CB1_CA5,   CB2_CA5,   CB3_CA5},
+    {0, CB1_CA6,   CB2_CA6,   CB3_CA6},
+    {0, CB1_CA7,   CB2_CA7,   CB3_CA7},
+    {0, CB1_CA8,   CB2_CA8,   CB3_CA8},
+    {0, CB1_CA9,   CB2_CA9,   CB3_CA9},
+    {0, CB1_CA10,  CB2_CA10,  CB3_CA10},
+    {0, CB1_CA11,  CB2_CA11,  CB3_CA11},
+    {0, CB1_CA12,  CB2_CA12,  CB3_CA12},
+    {0, CB1_CA13,  CB2_CA13,  CB3_CA13},
+    {0, CB1_CA14,  CB2_CA14,  CB3_CA14},
+    {1, CB4_CA1,   CB5_CA1,   CB6_CA1 },
+    {1, CB4_CA2,   CB5_CA2,   CB6_CA2},
+    {1, CB4_CA3,   CB5_CA3,   CB6_CA3},
+    {1, CB4_CA4,   CB5_CA4,   CB6_CA4},
+    {1, CB4_CA5,   CB5_CA5,   CB6_CA5},
+    {1, CB4_CA6,   CB5_CA6,   CB6_CA6},
+    {1, CB4_CA7,   CB5_CA7,   CB6_CA7},
 
     /*row2*/
-    {0, D_1,   E_1,   F_1},
-    {0, D_2,   E_2,   F_2},
-    {0, D_3,   E_3,   F_3},
-    {0, D_4,   E_4,   F_4},
-    {0, D_5,   E_5,   F_5},
-    {0, D_6,   E_6,   F_6},
-    {0, D_7,   E_7,   F_7},
-    {0, D_8,   E_8,   F_8},
-    {0, D_9,   E_9,   F_9},
-    {0, D_10,  E_10,  F_10},
-    {0, D_11,  E_11,  F_11},
-    {0, D_12,  E_12,  F_12},
-    {0, D_13,  E_13,  F_13},
-    {0, D_14,  E_14,  F_14},
-    {1, G_1,   H_1,   I_1},
-    {1, G_2,   H_2,   I_2},
-    {1, G_3,   H_3,   I_3},
-    {1, D_8,   E_8,   F_8},
-    {1, D_9,   E_9,   F_9},
-    {1, D_10,  E_10,  F_10},
-    {1, G_7,   H_7,   I_7},
+    {0, CB4_CA1,   CB5_CA1,   CB6_CA1},
+    {0, CB4_CA2,   CB5_CA2,   CB6_CA2},
+    {0, CB4_CA3,   CB5_CA3,   CB6_CA3},
+    {0, CB4_CA4,   CB5_CA4,   CB6_CA4},
+    {0, CB4_CA5,   CB5_CA5,   CB6_CA5},
+    {0, CB4_CA6,   CB5_CA6,   CB6_CA6},
+    {0, CB4_CA7,   CB5_CA7,   CB6_CA7},
+    {0, CB4_CA8,   CB5_CA8,   CB6_CA8},
+    {0, CB4_CA9,   CB5_CA9,   CB6_CA9},
+    {0, CB4_CA10,  CB5_CA10,  CB6_CA10},
+    {0, CB4_CA11,  CB5_CA11,  CB6_CA11},
+    {0, CB4_CA12,  CB5_CA12,  CB6_CA12},
+    {0, CB4_CA13,  CB5_CA13,  CB6_CA13},
+    {0, CB4_CA14,  CB5_CA14,  CB6_CA14},
+    {1, CB7_CA1,   CB8_CA1,   CB9_CA1},
+    {1, CB7_CA2,   CB8_CA2,   CB9_CA2},
+    {1, CB7_CA3,   CB8_CA3,   CB9_CA3},
+    {1, CB4_CA8,   CB5_CA8,   CB6_CA8},
+    {1, CB4_CA9,   CB5_CA9,   CB6_CA9},
+    {1, CB4_CA10,  CB5_CA10,  CB6_CA10},
+    {1, CB7_CA7,   CB8_CA7,   CB9_CA7},
 
     /*row3*/
-    {0, G_1,   H_1,   I_1},
-    {0, G_2,   H_2,   I_2},
-    {0, G_3,   H_3,   I_3},
-    {0, G_4,   H_4,   I_4},
-    {0, G_5,   H_5,   I_5},
-    {0, G_6,   H_6,   I_6},
-    {0, G_7,   H_7,   I_7},
-    {0, G_8,   H_8,   I_8},
-    {0, G_9,   H_9,   I_9},
-    {0, G_10,  H_10,  I_10},
-    {0, G_11,  H_11,  I_11},
-    {0, G_12,  H_12,  I_12},
-    {0, G_13,  H_13,  I_13},
-    {1, G_4,   H_4,   I_4},
-    {1, G_5,   H_5,   I_5},
-    {1, G_6,   H_6,   I_6},
+    {0, CB7_CA1,   CB8_CA1,   CB9_CA1},
+    {0, CB7_CA2,   CB8_CA2,   CB9_CA2},
+    {0, CB7_CA3,   CB8_CA3,   CB9_CA3},
+    {0, CB7_CA4,   CB8_CA4,   CB9_CA4},
+    {0, CB7_CA5,   CB8_CA5,   CB9_CA5},
+    {0, CB7_CA6,   CB8_CA6,   CB9_CA6},
+    {0, CB7_CA7,   CB8_CA7,   CB9_CA7},
+    {0, CB7_CA8,   CB8_CA8,   CB9_CA8},
+    {0, CB7_CA9,   CB8_CA9,   CB9_CA9},
+    {0, CB7_CA10,  CB8_CA10,  CB9_CA10},
+    {0, CB7_CA11,  CB8_CA11,  CB9_CA11},
+    {0, CB7_CA12,  CB8_CA12,  CB9_CA12},
+    {0, CB7_CA13,  CB8_CA13,  CB9_CA13},
+    {1, CB7_CA4,   CB8_CA4,   CB9_CA4},
+    {1, CB7_CA5,   CB8_CA5,   CB9_CA5},
+    {1, CB7_CA6,   CB8_CA6,   CB9_CA6},
 
 
     /*row4*/
-    {0, J_1,   K_1,   L_1},
-    {0, J_2,   K_2,   L_2},
-    {0, J_3,   K_3,   L_3},
-    {0, J_4,   K_4,   L_4},
-    {0, J_5,   K_5,   L_5},
-    {0, J_6,   K_6,   L_6},
-    {0, J_7,   K_7,   L_7},
-    {0, J_8,   K_8,   L_8},
-    {0, J_9,   K_9,   L_9},
-    {0, J_10,  K_10,  L_10},
-    {0, J_11,  K_11,  L_11},
-    {0, J_12,  K_12,  L_12},
-    {1,  J_4,   K_4,  L_4},
-    {1,  J_7,   K_7,  L_7},
-    {1,  J_8,   K_8,  L_8},
-    {1,  J_9,   K_9,  L_9},
-    {1,  J_10,  K_10, L_10},
+    {0, CB10_CA1,   CB11_CA1,   CB12_CA1},
+    {0, CB10_CA2,   CB11_CA2,   CB12_CA2},
+    {0, CB10_CA3,   CB11_CA3,   CB12_CA3},
+    {0, CB10_CA4,   CB11_CA4,   CB12_CA4},
+    {0, CB10_CA5,   CB11_CA5,   CB12_CA5},
+    {0, CB10_CA6,   CB11_CA6,   CB12_CA6},
+    {0, CB10_CA7,   CB11_CA7,   CB12_CA7},
+    {0, CB10_CA8,   CB11_CA8,   CB12_CA8},
+    {0, CB10_CA9,   CB11_CA9,   CB12_CA9},
+    {0, CB10_CA10,  CB11_CA10,  CB12_CA10},
+    {0, CB10_CA11,  CB11_CA11,  CB12_CA11},
+    {0, CB10_CA12,  CB11_CA12,  CB12_CA12},
+    {1,  CB10_CA4,   CB11_CA4,  CB12_CA4},
+    {1,  CB10_CA7,   CB11_CA7,  CB12_CA7},
+    {1,  CB10_CA8,   CB11_CA8,  CB12_CA8},
+    {1,  CB10_CA9,   CB11_CA9,  CB12_CA9},
+    {1,  CB10_CA10,  CB11_CA10, CB12_CA10},
 
     /*row5*/
-    {0, J_13,  K_13,  L_13},
-    {0, J_14,  K_14,  L_14},
-    {0, J_15,  K_15,  L_15},
-    {0, J_16,  K_16,  L_16},
-    {0, G_14,  H_14,  I_14},
-    {0, G_15,  H_15,  I_15},
-    {0, G_16,  H_16,  I_16},
-    {0, D_15,  E_15,  F_15},
-    {1,  J_1,   K_1,  L_1},
-    {1,  J_2,   K_2,  L_2},
-    {1,  J_3,   K_3,  L_3},
-    {1,  J_5,   K_5,  L_5},
-    {1,  J_6,   K_6,  L_6},
+    {0, CB10_CA13,  CB11_CA13,  CB12_CA13},
+    {0, CB10_CA14,  CB11_CA14,  CB12_CA14},
+    {0, CB10_CA15,  CB11_CA15,  CB12_CA15},
+    {0, CB10_CA16,  CB11_CA16,  CB12_CA16},
+    {0, CB7_CA14,  CB8_CA14,  CB9_CA14},
+    {0, CB7_CA15,  CB8_CA15,  CB9_CA15},
+    {0, CB7_CA16,  CB8_CA16,  CB9_CA16},
+    {0, CB4_CA15,  CB5_CA15,  CB6_CA15},
+    {1,  CB10_CA1,   CB11_CA1,  CB12_CA1},
+    {1,  CB10_CA2,   CB11_CA2,  CB12_CA2},
+    {1,  CB10_CA3,   CB11_CA3,  CB12_CA3},
+    {1,  CB10_CA5,   CB11_CA5,  CB12_CA5},
+    {1,  CB10_CA6,   CB11_CA6,  CB12_CA6},
 
 };
 #endif
diff --git a/keyboards/monsgeek/m6/m6.c b/keyboards/monsgeek/m6/m6.c
index 3d0a60eb0db..ef7fc92015f 100644
--- a/keyboards/monsgeek/m6/m6.c
+++ b/keyboards/monsgeek/m6/m6.c
@@ -24,105 +24,105 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, A_1,   B_1,   C_1},
-    {0, A_2,   B_2,   C_2},
-    {0, A_3,   B_3,   C_3},
-    {0, A_4,   B_4,   C_4},
-    {0, A_5,   B_5,   C_5},
-    {0, A_6,   B_6,   C_6},
-    {0, A_7,   B_7,   C_7},
-    {0, A_8,   B_8,   C_8},
-    {0, A_9,   B_9,   C_9},
-    {0, A_10,  B_10,  C_10},
-    {0, A_11,  B_11,  C_11},
-    {0, A_12,  B_12,  C_12},
-    {0, A_13,  B_13,  C_13},
-    {0, A_14,  B_14,  C_14},
-    {1, D_1,   E_1,   F_1},
+    {0, CB1_CA1,   CB2_CA1,   CB3_CA1},
+    {0, CB1_CA2,   CB2_CA2,   CB3_CA2},
+    {0, CB1_CA3,   CB2_CA3,   CB3_CA3},
+    {0, CB1_CA4,   CB2_CA4,   CB3_CA4},
+    {0, CB1_CA5,   CB2_CA5,   CB3_CA5},
+    {0, CB1_CA6,   CB2_CA6,   CB3_CA6},
+    {0, CB1_CA7,   CB2_CA7,   CB3_CA7},
+    {0, CB1_CA8,   CB2_CA8,   CB3_CA8},
+    {0, CB1_CA9,   CB2_CA9,   CB3_CA9},
+    {0, CB1_CA10,  CB2_CA10,  CB3_CA10},
+    {0, CB1_CA11,  CB2_CA11,  CB3_CA11},
+    {0, CB1_CA12,  CB2_CA12,  CB3_CA12},
+    {0, CB1_CA13,  CB2_CA13,  CB3_CA13},
+    {0, CB1_CA14,  CB2_CA14,  CB3_CA14},
+    {1, CB4_CA1,   CB5_CA1,   CB6_CA1},
 
-    {0, D_1,   E_1,   F_1},
-    {0, D_2,   E_2,   F_2},
-    {0, D_3,   E_3,   F_3},
-    {0, D_4,   E_4,   F_4},
-    {0, D_5,   E_5,   F_5},
-    {0, D_6,   E_6,   F_6},
-    {0, D_7,   E_7,   F_7},
-    {0, D_8,   E_8,   F_8},
-    {0, D_9,   E_9,   F_9},
-    {0, D_10,  E_10,  F_10},
-    {0, D_11,  E_11,  F_11},
-    {0, D_12,  E_12,  F_12},
-    {0, D_13,  E_13,  F_13},
-    {0, D_14,  E_14,  F_14},
-    {1, D_2,   E_2,   F_2},
+    {0, CB4_CA1,   CB5_CA1,   CB6_CA1},
+    {0, CB4_CA2,   CB5_CA2,   CB6_CA2},
+    {0, CB4_CA3,   CB5_CA3,   CB6_CA3},
+    {0, CB4_CA4,   CB5_CA4,   CB6_CA4},
+    {0, CB4_CA5,   CB5_CA5,   CB6_CA5},
+    {0, CB4_CA6,   CB5_CA6,   CB6_CA6},
+    {0, CB4_CA7,   CB5_CA7,   CB6_CA7},
+    {0, CB4_CA8,   CB5_CA8,   CB6_CA8},
+    {0, CB4_CA9,   CB5_CA9,   CB6_CA9},
+    {0, CB4_CA10,  CB5_CA10,  CB6_CA10},
+    {0, CB4_CA11,  CB5_CA11,  CB6_CA11},
+    {0, CB4_CA12,  CB5_CA12,  CB6_CA12},
+    {0, CB4_CA13,  CB5_CA13,  CB6_CA13},
+    {0, CB4_CA14,  CB5_CA14,  CB6_CA14},
+    {1, CB4_CA2,   CB5_CA2,   CB6_CA2},
 
-    {0, G_1,   H_1,   I_1},
-    {0, G_2,   H_2,   I_2},
-    {0, G_3,   H_3,   I_3},
-    {0, G_4,   H_4,   I_4},
-    {0, G_5,   H_5,   I_5},
-    {0, G_6,   H_6,   I_6},
-    {0, G_7,   H_7,   I_7},
-    {0, G_8,   H_8,   I_8},
-    {0, G_9,   H_9,   I_9},
-    {0, G_10,  H_10,  I_10},
-    {0, G_11,  H_11,  I_11},
-    {0, G_12,  H_12,  I_12},
-    {0, A_15,  B_15,  C_15},
-    {0, G_13,  H_13,  I_13},
-    {1, D_3,   E_3,   F_3},
+    {0, CB7_CA1,   CB8_CA1,   CB9_CA1},
+    {0, CB7_CA2,   CB8_CA2,   CB9_CA2},
+    {0, CB7_CA3,   CB8_CA3,   CB9_CA3},
+    {0, CB7_CA4,   CB8_CA4,   CB9_CA4},
+    {0, CB7_CA5,   CB8_CA5,   CB9_CA5},
+    {0, CB7_CA6,   CB8_CA6,   CB9_CA6},
+    {0, CB7_CA7,   CB8_CA7,   CB9_CA7},
+    {0, CB7_CA8,   CB8_CA8,   CB9_CA8},
+    {0, CB7_CA9,   CB8_CA9,   CB9_CA9},
+    {0, CB7_CA10,  CB8_CA10,  CB9_CA10},
+    {0, CB7_CA11,  CB8_CA11,  CB9_CA11},
+    {0, CB7_CA12,  CB8_CA12,  CB9_CA12},
+    {0, CB1_CA15,  CB2_CA15,  CB3_CA15},
+    {0, CB7_CA13,  CB8_CA13,  CB9_CA13},
+    {1, CB4_CA3,   CB5_CA3,   CB6_CA3},
 
-    {0, J_1,   K_1,   L_1},
-    {0, A_16,  B_16,  C_16},
-    {0, J_2,   K_2,   L_2},
-    {0, J_3,   K_3,   L_3},
-    {0, J_4,   K_4,   L_4},
-    {0, J_5,   K_5,   L_5},
-    {0, J_6,   K_6,   L_6},
-    {0, J_7,   K_7,   L_7},
-    {0, J_8,   K_8,   L_8},
-    {0, J_9,   K_9,   L_9},
-    {0, J_10,  K_10,  L_10},
-    {0, J_11,  K_11,  L_11},
-    {0, J_12,  K_12,  L_12},
-    {1, D_7,   E_7,   F_7},
-    {1, D_4,   E_4,   F_4},
+    {0, CB10_CA1,   CB11_CA1,   CB12_CA1},
+    {0, CB1_CA16,  CB2_CA16,  CB3_CA16},
+    {0, CB10_CA2,   CB11_CA2,   CB12_CA2},
+    {0, CB10_CA3,   CB11_CA3,   CB12_CA3},
+    {0, CB10_CA4,   CB11_CA4,   CB12_CA4},
+    {0, CB10_CA5,   CB11_CA5,   CB12_CA5},
+    {0, CB10_CA6,   CB11_CA6,   CB12_CA6},
+    {0, CB10_CA7,   CB11_CA7,   CB12_CA7},
+    {0, CB10_CA8,   CB11_CA8,   CB12_CA8},
+    {0, CB10_CA9,   CB11_CA9,   CB12_CA9},
+    {0, CB10_CA10,  CB11_CA10,  CB12_CA10},
+    {0, CB10_CA11,  CB11_CA11,  CB12_CA11},
+    {0, CB10_CA12,  CB11_CA12,  CB12_CA12},
+    {1, CB4_CA7,   CB5_CA7,   CB6_CA7},
+    {1, CB4_CA4,   CB5_CA4,   CB6_CA4},
 
-    {0, J_13,  K_13,  L_13},
-    {0, J_14,  K_14,  L_14},
-    {0, J_15,  K_15,  L_15},
-    {0, J_16,  K_16,  L_16},
-    {0, G_14,  H_14,  I_14},
-    {0, G_15,  H_15,  I_15},
-    {0, G_16,  H_16,  I_16},
-    {0, D_15,  E_15,  F_15},
-    {1, D_6,   E_6,   F_6},
-    {1, D_5,   E_5,   F_5},
+    {0, CB10_CA13,  CB11_CA13,  CB12_CA13},
+    {0, CB10_CA14,  CB11_CA14,  CB12_CA14},
+    {0, CB10_CA15,  CB11_CA15,  CB12_CA15},
+    {0, CB10_CA16,  CB11_CA16,  CB12_CA16},
+    {0, CB7_CA14,  CB8_CA14,  CB9_CA14},
+    {0, CB7_CA15,  CB8_CA15,  CB9_CA15},
+    {0, CB7_CA16,  CB8_CA16,  CB9_CA16},
+    {0, CB4_CA15,  CB5_CA15,  CB6_CA15},
+    {1, CB4_CA6,   CB5_CA6,   CB6_CA6},
+    {1, CB4_CA5,   CB5_CA5,   CB6_CA5},
 
 
-    {1, G_1,   H_1,   I_1},
-    {1, G_2,   H_2,   I_2},
-    {1, G_3,   H_3,   I_3},
-    {1, G_4,   H_4,   I_4},
-    {1, G_5,   H_5,   I_5},
-    {1, G_6,   H_6,   I_6},
-    {1, G_7,   H_7,   I_7},
-    {1, G_8,   H_8,   I_8},
-    {1, G_9,   H_9,   I_9},
-    {1, G_10,  H_10,  I_10},
-    {1, G_11,  H_11,  I_11},
+    {1, CB7_CA1,   CB8_CA1,   CB9_CA1},
+    {1, CB7_CA2,   CB8_CA2,   CB9_CA2},
+    {1, CB7_CA3,   CB8_CA3,   CB9_CA3},
+    {1, CB7_CA4,   CB8_CA4,   CB9_CA4},
+    {1, CB7_CA5,   CB8_CA5,   CB9_CA5},
+    {1, CB7_CA6,   CB8_CA6,   CB9_CA6},
+    {1, CB7_CA7,   CB8_CA7,   CB9_CA7},
+    {1, CB7_CA8,   CB8_CA8,   CB9_CA8},
+    {1, CB7_CA9,   CB8_CA9,   CB9_CA9},
+    {1, CB7_CA10,  CB8_CA10,  CB9_CA10},
+    {1, CB7_CA11,  CB8_CA11,  CB9_CA11},
 
-    {1, J_1,   K_1,   L_1},
-    {1, J_2,   K_2,   L_2},
-    {1, J_3,   K_3,   L_3},
-    {1, J_4,   K_4,   L_4},
-    {1, J_5,   K_5,   L_5},
-    {1, J_6,   K_6,   L_6},
-    {1, J_7,   K_7,   L_7},
-    {1, J_8,   K_8,   L_8},
-    {1, J_9,   K_9,   L_9},
-    {1, J_10,  K_10,  L_10},
-    {1, J_11,  K_11,  L_11},
+    {1, CB10_CA1,   CB11_CA1,   CB12_CA1},
+    {1, CB10_CA2,   CB11_CA2,   CB12_CA2},
+    {1, CB10_CA3,   CB11_CA3,   CB12_CA3},
+    {1, CB10_CA4,   CB11_CA4,   CB12_CA4},
+    {1, CB10_CA5,   CB11_CA5,   CB12_CA5},
+    {1, CB10_CA6,   CB11_CA6,   CB12_CA6},
+    {1, CB10_CA7,   CB11_CA7,   CB12_CA7},
+    {1, CB10_CA8,   CB11_CA8,   CB12_CA8},
+    {1, CB10_CA9,   CB11_CA9,   CB12_CA9},
+    {1, CB10_CA10,  CB11_CA10,  CB12_CA10},
+    {1, CB10_CA11,  CB11_CA11,  CB12_CA11},
 };
 
 // clang-format on
diff --git a/keyboards/montsinger/palmetto/info.json b/keyboards/montsinger/palmetto/info.json
index efe81dd9c30..9ff29ba893f 100755
--- a/keyboards/montsinger/palmetto/info.json
+++ b/keyboards/montsinger/palmetto/info.json
@@ -8,8 +8,7 @@
         "bootmagic": true,
         "extrakey": true,
         "mousekey": true,
-        "nkro": true,
-        "rgblight": false
+        "nkro": true
     },
     "matrix_pins": {
         "cols": ["GP28", "GP27", "GP29", "GP0", "GP1", "GP9", "GP26", "GP18", "GP10", "GP11", "GP25", "GP24", "GP12", "GP21", "GP13"],
diff --git a/keyboards/mt/mt64rgb/mt64rgb.c b/keyboards/mt/mt64rgb/mt64rgb.c
index 42e6a48dc2a..bcf26de2313 100644
--- a/keyboards/mt/mt64rgb/mt64rgb.c
+++ b/keyboards/mt/mt64rgb/mt64rgb.c
@@ -24,74 +24,74 @@ const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
  *   |  |      |      B location
  *   |  |      |      | */
 
-   {0, A_1,   B_1,   C_1},
-   {0, D_1,   E_1,   F_1},
-   {0, G_1,   H_1,   I_1},
-   {0, J_1,   K_1,   L_1},
-   {0, A_6,   B_6,   C_6},
-   {0, D_6,   E_6,   F_6},
-   {0, G_6,   H_6,   I_6},
-   {0, J_6,   K_6,   L_6},
-   {0, A_11,   B_11,   C_11},
-   {0, D_11,   E_11,   F_11},
-   {0, G_11,   H_11,   I_11},
-   {0, J_11,   K_11,   L_11},
-   {0, A_16,   B_16,   C_16},
-   {0, D_16,   E_16,   F_16},
+   {0, SW1_CS1,   SW2_CS1,   SW3_CS1},
+   {0, SW4_CS1,   SW5_CS1,   SW6_CS1},
+   {0, SW7_CS1,   SW8_CS1,   SW9_CS1},
+   {0, SW10_CS1,   SW11_CS1,   SW12_CS1},
+   {0, SW1_CS6,   SW2_CS6,   SW3_CS6},
+   {0, SW4_CS6,   SW5_CS6,   SW6_CS6},
+   {0, SW7_CS6,   SW8_CS6,   SW9_CS6},
+   {0, SW10_CS6,   SW11_CS6,   SW12_CS6},
+   {0, SW1_CS11,   SW2_CS11,   SW3_CS11},
+   {0, SW4_CS11,   SW5_CS11,   SW6_CS11},
+   {0, SW7_CS11,   SW8_CS11,   SW9_CS11},
+   {0, SW10_CS11,   SW11_CS11,   SW12_CS11},
+   {0, SW1_CS16,   SW2_CS16,   SW3_CS16},
+   {0, SW4_CS16,   SW5_CS16,   SW6_CS16},
     	
-   {0, A_2,   B_2,   C_2},
-   {0, D_2,   E_2,   F_2},
-   {0, G_2,   H_2,   I_2},
-   {0, J_2,   K_2,   L_2},
-   {0, A_7,   B_7,   C_7},
-   {0, D_7,   E_7,   F_7},
-   {0, G_7,   H_7,   I_7},
-   {0, J_7,   K_7,   L_7},
-   {0, A_12,   B_12,   C_12},
-   {0, D_12,   E_12,   F_12},
-   {0, G_12,   H_12,   I_12},
-   {0, J_12,   K_12,   L_12},
-   {0, G_16,   H_16,   I_16},
-    {0, J_16,   K_16,   L_16},
+   {0, SW1_CS2,   SW2_CS2,   SW3_CS2},
+   {0, SW4_CS2,   SW5_CS2,   SW6_CS2},
+   {0, SW7_CS2,   SW8_CS2,   SW9_CS2},
+   {0, SW10_CS2,   SW11_CS2,   SW12_CS2},
+   {0, SW1_CS7,   SW2_CS7,   SW3_CS7},
+   {0, SW4_CS7,   SW5_CS7,   SW6_CS7},
+   {0, SW7_CS7,   SW8_CS7,   SW9_CS7},
+   {0, SW10_CS7,   SW11_CS7,   SW12_CS7},
+   {0, SW1_CS12,   SW2_CS12,   SW3_CS12},
+   {0, SW4_CS12,   SW5_CS12,   SW6_CS12},
+   {0, SW7_CS12,   SW8_CS12,   SW9_CS12},
+   {0, SW10_CS12,   SW11_CS12,   SW12_CS12},
+   {0, SW7_CS16,   SW8_CS16,   SW9_CS16},
+    {0, SW10_CS16,   SW11_CS16,   SW12_CS16},
 
-   {0, A_3,   B_3,   C_3},
-   {0, D_3,   E_3,   F_3},
-   {0, G_3,   H_3,   I_3},
-   {0, J_3,   K_3,   L_3},
-   {0, A_8,   B_8,   C_8},
-   {0, D_8,   E_8,   F_8},
-   {0, G_8,   H_8,   I_8},
-   {0, J_8,   K_8,   L_8},
-   {0, A_13,   B_13,   C_13},
-   {0, D_13,   E_13,   F_13},
-   {0, G_13,   H_13,   I_13},
-   {0, J_13,   K_13,   L_13},
-   {0, A_15,   B_15,   C_15},
+   {0, SW1_CS3,   SW2_CS3,   SW3_CS3},
+   {0, SW4_CS3,   SW5_CS3,   SW6_CS3},
+   {0, SW7_CS3,   SW8_CS3,   SW9_CS3},
+   {0, SW10_CS3,   SW11_CS3,   SW12_CS3},
+   {0, SW1_CS8,   SW2_CS8,   SW3_CS8},
+   {0, SW4_CS8,   SW5_CS8,   SW6_CS8},
+   {0, SW7_CS8,   SW8_CS8,   SW9_CS8},
+   {0, SW10_CS8,   SW11_CS8,   SW12_CS8},
+   {0, SW1_CS13,   SW2_CS13,   SW3_CS13},
+   {0, SW4_CS13,   SW5_CS13,   SW6_CS13},
+   {0, SW7_CS13,   SW8_CS13,   SW9_CS13},
+   {0, SW10_CS13,   SW11_CS13,   SW12_CS13},
+   {0, SW1_CS15,   SW2_CS15,   SW3_CS15},
 
-   {0, A_4,   B_4,   C_4},
-   {0, D_4,   E_4,   F_4},
-   {0, G_4,   H_4,   I_4},
-   {0, J_4,   K_4,   L_4},
-   {0, A_9,   B_9,   C_9},
-   {0, D_9,   E_9,   F_9},
-   {0, G_9,   H_9,   I_9},
-   {0, J_9,   K_9,   L_9},
-   {0, A_14,   B_14,   C_14},
-   {0, D_14,   E_14,   F_14},
-   {0, G_14,   H_14,   I_14},
-   {0, J_14,   K_14,   L_14},
-   {0, D_15,   E_15,   F_15},
-   {0, G_15,   H_15,   I_15},
+   {0, SW1_CS4,   SW2_CS4,   SW3_CS4},
+   {0, SW4_CS4,   SW5_CS4,   SW6_CS4},
+   {0, SW7_CS4,   SW8_CS4,   SW9_CS4},
+   {0, SW10_CS4,   SW11_CS4,   SW12_CS4},
+   {0, SW1_CS9,   SW2_CS9,   SW3_CS9},
+   {0, SW4_CS9,   SW5_CS9,   SW6_CS9},
+   {0, SW7_CS9,   SW8_CS9,   SW9_CS9},
+   {0, SW10_CS9,   SW11_CS9,   SW12_CS9},
+   {0, SW1_CS14,   SW2_CS14,   SW3_CS14},
+   {0, SW4_CS14,   SW5_CS14,   SW6_CS14},
+   {0, SW7_CS14,   SW8_CS14,   SW9_CS14},
+   {0, SW10_CS14,   SW11_CS14,   SW12_CS14},
+   {0, SW4_CS15,   SW5_CS15,   SW6_CS15},
+   {0, SW7_CS15,   SW8_CS15,   SW9_CS15},
 
-   {0, A_5,   B_5,   C_5},
-   {0, D_5,   E_5,   F_5},
-   {0, G_5,   H_5,   I_5},
-   {0, J_5,   K_5,   L_5},
-   {0, A_10,   B_10,   C_10},
-   {0, D_10,  E_10,  F_10},
-   {0, G_10,  H_10,  I_10},
-   {0, J_10,  K_10,  L_10},
-   {0, J_15,  K_15,  L_15}
+   {0, SW1_CS5,   SW2_CS5,   SW3_CS5},
+   {0, SW4_CS5,   SW5_CS5,   SW6_CS5},
+   {0, SW7_CS5,   SW8_CS5,   SW9_CS5},
+   {0, SW10_CS5,   SW11_CS5,   SW12_CS5},
+   {0, SW1_CS10,   SW2_CS10,   SW3_CS10},
+   {0, SW4_CS10,  SW5_CS10,  SW6_CS10},
+   {0, SW7_CS10,  SW8_CS10,  SW9_CS10},
+   {0, SW10_CS10,  SW11_CS10,  SW12_CS10},
+   {0, SW10_CS15,  SW11_CS15,  SW12_CS15}
 };
 
 led_config_t g_led_config = {{
diff --git a/keyboards/mt/mt84/mt84.c b/keyboards/mt/mt84/mt84.c
index 4dd24c30b22..276c92fc065 100644
--- a/keyboards/mt/mt84/mt84.c
+++ b/keyboards/mt/mt84/mt84.c
@@ -24,95 +24,95 @@ const is31fl3737_led_t PROGMEM g_is31fl3737_leds[IS31FL3737_LED_COUNT] = {
  *   |  |      |      B location
  *   |  |      |      | */
 
-   {0, A_11,   B_11,   C_11},
-   {0, D_11,   E_11,   F_11},
-   {0, G_11,   H_11,   I_11},
-   {0, J_11,   K_11,   L_11},
-   {0, A_12,   B_12,   C_12},
-   {0, D_12,   E_12,   F_12},
-   {0, G_12,   H_12,   I_12},
-   {0, J_12,   K_12,   L_12},
-   {1, A_11,   B_11,   C_11},
-   {1, D_11,   E_11,   F_11},
-   {1, G_11,   H_11,   I_11},
-   {1, J_11,   K_11,   L_11},
-   {1, A_12,   B_12,   C_12},
-   {1, D_12,   E_12,   F_12},
-   {1, G_12,   H_12,   I_12},
-   {1, J_12,   K_12,   L_12},
+   {0, SW1_CS11,   SW2_CS11,   SW3_CS11},
+   {0, SW4_CS11,   SW5_CS11,   SW6_CS11},
+   {0, SW7_CS11,   SW8_CS11,   SW9_CS11},
+   {0, SW10_CS11,   SW11_CS11,   SW12_CS11},
+   {0, SW1_CS12,   SW2_CS12,   SW3_CS12},
+   {0, SW4_CS12,   SW5_CS12,   SW6_CS12},
+   {0, SW7_CS12,   SW8_CS12,   SW9_CS12},
+   {0, SW10_CS12,   SW11_CS12,   SW12_CS12},
+   {1, SW1_CS11,   SW2_CS11,   SW3_CS11},
+   {1, SW4_CS11,   SW5_CS11,   SW6_CS11},
+   {1, SW7_CS11,   SW8_CS11,   SW9_CS11},
+   {1, SW10_CS11,   SW11_CS11,   SW12_CS11},
+   {1, SW1_CS12,   SW2_CS12,   SW3_CS12},
+   {1, SW4_CS12,   SW5_CS12,   SW6_CS12},
+   {1, SW7_CS12,   SW8_CS12,   SW9_CS12},
+   {1, SW10_CS12,   SW11_CS12,   SW12_CS12},
 
-   {0, A_1,   B_1,   C_1},
-   {0, D_1,   E_1,   F_1},
-   {0, G_1,   H_1,   I_1},
-   {0, J_1,   K_1,   L_1},
-   {0, A_6,   B_6,   C_6},
-   {0, D_6,   E_6,   F_6},
-   {0, G_6,   H_6,   I_6},
-   {0, J_6,   K_6,   L_6},
-   {1, A_1,   B_1,   C_1},
-   {1, D_1,   E_1,   F_1},
-   {1, G_1,   H_1,   I_1},
-   {1, J_1,   K_1,   L_1},
-   {1, A_6,   B_6,   C_6},
-   {1, D_6,   E_6,   F_6},
-   {1, G_6,   H_6,   I_6},
+   {0, SW1_CS1,   SW2_CS1,   SW3_CS1},
+   {0, SW4_CS1,   SW5_CS1,   SW6_CS1},
+   {0, SW7_CS1,   SW8_CS1,   SW9_CS1},
+   {0, SW10_CS1,   SW11_CS1,   SW12_CS1},
+   {0, SW1_CS6,   SW2_CS6,   SW3_CS6},
+   {0, SW4_CS6,   SW5_CS6,   SW6_CS6},
+   {0, SW7_CS6,   SW8_CS6,   SW9_CS6},
+   {0, SW10_CS6,   SW11_CS6,   SW12_CS6},
+   {1, SW1_CS1,   SW2_CS1,   SW3_CS1},
+   {1, SW4_CS1,   SW5_CS1,   SW6_CS1},
+   {1, SW7_CS1,   SW8_CS1,   SW9_CS1},
+   {1, SW10_CS1,   SW11_CS1,   SW12_CS1},
+   {1, SW1_CS6,   SW2_CS6,   SW3_CS6},
+   {1, SW4_CS6,   SW5_CS6,   SW6_CS6},
+   {1, SW7_CS6,   SW8_CS6,   SW9_CS6},
 
-   {0, A_2,   B_2,   C_2},
-   {0, D_2,   E_2,   F_2},
-   {0, G_2,   H_2,   I_2},
-   {0, J_2,   K_2,   L_2},
-   {0, A_7,   B_7,   C_7},
-   {0, D_7,   E_7,   F_7},
-   {0, G_7,   H_7,   I_7},
-   {0, J_7,   K_7,   L_7},
-   {1, A_2,   B_2,   C_2},
-   {1, D_2,   E_2,   F_2},
-   {1, G_2,   H_2,   I_2},
-   {1, J_2,   K_2,   L_2},
-   {1, A_7,   B_7,   C_7},
-   {1, D_7,   E_7,   F_7},
-   {1, G_7,   H_7,   I_7},
+   {0, SW1_CS2,   SW2_CS2,   SW3_CS2},
+   {0, SW4_CS2,   SW5_CS2,   SW6_CS2},
+   {0, SW7_CS2,   SW8_CS2,   SW9_CS2},
+   {0, SW10_CS2,   SW11_CS2,   SW12_CS2},
+   {0, SW1_CS7,   SW2_CS7,   SW3_CS7},
+   {0, SW4_CS7,   SW5_CS7,   SW6_CS7},
+   {0, SW7_CS7,   SW8_CS7,   SW9_CS7},
+   {0, SW10_CS7,   SW11_CS7,   SW12_CS7},
+   {1, SW1_CS2,   SW2_CS2,   SW3_CS2},
+   {1, SW4_CS2,   SW5_CS2,   SW6_CS2},
+   {1, SW7_CS2,   SW8_CS2,   SW9_CS2},
+   {1, SW10_CS2,   SW11_CS2,   SW12_CS2},
+   {1, SW1_CS7,   SW2_CS7,   SW3_CS7},
+   {1, SW4_CS7,   SW5_CS7,   SW6_CS7},
+   {1, SW7_CS7,   SW8_CS7,   SW9_CS7},
 
-   {0, A_3,   B_3,   C_3},
-   {0, D_3,   E_3,   F_3},
-   {0, G_3,   H_3,   I_3},
-   {0, J_3,   K_3,   L_3},
-   {0, A_8,   B_8,   C_8},
-   {0, D_8,   E_8,   F_8},
-   {0, G_8,   H_8,   I_8},
-   {0, J_8,   K_8,   L_8},
-   {1, A_3,   B_3,   C_3},
-   {1, D_3,   E_3,   F_3},
-   {1, G_3,   H_3,   I_3},
-   {1, J_3,   K_3,   L_3},
-   {1, A_8,   B_8,   C_8},
-   {1, G_8,   H_8,   I_8},
+   {0, SW1_CS3,   SW2_CS3,   SW3_CS3},
+   {0, SW4_CS3,   SW5_CS3,   SW6_CS3},
+   {0, SW7_CS3,   SW8_CS3,   SW9_CS3},
+   {0, SW10_CS3,   SW11_CS3,   SW12_CS3},
+   {0, SW1_CS8,   SW2_CS8,   SW3_CS8},
+   {0, SW4_CS8,   SW5_CS8,   SW6_CS8},
+   {0, SW7_CS8,   SW8_CS8,   SW9_CS8},
+   {0, SW10_CS8,   SW11_CS8,   SW12_CS8},
+   {1, SW1_CS3,   SW2_CS3,   SW3_CS3},
+   {1, SW4_CS3,   SW5_CS3,   SW6_CS3},
+   {1, SW7_CS3,   SW8_CS3,   SW9_CS3},
+   {1, SW10_CS3,   SW11_CS3,   SW12_CS3},
+   {1, SW1_CS8,   SW2_CS8,   SW3_CS8},
+   {1, SW7_CS8,   SW8_CS8,   SW9_CS8},
 
-   {0, A_4,   B_4,   C_4},
-   {0, D_4,   E_4,   F_4},
-   {0, G_4,   H_4,   I_4},
-   {0, J_4,   K_4,   L_4},
-   {0, A_9,   B_9,   C_9},
-   {0, D_9,   E_9,   F_9},
-   {0, G_9,   H_9,   I_9},
-   {0, J_9,   K_9,   L_9},
-   {1, A_4,   B_4,   C_4},
-   {1, D_4,   E_4,   F_4},
-   {1, G_4,   H_4,   I_4},
-   {1, J_4,   K_4,   L_4},
-   {1, A_9,   B_9,   C_9},
-   {1, G_9,   H_9,   I_9},
+   {0, SW1_CS4,   SW2_CS4,   SW3_CS4},
+   {0, SW4_CS4,   SW5_CS4,   SW6_CS4},
+   {0, SW7_CS4,   SW8_CS4,   SW9_CS4},
+   {0, SW10_CS4,   SW11_CS4,   SW12_CS4},
+   {0, SW1_CS9,   SW2_CS9,   SW3_CS9},
+   {0, SW4_CS9,   SW5_CS9,   SW6_CS9},
+   {0, SW7_CS9,   SW8_CS9,   SW9_CS9},
+   {0, SW10_CS9,   SW11_CS9,   SW12_CS9},
+   {1, SW1_CS4,   SW2_CS4,   SW3_CS4},
+   {1, SW4_CS4,   SW5_CS4,   SW6_CS4},
+   {1, SW7_CS4,   SW8_CS4,   SW9_CS4},
+   {1, SW10_CS4,   SW11_CS4,   SW12_CS4},
+   {1, SW1_CS9,   SW2_CS9,   SW3_CS9},
+   {1, SW7_CS9,   SW8_CS9,   SW9_CS9},
 
-   {0, A_5,   B_5,   C_5},
-   {0, D_5,   E_5,   F_5},
-   {0, G_5,   H_5,   I_5},
-   {0, D_10,  E_10,  F_10},
-   {1, D_5,   E_5,   F_5},
-   {1, G_5,   H_5,   I_5},
-   {1, J_5,   K_5,   L_5},
-   {1, A_10,  B_10,  C_10},
-   {1, D_10,  E_10,  F_10},
-   {1, G_10,   H_10,   I_10}
+   {0, SW1_CS5,   SW2_CS5,   SW3_CS5},
+   {0, SW4_CS5,   SW5_CS5,   SW6_CS5},
+   {0, SW7_CS5,   SW8_CS5,   SW9_CS5},
+   {0, SW4_CS10,  SW5_CS10,  SW6_CS10},
+   {1, SW4_CS5,   SW5_CS5,   SW6_CS5},
+   {1, SW7_CS5,   SW8_CS5,   SW9_CS5},
+   {1, SW10_CS5,   SW11_CS5,   SW12_CS5},
+   {1, SW1_CS10,  SW2_CS10,  SW3_CS10},
+   {1, SW4_CS10,  SW5_CS10,  SW6_CS10},
+   {1, SW7_CS10,   SW8_CS10,   SW9_CS10}
 };
 
 led_config_t g_led_config = {{
diff --git a/keyboards/mt/mt980/keymaps/walker/config.h b/keyboards/mt/mt980/keymaps/walker/config.h
deleted file mode 100644
index 0bd39599381..00000000000
--- a/keyboards/mt/mt980/keymaps/walker/config.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#pragma once
-
-#define TAPPING_TERM 200
-#define ONESHOT_TAP_TOGGLE 5
-#define ONESHOT_TIMEOUT 5000
diff --git a/keyboards/mt/mt980/keymaps/walker/keymap.c b/keyboards/mt/mt980/keymaps/walker/keymap.c
deleted file mode 100644
index f0817dd33d5..00000000000
--- a/keyboards/mt/mt980/keymaps/walker/keymap.c
+++ /dev/null
@@ -1,168 +0,0 @@
-#include QMK_KEYBOARD_H
-
-bool numlock_on = true;
-
-typedef struct {
-  bool is_press_action;
-  int state;
-} tap;
-
-enum {
-  SINGLE_TAP = 1,
-  SINGLE_HOLD = 2,
-  DOUBLE_TAP = 3,
-  DOUBLE_HOLD = 4,
-  TRIPLE_TAP = 5,
-  TRIPLE_HOLD = 6
-};
-
-enum {
-  ALT_L1 = 0
-};
-
-int cur_dance (tap_dance_state_t *state);
-void alt_finished (tap_dance_state_t *state, void *user_data);
-void alt_reset (tap_dance_state_t *state, void *user_data);
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [0] = LAYOUT(
-    KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_NO,              KC_INS,   KC_PSCR,  KC_PGUP,  KC_PGDN, 
-    KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_BSPC,  KC_NUM,   KC_PSLS,  KC_PAST,  KC_PMNS,
-    KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,            KC_P7,    KC_P8,    KC_P9,    KC_PPLS,
-    KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_ENT,                       KC_P4,    KC_P5,    KC_P6,    KC_PPLS,
-    KC_LSFT,  KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,  KC_UP,              KC_P1,    KC_P2,    KC_P3,    KC_PENT,
-    KC_LCTL,  KC_LGUI,  TD(ALT_L1),                   KC_SPC,                                 KC_RALT,  MO(1),    KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT,            KC_P0,    KC_PDOT,  KC_PENT),
-
-  [1] = LAYOUT(
-    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_PAUSE, KC_SCRL,  KC_HOME,  KC_END,   
-    KC_TRNS,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   RGB_TOG,  QK_BOOT,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   
-    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   
-    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,                      KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   
-    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  RGB_VAI,            KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   
-    KC_TRNS,  KC_TRNS,  KC_TRNS,                      QK_BOOT,                                KC_TRNS,  KC_TRNS,  KC_TRNS,  RGB_RMOD, RGB_VAD,  RGB_MOD,            KC_TRNS,  KC_TRNS,  KC_TRNS)  
-
-};
-
-int cur_dance (tap_dance_state_t *state) {
-  if (state->count == 1) {
-    if (state->pressed) return SINGLE_HOLD;
-    else return SINGLE_TAP;
-  }
-  else if (state->count == 2) {
-    if (state->pressed) return DOUBLE_HOLD;
-    else return DOUBLE_TAP;
-  }
-  else if (state->count == 3) {
-    if (state->interrupted || !state->pressed)  return TRIPLE_TAP;
-    else return TRIPLE_HOLD;
-  }
-  else return 8;
-}
-
-static tap alttap_state = {
-  .is_press_action = true,
-  .state = 0
-};
-
-void alt_finished (tap_dance_state_t *state, void *user_data) {
-  alttap_state.state = cur_dance(state);
-  switch (alttap_state.state) {
-    case SINGLE_TAP: set_oneshot_layer(1, ONESHOT_START); clear_oneshot_layer_state(ONESHOT_PRESSED); break;
-    case SINGLE_HOLD: register_code(KC_LALT); break;
-    case DOUBLE_TAP: set_oneshot_layer(1, ONESHOT_START); set_oneshot_layer(1, ONESHOT_PRESSED); break;
-    case DOUBLE_HOLD: register_code(KC_LALT); layer_on(1); break;
-  }
-}
-
-void alt_reset (tap_dance_state_t *state, void *user_data) {
-  switch (alttap_state.state) {
-    case SINGLE_TAP: break;
-    case SINGLE_HOLD: unregister_code(KC_LALT); break;
-    case DOUBLE_TAP: break;
-    case DOUBLE_HOLD: layer_off(1); unregister_code(KC_LALT); break;
-  }
-  alttap_state.state = 0;
-}
-
-tap_dance_action_t tap_dance_actions[] = {
-  [ALT_L1] = ACTION_TAP_DANCE_FN_ADVANCED(NULL,alt_finished, alt_reset)
-};
-
-bool led_update_keymap(led_t led_state) {
-  if (led_state.num_lock) {
-    numlock_on = true;
-  }
-  else {
-    numlock_on = false;
-  }
-}
-
-bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
-
-  switch (keycode) {
-    case KC_TRNS:
-    case KC_NO:
-      /* Always cancel one-shot layer when another key gets pressed */
-      if (record->event.pressed && is_oneshot_layer_active())
-      clear_oneshot_layer_state(ONESHOT_OTHER_KEY_PRESSED);
-      return true;
-    case QK_BOOT:
-      /* Don't allow reset from oneshot layer state */
-      if (record->event.pressed && is_oneshot_layer_active()) {
-        clear_oneshot_layer_state(ONESHOT_OTHER_KEY_PRESSED);
-        return false;
-      }
-      return true;
-    case KC_PPLS:
-      if (!numlock_on) {
-        if (is_oneshot_layer_active() || layer_state & 0x2) {
-          if (record->event.pressed)
-            register_code(KC_HOME);
-          else
-            unregister_code(KC_HOME);
-          clear_oneshot_layer_state(ONESHOT_START);
-        }
-        else {
-          if (record->event.pressed)
-            register_code(KC_PGUP);
-          else
-            unregister_code(KC_PGUP);
-        }
-        return false;
-      }
-      return true;
-    case KC_PENT:
-      if (!numlock_on) {
-        if (is_oneshot_layer_active() || layer_state & 0x2) {
-          if (record->event.pressed)
-            register_code(KC_END);
-          else
-            unregister_code(KC_END);
-          clear_oneshot_layer_state(ONESHOT_START);
-        }
-        else {
-          if (record->event.pressed)
-            register_code(KC_PGDN);
-          else
-            unregister_code(KC_PGDN);
-        }
-        return false;
-      }
-      return true;
-    case KC_NUM:
-      /* Shift + NumLock will be treated as shift-Insert */
-      if ((keyboard_report->mods & MOD_BIT (KC_LSFT)) || (keyboard_report->mods & MOD_BIT (KC_RSFT))) {
-        if (record->event.pressed) {
-          register_code(KC_INS);
-          unregister_code(KC_INS);
-        }
-        return false;
-      }
-      else
-        return true;
-    default:
-      return true;
-  }
-  return true;
-}
diff --git a/keyboards/mt/mt980/keymaps/walker/rules.mk b/keyboards/mt/mt980/keymaps/walker/rules.mk
deleted file mode 100644
index e5ddcae8d92..00000000000
--- a/keyboards/mt/mt980/keymaps/walker/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-TAP_DANCE_ENABLE = yes
diff --git a/keyboards/mwstudio/mmk_3/config.h b/keyboards/mwstudio/mmk_3/config.h
index 0265d3ed6e3..f8916cddd03 100644
--- a/keyboards/mwstudio/mmk_3/config.h
+++ b/keyboards/mwstudio/mmk_3/config.h
@@ -22,5 +22,5 @@
 #define WS2812_PWM_DRIVER PWMD4
 #define WS2812_PWM_CHANNEL 3
 #define WS2812_PWM_PAL_MODE 1
-#define WS2812_DMA_STREAM STM32_DMA1_STREAM7
-#define WS2812_DMA_CHANNEL 2
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM7
+#define WS2812_PWM_DMA_CHANNEL 2
diff --git a/keyboards/mwstudio/mw660/config.h b/keyboards/mwstudio/mw660/config.h
index 87659c1f67c..58d0eee9e08 100644
--- a/keyboards/mwstudio/mw660/config.h
+++ b/keyboards/mwstudio/mw660/config.h
@@ -20,5 +20,5 @@
 #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).
 #define WS2812_PWM_PAL_MODE 1                 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 2
-#define WS2812_DMA_STREAM STM32_DMA1_STREAM7  // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
-#define WS2812_DMA_CHANNEL 2  
\ No newline at end of file
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM7  // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
+#define WS2812_PWM_DMA_CHANNEL 2  
\ No newline at end of file
diff --git a/keyboards/nack/keymaps/farfalleflickan/keymap.c b/keyboards/nack/keymaps/farfalleflickan/keymap.c
deleted file mode 100644
index ec0b2434fa4..00000000000
--- a/keyboards/nack/keymaps/farfalleflickan/keymap.c
+++ /dev/null
@@ -1,203 +0,0 @@
-/* Copyright 2020 farfalleflickan <farfalleflickan@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-#include "keymap.h"
-
-#define ____ _______
-
-// Defines names for use in layer keycodes and the keymap
-enum layer_names {
-    BASE,
-    NOGUI,
-    NUM,
-    FN
-};
-
-// Defines the keycodes used by our macros in process_record_user
-enum custom_keycodes {
-    CK_LSFT = SAFE_RANGE,   // Shift
-    CK_RALT,                // AltGr
-    CK_BSPC_DEL,            // Backspace or Del (if pressed with CK_LSFT or CK_RALT)
-    KK_RESET
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [BASE] = LAYOUT(
-/*   __________________________________________________________________________________________________________________________________________________________________________
-    | \            \            \            \            \            \            \            \            \            \            \            \            \            \ */
-//  | |----TAB-----|---Q--------|-----W------|-----E------|-----R------|----T-------|-----Y------|-----U------|----I-------|------O-----|----P-------|----Å-------|--( ¨^~ )---|
-       KC_TAB,      KC_Q,        KC_W,        KC_E,        KC_R,        KC_T,        KC_Y,        KC_U,        KC_I,        KC_O,        KC_P,        KC_LBRC,     KC_RBRC,
-//  | |----ESC-----|---A--------|---S--------|----D-------|-----F------|-----G------|-----H------|-----J------|-----K------|-----L------|-----Ö------|-----Ä------|--( '* )----|
-       KC_ESC,      KC_A,        KC_S,        KC_D,        KC_F,        KC_G,        KC_H,        KC_J,        KC_K,        KC_L,        KC_SCLN,     KC_QUOT,     KC_NUHS,
-//  | |---SHIFT----|---Z--------|---X--------|----C-------|-----V------|-----B------|-----N------|------M-----|---( ,; )---|---( .: )---|---( -_ )---|----UP------|-BACKSPACE--|
-       CK_LSFT,     KC_Z,        KC_X,        KC_C,        KC_V,        KC_B,        KC_N,        KC_M,        KC_COMM,     KC_DOT,      KC_SLSH,     KC_UP,       CK_BSPC_DEL,
-//  | |---CTRL-----|---ALT------|---META-----|----FN_1----|----------SPACE----------|----FN_2----|----AltGr---|--( <>| )---|---ENTER----|-LEFT-------|---DOWN-----|--RIGHT-----|
-       KC_LCTL,     KC_LALT,     KC_LGUI,     MO(NUM),     KC_SPC,      KC_NO,       MO(FN),      CK_RALT,     KC_NUBS,     KC_ENT,      KC_LEFT,     KC_DOWN,     KC_RIGHT
-//   \|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|
-    ),
-    [NOGUI] = LAYOUT(
-/*   __________________________________________________________________________________________________________________________________________________________________________
-    | \            \            \            \            \            \            \            \            \            \            \            \            \            \ */
-//  | |----TAB-----|---Q--------|-----W------|-----E------|-----R------|----T-------|-----Y------|-----U------|----I-------|------O-----|----P-------|----Å-------|--( ¨^~ )---|
-       KC_TAB,      KC_Q,        KC_W,        KC_E,        KC_R,        KC_T,        KC_Y,        KC_U,        KC_I,        KC_O,        KC_P,        KC_LBRC,     KC_RBRC,
-//  | |----ESC-----|---A--------|---S--------|----D-------|-----F------|-----G------|-----H------|-----J------|-----K------|-----L------|-----Ö------|-----Ä------|--( '* )----|
-       KC_ESC,      KC_A,        KC_S,        KC_D,        KC_F,        KC_G,        KC_H,        KC_J,        KC_K,        KC_L,        KC_SCLN,     KC_QUOT,     KC_NUHS,
-//  | |---SHIFT----|---Z--------|---X--------|----C-------|-----V------|-----B------|-----N------|------M-----|---( ,; )---|---( .: )---|---( -_ )---|----UP------|-BACKSPACE--|
-       CK_LSFT,     KC_Z,        KC_X,        KC_C,        KC_V,        KC_B,        KC_N,        KC_M,        KC_COMM,     KC_DOT,      KC_SLSH,     KC_UP,       CK_BSPC_DEL,
-//  | |---CTRL-----|---ALT------|---META-----|----FN_1----|----------SPACE----------|----FN_2----|----AltGr---|--( <>| )---|---ENTER----|-LEFT-------|---DOWN-----|--RIGHT-----|
-       KC_LCTL,     KC_LALT,     KC_NO,       MO(NUM),     KC_SPC,      KC_NO,       TO(BASE),    CK_RALT,     KC_NUBS,     KC_ENT,      KC_LEFT,     KC_DOWN,     KC_RIGHT
-//   \|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|
-    ),
-    [NUM] = LAYOUT(
-/*   __________________________________________________________________________________________________________________________________________________________________________
-    | \            \            \            \            \            \            \            \            \            \            \            \            \            \ */
-//  | |---TAB------|---( 1! )---|--( 2"@ )---|--( 3#£ )---|---( 4¤$ )--|--( 5%€ )---|---( 6& )---|--( 7/{ )---|--( 8([ )---|--( 9)] )---|--( 0=} )---|---( +?\ )--|---( ´` )---|
-       ____,        KC_1,        KC_2,        KC_3,        KC_4,        KC_5,        KC_6,        KC_7,        KC_8,        KC_9,        KC_0,        KC_MINS,     KC_EQL,
-//  | |----ESC-----|-----F1-----|-----F2-----|----F3------|----F4------|----F5------|-----F6-----|-----F7------|----F8-----|-----F9-----|-----F10----|----F11-----|----F12-----|
-       ____,        KC_F1,       KC_F2,       KC_F3,       KC_F4,       KC_F5,       KC_F6,       KC_F7,       KC_F8,       KC_F9,       KC_F10,      KC_F11,      KC_F12,
-//  | |---SHIFT----|------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|
-       ____,        KC_P0,       KC_P1,       KC_P2,       KC_P3,       KC_P4,       KC_P5,       KC_P6,       KC_P7,       KC_P8,       KC_P9,       KC_PGUP,     KC_NO,
-//  | |---CTRL-----|---ALT------|---META-----|---FN_1-----|------------|------------|----FN_2----|--AltGr-----|---( §½ )---|------------|------------|------------|------------|
-       ____,        ____,        ____,        TO(BASE),    KC_NO,      KC_NO,        MO(FN),      ____,        KC_GRV,      KC_PDOT,     KC_HOME,     KC_PGDN,   KC_END
-//   \|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|
-    ),
-    [FN] = LAYOUT(
-/*   __________________________________________________________________________________________________________________________________________________________________________
-    | \            \            \            \            \            \            \            \            \            \            \            \            \            \ */
-//  | |-RGB TOGGLE-|-CHANGE RGB-|-RGB HUE UP-|-RGB SAT UP-|------------|------------|------------|------------|------------|------------|------------|------------|-QK_BOOT KBD--|
-       RGB_TOG,     RGB_MOD,     RGB_HUI,     RGB_SAI,     KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KK_RESET,
-//  | |------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|
-       MU_TOGG,     KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,
-//  | |------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|-RGB LIGHT +|------------|
-       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       RGB_VAI,     KC_NO,
-//  | |------------|------------|------------|---FN_1-----|------------|------------|----FN_2----|------------|------------|------------|------------|-RGB LIGHT -|------------|
-       KC_NO,       KC_NO,       KC_NO,       TO(BASE),    KC_NO,       KC_NO,       TO(BASE),    TO(NOGUI),   KC_NO,       KC_NO,       KC_NO,       RGB_VAD,     KC_NO
-//   \|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|
-    )
-};
-
-// Interrupt bools
-bool lshift = false, ralt = false;
-
-// Number of items that are saved in prev_kcs
-uint8_t prev_indx = 0;
-// Used to save the last 6 actual keycodes
-uint16_t prev_kcs[6] = {0, 0, 0, 0, 0, 0};
-
-/*
-Used to add a keycode to a prev_kcs to remember it.
-When full the last code gets discarded and replaced by
-the new one.
-*/
-void add_to_prev(uint16_t kc){
-  for (int i=0; i<prev_indx; i++){
-    if (kc == prev_kcs[i])
-      return;
-  }
-  if (prev_indx == 6){
-    for (int i=5; i>0; i--){
-      prev_kcs[i] = prev_kcs[i-1];
-    }
-    prev_kcs[0] = kc;
-  } else {
-    prev_kcs[prev_indx] = kc;
-    prev_indx++;
-  }
-}
-
-/*
-Unregisters all codes saved in prev_kcs and resets prev_indx.
-gets called on multiple occasions mainly when shift is released
-and when frankenkeycodes are pressed. Prevents output of
-wrong characters when really specific key combinations
-that would never occur during normal usage are pressed.
-*/
-void unreg_prev(void){
-  if (prev_indx == 0)
-    return;
-  for (int i=0; i<prev_indx; i++){
-    unregister_code(prev_kcs[i]);
-  }
-  prev_indx = 0;
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    static uint32_t key_timer;
-    switch (keycode) {
-        case CK_LSFT:
-          if(record->event.pressed) {
-            unregister_code(KC_LSFT);
-            register_code(KC_LSFT);
-            lshift = true;
-          } else {
-            unreg_prev();
-            unregister_code(KC_LSFT);
-            lshift = false;
-          }
-          return false;
-          break;
-        case CK_RALT:
-          if(record->event.pressed) {
-            unregister_code(KC_RALT);
-            register_code(KC_RALT);
-            ralt = true;
-          } else {
-            unreg_prev();
-            unregister_code(KC_RALT);
-            ralt = false;
-          }
-          return false;
-          break;
-        case CK_BSPC_DEL:
-            if (ralt==true) {
-                RALT_NO(KC_BSPC,KC_DEL);
-            } else {
-                SHIFT_NO(KC_BSPC,KC_DEL);
-            }
-            break;
-        case KK_RESET: // Basically, turn off RGB before resetting
-            if (record->event.pressed) {
-                key_timer = timer_read32();
-                #ifdef RGB_MATRIX_ENABLE
-                rgb_matrix_disable_noeeprom();
-                #endif
-            } else {
-                if (timer_elapsed32(key_timer) >= 20) {
-                    reset_keyboard();
-                }
-            }
-            break;
-        default:
-          if(record->event.pressed) {
-            timer_timeout_keymap();
-            if (lshift)
-              register_code(KC_LSFT);
-            else
-              unregister_code(KC_LSFT);
-            
-            if (ralt)
-              register_code(KC_ALGR);
-            else
-              unregister_code(KC_ALGR);
-          }
-        break;
-    }
-    return true;
-}
-
-__attribute__((weak))
-void timer_timeout_keymap(void){
-}
diff --git a/keyboards/nack/keymaps/farfalleflickan/keymap.h b/keyboards/nack/keymaps/farfalleflickan/keymap.h
deleted file mode 100644
index 212f45ffdb4..00000000000
--- a/keyboards/nack/keymaps/farfalleflickan/keymap.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/* Copyright 2020 farfalleflickan <farfalleflickan@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-#include "quantum.h"
-
-void add_to_prev(uint16_t kc);
-void unreg_prev(void);
-void timer_timeout_keymap(void);
-bool process_record_user(uint16_t keycode, keyrecord_t *record);
-
-// Normal shift status
-#define SHIFT_NORM(kc1, kc2) \
-if (record->event.pressed) { \
-  timer_timeout_keymap(); \
-  if (lshift) { \
-    register_code(KC_LSFT); \
-    unregister_code(kc2); \
-    register_code(kc2); \
-    add_to_prev(kc2); \
-  } else { \
-    unregister_code(KC_LSFT); \
-    unregister_code(kc1); \
-    register_code(kc1); \
-  } \
-} else { \
-  unregister_code(kc1); \
-  unregister_code(kc2); \
-} \
-return false;
-
-// Always shifted
-#define SHIFT_ALL(kc1, kc2) \
-if (record->event.pressed) { \
-  timer_timeout_keymap(); \
-  register_code(KC_LSFT); \
-  if (lshift) { \
-    unregister_code(kc2); \
-    register_code(kc2); \
-    add_to_prev(kc2); \
-  } else { \
-    unregister_code(kc1); \
-    register_code(kc1); \
-    add_to_prev(kc1); \
-  } \
-} else { \
-  unregister_code(kc1); \
-  unregister_code(kc2); \
-  unreg_prev(); \
-  if (lshift) \
-    register_code(KC_LSFT); \
-  else \
-    unregister_code(KC_LSFT); \
-} \
-return false;
-
-// Never shifted
-#define SHIFT_NO(kc1, kc2) \
-if (record->event.pressed) { \
-  timer_timeout_keymap(); \
-  unregister_code(KC_LSFT); \
-  if (lshift) { \
-    unregister_code(kc2); \
-    register_code(kc2); \
-    add_to_prev(kc2); \
-  } else { \
-    unregister_code(kc1); \
-    register_code(kc1); \
-  } \
-} else { \
-  unregister_code(kc1); \
-  unregister_code(kc2); \
-  unreg_prev(); \
-  if (lshift) \
-    register_code(KC_LSFT); \
-  else \
-    unregister_code(KC_LSFT); \
-} \
-return false;
-
-//Never RALT
-#define RALT_NO(kc1, kc2) \
-if (record->event.pressed) { \
-  timer_timeout_keymap(); \
-  unregister_code(KC_RALT); \
-  if (ralt) { \
-    unregister_code(kc2); \
-    register_code(kc2); \
-    add_to_prev(kc2); \
-  } else { \
-    unregister_code(kc1); \
-    register_code(kc1); \
-  } \
-} else { \
-  unregister_code(kc1); \
-  unregister_code(kc2); \
-  unreg_prev(); \
-  if (ralt) \
-    register_code(KC_RALT); \
-  else \
-    unregister_code(KC_RALT); \
-} \
-return false;
diff --git a/keyboards/nack/keymaps/farfalleflickan/readme.md b/keyboards/nack/keymaps/farfalleflickan/readme.md
deleted file mode 100644
index fbe5c6f5e3c..00000000000
--- a/keyboards/nack/keymaps/farfalleflickan/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# farfalleflickan's keymap for nack
diff --git a/keyboards/nasu/keymaps/mariocs/config.h b/keyboards/nasu/keymaps/mariocs/config.h
deleted file mode 100644
index 18b30b7859d..00000000000
--- a/keyboards/nasu/keymaps/mariocs/config.h
+++ /dev/null
@@ -1,5 +0,0 @@
-// Copyright 2021 Mario Cadenas (@MarioCadenas)
-// SPDX-License-Identifier: GPL-2.0-or-later
-#pragma once
-
-#define SPLIT_LED_STATE_ENABLE
diff --git a/keyboards/nasu/keymaps/mariocs/keymap.c b/keyboards/nasu/keymaps/mariocs/keymap.c
deleted file mode 100644
index d8cae4295d8..00000000000
--- a/keyboards/nasu/keymaps/mariocs/keymap.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/* Copyright 2021 MarioCadenas (@MarioCadenas)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-
-enum {
-    TD_LGUI,
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    layer_state_cmp(state, 1) ? setPinInputHigh(B0) : setPinInputLow(B0);
-
-    return state;
-}
-
-tap_dance_action_t tap_dance_actions[] = {
-    [TD_LGUI] = ACTION_TAP_DANCE_LAYER_TOGGLE(KC_LGUI, 1),
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[0] = LAYOUT_alice_split_bs( /* Base */
-    KC_ESC,  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,             KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL, KC_TRNS, KC_BSPC,
-    KC_PGUP, KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                       KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
-    KC_PGDN, KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                        KC_H,    KC_J,     KC_K,   KC_L,  KC_SCLN, KC_QUOT,          KC_ENT,
-             KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                        KC_END,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(2),
-             KC_LCTL,          KC_LALT,          KC_SPC,  TD(TD_LGUI),                KC_SPC,           KC_RALT,                            KC_RCTL),
-
-[1] = LAYOUT_alice_split_bs( /* FN */
-    KC_TRNS, KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,          KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                 KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                 KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS,          KC_TRNS,
-             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,
-             KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS,                 KC_TRNS,          KC_TRNS,                            KC_TRNS),
-
-[2] = LAYOUT_alice_split_bs( /* Empty for dynamic keymaps */
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,        KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
-             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-             KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS,                 KC_TRNS,          KC_TRNS,                            KC_TRNS),
-
-[3] = LAYOUT_alice_split_bs( /* Empty for dynamic keymaps */
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
-             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-             KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS,                 KC_TRNS,          KC_TRNS,                            KC_TRNS)
-};
diff --git a/keyboards/nasu/keymaps/mariocs/readme.md b/keyboards/nasu/keymaps/mariocs/readme.md
deleted file mode 100644
index b5b0e66aa80..00000000000
--- a/keyboards/nasu/keymaps/mariocs/readme.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Mariocs's keymap for Nasu.
-
-![Layer 0](https://i.imgur.com/kxC7RL5.png)
-
-![Layer 1](https://i.imgur.com/v0cYmXb.png)
-
-![Layer 2](https://i.imgur.com/FJ4y9hP.png)
-
-
-# Functionality
-
-* Via enabled.
-* When layer 1 is activated (Toggled os just temporarily), the numlock led will be switched on.
-* Double tapping `LGUI` key will toggle layer 1.
diff --git a/keyboards/nasu/keymaps/mariocs/rules.mk b/keyboards/nasu/keymaps/mariocs/rules.mk
deleted file mode 100644
index 791d5ab5021..00000000000
--- a/keyboards/nasu/keymaps/mariocs/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-VIA_ENABLE = yes
-TAP_DANCE_ENABLE = yes
diff --git a/keyboards/navi60/info.json b/keyboards/navi60/info.json
index dde3b09ff86..42c3e5da1d1 100644
--- a/keyboards/navi60/info.json
+++ b/keyboards/navi60/info.json
@@ -21,11 +21,7 @@
         "extrakey": true,
         "console": false,
         "command": false,
-        "nkro": true,
-        "backlight": false,
-        "rgblight": false,
-        "audio": false,
-        "key_lock": false
+        "nkro": true
     },
     "layouts": {
         "LAYOUT": {
diff --git a/keyboards/ning/tiny_board/tb16_rgb/keymaps/ningjx/keymap.c b/keyboards/ning/tiny_board/tb16_rgb/keymaps/ningjx/keymap.c
deleted file mode 100644
index e9529fe91e1..00000000000
--- a/keyboards/ning/tiny_board/tb16_rgb/keymaps/ningjx/keymap.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright 2023 Ning (@ningjx)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /*
-     * ┌───┬───┬───┬───┐
-     * │ 7 │ 8 │ 9 │RGB│
-     * ├───┼───┼───┼───┤
-     * │ 4 │ 5 │ 6 │MOD│
-     * ├───┼───┼───┼───┤
-     * │ 1 │ 2 │ 3 │ - │
-     * ├───┼───┼───┼───┤
-     * │ 0 │ . │Ent│ + │
-     * └───┴───┴───┴───┘
-     */
-    [0] = LAYOUT_ortho_4x4(
-        KC_P7,   KC_P8,   KC_P9,   RGB_TOG,
-        KC_P4,   KC_P5,   KC_P6,   RGB_MODE_FORWARD,
-        KC_P1,   KC_P2,   KC_P3,   KC_PMNS,
-        KC_P0,   KC_PDOT, KC_PENT, KC_PPLS
-    )
-};
diff --git a/keyboards/novelkeys/nk20/config.h b/keyboards/novelkeys/nk20/config.h
index 317cc2c3e83..750a0335689 100644
--- a/keyboards/novelkeys/nk20/config.h
+++ b/keyboards/novelkeys/nk20/config.h
@@ -20,5 +20,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define WS2812_PWM_DRIVER PWMD3
 #define WS2812_PWM_CHANNEL 2
 #define WS2812_PWM_PAL_MODE 1
-#define WS2812_DMA_STREAM STM32_DMA1_STREAM3
-#define WS2812_DMA_CHANNEL 3
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM3
+#define WS2812_PWM_DMA_CHANNEL 3
diff --git a/keyboards/novelkeys/nk65/nk65.c b/keyboards/novelkeys/nk65/nk65.c
index c4a14e7087b..dd0a94a8e6f 100755
--- a/keyboards/novelkeys/nk65/nk65.c
+++ b/keyboards/novelkeys/nk65/nk65.c
@@ -28,135 +28,135 @@ const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
  *   |  |      G location
  *   |  |      |      B location
  *   |  |      |      | */
-    {0, B_1,   A_1,   C_1}, //LA1
-    {0, E_1,   D_1,   F_1}, //LA2
-    {0, H_1,   G_1,   I_1}, //LA3
-    {0, K_1,   J_1,   L_1}, //LA4
-    {0, B_2,   A_2,   C_2}, //LA5
-    {0, E_2,   D_2,   F_2}, //LA6
-    {0, H_2,   G_2,   I_2}, //LA7
-    {0, K_2,   J_2,   L_2}, //LA8
-    {0, B_3,   A_3,   C_3}, //LA9
-    {0, E_3,   D_3,   F_3}, //LA10
-    {0, H_3,   G_3,   I_3}, //LA11
-    {0, K_3,   J_3,   L_3}, //LA12
-    {0, B_4,   A_4,   C_4}, //LA13
-    {0, E_4,   D_4,   F_4}, //LA14
-    {0, H_4,   G_4,   I_4}, //LA15
-    {0, K_4,   J_4,   L_4}, //LA16
-    {0, B_5,   A_5,   C_5}, //LA17
-    {0, E_5,   D_5,   F_5}, //LA18
-    {0, H_5,   G_5,   I_5}, //LA19
-    {0, K_5,   J_5,   L_5}, //LA20
-    {0, B_6,   A_6,   C_6}, //LA21
-    {0, E_6,   D_6,   F_6}, //LA22
-    {0, H_6,   G_6,   I_6}, //LA23
-    {0, K_6,   J_6,   L_6}, //LA24
-    {0, B_7,   A_7,   C_7}, //LA25
-    {0, E_7,   D_7,   F_7}, //LA26
-    {0, H_7,   G_7,   I_7}, //LA27
-    {0, K_7,   J_7,   L_7}, //LA28
-    {0, B_8,   A_8,   C_8}, //LA29
-    {0, E_8,   D_8,   F_8}, //LA30
-    {0, H_8,   G_8,   I_8}, //LA31
-    {0, K_8,   J_8,   L_8}, //LA32
-    {0, B_9,   A_9,   C_9}, //LA33
-    {0, E_9,   D_9,   F_9}, //LA34
-    {0, H_9,   G_9,   I_9}, //LA35
-    {0, K_9,   J_9,   L_9}, //LA36
-    {0, B_10,  A_10,  C_10}, //LA37
-    {0, E_10,  D_10,  F_10}, //LA38
-    {0, H_10,  G_10,  I_10}, //LA39
-    {0, K_10,  J_10,  L_10}, //LA40
-    {0, B_11,  A_11,  C_11}, //LA41
-    {0, E_11,  D_11,  F_11}, //LA42
-    {0, H_11,  G_11,  I_11}, //LA43
-    {0, K_11,  J_11,  L_11}, //LA44
-    {0, B_12,  A_12,  C_12}, //LA45
-    {0, E_12,  D_12,  F_12}, //LA46
-    {0, H_12,  G_12,  I_12}, //LA47
-    {0, K_12,  J_12,  L_12}, //LA48
-    {0, B_13,  A_13,  C_13}, //LA49
-    {0, E_13,  D_13,  F_13}, //LA50
-    {0, H_13,  G_13,  I_13}, //LA51
-    {0, K_13,  J_13,  L_13}, //LA52
-    {0, B_14,  A_14,  C_14}, //LA53
-    {0, E_14,  D_14,  F_14}, //LA54
-    {0, H_14,  G_14,  I_14}, //LA55
-    {0, K_14,  J_14,  L_14}, //LA56
-    {0, B_15,  A_15,  C_15}, //LA57
-    {0, E_15,  D_15,  F_15}, //LA58
-    {0, H_15,  G_15,  I_15}, //LA59
-    {0, K_15,  J_15,  L_15}, //LA60
-    {0, B_16,  A_16,  C_16}, //LA61
-    {0, E_16,  D_16,  F_16}, //LA62
-    {0, H_16,  G_16,  I_16}, //LA63
-    {0, K_16,  J_16,  L_16}, //LA64
+    {0, SW2_CS1,   SW1_CS1,   SW3_CS1}, //LA1
+    {0, SW5_CS1,   SW4_CS1,   SW6_CS1}, //LA2
+    {0, SW8_CS1,   SW7_CS1,   SW9_CS1}, //LA3
+    {0, SW11_CS1,   SW10_CS1,   SW12_CS1}, //LA4
+    {0, SW2_CS2,   SW1_CS2,   SW3_CS2}, //LA5
+    {0, SW5_CS2,   SW4_CS2,   SW6_CS2}, //LA6
+    {0, SW8_CS2,   SW7_CS2,   SW9_CS2}, //LA7
+    {0, SW11_CS2,   SW10_CS2,   SW12_CS2}, //LA8
+    {0, SW2_CS3,   SW1_CS3,   SW3_CS3}, //LA9
+    {0, SW5_CS3,   SW4_CS3,   SW6_CS3}, //LA10
+    {0, SW8_CS3,   SW7_CS3,   SW9_CS3}, //LA11
+    {0, SW11_CS3,   SW10_CS3,   SW12_CS3}, //LA12
+    {0, SW2_CS4,   SW1_CS4,   SW3_CS4}, //LA13
+    {0, SW5_CS4,   SW4_CS4,   SW6_CS4}, //LA14
+    {0, SW8_CS4,   SW7_CS4,   SW9_CS4}, //LA15
+    {0, SW11_CS4,   SW10_CS4,   SW12_CS4}, //LA16
+    {0, SW2_CS5,   SW1_CS5,   SW3_CS5}, //LA17
+    {0, SW5_CS5,   SW4_CS5,   SW6_CS5}, //LA18
+    {0, SW8_CS5,   SW7_CS5,   SW9_CS5}, //LA19
+    {0, SW11_CS5,   SW10_CS5,   SW12_CS5}, //LA20
+    {0, SW2_CS6,   SW1_CS6,   SW3_CS6}, //LA21
+    {0, SW5_CS6,   SW4_CS6,   SW6_CS6}, //LA22
+    {0, SW8_CS6,   SW7_CS6,   SW9_CS6}, //LA23
+    {0, SW11_CS6,   SW10_CS6,   SW12_CS6}, //LA24
+    {0, SW2_CS7,   SW1_CS7,   SW3_CS7}, //LA25
+    {0, SW5_CS7,   SW4_CS7,   SW6_CS7}, //LA26
+    {0, SW8_CS7,   SW7_CS7,   SW9_CS7}, //LA27
+    {0, SW11_CS7,   SW10_CS7,   SW12_CS7}, //LA28
+    {0, SW2_CS8,   SW1_CS8,   SW3_CS8}, //LA29
+    {0, SW5_CS8,   SW4_CS8,   SW6_CS8}, //LA30
+    {0, SW8_CS8,   SW7_CS8,   SW9_CS8}, //LA31
+    {0, SW11_CS8,   SW10_CS8,   SW12_CS8}, //LA32
+    {0, SW2_CS9,   SW1_CS9,   SW3_CS9}, //LA33
+    {0, SW5_CS9,   SW4_CS9,   SW6_CS9}, //LA34
+    {0, SW8_CS9,   SW7_CS9,   SW9_CS9}, //LA35
+    {0, SW11_CS9,   SW10_CS9,   SW12_CS9}, //LA36
+    {0, SW2_CS10,  SW1_CS10,  SW3_CS10}, //LA37
+    {0, SW5_CS10,  SW4_CS10,  SW6_CS10}, //LA38
+    {0, SW8_CS10,  SW7_CS10,  SW9_CS10}, //LA39
+    {0, SW11_CS10,  SW10_CS10,  SW12_CS10}, //LA40
+    {0, SW2_CS11,  SW1_CS11,  SW3_CS11}, //LA41
+    {0, SW5_CS11,  SW4_CS11,  SW6_CS11}, //LA42
+    {0, SW8_CS11,  SW7_CS11,  SW9_CS11}, //LA43
+    {0, SW11_CS11,  SW10_CS11,  SW12_CS11}, //LA44
+    {0, SW2_CS12,  SW1_CS12,  SW3_CS12}, //LA45
+    {0, SW5_CS12,  SW4_CS12,  SW6_CS12}, //LA46
+    {0, SW8_CS12,  SW7_CS12,  SW9_CS12}, //LA47
+    {0, SW11_CS12,  SW10_CS12,  SW12_CS12}, //LA48
+    {0, SW2_CS13,  SW1_CS13,  SW3_CS13}, //LA49
+    {0, SW5_CS13,  SW4_CS13,  SW6_CS13}, //LA50
+    {0, SW8_CS13,  SW7_CS13,  SW9_CS13}, //LA51
+    {0, SW11_CS13,  SW10_CS13,  SW12_CS13}, //LA52
+    {0, SW2_CS14,  SW1_CS14,  SW3_CS14}, //LA53
+    {0, SW5_CS14,  SW4_CS14,  SW6_CS14}, //LA54
+    {0, SW8_CS14,  SW7_CS14,  SW9_CS14}, //LA55
+    {0, SW11_CS14,  SW10_CS14,  SW12_CS14}, //LA56
+    {0, SW2_CS15,  SW1_CS15,  SW3_CS15}, //LA57
+    {0, SW5_CS15,  SW4_CS15,  SW6_CS15}, //LA58
+    {0, SW8_CS15,  SW7_CS15,  SW9_CS15}, //LA59
+    {0, SW11_CS15,  SW10_CS15,  SW12_CS15}, //LA60
+    {0, SW2_CS16,  SW1_CS16,  SW3_CS16}, //LA61
+    {0, SW5_CS16,  SW4_CS16,  SW6_CS16}, //LA62
+    {0, SW8_CS16,  SW7_CS16,  SW9_CS16}, //LA63
+    {0, SW11_CS16,  SW10_CS16,  SW12_CS16}, //LA64
 
-    {1, B_1,   A_1,   C_1}, //LB1
-    {1, E_1,   D_1,   F_1}, //LB2
-    {1, H_1,   G_1,   I_1}, //LB3
-    {1, K_1,   J_1,   L_1}, //LB4
-    {1, B_2,   A_2,   C_2}, //LB5
-    {1, E_2,   D_2,   F_2}, //LB6
-    {1, H_2,   G_2,   I_2}, //LB7
-    {1, K_2,   J_2,   L_2}, //LB8
-    {1, B_3,   A_3,   C_3}, //LB9
-    {1, E_3,   D_3,   F_3}, //LB10
-    {1, H_3,   G_3,   I_3}, //LB11
-    {1, K_3,   J_3,   L_3}, //LB12
-    {1, B_4,   A_4,   C_4}, //LB13
-    {1, E_4,   D_4,   F_4}, //LB14
-    {1, H_4,   G_4,   I_4}, //LB15
-    {1, K_4,   J_4,   L_4}, //LB16
-    {1, B_5,   A_5,   C_5}, //LB17
-    {1, E_5,   D_5,   F_5}, //LB18
-    {1, H_5,   G_5,   I_5}, //LB19
-    {1, K_5,   J_5,   L_5}, //LB20
-    {1, B_6,   A_6,   C_6}, //LB21
-    {1, E_6,   D_6,   F_6}, //LB22
-    {1, H_6,   G_6,   I_6}, //LB23
-    {1, K_6,   J_6,   L_6}, //LB24
-    {1, B_7,   A_7,   C_7}, //LB25
-    {1, E_7,   D_7,   F_7}, //LB26
-    {1, H_7,   G_7,   I_7}, //LB27
-    {1, K_7,   J_7,   L_7}, //LB28
-    {1, B_8,   A_8,   C_8}, //LB29
-    {1, E_8,   D_8,   F_8}, //LB30
-    {1, H_8,   G_8,   I_8}, //LB31
-    {1, K_8,   J_8,   L_8}, //LB32
-    {1, B_9,   A_9,   C_9}, //LB33
-    {1, E_9,   D_9,   F_9}, //LB34
-    {1, H_9,   G_9,   I_9}, //LB35
-    {1, K_9,   J_9,   L_9}, //LB36
-    {1, B_10,  A_10,  C_10}, //LB37
-    {1, E_10,  D_10,  F_10}, //LB38
-    {1, H_10,  G_10,  I_10}, //LB39
-    {1, K_10,  J_10,  L_10}, //LB40
-    {1, B_11,  A_11,  C_11}, //LB41
-    {1, E_11,  D_11,  F_11}, //LB42
-    {1, H_11,  G_11,  I_11}, //LB43
-    {1, K_11,  J_11,  L_11}, //LB44
-    {1, B_12,  A_12,  C_12}, //LB45
-    {1, E_12,  D_12,  F_12}, //LB46
-    {1, H_12,  G_12,  I_12}, //LB47
-    {1, K_12,  J_12,  L_12}, //LB48
-    {1, B_13,  A_13,  C_13}, //LB49
-    {1, E_13,  D_13,  F_13}, //LB50
-    {1, H_13,  G_13,  I_13}, //LB51
-    {1, K_13,  J_13,  L_13}, //LB52
-    {1, B_14,  A_14,  C_14}, //LB53
-    {1, E_14,  D_14,  F_14}, //LB54
-    {1, H_14,  G_14,  I_14}, //LB55
-    {1, K_14,  J_14,  L_14}, //LB56
-    {1, B_15,  A_15,  C_15}, //LB57
-    {1, E_15,  D_15,  F_15}, //LB58
-    {1, H_15,  G_15,  I_15}, //LB59
-    {1, K_15,  J_15,  L_15}, //LB60
-    {1, B_16,  A_16,  C_16}, //LB61
-    {1, E_16,  D_16,  F_16}, //LB62
-    {1, H_16,  G_16,  I_16}, //LB63
-    {1, K_16,  J_16,  L_16}, //LB64
+    {1, SW2_CS1,   SW1_CS1,   SW3_CS1}, //LB1
+    {1, SW5_CS1,   SW4_CS1,   SW6_CS1}, //LB2
+    {1, SW8_CS1,   SW7_CS1,   SW9_CS1}, //LB3
+    {1, SW11_CS1,   SW10_CS1,   SW12_CS1}, //LB4
+    {1, SW2_CS2,   SW1_CS2,   SW3_CS2}, //LB5
+    {1, SW5_CS2,   SW4_CS2,   SW6_CS2}, //LB6
+    {1, SW8_CS2,   SW7_CS2,   SW9_CS2}, //LB7
+    {1, SW11_CS2,   SW10_CS2,   SW12_CS2}, //LB8
+    {1, SW2_CS3,   SW1_CS3,   SW3_CS3}, //LB9
+    {1, SW5_CS3,   SW4_CS3,   SW6_CS3}, //LB10
+    {1, SW8_CS3,   SW7_CS3,   SW9_CS3}, //LB11
+    {1, SW11_CS3,   SW10_CS3,   SW12_CS3}, //LB12
+    {1, SW2_CS4,   SW1_CS4,   SW3_CS4}, //LB13
+    {1, SW5_CS4,   SW4_CS4,   SW6_CS4}, //LB14
+    {1, SW8_CS4,   SW7_CS4,   SW9_CS4}, //LB15
+    {1, SW11_CS4,   SW10_CS4,   SW12_CS4}, //LB16
+    {1, SW2_CS5,   SW1_CS5,   SW3_CS5}, //LB17
+    {1, SW5_CS5,   SW4_CS5,   SW6_CS5}, //LB18
+    {1, SW8_CS5,   SW7_CS5,   SW9_CS5}, //LB19
+    {1, SW11_CS5,   SW10_CS5,   SW12_CS5}, //LB20
+    {1, SW2_CS6,   SW1_CS6,   SW3_CS6}, //LB21
+    {1, SW5_CS6,   SW4_CS6,   SW6_CS6}, //LB22
+    {1, SW8_CS6,   SW7_CS6,   SW9_CS6}, //LB23
+    {1, SW11_CS6,   SW10_CS6,   SW12_CS6}, //LB24
+    {1, SW2_CS7,   SW1_CS7,   SW3_CS7}, //LB25
+    {1, SW5_CS7,   SW4_CS7,   SW6_CS7}, //LB26
+    {1, SW8_CS7,   SW7_CS7,   SW9_CS7}, //LB27
+    {1, SW11_CS7,   SW10_CS7,   SW12_CS7}, //LB28
+    {1, SW2_CS8,   SW1_CS8,   SW3_CS8}, //LB29
+    {1, SW5_CS8,   SW4_CS8,   SW6_CS8}, //LB30
+    {1, SW8_CS8,   SW7_CS8,   SW9_CS8}, //LB31
+    {1, SW11_CS8,   SW10_CS8,   SW12_CS8}, //LB32
+    {1, SW2_CS9,   SW1_CS9,   SW3_CS9}, //LB33
+    {1, SW5_CS9,   SW4_CS9,   SW6_CS9}, //LB34
+    {1, SW8_CS9,   SW7_CS9,   SW9_CS9}, //LB35
+    {1, SW11_CS9,   SW10_CS9,   SW12_CS9}, //LB36
+    {1, SW2_CS10,  SW1_CS10,  SW3_CS10}, //LB37
+    {1, SW5_CS10,  SW4_CS10,  SW6_CS10}, //LB38
+    {1, SW8_CS10,  SW7_CS10,  SW9_CS10}, //LB39
+    {1, SW11_CS10,  SW10_CS10,  SW12_CS10}, //LB40
+    {1, SW2_CS11,  SW1_CS11,  SW3_CS11}, //LB41
+    {1, SW5_CS11,  SW4_CS11,  SW6_CS11}, //LB42
+    {1, SW8_CS11,  SW7_CS11,  SW9_CS11}, //LB43
+    {1, SW11_CS11,  SW10_CS11,  SW12_CS11}, //LB44
+    {1, SW2_CS12,  SW1_CS12,  SW3_CS12}, //LB45
+    {1, SW5_CS12,  SW4_CS12,  SW6_CS12}, //LB46
+    {1, SW8_CS12,  SW7_CS12,  SW9_CS12}, //LB47
+    {1, SW11_CS12,  SW10_CS12,  SW12_CS12}, //LB48
+    {1, SW2_CS13,  SW1_CS13,  SW3_CS13}, //LB49
+    {1, SW5_CS13,  SW4_CS13,  SW6_CS13}, //LB50
+    {1, SW8_CS13,  SW7_CS13,  SW9_CS13}, //LB51
+    {1, SW11_CS13,  SW10_CS13,  SW12_CS13}, //LB52
+    {1, SW2_CS14,  SW1_CS14,  SW3_CS14}, //LB53
+    {1, SW5_CS14,  SW4_CS14,  SW6_CS14}, //LB54
+    {1, SW8_CS14,  SW7_CS14,  SW9_CS14}, //LB55
+    {1, SW11_CS14,  SW10_CS14,  SW12_CS14}, //LB56
+    {1, SW2_CS15,  SW1_CS15,  SW3_CS15}, //LB57
+    {1, SW5_CS15,  SW4_CS15,  SW6_CS15}, //LB58
+    {1, SW8_CS15,  SW7_CS15,  SW9_CS15}, //LB59
+    {1, SW11_CS15,  SW10_CS15,  SW12_CS15}, //LB60
+    {1, SW2_CS16,  SW1_CS16,  SW3_CS16}, //LB61
+    {1, SW5_CS16,  SW4_CS16,  SW6_CS16}, //LB62
+    {1, SW8_CS16,  SW7_CS16,  SW9_CS16}, //LB63
+    {1, SW11_CS16,  SW10_CS16,  SW12_CS16}, //LB64
 };
 #endif
 
diff --git a/keyboards/novelkeys/nk65b/config.h b/keyboards/novelkeys/nk65b/config.h
index 40e3b54053e..eaddb87b820 100755
--- a/keyboards/novelkeys/nk65b/config.h
+++ b/keyboards/novelkeys/nk65b/config.h
@@ -20,5 +20,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define WS2812_PWM_DRIVER PWMD3
 #define WS2812_PWM_CHANNEL 1
 #define WS2812_PWM_PAL_MODE 1
-#define WS2812_DMA_STREAM STM32_DMA1_STREAM3
-#define WS2812_DMA_CHANNEL 3
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM3
+#define WS2812_PWM_DMA_CHANNEL 3
diff --git a/keyboards/novelkeys/nk87/nk87.c b/keyboards/novelkeys/nk87/nk87.c
index e701bfaccf9..420141c7283 100755
--- a/keyboards/novelkeys/nk87/nk87.c
+++ b/keyboards/novelkeys/nk87/nk87.c
@@ -28,135 +28,135 @@ const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
  *   |  |      G location
  *   |  |      |      B location
  *   |  |      |      | */
-    {0, B_1,   A_1,   C_1}, //LA1
-    {0, E_1,   D_1,   F_1}, //LA2
-    {0, H_1,   G_1,   I_1}, //LA3
-    {0, K_1,   J_1,   L_1}, //LA4
-    {0, B_2,   A_2,   C_2}, //LA5
-    {0, E_2,   D_2,   F_2}, //LA6
-    {0, H_2,   G_2,   I_2}, //LA7
-    {0, K_2,   J_2,   L_2}, //LA8
-    {0, B_3,   A_3,   C_3}, //LA9
-    {0, E_3,   D_3,   F_3}, //LA10
-    {0, H_3,   G_3,   I_3}, //LA11
-    {0, K_3,   J_3,   L_3}, //LA12
-    {0, B_4,   A_4,   C_4}, //LA13
-    {0, E_4,   D_4,   F_4}, //LA14
-    {0, H_4,   G_4,   I_4}, //LA15
-    {0, K_4,   J_4,   L_4}, //LA16
-    {0, B_5,   A_5,   C_5}, //LA17
-    {0, E_5,   D_5,   F_5}, //LA18
-    {0, H_5,   G_5,   I_5}, //LA19
-    {0, K_5,   J_5,   L_5}, //LA20
-    {0, B_6,   A_6,   C_6}, //LA21
-    {0, E_6,   D_6,   F_6}, //LA22
-    {0, H_6,   G_6,   I_6}, //LA23
-    {0, K_6,   J_6,   L_6}, //LA24
-    {0, B_7,   A_7,   C_7}, //LA25
-    {0, E_7,   D_7,   F_7}, //LA26
-    {0, H_7,   G_7,   I_7}, //LA27
-    {0, K_7,   J_7,   L_7}, //LA28
-    {0, B_8,   A_8,   C_8}, //LA29
-    {0, E_8,   D_8,   F_8}, //LA30
-    {0, H_8,   G_8,   I_8}, //LA31
-    {0, K_8,   J_8,   L_8}, //LA32
-    {0, B_9,   A_9,   C_9}, //LA33
-    {0, E_9,   D_9,   F_9}, //LA34
-    {0, H_9,   G_9,   I_9}, //LA35
-    {0, K_9,   J_9,   L_9}, //LA36
-    {0, B_10,  A_10,  C_10}, //LA37
-    {0, E_10,  D_10,  F_10}, //LA38
-    {0, H_10,  G_10,  I_10}, //LA39
-    {0, K_10,  J_10,  L_10}, //LA40
-    {0, B_11,  A_11,  C_11}, //LA41
-    {0, E_11,  D_11,  F_11}, //LA42
-    {0, H_11,  G_11,  I_11}, //LA43
-    {0, K_11,  J_11,  L_11}, //LA44
-    {0, B_12,  A_12,  C_12}, //LA45
-    {0, E_12,  D_12,  F_12}, //LA46
-    {0, H_12,  G_12,  I_12}, //LA47
-    {0, K_12,  J_12,  L_12}, //LA48
-    {0, B_13,  A_13,  C_13}, //LA49
-    {0, E_13,  D_13,  F_13}, //LA50
-    {0, H_13,  G_13,  I_13}, //LA51
-    {0, K_13,  J_13,  L_13}, //LA52
-    {0, B_14,  A_14,  C_14}, //LA53
-    {0, E_14,  D_14,  F_14}, //LA54
-    {0, H_14,  G_14,  I_14}, //LA55
-    {0, K_14,  J_14,  L_14}, //LA56
-    {0, B_15,  A_15,  C_15}, //LA57
-    {0, E_15,  D_15,  F_15}, //LA58
-    {0, H_15,  G_15,  I_15}, //LA59
-    {0, K_15,  J_15,  L_15}, //LA60
-    {0, B_16,  A_16,  C_16}, //LA61
-    {0, E_16,  D_16,  F_16}, //LA62
-    {0, H_16,  G_16,  I_16}, //LA63
-    {0, K_16,  J_16,  L_16}, //LA64
+    {0, SW2_CS1,   SW1_CS1,   SW3_CS1}, //LA1
+    {0, SW5_CS1,   SW4_CS1,   SW6_CS1}, //LA2
+    {0, SW8_CS1,   SW7_CS1,   SW9_CS1}, //LA3
+    {0, SW11_CS1,   SW10_CS1,   SW12_CS1}, //LA4
+    {0, SW2_CS2,   SW1_CS2,   SW3_CS2}, //LA5
+    {0, SW5_CS2,   SW4_CS2,   SW6_CS2}, //LA6
+    {0, SW8_CS2,   SW7_CS2,   SW9_CS2}, //LA7
+    {0, SW11_CS2,   SW10_CS2,   SW12_CS2}, //LA8
+    {0, SW2_CS3,   SW1_CS3,   SW3_CS3}, //LA9
+    {0, SW5_CS3,   SW4_CS3,   SW6_CS3}, //LA10
+    {0, SW8_CS3,   SW7_CS3,   SW9_CS3}, //LA11
+    {0, SW11_CS3,   SW10_CS3,   SW12_CS3}, //LA12
+    {0, SW2_CS4,   SW1_CS4,   SW3_CS4}, //LA13
+    {0, SW5_CS4,   SW4_CS4,   SW6_CS4}, //LA14
+    {0, SW8_CS4,   SW7_CS4,   SW9_CS4}, //LA15
+    {0, SW11_CS4,   SW10_CS4,   SW12_CS4}, //LA16
+    {0, SW2_CS5,   SW1_CS5,   SW3_CS5}, //LA17
+    {0, SW5_CS5,   SW4_CS5,   SW6_CS5}, //LA18
+    {0, SW8_CS5,   SW7_CS5,   SW9_CS5}, //LA19
+    {0, SW11_CS5,   SW10_CS5,   SW12_CS5}, //LA20
+    {0, SW2_CS6,   SW1_CS6,   SW3_CS6}, //LA21
+    {0, SW5_CS6,   SW4_CS6,   SW6_CS6}, //LA22
+    {0, SW8_CS6,   SW7_CS6,   SW9_CS6}, //LA23
+    {0, SW11_CS6,   SW10_CS6,   SW12_CS6}, //LA24
+    {0, SW2_CS7,   SW1_CS7,   SW3_CS7}, //LA25
+    {0, SW5_CS7,   SW4_CS7,   SW6_CS7}, //LA26
+    {0, SW8_CS7,   SW7_CS7,   SW9_CS7}, //LA27
+    {0, SW11_CS7,   SW10_CS7,   SW12_CS7}, //LA28
+    {0, SW2_CS8,   SW1_CS8,   SW3_CS8}, //LA29
+    {0, SW5_CS8,   SW4_CS8,   SW6_CS8}, //LA30
+    {0, SW8_CS8,   SW7_CS8,   SW9_CS8}, //LA31
+    {0, SW11_CS8,   SW10_CS8,   SW12_CS8}, //LA32
+    {0, SW2_CS9,   SW1_CS9,   SW3_CS9}, //LA33
+    {0, SW5_CS9,   SW4_CS9,   SW6_CS9}, //LA34
+    {0, SW8_CS9,   SW7_CS9,   SW9_CS9}, //LA35
+    {0, SW11_CS9,   SW10_CS9,   SW12_CS9}, //LA36
+    {0, SW2_CS10,  SW1_CS10,  SW3_CS10}, //LA37
+    {0, SW5_CS10,  SW4_CS10,  SW6_CS10}, //LA38
+    {0, SW8_CS10,  SW7_CS10,  SW9_CS10}, //LA39
+    {0, SW11_CS10,  SW10_CS10,  SW12_CS10}, //LA40
+    {0, SW2_CS11,  SW1_CS11,  SW3_CS11}, //LA41
+    {0, SW5_CS11,  SW4_CS11,  SW6_CS11}, //LA42
+    {0, SW8_CS11,  SW7_CS11,  SW9_CS11}, //LA43
+    {0, SW11_CS11,  SW10_CS11,  SW12_CS11}, //LA44
+    {0, SW2_CS12,  SW1_CS12,  SW3_CS12}, //LA45
+    {0, SW5_CS12,  SW4_CS12,  SW6_CS12}, //LA46
+    {0, SW8_CS12,  SW7_CS12,  SW9_CS12}, //LA47
+    {0, SW11_CS12,  SW10_CS12,  SW12_CS12}, //LA48
+    {0, SW2_CS13,  SW1_CS13,  SW3_CS13}, //LA49
+    {0, SW5_CS13,  SW4_CS13,  SW6_CS13}, //LA50
+    {0, SW8_CS13,  SW7_CS13,  SW9_CS13}, //LA51
+    {0, SW11_CS13,  SW10_CS13,  SW12_CS13}, //LA52
+    {0, SW2_CS14,  SW1_CS14,  SW3_CS14}, //LA53
+    {0, SW5_CS14,  SW4_CS14,  SW6_CS14}, //LA54
+    {0, SW8_CS14,  SW7_CS14,  SW9_CS14}, //LA55
+    {0, SW11_CS14,  SW10_CS14,  SW12_CS14}, //LA56
+    {0, SW2_CS15,  SW1_CS15,  SW3_CS15}, //LA57
+    {0, SW5_CS15,  SW4_CS15,  SW6_CS15}, //LA58
+    {0, SW8_CS15,  SW7_CS15,  SW9_CS15}, //LA59
+    {0, SW11_CS15,  SW10_CS15,  SW12_CS15}, //LA60
+    {0, SW2_CS16,  SW1_CS16,  SW3_CS16}, //LA61
+    {0, SW5_CS16,  SW4_CS16,  SW6_CS16}, //LA62
+    {0, SW8_CS16,  SW7_CS16,  SW9_CS16}, //LA63
+    {0, SW11_CS16,  SW10_CS16,  SW12_CS16}, //LA64
 
-    {1, B_1,   A_1,   C_1}, //LB1
-    {1, E_1,   D_1,   F_1}, //LB2
-    {1, H_1,   G_1,   I_1}, //LB3
-    {1, K_1,   J_1,   L_1}, //LB4
-    {1, B_2,   A_2,   C_2}, //LB5
-    {1, E_2,   D_2,   F_2}, //LB6
-    {1, H_2,   G_2,   I_2}, //LB7
-    {1, K_2,   J_2,   L_2}, //LB8
-    {1, B_3,   A_3,   C_3}, //LB9
-    {1, E_3,   D_3,   F_3}, //LB10
-    {1, H_3,   G_3,   I_3}, //LB11
-    {1, K_3,   J_3,   L_3}, //LB12
-    {1, B_4,   A_4,   C_4}, //LB13
-    {1, E_4,   D_4,   F_4}, //LB14
-    {1, H_4,   G_4,   I_4}, //LB15
-    {1, K_4,   J_4,   L_4}, //LB16
-    {1, B_5,   A_5,   C_5}, //LB17
-    {1, E_5,   D_5,   F_5}, //LB18
-    {1, H_5,   G_5,   I_5}, //LB19
-    {1, K_5,   J_5,   L_5}, //LB20
-    {1, B_6,   A_6,   C_6}, //LB21
-    {1, E_6,   D_6,   F_6}, //LB22
-    {1, H_6,   G_6,   I_6}, //LB23
-    {1, K_6,   J_6,   L_6}, //LB24
-    {1, B_7,   A_7,   C_7}, //LB25
-    {1, E_7,   D_7,   F_7}, //LB26
-    {1, H_7,   G_7,   I_7}, //LB27
-    {1, K_7,   J_7,   L_7}, //LB28
-    {1, B_8,   A_8,   C_8}, //LB29
-    {1, E_8,   D_8,   F_8}, //LB30
-    {1, H_8,   G_8,   I_8}, //LB31
-    {1, K_8,   J_8,   L_8}, //LB32
-    {1, B_9,   A_9,   C_9}, //LB33
-    {1, E_9,   D_9,   F_9}, //LB34
-    {1, H_9,   G_9,   I_9}, //LB35
-    {1, K_9,   J_9,   L_9}, //LB36
-    {1, B_10,  A_10,  C_10}, //LB37
-    {1, E_10,  D_10,  F_10}, //LB38
-    {1, H_10,  G_10,  I_10}, //LB39
-    {1, K_10,  J_10,  L_10}, //LB40
-    {1, B_11,  A_11,  C_11}, //LB41
-    {1, E_11,  D_11,  F_11}, //LB42
-    {1, H_11,  G_11,  I_11}, //LB43
-    {1, K_11,  J_11,  L_11}, //LB44
-    {1, B_12,  A_12,  C_12}, //LB45
-    {1, E_12,  D_12,  F_12}, //LB46
-    {1, H_12,  G_12,  I_12}, //LB47
-    {1, K_12,  J_12,  L_12}, //LB48
-    {1, B_13,  A_13,  C_13}, //LB49
-    {1, E_13,  D_13,  F_13}, //LB50
-    {1, H_13,  G_13,  I_13}, //LB51
-    {1, K_13,  J_13,  L_13}, //LB52
-    {1, B_14,  A_14,  C_14}, //LB53
-    {1, E_14,  D_14,  F_14}, //LB54
-    {1, H_14,  G_14,  I_14}, //LB55
-    {1, K_14,  J_14,  L_14}, //LB56
-    {1, B_15,  A_15,  C_15}, //LB57
-    {1, E_15,  D_15,  F_15}, //LB58
-    {1, H_15,  G_15,  I_15}, //LB59
-    {1, K_15,  J_15,  L_15}, //LB60
-    {1, B_16,  A_16,  C_16}, //LB61
-    {1, E_16,  D_16,  F_16}, //LB62
-    {1, H_16,  G_16,  I_16}, //LB63
-    {1, K_16,  J_16,  L_16}, //LB64
+    {1, SW2_CS1,   SW1_CS1,   SW3_CS1}, //LB1
+    {1, SW5_CS1,   SW4_CS1,   SW6_CS1}, //LB2
+    {1, SW8_CS1,   SW7_CS1,   SW9_CS1}, //LB3
+    {1, SW11_CS1,   SW10_CS1,   SW12_CS1}, //LB4
+    {1, SW2_CS2,   SW1_CS2,   SW3_CS2}, //LB5
+    {1, SW5_CS2,   SW4_CS2,   SW6_CS2}, //LB6
+    {1, SW8_CS2,   SW7_CS2,   SW9_CS2}, //LB7
+    {1, SW11_CS2,   SW10_CS2,   SW12_CS2}, //LB8
+    {1, SW2_CS3,   SW1_CS3,   SW3_CS3}, //LB9
+    {1, SW5_CS3,   SW4_CS3,   SW6_CS3}, //LB10
+    {1, SW8_CS3,   SW7_CS3,   SW9_CS3}, //LB11
+    {1, SW11_CS3,   SW10_CS3,   SW12_CS3}, //LB12
+    {1, SW2_CS4,   SW1_CS4,   SW3_CS4}, //LB13
+    {1, SW5_CS4,   SW4_CS4,   SW6_CS4}, //LB14
+    {1, SW8_CS4,   SW7_CS4,   SW9_CS4}, //LB15
+    {1, SW11_CS4,   SW10_CS4,   SW12_CS4}, //LB16
+    {1, SW2_CS5,   SW1_CS5,   SW3_CS5}, //LB17
+    {1, SW5_CS5,   SW4_CS5,   SW6_CS5}, //LB18
+    {1, SW8_CS5,   SW7_CS5,   SW9_CS5}, //LB19
+    {1, SW11_CS5,   SW10_CS5,   SW12_CS5}, //LB20
+    {1, SW2_CS6,   SW1_CS6,   SW3_CS6}, //LB21
+    {1, SW5_CS6,   SW4_CS6,   SW6_CS6}, //LB22
+    {1, SW8_CS6,   SW7_CS6,   SW9_CS6}, //LB23
+    {1, SW11_CS6,   SW10_CS6,   SW12_CS6}, //LB24
+    {1, SW2_CS7,   SW1_CS7,   SW3_CS7}, //LB25
+    {1, SW5_CS7,   SW4_CS7,   SW6_CS7}, //LB26
+    {1, SW8_CS7,   SW7_CS7,   SW9_CS7}, //LB27
+    {1, SW11_CS7,   SW10_CS7,   SW12_CS7}, //LB28
+    {1, SW2_CS8,   SW1_CS8,   SW3_CS8}, //LB29
+    {1, SW5_CS8,   SW4_CS8,   SW6_CS8}, //LB30
+    {1, SW8_CS8,   SW7_CS8,   SW9_CS8}, //LB31
+    {1, SW11_CS8,   SW10_CS8,   SW12_CS8}, //LB32
+    {1, SW2_CS9,   SW1_CS9,   SW3_CS9}, //LB33
+    {1, SW5_CS9,   SW4_CS9,   SW6_CS9}, //LB34
+    {1, SW8_CS9,   SW7_CS9,   SW9_CS9}, //LB35
+    {1, SW11_CS9,   SW10_CS9,   SW12_CS9}, //LB36
+    {1, SW2_CS10,  SW1_CS10,  SW3_CS10}, //LB37
+    {1, SW5_CS10,  SW4_CS10,  SW6_CS10}, //LB38
+    {1, SW8_CS10,  SW7_CS10,  SW9_CS10}, //LB39
+    {1, SW11_CS10,  SW10_CS10,  SW12_CS10}, //LB40
+    {1, SW2_CS11,  SW1_CS11,  SW3_CS11}, //LB41
+    {1, SW5_CS11,  SW4_CS11,  SW6_CS11}, //LB42
+    {1, SW8_CS11,  SW7_CS11,  SW9_CS11}, //LB43
+    {1, SW11_CS11,  SW10_CS11,  SW12_CS11}, //LB44
+    {1, SW2_CS12,  SW1_CS12,  SW3_CS12}, //LB45
+    {1, SW5_CS12,  SW4_CS12,  SW6_CS12}, //LB46
+    {1, SW8_CS12,  SW7_CS12,  SW9_CS12}, //LB47
+    {1, SW11_CS12,  SW10_CS12,  SW12_CS12}, //LB48
+    {1, SW2_CS13,  SW1_CS13,  SW3_CS13}, //LB49
+    {1, SW5_CS13,  SW4_CS13,  SW6_CS13}, //LB50
+    {1, SW8_CS13,  SW7_CS13,  SW9_CS13}, //LB51
+    {1, SW11_CS13,  SW10_CS13,  SW12_CS13}, //LB52
+    {1, SW2_CS14,  SW1_CS14,  SW3_CS14}, //LB53
+    {1, SW5_CS14,  SW4_CS14,  SW6_CS14}, //LB54
+    {1, SW8_CS14,  SW7_CS14,  SW9_CS14}, //LB55
+    {1, SW11_CS14,  SW10_CS14,  SW12_CS14}, //LB56
+    {1, SW2_CS15,  SW1_CS15,  SW3_CS15}, //LB57
+    {1, SW5_CS15,  SW4_CS15,  SW6_CS15}, //LB58
+    {1, SW8_CS15,  SW7_CS15,  SW9_CS15}, //LB59
+    {1, SW11_CS15,  SW10_CS15,  SW12_CS15}, //LB60
+    {1, SW2_CS16,  SW1_CS16,  SW3_CS16}, //LB61
+    {1, SW5_CS16,  SW4_CS16,  SW6_CS16}, //LB62
+    {1, SW8_CS16,  SW7_CS16,  SW9_CS16}, //LB63
+    {1, SW11_CS16,  SW10_CS16,  SW12_CS16}, //LB64
 };
 #endif
 
diff --git a/keyboards/novelkeys/nk87b/config.h b/keyboards/novelkeys/nk87b/config.h
index a79137e7d9f..933d4ed5c07 100644
--- a/keyboards/novelkeys/nk87b/config.h
+++ b/keyboards/novelkeys/nk87b/config.h
@@ -20,5 +20,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define WS2812_PWM_DRIVER PWMD3
 #define WS2812_PWM_CHANNEL 3
 #define WS2812_PWM_PAL_MODE 1
-#define WS2812_DMA_STREAM STM32_DMA1_STREAM3
-#define WS2812_DMA_CHANNEL 3
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM3
+#define WS2812_PWM_DMA_CHANNEL 3
diff --git a/keyboards/novelkeys/nk_plus/config.h b/keyboards/novelkeys/nk_plus/config.h
index 40e3b54053e..eaddb87b820 100644
--- a/keyboards/novelkeys/nk_plus/config.h
+++ b/keyboards/novelkeys/nk_plus/config.h
@@ -20,5 +20,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define WS2812_PWM_DRIVER PWMD3
 #define WS2812_PWM_CHANNEL 1
 #define WS2812_PWM_PAL_MODE 1
-#define WS2812_DMA_STREAM STM32_DMA1_STREAM3
-#define WS2812_DMA_CHANNEL 3
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM3
+#define WS2812_PWM_DMA_CHANNEL 3
diff --git a/keyboards/novelkeys/nk_plus/info.json b/keyboards/novelkeys/nk_plus/info.json
index 41beca36824..b823d2808b8 100755
--- a/keyboards/novelkeys/nk_plus/info.json
+++ b/keyboards/novelkeys/nk_plus/info.json
@@ -14,15 +14,13 @@
         "rows": ["B2", "B1", "B0", "B10", "B3"]
     },
     "features": {
-        "backlight": false,
         "bootmagic": true,
         "command": false,
         "console": false,
         "extrakey": true,
         "mousekey": true,
         "nkro": true,
-        "rgb_matrix": true,
-        "rgblight": false
+        "rgb_matrix": true
     },
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
diff --git a/keyboards/nullbitsco/nibble/keymaps/snailmap/keymap.c b/keyboards/nullbitsco/nibble/keymaps/snailmap/keymap.c
deleted file mode 100644
index a53335003f6..00000000000
--- a/keyboards/nullbitsco/nibble/keymaps/snailmap/keymap.c
+++ /dev/null
@@ -1,543 +0,0 @@
-/* Copyright 2021 dogspace <https://github.com/dogspace>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-enum custom_keycodes {
-    KC_CUST = SAFE_RANGE,
-};
-
-enum layer_names {
-    _MA,
-    _L1,
-    _L2,
-    _L3
-};
-
-// NOTE: Default keymap layers were designed for ANSI split-space layout  http://www.keyboard-layout-editor.com/#/gists/f28bd5ff4e62f69e89896df3a59671c6
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_MA] = LAYOUT_ansi(
-                   KC_ESC,     KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,       KC_0,          KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
-        KC_MUTE,   KC_TAB,     KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,       KC_P,          KC_LBRC, KC_RBRC, KC_BSLS, LCTL(KC_F),
-        KC_CAPS,   MO(_L2),    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,       KC_SCLN,       KC_QUOT,          KC_ENT,  KC_CALC,
-        TG(_L2),   KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,     KC_SLSH,       KC_RSFT,          KC_UP,   KC_WHOM,
-        MO(_L3),   KC_LCTL,    KC_LGUI, KC_LALT,                   KC_SPC,                    MO(_L1), LCTL(KC_C), LCTL(KC_V),    KC_LEFT,          KC_DOWN, KC_RGHT
-    ),
-    [_L1] = LAYOUT_ansi(
-                   KC_GRAVE,   _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______,       _______, _______, _______, _______,
-        RGB_TOG,   _______,    _______, _______, _______, _______, _______, _______, KC_PGUP, KC_UP,   _______,    _______,       _______, _______, _______, _______,
-        _______,   LCTL(KC_Z), KC_LCTL, KC_LSFT, _______, _______, _______, KC_HOME, KC_LEFT, KC_DOWN, KC_RIGHT,   KC_END,        _______,          _______, _______,
-        _______,   _______,    _______, _______, _______, _______, _______, _______, KC_PGDN, _______, _______,    LCTL(KC_SLSH), _______,          _______, _______,
-        _______,   _______,    _______, _______,                   _______,                   _______, LCTL(KC_X), _______,       _______,          _______, _______
-    ),
-    [_L2] = LAYOUT_ansi(
-                   KC_GRAVE,   _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______,       _______, _______, _______, _______,
-        RGB_TOG,   _______,    _______, _______, _______, _______, _______, KC_PAST, KC_7,    KC_8,    KC_9,       _______,       _______, _______, _______, _______,
-        _______,   _______,    _______, _______, _______, _______, _______, KC_PPLS, KC_4,    KC_5,    KC_6,       _______,       _______,          _______, _______,
-        _______,   _______,    _______, _______, _______, _______, _______, KC_PMNS, KC_1,    KC_2,    KC_3,       _______,       _______,          _______, _______,
-        _______,   _______,    _______, _______,                   KC_0,                      KC_PSLS, _______,    _______,       _______,          _______, _______
-    ),
-    [_L3] = LAYOUT_ansi(
-                 _______,    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,      KC_F10,        KC_F11,  KC_F12,  _______, _______,
-        RGB_TOG, _______,    _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______,       _______, _______, _______, _______,
-        _______, _______,    _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______,       _______,          _______, _______,
-        KC_SYRQ, _______,    _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______,       _______,          _______, _______,
-        _______, _______,    _______, _______,                   _______,                   _______, _______,    _______,       _______,          _______, _______
-    )
-};
-
-#ifdef OLED_ENABLE
-/*===========================================    OLED CONFIGURATION    ===========================================*/
-bool  oled_horizontal   = true;         // OLED rotation  (true = horizontal,  false = vertical)
-bool  ansi_layout       = true;         // ANSI or ISO layout  (true = ANSI,  false = ISO)
-bool  split_space       = true;         // Split spacebar  (true = split spacebar,  false = 6.25u or 7u spacebar)
-bool  three_mods_left   = true;         // Left mods layout  (true = 3x 1.25u keys,  false = 2x 1.5u keys)
-bool  three_mods_right  = false;        // Right mods layout  (true = 3x 1u keys,  false = 2x 1.5u keys)
-bool  graph_direction   = true;         // Graph movement  (true = right to left,  false = left to right)
-float graph_top_wpm     = 100.0;        // Minimum WPM required to reach the top of the graph
-int   graph_refresh     = 1000;         // In milliseconds, determines the graph-line frequency
-int   icon_med_wpm      = 50;           // WPM required to display the medium snail
-int   icon_fast_wpm     = 72;           // WPM required to display the fast snail
-// Layer names:  Should be exactly 5 characters in length if vertical display, or 6 characters if horizontal
-#define MA_LAYER_NAME     "QWERTY"      // Layer _MA name
-#define L1_LAYER_NAME     "ARROWS"      // Layer _L1 name
-#define L2_LAYER_NAME     "NUMPAD"      // Layer _L2 name
-#define L3_LAYER_NAME     "FUNCTN"      // Layer _L3 name
-/*================================================================================================================*/
-bool  first_loop  = true;
-int   timer       = 0;
-int   wpm_limit   = 20;
-int   max_wpm     = -1;
-int   wpm_icon    = -1;
-int   graph_lines[64];
-
-// Set OLED rotation
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-    if (oled_horizontal) {
-        return OLED_ROTATION_180;
-    } else {
-        return OLED_ROTATION_90;
-    }
-}
-
-// Toggles pixel on/off, converts horizontal coordinates to vertical equivalent if necessary
-static void write_pixel(int x, int y, bool onoff) {
-    if (oled_horizontal) {
-        oled_write_pixel(x, y, onoff);
-    } else {
-        oled_write_pixel(y, 127 - x, onoff);
-    }
-}
-
-// Draw static background image to OLED (keyboard with no bottom row)
-static void render_background(void) {
-    if (oled_horizontal) {
-        static const char PROGMEM oled_keymap_horizontal[] = {
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00,
-            0x84, 0x80, 0x80, 0x80, 0x80, 0x04, 0x00, 0x00, 0x00, 0x80, 0x04, 0x00, 0x00, 0x00, 0x80, 0x04,
-            0x00, 0x00, 0x00, 0x80, 0x04, 0x00, 0x00, 0x00, 0x80, 0x04, 0x00, 0x00, 0x00, 0x80, 0x04, 0x00,
-            0x00, 0x00, 0x80, 0x04, 0x00, 0x00, 0x00, 0x80, 0x04, 0x00, 0x00, 0x00, 0x80, 0x04, 0x00, 0x00,
-            0x00, 0x80, 0x04, 0x00, 0x00, 0x00, 0x80, 0x04, 0x00, 0x00, 0x00, 0x80, 0x04, 0x00, 0x00, 0x00,
-            0x80, 0x04, 0x04, 0x04, 0x04, 0x84, 0x84, 0x84, 0x84, 0x00, 0x00, 0x00, 0x00, 0x84, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00,
-            0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x10,
-            0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00,
-            0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00,
-            0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
-            0x00, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
-            0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
-            0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
-            0x02, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x02,
-            0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02,
-            0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-        };
-        oled_write_raw_P(oled_keymap_horizontal, sizeof(oled_keymap_horizontal));
-    } else {
-        static const char PROGMEM oled_keymap_vertical[] = {
-            0x00, 0x00, 0x84, 0x00, 0x00, 0x00, 0x00, 0x84, 0x00, 0x00, 0x00, 0x00, 0x84, 0x00, 0x00, 0x00,
-            0x00, 0x84, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x87, 0x00, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00,
-            0x00, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00,
-            0x00, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x21, 0x00, 0x00, 0x00, 0x00, 0x42, 0x00, 0x00, 0x00, 0x00, 0x21, 0x00, 0x00, 0x00,
-            0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x84, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x84, 0x00, 0x00, 0x00,
-            0x00, 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x21, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
-            0x00, 0x84, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x42, 0x00, 0x00, 0x00, 0x00, 0x84, 0x00, 0x00, 0x00, 0x00, 0x42, 0x00, 0x00, 0x00,
-            0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00,
-            0x00, 0x42, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x21, 0x00, 0x00, 0x00, 0x00, 0x42, 0x00, 0x00, 0x00, 0x00, 0x21, 0x00, 0x00, 0x00,
-            0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x84, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x00, 0x00, 0x00,
-            0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
-            0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-        };
-        oled_write_raw_P(oled_keymap_vertical, sizeof(oled_keymap_vertical));
-    }
-}
-
-// Location of OLED keyboard's top left pixel, relative to the display
-static const int keymap_template[2] = {41, 0};
-// Location of key highlights top left pixels, relative to keymap_template  {X, Y, Key length in px}
-static int keymap_coords[MATRIX_ROWS][MATRIX_COLS][3] = {
-    { {12, 15, 1}, {5, 0, 1},  {10, 0, 1},  {15, 0, 1},  {20, 0, 1},  {25, 0, 1},  {30, 0, 1},   {35, 0, 1},  {40, 0, 1},  {45, 0, 1},  {50, 0, 1},  {55, 0, 1},  {60, 0, 1},  {65, 0, 1}, {70, 0, 8},  {82, 0, 1}  },
-    { {0, 5, 1},   {5, 5, 5},  {14, 5, 1},  {19, 5, 1},  {24, 5, 1},  {29, 5, 1},  {34, 5, 1},   {39, 5, 1},  {44, 5, 1},  {49, 5, 1},  {54, 5, 1},  {59, 5, 1},  {64, 5, 1},  {69, 5, 1}, {74, 5, 4},  {82, 5, 1}  },
-    { {0, 10, 1},  {5, 10, 6}, {15, 10, 1}, {20, 10, 1}, {25, 10, 1}, {30, 10, 1}, {35, 10, 1},  {40, 10, 1}, {45, 10, 1}, {50, 10, 1}, {55, 10, 1}, {60, 10, 1}, {65, 10, 1}, {0, 0, 0},  {70, 10, 8}, {82, 10, 1} },
-    { {0, 15, 1},  {5, 15, 8}, {17, 15, 1}, {22, 15, 1}, {27, 15, 1}, {32, 15, 1}, {37, 15, 1},  {42, 15, 1}, {47, 15, 1}, {52, 15, 1}, {57, 15, 1}, {62, 15, 1}, {67, 15, 6}, {0, 0, 0},  {77, 15, 1}, {82, 15, 1} },
-    { {0, 20, 1},  {5, 20, 2}, {11, 20, 2}, {17, 20, 2}, {0, 0, 0},   {0, 0, 0},   {23, 20, 12}, {0, 0, 0},   {0, 0, 0},   {39, 20, 3}, {56, 20, 4}, {64, 20, 4}, {72, 20, 1}, {0, 0, 0},  {77, 20, 1}, {82, 20, 1} }
-};
-
-// Draw the bottom row of the keyboard (based on OLED config variables), update coordinates
-static void render_fn_row(void) {
-    // Update locations of spacebar and modifier key highlights
-    if ((split_space == false) && (three_mods_left == false)) {
-        keymap_coords[4][1][2] = 3;
-        keymap_coords[4][2][0] = 12;
-        keymap_coords[4][2][2] = 3;
-        keymap_coords[4][3][0] = 0;
-        keymap_coords[4][3][1] = 0;
-        keymap_coords[4][3][2] = 0;
-        keymap_coords[4][6][0] = 19;
-        keymap_coords[4][6][2] = 34;
-    } else if ((split_space == false) && (three_mods_left == true)) {
-        keymap_coords[4][6][2] = 30;
-    }
-    if ((split_space == false) && (three_mods_right == true)) {
-        keymap_coords[4][9][0]  = 57;
-        keymap_coords[4][9][2]  = 1;
-        keymap_coords[4][10][0] = 62;
-        keymap_coords[4][10][2] = 1;
-        keymap_coords[4][11][0] = 67;
-        keymap_coords[4][11][2] = 1;
-    }
-    // Draw modifiers
-    for (int i = 0; i < 16; i++) {
-        if (keymap_coords[4][i][2] != 0) {
-            for (int p = 0; p < keymap_coords[4][i][2]; p++) {
-                int x = keymap_template[0] + keymap_coords[4][i][0] + 2 + p;
-                write_pixel(x, 22, true);
-            }
-        }
-    }
-    // Draw second line for split spacebar
-    if (split_space == true) {
-        for (int i = 0; i < 6; i++) {
-            int x = keymap_template[0] + 46 + 2 + i;
-            write_pixel(x, 22, true);
-        }
-    }
-}
-
-// Update OLED keyboard with ISO layout, update coordinates
-static void render_iso(void) {
-    for (int i = 0; i < 6; i++) {
-        // Turn off ANSI enter
-        write_pixel(keymap_template[0] + 73 + i, keymap_template[1] + 12, false);
-        if (i < 4) {
-            // Turn off part of ANSI left shift
-            write_pixel(keymap_template[0] + 10 + i, keymap_template[1] + 17, false);
-            // Draw vertical line for ISO enter
-            write_pixel(keymap_template[0] + 79, keymap_template[1] + 8 + i, true);
-        }
-    }
-    // Update locations of shift and grave key highlights
-    keymap_coords[3][1][2]  = 3;
-    keymap_coords[1][14][0] = 70;
-    keymap_coords[1][14][1] = 10;
-    keymap_coords[1][14][2] = 1;
-}
-
-// Toggles pixels surrounding key
-static void render_keymap(uint8_t key_row, uint8_t key_col, bool onoff) {
-    int length = keymap_coords[key_row][key_col][2] + 4;
-    int left   = keymap_coords[key_row][key_col][0] + keymap_template[0];
-    int top    = keymap_coords[key_row][key_col][1] + keymap_template[1];
-    int right  = left + length - 1;
-    int bottom = top + 4;
-
-    // Special case 1 - Draw enter key on ISO layout, return
-    if ((ansi_layout == false) && (key_row == 2) && (key_col == 14)) {
-        for (int i = 0; i < 10; i++) {
-            write_pixel(keymap_template[0] + 81, keymap_template[1] + 5 + i, onoff);
-            if (i < 5) {
-                write_pixel(keymap_template[0] + 74, keymap_template[1] + 5 + i, onoff);
-            }
-            if (i < 6) {
-                write_pixel(keymap_template[0] + 75, keymap_template[1] + 9 + i, onoff);
-            }
-            if (i < 7) {
-                write_pixel(keymap_template[0] + 75 + i, keymap_template[1] + 5, onoff);
-                write_pixel(keymap_template[0] + 75 + i, keymap_template[1] + 14, onoff);
-            }
-        }
-        return;
-    }
-    // Draw top and bottom walls (horizontal for <length>px)
-    for (int x = 0; x < length; x++) {
-        write_pixel(left + x, top, onoff);
-        write_pixel(left + x, bottom, onoff);
-    }
-    // Draw left and right walls (vertical for 5px)
-    for (int y = 0; y < 5; y++) {
-        write_pixel(left,  top + y, onoff);
-        write_pixel(right, top + y, onoff);
-    }
-    // Special case 2 - Draw right spacebar on split-space layout
-    if ((split_space == true) && (key_row == 4) && (key_col == 6)) {
-        int start = keymap_template[0] + 46;
-        int stop  = keymap_template[0] + 55;
-        for (int x = start; x < stop; x++) {
-            write_pixel(x, top, onoff);
-            write_pixel(x, bottom, onoff);
-        }
-        for (int y = 0; y < 5; y++) {
-            write_pixel(start, top + y, onoff);
-            write_pixel(stop,  top + y, onoff);
-        }
-    }
-}
-
-// Write active layer name
-static void render_layer_state(void) {
-  if (oled_horizontal) {
-    oled_set_cursor(0, 0);
-  } else {
-    oled_set_cursor(0, 15);
-  }
-  switch (get_highest_layer(layer_state)) {
-  case _MA:
-      oled_write_P(PSTR(MA_LAYER_NAME), false);
-      break;
-  case _L1:
-      oled_write_P(PSTR(L1_LAYER_NAME), false);
-      break;
-  case _L2:
-      oled_write_P(PSTR(L2_LAYER_NAME), false);
-      break;
-  case _L3:
-      oled_write_P(PSTR(L3_LAYER_NAME), false);
-      break;
-  default:
-      oled_write("ERROR", false);
-      break;
-  }
-}
-
-// Update WPM counters
-static void render_wpm_counters(int current_wpm) {
-    int cursorposition_cur = 2;
-    int cursorposition_max = 1;
-    if (oled_horizontal == false) {
-        cursorposition_cur = 13;
-        cursorposition_max = 14;
-    }
-
-    char wpm_counter[4];
-    wpm_counter[3] = '\0';
-    wpm_counter[2] = '0' + current_wpm % 10;
-    wpm_counter[1] = '0' + (current_wpm / 10) % 10;
-    wpm_counter[0] = '0' + (current_wpm / 100) % 10;
-    oled_set_cursor(0, cursorposition_cur);
-    oled_write(wpm_counter, false);
-
-    if (current_wpm > max_wpm) {
-        max_wpm = current_wpm;
-        wpm_limit = max_wpm + 20;
-        oled_set_cursor(0, cursorposition_max);
-        oled_write(wpm_counter, false);
-    }
-}
-
-// Update WPM snail icon
-static void render_wpm_icon(int current_wpm) {
-    // wpm_icon is used to prevent unnecessary redraw
-    if ((current_wpm < icon_med_wpm) && (wpm_icon != 0)) {
-        wpm_icon = 0;
-    } else if ((current_wpm >= icon_med_wpm) && (current_wpm < icon_fast_wpm) && (wpm_icon != 1)) {
-        wpm_icon = 1;
-    } else if ((current_wpm >= icon_fast_wpm) && (wpm_icon != 2)) {
-        wpm_icon = 2;
-    } else {
-        return;
-    }
-    static const char PROGMEM snails[][2][24] = {
-        {{0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20, 0xA0, 0x20, 0x40, 0x40, 0x80, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20, 0x50, 0x88, 0x04, 0x00, 0x00},
-         {0x40, 0x60, 0x50, 0x4E, 0x51, 0x64, 0x4A, 0x51, 0x54, 0x49, 0x41, 0x62, 0x54, 0x49, 0x46, 0x41, 0x40, 0x30, 0x09, 0x04, 0x02, 0x01, 0x00, 0x00}},
-        {{0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x40, 0x40, 0x40, 0x40, 0x80, 0x80, 0x00, 0x00, 0x00, 0x04, 0x98, 0x60, 0x80, 0x00, 0x00, 0x00, 0x00},
-         {0x60, 0x50, 0x54, 0x4A, 0x51, 0x64, 0x4A, 0x51, 0x55, 0x49, 0x41, 0x62, 0x54, 0x49, 0x46, 0x41, 0x21, 0x10, 0x0A, 0x08, 0x05, 0x02, 0x00, 0x00}},
-        {{0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x40, 0x40, 0x40, 0x80, 0x80, 0x10, 0x10, 0x10, 0x20, 0x40, 0x40, 0xC0, 0x80, 0x80, 0x00, 0x00, 0x00},
-         {0x60, 0x58, 0x54, 0x62, 0x49, 0x54, 0x52, 0x51, 0x55, 0x49, 0x62, 0x52, 0x4D, 0x45, 0x46, 0x22, 0x21, 0x11, 0x10, 0x0A, 0x08, 0x05, 0x02, 0x00}}
-    };
-    if (oled_horizontal) {
-        oled_set_cursor(3, 1);
-        oled_write_raw_P(snails[wpm_icon][0], sizeof(snails[wpm_icon][0]));
-        oled_set_cursor(3, 2);
-        oled_write_raw_P(snails[wpm_icon][1], sizeof(snails[wpm_icon][1]));
-    } else {
-        oled_set_cursor(0, 11);
-        oled_write_raw_P(snails[wpm_icon][0], sizeof(snails[wpm_icon][0]));
-        oled_set_cursor(0, 12);
-        oled_write_raw_P(snails[wpm_icon][1], sizeof(snails[wpm_icon][1]));
-    }
-}
-
-// Update WPM graph
-static void render_wpm_graph(int current_wpm) {
-    int line_height = ((current_wpm / graph_top_wpm) * 7);
-    if (line_height > 7) {
-        line_height = 7;
-    }
-    // Count graph line pixels, return if nothing to draw
-    int pixel_count = line_height;
-    for (int i = 0; i < 63; i++) {
-        pixel_count += graph_lines[i];
-    }
-    if (pixel_count == 0) {
-        return;
-    }
-    // Shift array elements left or right depending on graph_direction, append new graph line
-    if (graph_direction) {
-        for (int i = 0; i < 63; i++) {
-            graph_lines[i] = graph_lines[i + 1];
-        }
-        graph_lines[63] = line_height;
-    } else {
-        for (int i = 63; i > 0; i--) {
-            graph_lines[i] = graph_lines[i - 1];
-        }
-        graph_lines[0] = line_height;
-    }
-    // Draw all graph lines (left to right, bottom to top)
-    int draw_count, arrpos;
-    for (int x = 1; x <= 127; x += 2) {
-        arrpos = x / 2;
-        draw_count = graph_lines[arrpos];
-        for (int y = 31; y >= 25; y--) {
-            if (draw_count > 0) {
-                write_pixel(x, y, true);
-                draw_count--;
-            } else {
-                write_pixel(x, y, false);
-            }
-        }
-    }
-}
-
-// Call OLED functions
-bool oled_task_user(void) {
-    // Draw OLED keyboard, prevent redraw
-    if (first_loop) {
-        render_background();
-        render_fn_row();
-        if (ansi_layout == false) {
-            render_iso();
-        }
-        first_loop = false;
-    }
-    // Get current WPM, subtract 25% for accuracy and prevent large jumps caused by simultaneous keypresses
-    int current_wpm = get_current_wpm();
-    // Note: This will most likely be removed once QMK's WPM calculation is updated
-    current_wpm -= current_wpm >> 2;
-    if (current_wpm > wpm_limit) {
-        current_wpm = max_wpm;
-        set_current_wpm(max_wpm);
-    }
-    // Write active layer name to display
-    render_layer_state();
-    // Update WPM counters
-    render_wpm_counters(current_wpm);
-    // Update WPM snail icon
-    render_wpm_icon(current_wpm);
-    // Update WPM graph every graph_refresh milliseconds
-    if (timer_elapsed(timer) > graph_refresh) {
-        render_wpm_graph(current_wpm);
-        timer = timer_read();
-    }
-    return false;
-}
-#endif
-
-// Called by QMK during key processing
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    // Forwards keystrokes from an external input device over UART/TRRS
-    process_record_remote_kb(keycode, record);
-
-    #ifdef OLED_ENABLE
-    // Toggle pixels surrounding key
-    render_keymap(record->event.key.row, record->event.key.col, record->event.pressed);
-    #endif
-
-    return true;
-}
-
-// Rotary encoder - RGB and OLED settings
-void change_RGB(bool clockwise) {
-    // While on any layer except default:       // Rotary         = RGB Mode
-    bool shift = get_mods() & MOD_MASK_SHIFT;   // Rotary + Shift = OLED Brightness
-    bool ctrl = get_mods() & MOD_MASK_CTRL;     // Rotary + Ctrl  = RGB Brightness
-    bool gui = get_mods() & MOD_MASK_GUI;       // Rotary + Gui   = RGB Saturation
-    bool alt = get_mods() & MOD_MASK_ALT;       // Rotary + Alt   = RGB Hue
-
-    if (clockwise) {
-        if (shift) {
-            int new_brightness = oled_get_brightness() + 10;
-            if (new_brightness < 255) {
-                oled_set_brightness(new_brightness);
-            } else {
-                oled_set_brightness(255);
-            }
-        } else if (ctrl) {
-            rgblight_increase_val();
-        } else if (gui) {
-            rgblight_increase_sat();
-        } else if (alt) {
-            rgblight_increase_hue();
-        } else {
-            rgblight_step();
-        }
-    } else {
-        if (shift) {
-            int new_brightness = oled_get_brightness() - 10;
-            if (new_brightness > 0) {
-                oled_set_brightness(new_brightness);
-            } else {
-                oled_set_brightness(0);
-            }
-        } else if (ctrl) {
-            rgblight_decrease_val();
-        } else if (gui) {
-            rgblight_decrease_sat();
-        } else if (alt) {
-            rgblight_decrease_hue();
-        } else {
-            rgblight_step_reverse();
-        }
-    }
-}
-
-// Rotary encoder behavior - Change volume on default layer, RGB/OLED on other layers
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (layer_state_is(0)) {
-        if (clockwise) {
-            tap_code(KC_VOLU);
-        } else {
-            tap_code(KC_VOLD);
-        }
-    } else {
-        change_RGB(clockwise);
-    }
-    return true;
-}
-
-// Initialize remote keyboard, if connected
-void matrix_init_user(void) {
-    matrix_init_remote_kb();
-}
-
-// Scan and parse keystrokes from remote keyboard, if connected
-void matrix_scan_user(void) {
-    matrix_scan_remote_kb();
-}
diff --git a/keyboards/nullbitsco/nibble/keymaps/snailmap/readme.md b/keyboards/nullbitsco/nibble/keymaps/snailmap/readme.md
deleted file mode 100644
index 5ea93b01afb..00000000000
--- a/keyboards/nullbitsco/nibble/keymaps/snailmap/readme.md
+++ /dev/null
@@ -1,36 +0,0 @@
-
-# SnailMap
-
-![KeySnail](https://i.imgur.com/yEQJyI2h.png)
-
-## :snail: Display
-
-- Mini keyboard that highlights the currently pressed keys
-- Snail icon that changes based on the current WPM
-- Current and max WPM counters
-- Active layer name
-- WPM graph
-
-## :gear: Customization
-
-The `OLED configuration variables` can be used to easily customize the display
-
-```
-oled_horizontal     - Horizontal or vertical orientation
-ansi_layout         - ANSI or ISO layout
-split_space         - Bottom row spacebar
-three_mods_left     - Left modifier keys
-three_mods_right    - Right modifier keys
-graph_direction     - Graph movement direction
-graph_refresh       - Frequency of graph lines
-graph_top_wpm       - WPM required to reach the top of the graph
-icon_med_wpm        - WPM required to display the medium snail
-icon_fast_wpm       - WPM required to display the fast snail
-MA_LAYER_NAME       - Layer 0 display name
-L1_LAYER_NAME       - Layer 1 display name
-L2_LAYER_NAME       - Layer 2 display name
-L3_LAYER_NAME       - Layer 3 display name
-```
-___
-
-###### *Keymap created by* [dogspace](https://github.com/dogspace)
diff --git a/keyboards/nullbitsco/nibble/keymaps/snailmap/rules.mk b/keyboards/nullbitsco/nibble/keymaps/snailmap/rules.mk
deleted file mode 100644
index 4e0f1b619a2..00000000000
--- a/keyboards/nullbitsco/nibble/keymaps/snailmap/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-OLED_ENABLE = yes
-WPM_ENABLE = yes
-SPACE_CADET_ENABLE = no
-GRAVE_ESC_ENABLE = no
-MAGIC_ENABLE = no
\ No newline at end of file
diff --git a/keyboards/nullbitsco/scramble/keymaps/oled/config.h b/keyboards/nullbitsco/scramble/keymaps/oled/config.h
index cd980b09366..67a896c8af0 100644
--- a/keyboards/nullbitsco/scramble/keymaps/oled/config.h
+++ b/keyboards/nullbitsco/scramble/keymaps/oled/config.h
@@ -18,5 +18,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 // Alternate boot pins for accessing the bootloader,
 // since the boot switch is blocked by the OLED.
-#define BOOTMAGIC_LITE_ROW 1
-#define BOOTMAGIC_LITE_COLUMN 2
+#define BOOTMAGIC_ROW 1
+#define BOOTMAGIC_COLUMN 2
diff --git a/keyboards/nullbitsco/tidbit/keymaps/snailmap_lite/keymap.c b/keyboards/nullbitsco/tidbit/keymaps/snailmap_lite/keymap.c
deleted file mode 100644
index d14723df034..00000000000
--- a/keyboards/nullbitsco/tidbit/keymaps/snailmap_lite/keymap.c
+++ /dev/null
@@ -1,289 +0,0 @@
-/* Copyright 2021 dogspace <https://github.com/dogspace>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-enum layer_names {
-    _LAY0,
-    _LAY1,
-    _LAY2,
-    _LAY3
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_LAY0] = LAYOUT(
-        KC_PSLS, KC_PAST, KC_PMNS,
-        KC_P7, KC_P8,   KC_P9,   KC_PPLS,
-        KC_P4, KC_P5,   KC_P6,   KC_PPLS,
-        KC_P1, KC_P2,   KC_P3,   KC_PENT,
-        KC_P0, KC_P0,   KC_PDOT, KC_PENT
-    ),
-    [_LAY1] = LAYOUT(
-        _______, _______, _______,
-        _______, _______, _______, _______,
-        _______, _______, _______, _______,
-        _______, _______, _______, _______,
-        _______, _______, _______, _______
-    ),
-    [_LAY2] = LAYOUT(
-        _______, _______, _______,
-        _______, _______, _______, _______,
-        _______, _______, _______, _______,
-        _______, _______, _______, _______,
-        _______, _______, _______, _______
-    ),
-    [_LAY3] = LAYOUT(
-        _______, _______, _______,
-        _______, _______, _______, _______,
-        _______, _______, _______, _______,
-        _______, _______, _______, _______,
-        _______, _______, _______, _______
-    )
-};
-
-#ifdef ENCODER_MAP_ENABLE
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
-    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), },
-    [1] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), },
-    [2] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), },
-    [3] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), },
-};
-#endif
-
-#ifdef OLED_ENABLE
-/*===========================================    OLED CONFIGURATION    ===========================================*/
-#define OLED_ROTATE      true         // OLED rotation (flip 180* from default orientation)
-#define GRAPH_DIRECTION  true         // Graph movement  (true = right to left,  false = left to right)
-#define GRAPH_TOP_WPM    100.0        // Minimum WPM required to reach the top of the graph
-#define GRAPH_REFRESH    1000         // In milliseconds, determines the graph-line frequency
-#define ICON_MED_WPM     10           // WPM required to display the medium snail
-#define ICON_FAST_WPM    25           // WPM required to display the fast snail
-
-// Layer names:  Should be exactly 5 characters in length if vertical display, or 6 characters if horizontal
-#define MA_LAYER_NAME     "LAY 0"      // Layer _MA name
-#define L1_LAYER_NAME     "LAY 1"      // Layer _L1 name
-#define L2_LAYER_NAME     "LAY 2"      // Layer _L2 name
-#define L3_LAYER_NAME     "LAY 3"      // Layer _L3 name
-
-#define CAPLCK_STR        "CAPLK"       // Caps Lock string
-#define NUMLCK_STR        "NUMLK"       // Num Lock string
-#define SCRLK_STR         "SCRLK"       // Scroll Lock string
-#define EMPTY_STR         "     "       // Empty string
-
-/*================================================================================================================*/
-
-typedef struct oled_params {
-    bool first_loop : 1;
-    uint8_t wpm_icon : 7;
-    uint16_t timer;
-    uint8_t wpm_limit;
-    uint8_t max_wpm;
-    uint8_t graph_lines[32];
-} oled_params;
-
-oled_params oled_data;
-
-void oled_init_data(void) {
-    // Initialize oled params
-    oled_data.first_loop = true;
-    oled_data.wpm_icon = 5;
-    oled_data.timer = 0;
-    oled_data.wpm_limit = 20;
-    oled_data.max_wpm = 0;
-
-    for (int i=0; i<32; i++) {
-        oled_data.graph_lines[i] = 0;
-    }
-}
-
-// Set OLED rotation
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-    oled_init_data();
-    return OLED_ROTATE ? OLED_ROTATION_270 : OLED_ROTATION_90;
-}
-
-// Draw static background image to OLED (keyboard with no bottom row)
-static void render_background(void) {
-    static const char PROGMEM nullbits_n_oled[] = {
-        0x00, 0xe0, 0xf0, 0xf0, 0xf8, 0xf8, 0xf0, 0xf0, 0xe0, 0x80, 0x20, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0,
-        0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xe0, 0xe0, 0xe0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f,
-        0x1f, 0x1f, 0x1f, 0x1f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfc, 0xf0, 0x00, 0x00,
-        0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x00,
-        0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00,
-        0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00,
-        0x00, 0x07, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x07, 0x03, 0x00,
-    };
-    oled_write_raw_P(nullbits_n_oled, sizeof(nullbits_n_oled));
-}
-
-// Toggles pixel on/off, converts horizontal coordinates to vertical equivalent if necessary
-static void write_pixel(uint8_t x, uint8_t y, bool onoff) {
-    oled_write_pixel(y, 127 - x, onoff);
-}
-
-// Write active layer name
-static void render_layer_state(void) {
-  oled_set_cursor(0, 15);
-  switch (get_highest_layer(layer_state)) {
-  case _LAY0:
-      oled_write_P(PSTR(MA_LAYER_NAME), false);
-      break;
-  case _LAY1:
-      oled_write_P(PSTR(L1_LAYER_NAME), false);
-      break;
-  case _LAY2:
-      oled_write_P(PSTR(L2_LAYER_NAME), false);
-      break;
-  case _LAY3:
-      oled_write_P(PSTR(L3_LAYER_NAME), false);
-      break;
-  default:
-      oled_write("ERROR", false);
-      break;
-  }
-}
-
-// Update WPM counters
-static void render_wpm_counters(uint8_t current_wpm) {
-    uint8_t cursorposition_cur = 13;
-    uint8_t cursorposition_max = 14;
-
-    oled_set_cursor(0, cursorposition_cur);
-    oled_write(get_u8_str(current_wpm, '0'), false);
-
-    if (current_wpm > oled_data.max_wpm) {
-        oled_data.max_wpm = current_wpm;
-        oled_data.wpm_limit = oled_data.max_wpm + 20;
-        oled_set_cursor(0, cursorposition_max);
-        oled_write(get_u8_str(current_wpm, '0'), false);
-    }
-}
-
-static void render_led_status(void) {
-    // Host Keyboard LED Status
-    led_t led_state = host_keyboard_led_state();
-    oled_set_cursor(0, 8);
-    oled_write_P(led_state.caps_lock ? PSTR(CAPLCK_STR) : PSTR(EMPTY_STR), false);
-    oled_set_cursor(0, 9);
-    oled_write_P(led_state.num_lock ? PSTR(NUMLCK_STR) : PSTR(EMPTY_STR), false);
-    oled_set_cursor(0, 10);
-    oled_write_P(led_state.scroll_lock ? PSTR(SCRLK_STR) : PSTR(EMPTY_STR), false);
-}
-
-// Update WPM snail icon
-static void render_wpm_icon(uint8_t current_wpm) {
-    // wpm_icon is used to prevent unnecessary redraw
-    if ((current_wpm < ICON_MED_WPM) && (oled_data.wpm_icon != 0)) {
-        oled_data.wpm_icon = 0;
-    } else if ((current_wpm >= ICON_MED_WPM) && (current_wpm < ICON_FAST_WPM) && (oled_data.wpm_icon != 1)) {
-        oled_data.wpm_icon = 1;
-    } else if ((current_wpm >= ICON_FAST_WPM) && (oled_data.wpm_icon != 2)) {
-        oled_data.wpm_icon = 2;
-    } else {
-        return;
-    }
-    static const char PROGMEM snails[][2][24] = {
-        {{0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20, 0xA0, 0x20, 0x40, 0x40, 0x80, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20, 0x50, 0x88, 0x04, 0x00, 0x00},
-         {0x40, 0x60, 0x50, 0x4E, 0x51, 0x64, 0x4A, 0x51, 0x54, 0x49, 0x41, 0x62, 0x54, 0x49, 0x46, 0x41, 0x40, 0x30, 0x09, 0x04, 0x02, 0x01, 0x00, 0x00}},
-        {{0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x40, 0x40, 0x40, 0x40, 0x80, 0x80, 0x00, 0x00, 0x00, 0x04, 0x98, 0x60, 0x80, 0x00, 0x00, 0x00, 0x00},
-         {0x60, 0x50, 0x54, 0x4A, 0x51, 0x64, 0x4A, 0x51, 0x55, 0x49, 0x41, 0x62, 0x54, 0x49, 0x46, 0x41, 0x21, 0x10, 0x0A, 0x08, 0x05, 0x02, 0x00, 0x00}},
-        {{0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x40, 0x40, 0x40, 0x80, 0x80, 0x10, 0x10, 0x10, 0x20, 0x40, 0x40, 0xC0, 0x80, 0x80, 0x00, 0x00, 0x00},
-         {0x60, 0x58, 0x54, 0x62, 0x49, 0x54, 0x52, 0x51, 0x55, 0x49, 0x62, 0x52, 0x4D, 0x45, 0x46, 0x22, 0x21, 0x11, 0x10, 0x0A, 0x08, 0x05, 0x02, 0x00}}
-    };
-    oled_set_cursor(0, 11);
-    oled_write_raw_P(snails[oled_data.wpm_icon][0], sizeof(snails[oled_data.wpm_icon][0]));
-    oled_set_cursor(0, 12);
-    oled_write_raw_P(snails[oled_data.wpm_icon][1], sizeof(snails[oled_data.wpm_icon][1]));
-}
-
-// Update WPM graph
-static void render_wpm_graph(uint8_t current_wpm) {
-    uint8_t line_height = ((current_wpm / GRAPH_TOP_WPM) * 7);
-    if (line_height > 7) {
-        line_height = 7;
-    }
-    // Count graph line pixels, return if nothing to draw
-    uint8_t pixel_count = line_height;
-    for (int i = 0; i < 31; i++) {
-        pixel_count += oled_data.graph_lines[i];
-    }
-    if (pixel_count == 0) {
-        return;
-    }
-    // Shift array elements left or right depending on GRAPH_DIRECTION pend new graph line
-    if (GRAPH_DIRECTION) {
-        for (int i = 0; i < 31; i++) {
-            oled_data.graph_lines[i] = oled_data.graph_lines[i + 1];
-        }
-        oled_data.graph_lines[31] = line_height;
-    } else {
-        for (int i = 31; i > 0; i--) {
-            oled_data.graph_lines[i] = oled_data.graph_lines[i - 1];
-        }
-        oled_data.graph_lines[0] = line_height;
-    }
-    // Draw all graph lines (left to right, bottom to top)
-    uint16_t draw_count, arrpos;
-    for (int x = 1; x <= 63; x += 2) {
-        arrpos = x / 2;
-        draw_count = oled_data.graph_lines[arrpos];
-        for (int y = 31; y >= 25; y--) {
-            if (draw_count > 0) {
-                write_pixel(x, y, true);
-                draw_count--;
-            } else {
-                write_pixel(x, y, false);
-            }
-        }
-    }
-}
-
-// Call OLED functions
-bool oled_task_user(void) {
-    // Draw OLED keyboard, prevent redraw
-    if (oled_data.first_loop) {
-        render_background();
-        oled_data.first_loop = false;
-    }
-    // Get current WPM, subtract 25% for accuracy and prevent large jumps caused by simultaneous keypresses
-    uint8_t current_wpm = get_current_wpm();
-    // Write active layer name to display
-    render_layer_state();
-    // Update WPM counters
-    render_wpm_counters(current_wpm);
-    // Update WPM snail icon
-    render_wpm_icon(current_wpm);
-    // Update LED status
-    render_led_status();
-    // Update WPM graph every graph_refresh milliseconds
-    if (timer_elapsed(oled_data.timer) > GRAPH_REFRESH) {
-        render_wpm_graph(current_wpm);
-        oled_data.timer = timer_read();
-    }
-    return false;
-}
-#endif
-
-bool wpm_keycode_user(uint16_t keycode) {
-    // Count all keycodes on the macropad
-    return true;
-}
-
diff --git a/keyboards/nullbitsco/tidbit/keymaps/snailmap_lite/rules.mk b/keyboards/nullbitsco/tidbit/keymaps/snailmap_lite/rules.mk
deleted file mode 100644
index 605f034e1df..00000000000
--- a/keyboards/nullbitsco/tidbit/keymaps/snailmap_lite/rules.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-OLED_ENABLE = yes
-WPM_ENABLE = yes
-VIA_ENABLE = yes
-SPACE_CADET_ENABLE = no
-GRAVE_ESC_ENABLE = no
-MAGIC_ENABLE = no
-ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/numatreus/keymaps/yohewi/keymap.c b/keyboards/numatreus/keymaps/yohewi/keymap.c
deleted file mode 100644
index 5b53389f986..00000000000
--- a/keyboards/numatreus/keymaps/yohewi/keymap.c
+++ /dev/null
@@ -1,61 +0,0 @@
-#include QMK_KEYBOARD_H
-
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-// The underscores don't mean anything - you can have a layer called STUFF or any other name.
-// Layer names don't all need to be of the same length, obviously, and you can also skip them
-// entirely and just use numbers.
-
-enum layer_number {
-  _QWERTY,
-  _LOWER,
-  _RAISE,
-};
-
-enum custom_keycodes {
-  BASE = SAFE_RANGE,
-  LOWER,
-  RAISE,
-};
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /*
-   *  q      w      e     r     t       ||     y      u     i     o     p
-   *  a      s      d     f     g       ||     h      j     k     l     ;
-   *  z      x      c     v     b       ||     n      m     ,     .     \
-   * esc    tab    ctl   lw   spc   bspc|| GRV   ent  RS    /     alt    -
-   */
-
-  [_QWERTY] = LAYOUT( /* Qwerty */
-    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P    ,
-    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN ,
-    SFT_T(KC_Z),    KC_X,    KC_C,    KC_V,    KC_B,               KC_N,    KC_M,    KC_COMM, KC_DOT,  SFT_T(KC_BSLS) ,
-    KC_ESC, KC_TAB, KC_LCTL,  MO(_LOWER), KC_SPC, KC_BSPC, LALT(KC_GRV), KC_ENT,  MO(_RAISE),  KC_DOT, KC_RALT, KC_MINS ),
-
-
-  /*
-   *  1       2     3     4     5        ||      6     7      8     9    0
-   *  #      <      >    =       -       ||      _     +                ENT
-   *  [       ]      (     )    &        ||     `         .        UP    \
-   * TRANS  TRANS TRANS TRANS TRANS TRANS|| TRANS TRANS  RS  LEFT DPWM RGHT
-   */
-  [_RAISE] = LAYOUT( /* [> RAISE <] */
-    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                      KC_6,    KC_7,    KC_8,   KC_9, KC_0 ,
-    KC_HASH, KC_LABK, KC_RABK, KC_EQL,   KC_MINS,                   KC_UNDS, KC_PLUS,   KC_TRNS,  KC_TRNS, KC_ENT ,
-    KC_LBRC, KC_RBRC, KC_LPRN, KC_RPRN, KC_AMPR,                   KC_GRV,  KC_TRNS,    KC_DOT,   KC_UP, KC_BSLS ,
-    KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT  ),
-
-  /*
-   * !        @     #    $     %        ||     ^    &    *     (    )
-   *  F1    F2    F3   F4    F5        ||     F6    F7   F8    F9    F10
-   *  F11    F12              reset      ||               ,    UP   \
-   *  TRNS  TRNS  TRNS TRNS TRNS TRNS||TRNS TRNS  TRNS  LEFT DPWM RGHT
-   */
-
-  [_LOWER] = LAYOUT( /* [> LOWER <] */
-    KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                   KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN  ,
-    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                     KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10  ,
-    KC_F11,  KC_F12,  KC_NO,   KC_NO,   QK_BOOT,                   KC_TRNS,   KC_TRNS,   KC_QUOT,   KC_UP,   KC_BSLS  ,
-    KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_ENT,  TO(_QWERTY), KC_LEFT, KC_DOWN, KC_RGHT )
-};
diff --git a/keyboards/ok60/keymaps/ebrowncross/keymap.c b/keyboards/ok60/keymaps/ebrowncross/keymap.c
deleted file mode 100644
index 4ef2f9964c0..00000000000
--- a/keyboards/ok60/keymaps/ebrowncross/keymap.c
+++ /dev/null
@@ -1,30 +0,0 @@
-#include QMK_KEYBOARD_H
-
-// An ISO UK keymap
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    [0] = LAYOUT_60_iso(
-        KC_ESC,  KC_1,    KC_2,    KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,  KC_9,    KC_0,    KC_MINS,  KC_EQL,  KC_BSPC,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,  KC_R,  KC_T,  KC_Y,  KC_U,  KC_I,  KC_O,    KC_P,    KC_LBRC,  KC_RBRC,
-        KC_CAPS, KC_A,    KC_S,    KC_D,  KC_F,  KC_G,  KC_H,  KC_J,  KC_K,  KC_L,    KC_SCLN, KC_QUOT,  KC_NUHS, KC_ENT,
-        KC_LSFT, KC_NUBS, KC_Z,    KC_X,  KC_C,  KC_V,  KC_B,  KC_N,  KC_M,  KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT,
-        KC_LCTL, KC_LGUI, KC_LALT,                      KC_SPC,                       MO(1),   KC_LGUI, KC_MENU,  KC_LCTL
-    ),
-
-    [1] = LAYOUT_60_iso(
-        KC_GRAVE, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
-        _______,  KC_HOME, KC_UP,   KC_END,  KC_PGUP, _______, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP,
-        _______,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, _______, _______, _______, _______, KC_DEL,  KC_END,  KC_PGDN, KC_PSCR,
-        _______,  _______, BL_DOWN, BL_TOGG, BL_UP,   _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU,
-        _______,  _______, _______,                            _______,                            _______, MO(2),   _______, _______
-    ),
-
-    [2] = LAYOUT_60_iso(
-        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______, _______
-    ),
-};
diff --git a/keyboards/omkbd/ergodash/mini/keymaps/toyoshimahidenori/config.h b/keyboards/omkbd/ergodash/mini/keymaps/toyoshimahidenori/config.h
deleted file mode 100644
index a597d848e2e..00000000000
--- a/keyboards/omkbd/ergodash/mini/keymaps/toyoshimahidenori/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
diff --git a/keyboards/omkbd/ergodash/mini/keymaps/toyoshimahidenori/keymap.c b/keyboards/omkbd/ergodash/mini/keymaps/toyoshimahidenori/keymap.c
deleted file mode 100644
index 8bc5d09d802..00000000000
--- a/keyboards/omkbd/ergodash/mini/keymaps/toyoshimahidenori/keymap.c
+++ /dev/null
@@ -1,141 +0,0 @@
-/* Copyright 2020 Toyoshima Hidenori <t@toyo.dev>
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>
-*/
-
-#include QMK_KEYBOARD_H
-
-enum layers {
-    _QWERTY,
-    _LOWER,
-    _RAISE,
-    _ADJUST,
-};
-
-enum custom_keycodes {
-    QWERTY = SAFE_RANGE,
-    LOWER,
-    RAISE,
-    ADJUST,
-};
-
-#define EISU LALT(KC_GRV)
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /* Qwerty
-   * ,----------------------------------------------------------------------------------------------------------------------.
-   * |  TAB |   Q  |   W  |   E  |   R  |   T  |   -  |                    |   =  |   Y  |   U  |   I  |   O  |   P  |  \   |
-   * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------|
-   * | Ctrl |   A  |   S  |   D  |   F  |   G  |   [  |                    |   ]  |   H  |   J  |   K  |   L  |   ;  |  '   |
-   * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------|
-   * | Shift|   Z  |   X  |   C  |   V  |   B  |  GUI |                    |  GUI |   N  |   M  |   ,  |   .  |   /  | Shift|
-   * |-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------|
-   * | Ctrl |  ESC |  ALt | ESC  |||||||| Shift| Raise| Space|||||||| enter| Lower| Bcspc|||||||| Left | Down |  Up  | Right|
-   * ,----------------------------------------------------------------------------------------------------------------------.
-   */
-    [_QWERTY] = LAYOUT(
-    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_MINS,                        KC_EQL , KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
-    KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_LBRC,                        KC_RBRC, KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_LGUI,                        KC_RGUI, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-    KC_LCTL, KC_ESC,  KC_LALT, KC_ESC,           KC_LSFT, RAISE,   KC_SPC,        KC_ENT, LOWER,   KC_BSPC,          KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-  ),
-
-  /* Lower
-   * ,----------------------------------------------------------------------------------------------------------------------.
-   * |   ~  |   1  |   2  |   3  |   4  |   5  |   _  |                    |   +  | 6    | 7    |  8   | 9    |   0  |   |  |
-   * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------|
-   * | Ctrl |   ^  |   &  |   *  |   (  |   )  |   {  |                    |   }  | Left | Down |  Up  | Right|   :  |  "   |
-   * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------|
-   * | Shift|   !  |   @  |   #  |   $  |   %  |  GUI |                    |  GUI |   -  |   =  |   <  |   >  |   ?  | Shift|
-   * |-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------|
-   * | Ctrl |  ESC |  ALt | EISU |||||||| kana | Raise| Space|||||||| Enter| Lower|Delete|||||||| Home |PageDn|PageUp|  End |
-   * ,----------------------------------------------------------------------------------------------------------------------.
-   */
-  [_LOWER] = LAYOUT(
-    KC_TILD, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_UNDS,                       KC_PLUS, KC_6,    KC_7,    KC_8,   KC_9,    KC_0,    KC_PIPE,
-    KC_LCTL, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_LCBR,                       KC_RCBR, KC_LEFT, KC_DOWN, KC_UP,  KC_RGHT, KC_COLN, KC_DQT ,
-    KC_LSFT, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_LGUI,                       KC_RGUI, KC_MINS, KC_EQL,  KC_LT,  KC_GT,   KC_QUES, KC_RSFT,
-    KC_LCTL, KC_ESC, KC_LALT,  KC_LNG2,          KC_LNG1, RAISE,   KC_SPC,       KC_ENT, LOWER,   KC_DEL,           KC_HOME,KC_PGDN, KC_PGUP, KC_END
-  ),
-
-  /* Raise
-   * ,----------------------------------------------------------------------------------------------------------------------.
-   * |   `  |   1  |   2  |   3  |   4  |   5  |   _  |                    |   +  | 6    | 7    |  8   | 9    |   0  |   |  |
-   * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------|
-   * | Ctrl |   ^  |   &  |   *  |   (  |   )  |   {  |                    |   }  | Left | Down |  Up  | Right|   :  |  "   |
-   * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------|
-   * | Shift|   !  |   @  |   #  |   $  |   %  |  GUI |                    |  GUI |   _  |   +  |   <  |   >  |   ?  | Shift|
-   * |-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------|
-   * | Ctrl |  ESC |  ALt | EISU |||||||| kana | Raise| Space|||||||| Enter| Lower|Delete|||||||| Home |PageDn|PageUp|  End |
-   * ,----------------------------------------------------------------------------------------------------------------------.
-  */
-  [_RAISE] = LAYOUT(
-    KC_GRV , KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_UNDS,                       KC_PLUS, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_PIPE,
-    KC_LCTL, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_LCBR,                       KC_RCBR, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_COLN, KC_DQT ,
-    KC_LSFT, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_LGUI,                       KC_RGUI, KC_UNDS, KC_PLUS, KC_LT,   KC_GT,   KC_QUES, KC_RSFT,
-    KC_LCTL, KC_ESC,  KC_LALT, KC_LNG2,          KC_LNG1, RAISE,   KC_SPC,       KC_ENT, LOWER,   KC_DEL,           KC_HOME, KC_PGDN, KC_PGUP, KC_END
-  ),
-
-  /* Adjust
-   * ,----------------------------------------------------------------------------------------------------------------------.
-   * |      | Reset|RGB ON|  MODE|  HUE-|  HUE+|      |                    |      |  SAT-|  SAT+|  VAL-|  VAL+|      |      |
-   * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------|
-   * |      |                                  |      |                    |      |      |      |      |      |      |      |
-   * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------|
-   * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |      |                    |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
-   * |-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------|
-   * |      |      |      |      ||||||||      |      |      ||||||||      |      |      ||||||||      |      |      |      |
-   * ,----------------------------------------------------------------------------------------------------------------------.
-   */
-  [_ADJUST] = LAYOUT(
-    _______, QK_BOOT, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI,_______,                       _______, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, _______, _______,
-    _______, _______, BL_TOGG, BL_BRTG, BL_UP  , BL_DOWN,_______,                       _______, _______, _______, _______, _______, _______, _______,
-    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,    KC_F6 ,_______,                       _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-    _______, _______, _______, _______,          _______,_______,_______,       _______,_______, _______,          _______, _______, _______, _______
-  )
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case ADJUST:
-      if (record->event.pressed) {
-        layer_on(_ADJUST);
-      } else {
-        layer_off(_ADJUST);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/omkbd/ergodash/mini/keymaps/toyoshimahidenori/readme.md b/keyboards/omkbd/ergodash/mini/keymaps/toyoshimahidenori/readme.md
deleted file mode 100644
index ebc13043a7e..00000000000
--- a/keyboards/omkbd/ergodash/mini/keymaps/toyoshimahidenori/readme.md
+++ /dev/null
@@ -1,62 +0,0 @@
-# ToyoshimaHidenori's keymap for Ergodash mini
-
-This is the ToyoshimaHidenori's keymap configuration for Ergodash mini.
-There are four layers, QWERTY(default), LOWER, RAISE and ADJSUT.
-
-## Layers
-
-### Qwerty
-
-```
-,----------------------------------------------------------------------------------------------------------------------.
-|  TAB |   Q  |   W  |   E  |   R  |   T  |   -  |                    |   =  |   Y  |   U  |   I  |   O  |   P  |  \   |
-|------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------|
-| Ctrl |   A  |   S  |   D  |   F  |   G  |   [  |                    |   ]  |   H  |   J  |   K  |   L  |   ;  |  '   |
-|------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------|
-| Shift|   Z  |   X  |   C  |   V  |   B  |  GUI |                    |  GUI |   N  |   M  |   ,  |   .  |   /  | Shift|
-|-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------|
-| Ctrl |  ESC |  ALt | ESC  |||||||| Shift| Raise| Space|||||||| enter| Lower| Bcspc|||||||| Left | Down |  Up  | Right|
-,----------------------------------------------------------------------------------------------------------------------.
-```
-
-### Lower
-
-```
-,----------------------------------------------------------------------------------------------------------------------.
-|   ~  |   1  |   2  |   3  |   4  |   5  |   _  |                    |   +  | 6    | 7    |  8   | 9    |   0  |   |  |
-|------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------|
-| Ctrl |   ^  |   &  |   *  |   (  |   )  |   {  |                    |   }  | Left | Down |  Up  | Right|   :  |  "   |
-|------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------|
-| Shift|   !  |   @  |   #  |   $  |   %  |  GUI |                    |  GUI |   -  |   =  |   <  |   >  |   ?  | Shift|
-|-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------|
-| Ctrl |  ESC |  ALt | EISU |||||||| kana | Raise| Space|||||||| Enter| Lower|Delete|||||||| Home |PageDn|PageUp|  End |
-,----------------------------------------------------------------------------------------------------------------------.
-```
-
-### Raise
-
-```
-,----------------------------------------------------------------------------------------------------------------------.
-|   `  |   1  |   2  |   3  |   4  |   5  |   _  |                    |   +  | 6    | 7    |  8   | 9    |   0  |   |  |
-|------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------|
-| Ctrl |   ^  |   &  |   *  |   (  |   )  |   {  |                    |   }  | Left | Down |  Up  | Right|   :  |  "   |
-|------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------|
-| Shift|   !  |   @  |   #  |   $  |   %  |  GUI |                    |  GUI |   _  |   +  |   <  |   >  |   ?  | Shift|
-|-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------|
-| Ctrl |  ESC |  ALt | EISU |||||||| kana | Raise| Space|||||||| Enter| Lower|Delete|||||||| Home |PageDn|PageUp|  End |
-,----------------------------------------------------------------------------------------------------------------------.
-```
-
-### Adjust
-
-```
-,----------------------------------------------------------------------------------------------------------------------.
-|      | Reset|RGB ON|  MODE|  HUE-|  HUE+|      |                    |      |  SAT-|  SAT+|  VAL-|  VAL+|      |      |
-|------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------|
-|      |                                  |      |                    |      |      |      |      |      |      |      |
-|------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------|
-|  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |      |                    |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
-|-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------|
-|      |      |      |      ||||||||      |      |      ||||||||      |      |      ||||||||      |      |      |      |
-,----------------------------------------------------------------------------------------------------------------------.
-```
diff --git a/keyboards/omkbd/ergodash/mini/keymaps/toyoshimahidenori/rules.mk b/keyboards/omkbd/ergodash/mini/keymaps/toyoshimahidenori/rules.mk
deleted file mode 100644
index 11b62b9bffe..00000000000
--- a/keyboards/omkbd/ergodash/mini/keymaps/toyoshimahidenori/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-BACKLIGHT_ENABLE = yes
-RGBLIGHT_ENABLE = yes
-AUDIO_ENABLE = no
diff --git a/keyboards/omkbd/ergodash/mini/keymaps/yoshimaru46/config.h b/keyboards/omkbd/ergodash/mini/keymaps/yoshimaru46/config.h
deleted file mode 100644
index a597d848e2e..00000000000
--- a/keyboards/omkbd/ergodash/mini/keymaps/yoshimaru46/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
diff --git a/keyboards/omkbd/ergodash/mini/keymaps/yoshimaru46/keymap.c b/keyboards/omkbd/ergodash/mini/keymaps/yoshimaru46/keymap.c
deleted file mode 100644
index 9636b761bcf..00000000000
--- a/keyboards/omkbd/ergodash/mini/keymaps/yoshimaru46/keymap.c
+++ /dev/null
@@ -1,111 +0,0 @@
-/* Copyright 2021 Yoshihiro Saito
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- */
-
-#include QMK_KEYBOARD_H
-
-enum layers {
-    _QWERTY,
-    _LOWER,
-    _RAISE,
-    _ADJUST,
-};
-
-enum custom_keycodes {
-    QWERTY = SAFE_RANGE,
-    LOWER,
-    RAISE,
-    ADJUST,
-};
-
-// Shift + ( = <
-const key_override_t left_paren_angle_bracket_override = ko_make_basic(MOD_MASK_SHIFT, KC_LEFT_PAREN, KC_LEFT_ANGLE_BRACKET);
-
-// Shift + ) = >
-const key_override_t right_paren_angle_bracket_override = ko_make_basic(MOD_MASK_SHIFT, KC_RIGHT_PAREN, KC_RIGHT_ANGLE_BRACKET);
-
-const key_override_t **key_overrides = (const key_override_t *[]){
-	&left_paren_angle_bracket_override,
-	&right_paren_angle_bracket_override,
-	NULL
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Qwerty */
-    [_QWERTY] = LAYOUT(
-    QK_GESC, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_LPRN,                           KC_RPRN, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-    KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_LBRC,                           KC_RBRC, KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_DEL,
-    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    XXXXXXX,                           XXXXXXX, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_QUOT,
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          KC_LGUI, LOWER,   CTL_T(KC_SPC), SC_SENT,   RAISE,   KC_RGUI,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-  ),
-
-  /* Lower */
-  [_LOWER] = LAYOUT(
-    XXXXXXX, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_F11,                            KC_GRV,  KC_CIRC, KC_AMPR, KC_ASTR, XXXXXXX, XXXXXXX, XXXXXXX,
-    XXXXXXX, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F12,                            KC_BSLS, KC_TILD, KC_MINS, KC_EQL,  XXXXXXX, XXXXXXX, XXXXXXX,
-    XXXXXXX, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  XXXXXXX,                           XXXXXXX, KC_PIPE, KC_UNDS, KC_PLUS, XXXXXXX, XXXXXXX, XXXXXXX,
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          _______, XXXXXXX, _______,       _______,   XXXXXXX, _______,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-  ),
-
-  /* Raise */
-  [_RAISE] = LAYOUT(
-    XXXXXXX, KC_P1,   KC_P2,   KC_P3,   KC_P4,   KC_P5,   XXXXXXX,                           XXXXXXX, KC_P6,   KC_P7,   KC_P8,   KC_P9,   KC_P0,   XXXXXXX,
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                           XXXXXXX, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, XXXXXXX, XXXXXXX,
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                           XXXXXXX, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT, XXXXXXX, XXXXXXX,
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          _______, XXXXXXX, _______,       _______,   XXXXXXX, _______,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-  ),
-
-  /* Adjust */
-  [_ADJUST] = LAYOUT(
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX ,XXXXXXX,                           XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX ,XXXXXXX,                           XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX ,XXXXXXX,                           XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          _______ ,_______, _______,       _______,   XXXXXXX, _______,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-  ),
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case LOWER:
-            if (record->event.pressed) {
-                layer_on(_LOWER);
-                update_tri_layer(_LOWER, _RAISE, _ADJUST);
-            } else {
-                layer_off(_LOWER);
-                update_tri_layer(_LOWER, _RAISE, _ADJUST);
-            }
-            return false;
-            break;
-        case RAISE:
-            if (record->event.pressed) {
-                layer_on(_RAISE);
-                update_tri_layer(_LOWER, _RAISE, _ADJUST);
-            } else {
-                layer_off(_RAISE);
-                update_tri_layer(_LOWER, _RAISE, _ADJUST);
-            }
-            return false;
-            break;
-        case ADJUST:
-            if (record->event.pressed) {
-                layer_on(_ADJUST);
-            } else {
-                layer_off(_ADJUST);
-            }
-            return false;
-            break;
-    }
-    return true;
-}
diff --git a/keyboards/omkbd/ergodash/mini/keymaps/yoshimaru46/readme.md b/keyboards/omkbd/ergodash/mini/keymaps/yoshimaru46/readme.md
deleted file mode 100644
index 67a6ed9b90f..00000000000
--- a/keyboards/omkbd/ergodash/mini/keymaps/yoshimaru46/readme.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# yoshimaru46's keymap for Ergodash mini
-
-This is the yoshimaru46's keymap configuration for Ergodash mini.
-There are three layers, QWERTY(default), LOWER, and RAISE.
diff --git a/keyboards/omkbd/ergodash/mini/keymaps/yoshimaru46/rules.mk b/keyboards/omkbd/ergodash/mini/keymaps/yoshimaru46/rules.mk
deleted file mode 100644
index f85c6a4151a..00000000000
--- a/keyboards/omkbd/ergodash/mini/keymaps/yoshimaru46/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-BACKLIGHT_ENABLE = no
-RGBLIGHT_ENABLE = no
-AUDIO_ENABLE = no
-KEY_OVERRIDE_ENABLE = yes
diff --git a/keyboards/omkbd/ergodash/rev1/keymaps/greenshadowmaker/config.h b/keyboards/omkbd/ergodash/rev1/keymaps/greenshadowmaker/config.h
deleted file mode 100644
index a597d848e2e..00000000000
--- a/keyboards/omkbd/ergodash/rev1/keymaps/greenshadowmaker/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
diff --git a/keyboards/omkbd/ergodash/rev1/keymaps/greenshadowmaker/keyboard-layout-editor.json b/keyboards/omkbd/ergodash/rev1/keymaps/greenshadowmaker/keyboard-layout-editor.json
deleted file mode 100644
index 8f8d3085538..00000000000
--- a/keyboards/omkbd/ergodash/rev1/keymaps/greenshadowmaker/keyboard-layout-editor.json
+++ /dev/null
@@ -1,460 +0,0 @@
-[
-  {
-    "name": "gsm-ErgoDash",
-    "notes": "Front Legend = \"Adust\" layer (both lower and Raise)\n\n\nLayout Positions are an aproximation and not exact"
-  },
-  [
-    {
-      "x": 3,
-      "t": "#0000ff\n#ff0000"
-    },
-    "\nF3\n\n\n\n\n\n\n\n3 #",
-    {
-      "x": 11
-    },
-    "\nF8\n\n\n\n\n\n\n\n8 *"
-  ],
-  [
-    {
-      "y": -0.875,
-      "x": 2
-    },
-    "\nF2\n\n\n\n\n\n\n\n2 @",
-    {
-      "x": 1
-    },
-    "\nF4\n\n\n\n\n\n\n\n4 $",
-    {
-      "x": 9
-    },
-    "\nF7\n\n\n\n\n\n\n\n7 &",
-    {
-      "x": 1
-    },
-    "\nF9\n\n\n\n\n\n\n\n9 ("
-  ],
-  [
-    {
-      "y": -0.875,
-      "x": 5
-    },
-    "\nF5\n\n\n\n\n\n\n\n5 %",
-    {
-      "x": 7
-    },
-    "\nF6\n\n\n\n\n\n\n\n6 &"
-  ],
-  [
-    {
-      "y": -0.875,
-      "t": "#000000",
-      "a": 3
-    },
-    "Esc\n\n\n\nreset",
-    {
-      "t": "#0000ff\n#ff0000",
-      "a": 4
-    },
-    "\nF1\n\n\n\n\n\n\n\n1 !",
-    {
-      "x": 15
-    },
-    "\nF10\n\n\n\n\n\n\n\n0 )",
-    {
-      "t": "#000000",
-      "a": 7,
-      "fa": [
-        2
-      ]
-    },
-    "Bksp"
-  ],
-  [
-    {
-      "y": -0.625,
-      "x": 6,
-      "f": 3
-    },
-    "= +",
-    {
-      "x": 5,
-      "f": 3
-    },
-    "- _"
-  ],
-  [
-    {
-      "y": -0.75,
-      "x": 3,
-      "f": 3
-    },
-    "E",
-    {
-      "x": 11,
-      "f": 3
-    },
-    "I"
-  ],
-  [
-    {
-      "y": -0.875,
-      "x": 2,
-      "t": "#0000ff\n#ff0000\n\n\n\n\n\n\n\n\n#ff0000",
-      "a": 4,
-      "f": 3
-    },
-    "PgUP\nUP\n\n\n\n\n\n\n\nW",
-    {
-      "x": 1,
-      "t": "#000000",
-      "a": 3,
-      "f": 3
-    },
-    "R\n\n\n\nrgb_tog",
-    {
-      "x": 9,
-      "a": 7,
-      "f": 3
-    },
-    "U",
-    {
-      "x": 1,
-      "f": 3
-    },
-    "O"
-  ],
-  [
-    {
-      "y": -0.875,
-      "x": 5,
-      "a": 3,
-      "f": 3
-    },
-    "T\n\n\n\nbl_tog",
-    {
-      "x": 7,
-      "a": 7,
-      "f": 3
-    },
-    "Y"
-  ],
-  [
-    {
-      "y": -0.875,
-      "f": 3
-    },
-    "Tab",
-    {
-      "f": 3
-    },
-    "Q",
-    {
-      "x": 15,
-      "f": 3
-    },
-    "P",
-    {
-      "f": 3
-    },
-    "] }"
-  ],
-  [
-    {
-      "y": -0.625,
-      "x": 6
-    },
-    "",
-    {
-      "x": 5,
-      "f": 3
-    },
-    "[ {"
-  ],
-  [
-    {
-      "y": -0.75,
-      "x": 3,
-      "t": "#0000ff\n#ff0000\n\n\n\n\n\n\n\n\n#ff0000",
-      "a": 0,
-      "f": 3
-    },
-    "End\nRIGHT\n\n\nrgb_sai\n\n\n\n\nD",
-    {
-      "x": 11,
-      "t": "#000000",
-      "a": 7,
-      "f": 3
-    },
-    "K"
-  ],
-  [
-    {
-      "y": -0.875,
-      "x": 2,
-      "t": "#0000ff\n#ff0000\n\n\n\n\n\n\n\n\n#ff0000",
-      "a": 0,
-      "f": 3
-    },
-    "PgDwn\nDOWN\n\n\nrgb_hai\n\n\n\n\nS",
-    {
-      "x": 1,
-      "t": "#000000",
-      "a": 3,
-      "f": 3
-    },
-    "F\n\n\n\nrgb_val",
-    {
-      "x": 9,
-      "a": 7,
-      "f": 3
-    },
-    "J",
-    {
-      "x": 1,
-      "f": 3
-    },
-    "L"
-  ],
-  [
-    {
-      "y": -0.875,
-      "x": 5,
-      "a": 3,
-      "f": 3
-    },
-    "G\n\n\n\nbl_inc",
-    {
-      "x": 7,
-      "a": 7,
-      "f": 3
-    },
-    "H"
-  ],
-  [
-    {
-      "y": -0.875,
-      "c": "#0000ff",
-      "t": "#ffffffff",
-      "f": 3
-    },
-    "Raise",
-    {
-      "c": "#cccccc",
-      "t": "#0000ff\n#ff0000\n\n\n\n\n\n\n\n\n#ff0000",
-      "a": 4,
-      "f": 3
-    },
-    "Home\nLEFT\n\n\n\n\n\n\n\nA",
-    {
-      "x": 15,
-      "t": "#000000",
-      "a": 7,
-      "f": 3
-    },
-    ": ;",
-    {
-      "f": 3
-    },
-    "' \""
-  ],
-  [
-    {
-      "y": -0.625,
-      "x": 6
-    },
-    "",
-    {
-      "x": 5
-    },
-    ""
-  ],
-  [
-    {
-      "y": -0.75,
-      "x": 3,
-      "a": 3,
-      "f": 3
-    },
-    "C\n\n\n\nrgb_sad",
-    {
-      "x": 11,
-      "a": 7,
-      "f": 3
-    },
-    ", <"
-  ],
-  [
-    {
-      "y": -0.875,
-      "x": 2,
-      "a": 3,
-      "f": 3
-    },
-    "X\n\n\n\nrgb_sad",
-    {
-      "x": 1,
-      "f": 3
-    },
-    "V\n\n\n\nrgb_vad",
-    {
-      "x": 9,
-      "a": 7,
-      "f": 3
-    },
-    "M",
-    {
-      "x": 1,
-      "f": 3
-    },
-    ". >"
-  ],
-  [
-    {
-      "y": -0.875,
-      "x": 5,
-      "a": 3,
-      "f": 3
-    },
-    "B\n\n\n\nbl_dec",
-    {
-      "x": 7,
-      "a": 7,
-      "f": 3
-    },
-    "N"
-  ],
-  [
-    {
-      "y": -0.875,
-      "a": 3,
-      "f": 3
-    },
-    "Shift\n\n\n\neep_rst",
-    {
-      "a": 7,
-      "f": 3
-    },
-    "Z",
-    {
-      "x": 15,
-      "f": 3
-    },
-    "/ ?",
-    {
-      "f": 3
-    },
-    "Shift"
-  ],
-  [
-    {
-      "y": -0.25,
-      "x": 2,
-      "f": 3
-    },
-    "Alt",
-    {
-      "x": 13,
-      "f": 3
-    },
-    "DOWN"
-  ],
-  [
-    {
-      "y": -0.9749999999999996,
-      "x": 3.5,
-      "f": 3
-    },
-    "Ctrl",
-    {
-      "x": 10.15,
-      "f": 3
-    },
-    "LEFT"
-  ],
-  [
-    {
-      "y": -0.7750000000000004,
-      "f": 3
-    },
-    "`~",
-    {
-      "f": 3
-    },
-    "\\|",
-    {
-      "x": 15,
-      "f": 3
-    },
-    "UP",
-    {
-      "f": 3
-    },
-    "RIGHT"
-  ],
-  [
-    {
-      "r": 30,
-      "rx": 6.5,
-      "ry": 4.25,
-      "y": -0.25,
-      "x": -0.2999999999999998,
-      "c": "#eb7c15",
-      "f": 3,
-      "h": 2
-    },
-    "Space",
-    {
-      "c": "#cccccc",
-      "f": 3
-    },
-    "Del"
-  ],
-  [
-    {
-      "x": -1.2999999999999998,
-      "c": "#ff0000",
-      "f": 3
-    },
-    "Lower",
-    {
-      "x": 1,
-      "c": "#cccccc",
-      "t": "#0000ff\n#ff0000",
-      "a": 4
-    },
-    "\nApp\n\n\n\n\n\n\n\nOS"
-  ],
-  [
-    {
-      "r": -30,
-      "rx": 13,
-      "y": -0.5,
-      "x": -2,
-      "t": "#000000",
-      "a": 7,
-      "f": 3
-    },
-    "PrtScr",
-    {
-      "c": "#eb7c15",
-      "f": 3,
-      "h": 2
-    },
-    "Space"
-  ],
-  [
-    {
-      "x": -2,
-      "c": "#cccccc",
-      "f": 3
-    },
-    "Enter",
-    {
-      "x": 1,
-      "c": "#0000ff",
-      "t": "#ffffff",
-      "f": 3
-    },
-    "Raise"
-  ]
-]
\ No newline at end of file
diff --git a/keyboards/omkbd/ergodash/rev1/keymaps/greenshadowmaker/keymap.c b/keyboards/omkbd/ergodash/rev1/keymaps/greenshadowmaker/keymap.c
deleted file mode 100644
index 7ed548b765a..00000000000
--- a/keyboards/omkbd/ergodash/rev1/keymaps/greenshadowmaker/keymap.c
+++ /dev/null
@@ -1,124 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum custom_keycodes {
-  LOWER = SAFE_RANGE,
-  RAISE,
-};
-
-enum layer_names {
-  _QWERTY,
-  _LOWER,
-  _RAISE,
-  _ADJUST,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /* Qwerty
-   * ,----------------------------------------------------------------------------------------------------------------------.
-   * | ESC  |   1  |   2  |   3  |   4  |   5  |   =  |                    |   -  |   6  |   7  |   8  |   9  |   0  |Backsp|
-   * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------|
-   * |  Tab |   Q  |   W  |   E  |   R  |   T  |      |                    |   [  |   Y  |   U  |   I  |   O  |   P  |  ]   |
-   * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------|
-   * | Raise|   A  |   S  |   D  |   F  |   G  |      |                    |      |   H  |   J  |   K  |   L  |   ;  |  "   |
-   * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------|
-   * | Shift|   Z  |   X  |   C  |   V  |   B  ||||||||  Del |      |      ||||||||   N  |   M  |   ,  |   .  |   /  | Shift|
-   * |-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------|
-   * |  `   |  \   |  ALt | Ctrl |||||||| Lower| Space|  LGui|||||||| Enter| Space| Raise|||||||| Left | Down |  Up  | Right|
-   * ,----------------------------------------------------------------------------------------------------------------------.
-   */
-  [_QWERTY] = LAYOUT( 
-     KC_ESC,   KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_EQL,                        KC_MINS, KC_6,    KC_7,  KC_8,    KC_9,    KC_0,    KC_BSPC,
-     KC_TAB,   KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,   XXXXXXX,                        KC_LBRC, KC_Y,    KC_U,  KC_I,    KC_O,    KC_P,    KC_RBRC,
-      RAISE,   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,   XXXXXXX,                        XXXXXXX, KC_H,    KC_J,  KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-    KC_LSFT,   KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,            KC_DEL,        KC_PSCR,         KC_N,    KC_M,  KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-     KC_GRV,KC_BSLS, KC_LALT, KC_LCTL,            LOWER,    KC_SPC,KC_LGUI,        KC_ENT ,KC_SPC , RAISE,          KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-  ),
-
-  /* Lower
-   * ,----------------------------------------------------------------------------------------------------------------------.
-   * |      |  F1  |  F2  |  F3  |  F4  |  F5  |      |                    |      |  F6  |  F7  |  F8  |  F9  |  F10 |      |
-   * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------|
-   * |      |      |  Up  |      |      |      |      |                    |      |      |      |      |      |      |      |
-   * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------|
-   * | Raise| Left | Down | Rght |      |      |      |                    |      |      |      |      |      |      |      |
-   * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------|
-   * | Shift|      |      |      |      |      ||||||||      |      |      ||||||||      |      |      |      |      | Shift|
-   * |-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------|
-   * |      |      |      |      |||||||| Lower| Space|      ||||||||      | Space| Raise||||||||      |      |      |      |
-   * ,----------------------------------------------------------------------------------------------------------------------.
-   */
-  [_LOWER] = LAYOUT(
-    XXXXXXX,  KC_F1,   KC_F2,   KC_F3,   KC_F4,    KC_F5, XXXXXXX,                        XXXXXXX, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  XXXXXXX, 
-    XXXXXXX, XXXXXXX,   KC_UP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-      RAISE, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX, XXXXXXX,                        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,           XXXXXXX,     XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_RSFT,
-    XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX,             LOWER,   KC_SPC ,XXXXXXX,     XXXXXXX, KC_SPC ,   RAISE,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX 
-  ),
-
-  /* Raise
-   * ,----------------------------------------------------------------------------------------------------------------------.
-   * |      |      |      |      |      |      |      |                    |      |      |      |      |      |      |      |
-   * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------|
-   * |      |      | PgUp |      |      |      |      |                    |      |      |      |      |      |      |      |
-   * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------|
-   * | Raise| Home | PgDwn| End  |      |      |      |                    |      |      |      |      |      |      |      |
-   * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------|
-   * | Shift|      |      |      |      |      ||||||||      |      |      ||||||||      |      |      |      |      | Shift|
-   * |-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------|
-   * |      |      |      |      |||||||| Lower| Space|      ||||||||      |Space | Raise||||||||      |      |      |      |
-   * ,----------------------------------------------------------------------------------------------------------------------.
-   */
-  [_RAISE] = LAYOUT(
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    XXXXXXX, XXXXXXX, KC_PGUP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-      RAISE, KC_HOME, KC_PGDN, KC_END, XXXXXXX, XXXXXXX, XXXXXXX,                        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,           XXXXXXX,     XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_RSFT,
-    XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX,             LOWER,   KC_SPC ,XXXXXXX,     XXXXXXX, KC_SPC ,   RAISE,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX 
-  ),
-
-  /* Adjust  (Both Raise and Lower Together)
-   * ,----------------------------------------------------------------------------------------------------------------------.
-   * | Reset|      |      |      |      |      |      |                    |      |      |      |      |      |      |      |
-   * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------|
-   * |      |      |      |      |rgbtog|bl_tog|      |                    |      |      |      |      |      |      |      |
-   * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------|
-   * | Raise|      |rgbhui|rgbsai|rgbvai|bl_inc|      |                    |      |      |      |      |      |      |      |
-   * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------|
-   * |EE_CLR|      |rgbhud|rgbdec|rgbvad|bl_dec||||||||      |      |      ||||||||      |      |      |      |      | Shift|
-   * |-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------|
-   * |      |      |      |      |||||||| Lower| Space|      ||||||||      | Space| Raise||||||||      |      |      |      |
-   * ,----------------------------------------------------------------------------------------------------------------------.
-   */
-  [_ADJUST] = LAYOUT(
-      QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, BL_TOGG, XXXXXXX,                        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-      RAISE, XXXXXXX, RGB_HUI, RGB_SAI, RGB_VAI,  BL_UP,  XXXXXXX,                        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    EE_CLR,  XXXXXXX, RGB_HUD, RGB_SAD, RGB_VAD,  BL_DOWN,          XXXXXXX,     XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_RSFT,
-    XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX,             LOWER,   KC_SPC ,XXXXXXX,     XXXXXXX,  KC_SPC,   RAISE,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-  )
-}; 
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-  }
-  return true;
-}
diff --git a/keyboards/omkbd/ergodash/rev1/keymaps/greenshadowmaker/rules.mk b/keyboards/omkbd/ergodash/rev1/keymaps/greenshadowmaker/rules.mk
deleted file mode 100644
index 11b62b9bffe..00000000000
--- a/keyboards/omkbd/ergodash/rev1/keymaps/greenshadowmaker/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-BACKLIGHT_ENABLE = yes
-RGBLIGHT_ENABLE = yes
-AUDIO_ENABLE = no
diff --git a/keyboards/omkbd/ergodash/rev1/keymaps/m47ch4n/config.h b/keyboards/omkbd/ergodash/rev1/keymaps/m47ch4n/config.h
deleted file mode 100644
index a597d848e2e..00000000000
--- a/keyboards/omkbd/ergodash/rev1/keymaps/m47ch4n/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
diff --git a/keyboards/omkbd/ergodash/rev1/keymaps/m47ch4n/keymap.c b/keyboards/omkbd/ergodash/rev1/keymaps/m47ch4n/keymap.c
deleted file mode 100644
index 3b52ba975eb..00000000000
--- a/keyboards/omkbd/ergodash/rev1/keymaps/m47ch4n/keymap.c
+++ /dev/null
@@ -1,219 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "keymap_japanese.h"
-
-// clang-format off
-enum layers { _QWERTY, _LOWER, _RAISE, _ADJUST };
-
-enum custom_keycodes { JP = SAFE_RANGE, US, SHIFT, LOWER, RAISE, ADJUST,
-    CSTM_0, CSTM_1, CSTM_2, CSTM_3, CSTM_4, CSTM_5, CSTM_6, CSTM_7, CSTM_8, CSTM_9,
-    CIRC, AT, LBRC, RBRC, BSLS, AMPR, QUOT, LPRN, RPRN, EQL, TILD, PIPE, GRV, LCBR,
-    PLUS, ASTR, RCBR, UNDS, MINS, SCLN, COMM, DOT, SLSH, EXLM, HASH, DLR, PERC, DEL };
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Qwerty
-     * ,----------------------------------------------------------------------------------------------------------------------.
-     * | ESC  |   1  |   2  |   3  |   4  |   5  | ZKHK |                    | ZKHK |   6  |   7  |   8  |   9  |   0  |  `   |
-     * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------|
-     * | TAB  |   Q  |   W  |   E  |   R  |   T  | MHEN |                    |HENKAN|   Y  |   U  |   I  |   O  |   P  |  \   |
-     * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------|
-     * | CTRL |   A  |   S  |   D  |   F  |   G  | EISU | <- ONLY FOR MAC -> | KANA |   H  |   J  |   K  |   L  |   ;  |  '   |
-     * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------|
-     * | SHIFT|   Z  |   X  |   C  |   V  |   B  | SHIFT|                    | SHIFT|   N  |   M  |   ,  |   .  |   /  | SHIFT|
-     * |-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------|
-     * | SHIFT|ADJUST|  ALT |  GUI |||||||| LOWER| SPACE|      ||||||||      | ENTER| RAISE||||||||  GUI |  ALT |ADJUST| SHIFT|
-     * ,----------------------------------------------------------------------------------------------------------------------.
-     */
-    [_QWERTY] = LAYOUT(
-      KC_ESC,  CSTM_1,  CSTM_2,  CSTM_3,  CSTM_4,  CSTM_5,  JP_KANA,                        JP_KANA, CSTM_6,  CSTM_7,  CSTM_8,  CSTM_9,  CSTM_0,  GRV    ,
-      KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    JP_MHEN,                        JP_HENK, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    BSLS   ,
-      KC_LGUI, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_LNG2,                        JP_LANG1,KC_H,    KC_J,    KC_K,    KC_L,    SCLN,    QUOT   ,
-      SHIFT,   KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    SHIFT  ,                        SHIFT,   KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SHIFT  ,
-      SHIFT,   ADJUST,  KC_LALT, KC_LCTL,          LOWER,   KC_SPC ,XXXXXXX,        XXXXXXX,KC_ENT , RAISE,            KC_LCTL, KC_LALT, ADJUST,  SHIFT
-    ),
-
-    /* Lower
-     * ,----------------------------------------------------------------------------------------------------------------------.
-     * |  F11 |  F1  |  F2  |  F3  |  F4  |  F5  |      |                    |      |  F6  |  F7  |  F8  |  F9  |  F10 |  F12 |
-     * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------|
-     * |  ~   |   !  |   @  |   #  |   $  |   %  |      |                    |      |   ^  |   &  |   *  |   (  |   )  |  |   |
-     * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------|
-     * |      |   1  |   2  |   3  |   4  |   5  |      |                    |      |   6  |   7  |   8  |   9  |   0  |      |
-     * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------|
-     * |      ||||||||||||||||||||||   -  |   _  |      |                    |      |   +  |   =  |   [  |   ]  ||||||||      |
-     * |-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------|
-     * |      |      |      |      ||||||||      |  ESC |      ||||||||      | BKSP |      ||||||||      |      |      |      |
-     * ,----------------------------------------------------------------------------------------------------------------------.
-     */
-    [_LOWER] = LAYOUT(
-      KC_F11,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   _______,                        _______, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F12 ,
-      TILD,    EXLM,    AT,      HASH,    DLR,     PERC,    _______,                        _______, CIRC,    AMPR,    ASTR,    LPRN,    RPRN,    PIPE   ,
-      _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    _______,                        _______, KC_6,    KC_7,    KC_8,    KC_9,    KC_0   , _______,
-      _______, XXXXXXX, XXXXXXX, XXXXXXX, MINS,    UNDS,    _______,                        _______, PLUS,    EQL,     LBRC,    RBRC,    XXXXXXX, _______,
-      _______, _______, _______, _______,          _______, KC_ESC ,_______,        _______,KC_BSPC, _______,          _______, _______, _______, _______
-    ),
-
-    /* Raise
-     * ,----------------------------------------------------------------------------------------------------------------------.
-     * |  F11 |  F1  |  F2  |  F3  |  F4  |  F5  |      |                    |      |  F6  |  F7  |  F8  |  F9  |  F10 |  F12 |
-     * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------|
-     * |  ~   |   !  |   @  |   #  |   $  |   %  |      |                    |      |   ^  |   &  |   *  |   (  |   )  |  |   |
-     * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------|
-     * |      |   1  |   2  |   3  |   4  |   5  |      |                    |      |   6  |   7  |   8  |   9  |   0  |      |
-     * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------|
-     * |      ||||||||   [  |   ]  |   -  |   _  |      |                    |      |   +  |   =  ||||||||||||||||||||||      |
-     * |-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------|
-     * |      |      |      |      ||||||||      |  ESC |      ||||||||      | BKSP |      ||||||||      |      |      |      |
-     * ,----------------------------------------------------------------------------------------------------------------------.
-     */
-    [_RAISE] = LAYOUT(
-      KC_F11,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   _______,                        _______, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F12 ,
-      TILD,    EXLM,    AT,      HASH,    DLR,     PERC,    _______,                        _______, CIRC,    AMPR,    ASTR,    LPRN,    RPRN,    PIPE   ,
-      _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    _______,                        _______, KC_6,    KC_7,    KC_8,    KC_9,    KC_0   , _______,
-      _______, XXXXXXX, LBRC,    RBRC,    MINS,    UNDS,    _______,                        _______, PLUS,    EQL,     XXXXXXX, XXXXXXX, XXXXXXX, _______,
-      _______, _______, _______, _______,          _______, KC_ESC ,_______,        _______,KC_BSPC, _______,          _______, _______, _______, _______
-    ),
-
-    /* Adjust
-     * ,----------------------------------------------------------------------------------------------------------------------.
-     * |      |      |      |      |      |      |  US  |                    |  JP  |      |      |      |      |      |      |
-     * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------|
-     * |      |      |      |      |      |      |      |                    |      |      |      |      |      |      |      |
-     * |------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------|
-     * |      | HOME |PAGEDN|PAGEUP|  END ||||||||      |                    |      | LEFT | DOWN |  UP  | RIGHT||||||||      |
-     * |------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------|
-     * |      |      |   {  |   }  |      |      |      |                    |      |      |      |   {  |   }  |      |      |
-     * |-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------|
-     * |      |      |      |      ||||||||      |      |      ||||||||      |      |      ||||||||      |      |      |      |
-     * ,----------------------------------------------------------------------------------------------------------------------.
-     */
-    [_ADJUST] = LAYOUT(
-      _______, _______, _______, _______, _______, _______, US     ,                        JP,      _______, _______, _______, _______, _______, _______,
-      _______, _______, _______, _______, _______, _______, _______,                        _______, _______, _______, _______, _______, _______, _______,
-      _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END,  XXXXXXX, _______,                        _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, XXXXXXX, _______,
-      _______, _______, LCBR,    RCBR,    _______, _______, _______,                        _______, _______, _______, LCBR,    RCBR,    _______, _______,
-      _______, _______, _______, _______,          _______, _______,_______,        _______,_______, _______,          _______, _______, _______, _______
-    )};
-// clang-format on
-
-#ifdef AUDIO_ENABLE
-float tone_qwerty[][2] = SONG(QWERTY_SOUND);
-#endif
-
-#define JP_LAYOUT true
-#define US_LAYOUT false
-
-#ifdef MASTER_LEFT
-bool LAYOUT_STATUS = US_LAYOUT;
-#else
-bool LAYOUT_STATUS = JP_LAYOUT;
-#endif
-
-bool SHIFT_PRESSED = false;
-
-void persistent_default_layer_set(uint16_t default_layer) {
-    eeconfig_update_default_layer(default_layer);
-    default_layer_set(default_layer);
-}
-
-#define SEND_STRING_RESTORE(STR) (SHIFT_PRESSED ? SEND_STRING(STR SS_DOWN(X_LSFT)) : SEND_STRING(STR SS_UP(X_LSFT)))
-
-#define KEY(CODE) (record->event.pressed ? SEND_STRING(SS_DOWN(X_##CODE)) : SEND_STRING_RESTORE(SS_UP(X_##CODE)))
-
-#define KEY_SHIFT(CODE) (record->event.pressed ? SEND_STRING(SS_DOWN(X_LSFT) SS_DOWN(X_##CODE)) : SEND_STRING_RESTORE(SS_UP(X_##CODE)))
-
-#define KEY_UPSHIFT(CODE) (record->event.pressed ? SEND_STRING(SS_UP(X_LSFT) SS_DOWN(X_##CODE)) : SEND_STRING_RESTORE(SS_UP(X_##CODE)))
-
-#define SHIFT_DU(CODE_DOWN, CODE_UP) (SHIFT_PRESSED ? CODE_DOWN : CODE_UP)
-#define CASE_US(CODE, US, JP)                   \
-    case CODE:                                  \
-        (LAYOUT_STATUS == JP_LAYOUT ? JP : US); \
-        return false;
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        CASE_US(CSTM_0, KEY(0), SHIFT_DU(KEY_SHIFT(9), KEY(0)));
-        CASE_US(CSTM_1, KEY(1), KEY(1));
-        CASE_US(CSTM_2, KEY(2), SHIFT_DU(KEY_UPSHIFT(LBRACKET), KEY(2)));
-        CASE_US(CSTM_3, KEY(3), KEY(3));
-        CASE_US(CSTM_4, KEY(4), KEY(4));
-        CASE_US(CSTM_5, KEY(5), KEY(5));
-        CASE_US(CSTM_6, KEY(6), SHIFT_DU(KEY_UPSHIFT(EQUAL), KEY(6)));
-        CASE_US(CSTM_7, KEY(7), SHIFT_DU(KEY_SHIFT(6), KEY(7)));
-        CASE_US(CSTM_8, KEY(8), SHIFT_DU(KEY_SHIFT(QUOTE), KEY(8)));
-        CASE_US(CSTM_9, KEY(9), SHIFT_DU(KEY_SHIFT(8), KEY(9)));
-        CASE_US(DEL, KEY(DELETE), KEY_UPSHIFT(BSPACE));
-        CASE_US(TILD, KEY_SHIFT(GRAVE), KEY_SHIFT(EQUAL));
-        CASE_US(EXLM, KEY_SHIFT(1), KEY_SHIFT(1));
-        CASE_US(AT, KEY_SHIFT(2), KEY(LBRACKET));
-        CASE_US(HASH, KEY_SHIFT(3), KEY_SHIFT(3));
-        CASE_US(DLR, KEY_SHIFT(4), KEY_SHIFT(4));
-        CASE_US(PERC, KEY_SHIFT(5), KEY_SHIFT(5));
-        CASE_US(CIRC, KEY_SHIFT(6), KEY(EQUAL));
-        CASE_US(AMPR, KEY_SHIFT(7), KEY_SHIFT(6));
-        CASE_US(ASTR, KEY_SHIFT(8), KEY_SHIFT(QUOTE));
-        CASE_US(LPRN, KEY_SHIFT(9), KEY_SHIFT(8));
-        CASE_US(RPRN, KEY_SHIFT(0), KEY_SHIFT(9));
-        CASE_US(LBRC, KEY(LBRACKET), SHIFT_DU(KEY_SHIFT(RBRACKET), KEY(RBRACKET)));
-        CASE_US(RBRC, KEY(RBRACKET), SHIFT_DU(KEY_SHIFT(NONUS_HASH), KEY(NONUS_HASH)));
-        CASE_US(LCBR, KEY_SHIFT(LBRACKET), KEY_SHIFT(RBRACKET));
-        CASE_US(RCBR, KEY_SHIFT(RBRACKET), KEY_SHIFT(NONUS_HASH));
-        CASE_US(GRV, KEY(GRAVE), SHIFT_DU(KEY_SHIFT(EQUAL), KEY_SHIFT(LBRACKET)));
-        CASE_US(BSLS, KEY(BSLASH), SHIFT_DU(KEY_SHIFT(INT3), KEY(INT3)));
-        CASE_US(PIPE, KEY_SHIFT(BSLASH), KEY_SHIFT(INT3));
-        CASE_US(MINS, KEY(MINUS), SHIFT_DU(KEY_SHIFT(INT1), KEY(MINUS)));
-        CASE_US(UNDS, KEY_SHIFT(MINUS), KEY_SHIFT(INT1));
-        CASE_US(EQL, KEY(EQUAL), SHIFT_DU(KEY_SHIFT(SCOLON), KEY_SHIFT(MINUS)));
-        CASE_US(PLUS, KEY_SHIFT(EQUAL), KEY_SHIFT(SCOLON));
-        CASE_US(SCLN, KEY(SCOLON), SHIFT_DU(KEY_UPSHIFT(QUOTE), KEY(SCOLON)));
-        CASE_US(QUOT, KEY(QUOTE), SHIFT_DU(KEY_SHIFT(2), KEY_SHIFT(7)));
-        case JP:
-            if (record->event.pressed) {
-                LAYOUT_STATUS = JP_LAYOUT;
-            }
-            return false;
-            break;
-        case US:
-            if (record->event.pressed) {
-                LAYOUT_STATUS = US_LAYOUT;
-            }
-            return false;
-            break;
-        case SHIFT:
-            if (record->event.pressed) {
-                SEND_STRING(SS_DOWN(X_LSFT));
-                SHIFT_PRESSED = true;
-            } else {
-                SEND_STRING(SS_UP(X_LSFT));
-                SHIFT_PRESSED = false;
-            }
-            return false;
-            break;
-        case LOWER:
-            if (record->event.pressed) {
-                layer_on(_LOWER);
-            } else {
-                layer_off(_LOWER);
-            }
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-            return false;
-            break;
-        case RAISE:
-            if (record->event.pressed) {
-                layer_on(_RAISE);
-            } else {
-                layer_off(_RAISE);
-            }
-            update_tri_layer(_LOWER, _RAISE, _ADJUST);
-            return false;
-            break;
-        case ADJUST:
-            if (record->event.pressed) {
-                layer_on(_ADJUST);
-            } else {
-                layer_off(_ADJUST);
-            }
-            return false;
-            break;
-    }
-    return true;
-}
diff --git a/keyboards/omkbd/ergodash/rev1/keymaps/m47ch4n/m47ch4ns_keymap.json b/keyboards/omkbd/ergodash/rev1/keymaps/m47ch4n/m47ch4ns_keymap.json
deleted file mode 100644
index 1f5eee60146..00000000000
--- a/keyboards/omkbd/ergodash/rev1/keymaps/m47ch4n/m47ch4ns_keymap.json
+++ /dev/null
@@ -1 +0,0 @@
-{"keyboard":"ergodash/rev1","keymap":"m47ch4ns_keymap","layout":"LAYOUT_3key_1us","layers":[["KC_ESC","KC_1","KC_2","KC_3","KC_4","KC_5","KC_NO","KC_NO","KC_6","KC_7","KC_8","KC_9","KC_0","KC_GRV","KC_TAB","KC_Q","KC_W","KC_E","KC_R","KC_T","KC_NO","KC_NO","KC_Y","KC_U","KC_I","KC_O","KC_P","KC_BSLS","KC_LCTL","KC_A","KC_S","KC_D","KC_F","KC_G","KC_NO","KC_NO","KC_H","KC_J","KC_K","KC_L","KC_SCLN","KC_QUOT","KC_LSFT","KC_Z","KC_X","KC_C","KC_V","KC_B","KC_LSFT","KC_RSFT","KC_N","KC_M","KC_COMM","KC_DOT","KC_SLSH","KC_RSFT","KC_LSFT","ANY(ADJUST)","KC_LALT","KC_LGUI","ANY(LOWER)","KC_SPC","KC_ENT","ANY(RAISE)","KC_RGUI","KC_RALT","ANY(ADJUST)","KC_RSFT"],["KC_F11","KC_F1","KC_F2","KC_F3","KC_F4","KC_F5","KC_TRNS","KC_TRNS","KC_F6","KC_F7","KC_F8","KC_F9","KC_F10","KC_F12","KC_TRNS","KC_EXLM","KC_AT","KC_HASH","KC_DLR","KC_PERC","KC_TRNS","KC_TRNS","KC_CIRC","KC_AMPR","KC_ASTR","KC_LPRN","KC_RPRN","KC_PIPE","KC_TRNS","KC_1","KC_2","KC_3","KC_4","KC_5","KC_TRNS","KC_TRNS","KC_6","KC_7","KC_8","KC_9","KC_0","KC_TRNS","KC_TRNS","KC_NO","KC_NO","KC_NO","KC_MINS","KC_UNDS","KC_TRNS","KC_TRNS","KC_PLUS","KC_EQL","KC_LBRC","KC_RBRC","KC_NO","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_ESC","KC_BSPC","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS"],["KC_F11","KC_F1","KC_F2","KC_F3","KC_F4","KC_F5","KC_TRNS","KC_TRNS","KC_F6","KC_F7","KC_F8","KC_F9","KC_F10","KC_F12","KC_TRNS","KC_EXLM","KC_AT","KC_HASH","KC_DLR","KC_PERC","KC_TRNS","KC_TRNS","KC_CIRC","KC_AMPR","KC_ASTR","KC_LPRN","KC_RPRN","KC_PIPE","KC_TRNS","KC_1","KC_2","KC_3","KC_4","KC_5","KC_TRNS","KC_TRNS","KC_6","KC_7","KC_8","KC_9","KC_0","KC_TRNS","KC_TRNS","KC_NO","KC_LBRC","KC_RBRC","KC_MINS","KC_UNDS","KC_TRNS","KC_TRNS","KC_PLUS","KC_EQL","KC_NO","KC_NO","KC_NO","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_ESC","KC_BSPC","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS"],["KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_HOME","KC_PGDN","KC_PGUP","KC_END","KC_TRNS","KC_TRNS","KC_TRNS","KC_LEFT","KC_DOWN","KC_UP","KC_RGHT","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_LCBR","KC_RCBR","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS"]],"author":"","notes":""}
\ No newline at end of file
diff --git a/keyboards/omkbd/ergodash/rev1/keymaps/m47ch4n/readme.md b/keyboards/omkbd/ergodash/rev1/keymaps/m47ch4n/readme.md
deleted file mode 100644
index 598f258e1c0..00000000000
--- a/keyboards/omkbd/ergodash/rev1/keymaps/m47ch4n/readme.md
+++ /dev/null
@@ -1,73 +0,0 @@
-# m47ch4n's keymap for Ergodash rev1
-
-This is the m47ch4n's keymap configuration for Ergodash rev1.
-There are four layers, QWERTY(default), LOWER, RAISE and ADJSUT.
-
-## Layers
-
-### Qwerty
-
-```
-,----------------------------------------------------------------------------------------------------------------------.
-| ESC  |   1  |   2  |   3  |   4  |   5  | ZKHK |                    | ZKHK |   6  |   7  |   8  |   9  |   0  |  `   |
-|------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------|
-| TAB  |   Q  |   W  |   E  |   R  |   T  | MHEN |                    |HENKAN|   Y  |   U  |   I  |   O  |   P  |  \   |
-|------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------|
-| CTRL |   A  |   S  |   D  |   F  |   G  | EISU |<-- ONLY FOR MAC -->| KANA |   H  |   J  |   K  |   L  |   ;  |  '   |
-|------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------|
-| SHIFT|   Z  |   X  |   C  |   V  |   B  | SHIFT|                    | SHIFT|   N  |   M  |   ,  |   .  |   /  | SHIFT|
-|-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------|
-| SHIFT|ADJUST|  ALT |  GUI |||||||| LOWER| SPACE|      ||||||||      | ENTER| RAISE||||||||  GUI |  ALT |ADJUST| SHIFT|
-,----------------------------------------------------------------------------------------------------------------------.
-```
-
-### Lower
-
-```
-,----------------------------------------------------------------------------------------------------------------------.
-|  F11 |  F1  |  F2  |  F3  |  F4  |  F5  |      |                    |      |  F6  |  F7  |  F8  |  F9  |  F10 |  F12 |
-|------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------|
-|  ~   |   !  |   @  |   #  |   $  |   %  |      |                    |      |   ^  |   &  |   *  |   (  |   )  |  |   |
-|------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------|
-|      |   1  |   2  |   3  |   4  |   5  |      |                    |      |   6  |   7  |   8  |   9  |   0  |      |
-|------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------|
-|      ||||||||||||||||||||||   -  |   _  |      |                    |      |   +  |   =  |   [  |   ]  ||||||||      |
-|-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------|
-|      |      |      |      ||||||||      |  ESC |      ||||||||      | BKSP |      ||||||||      |      |      |      |
-,----------------------------------------------------------------------------------------------------------------------.
-```
-
-### Raise
-
-```
-,----------------------------------------------------------------------------------------------------------------------.
-|  F11 |  F1  |  F2  |  F3  |  F4  |  F5  |      |                    |      |  F6  |  F7  |  F8  |  F9  |  F10 |  F12 |
-|------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------|
-|  ~   |   !  |   @  |   #  |   $  |   %  |      |                    |      |   ^  |   &  |   *  |   (  |   )  |  |   |
-|------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------|
-|      |   1  |   2  |   3  |   4  |   5  |      |                    |      |   6  |   7  |   8  |   9  |   0  |      |
-|------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------|
-|      ||||||||   [  |   ]  |   -  |   _  |      |                    |      |   +  |   =  ||||||||||||||||||||||      |
-|-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------|
-|      |      |      |      ||||||||      |  ESC |      ||||||||      | BKSP |      ||||||||      |      |      |      |
-,----------------------------------------------------------------------------------------------------------------------.
-```
-
-### Adjust
-
-```
-,----------------------------------------------------------------------------------------------------------------------.
-|      |      |      |      |      |      |  US  |                    |  JP  |      |      |      |      |      |      |
-|------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------|
-|      |      |      |      |      |      |      |                    |      |      |      |      |      |      |      |
-|------+------+------+------+------+------+------+--------------------+------+------+------+------+------+------+------|
-|      | HOME |PAGEDN|PAGEUP|  END ||||||||      |                    |      | LEFT | DOWN |  UP  | RIGHT||||||||      |
-|------+------+------+------+------+------+---------------------------+------+------+------+------+------+------+------|
-|      |      |   {  |   }  |      |      |      |                    |      |      |      |   {  |   }  |      |      |
-|-------------+------+------+------+------+------+------+------+------+------+------+------+------+------+-------------|
-|      |      |      |      ||||||||      |      |      ||||||||      |      |      ||||||||      |      |      |      |
-,----------------------------------------------------------------------------------------------------------------------.
-```
-
-If your pc connect this keyboard with JIS(JP) layout, you should press JP MODE key.
-
diff --git a/keyboards/omkbd/ergodash/rev1/keymaps/m47ch4n/rules.mk b/keyboards/omkbd/ergodash/rev1/keymaps/m47ch4n/rules.mk
deleted file mode 100644
index bb9e33b0829..00000000000
--- a/keyboards/omkbd/ergodash/rev1/keymaps/m47ch4n/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-BACKLIGHT_ENABLE = no
-RGBLIGHT_ENABLE = no
-AUDIO_ENABLE = no
diff --git a/keyboards/omkbd/ergodash/rev1/keymaps/shadowprogr/config.h b/keyboards/omkbd/ergodash/rev1/keymaps/shadowprogr/config.h
deleted file mode 100644
index 2493fe09e22..00000000000
--- a/keyboards/omkbd/ergodash/rev1/keymaps/shadowprogr/config.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-#define LEADER_PER_KEY_TIMING
-#define LEADER_TIMEOUT 250
diff --git a/keyboards/omkbd/ergodash/rev1/keymaps/shadowprogr/keymap.c b/keyboards/omkbd/ergodash/rev1/keymaps/shadowprogr/keymap.c
deleted file mode 100644
index e197874ab57..00000000000
--- a/keyboards/omkbd/ergodash/rev1/keymaps/shadowprogr/keymap.c
+++ /dev/null
@@ -1,199 +0,0 @@
-#include QMK_KEYBOARD_H
-
-
-enum layers {
-    _WINDOWS,
-    _LINUX, 
-    _NUMPAD,
-    _LOWER,
-    _RAISE,
-    _ADJUST,
-};
-
-enum custom_keycodes {
-  WINDOWS = SAFE_RANGE,
-  LINUX,
-  NUMPAD,
-  LOWER,
-  RAISE,
-  ADJUST
-};
-
-#define CTL_ENT MT(MOD_RCTL, KC_PENT)
-#define NUMPAD MO(_NUMPAD)
-#define SHELL LCA(KC_T)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /* Windows Qwerty
-   * .---------------------------------------------------------------------------------------------------------------------------------------.
-   * | `     |   1   |   2   |   3   |   4   |   5   |   -   |                       |   =   |   6   |   7   |   8   |   9   |   0   |BSpace |
-   * |-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-   * | Tab   |   Q   |   W   |   E   |   R   |   T   |   [   |                       |   ]   |   Y   |   U   |   I   |   O   |   P   |   \   |
-   * |-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-   * | Esc   |   A   |   S   |   D   |   F   |   G   | Home  |                       | Del   |   H   |   J   |   K   |   L   |   :   |   '   |
-   * |-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-   * | Shift |   Z   |   X   |   C   |   V   |   B   |   -   |                       |   =   |   N   |   M   |   ,   |   .   |   /   | Shift |
-   * |-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-   * | LCtrl | LGUI  | LAlt  |Numpad ||||||||| Space | Lower | Enter ||||||||| Enter | Raise |BSpace ||||||||| F5    | RAlt  | RGui  |Ctl/Ent|
-   * .---------------------------------------------------------------------------------------------------------------------------------------.
-   */
-  [_WINDOWS] = LAYOUT(
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_MINS,                            KC_EQL,  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
-    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_LBRC,                            KC_RBRC, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
-    KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_HOME,                            KC_DEL,  KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_MINS,                            KC_EQL,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-    KC_LCTL, KC_LGUI, KC_LALT, NUMPAD,           KC_SPC,  LOWER,   KC_ENT,           KC_ENT,  RAISE,   KC_BSPC,          KC_F5,   KC_RALT, KC_RGUI, CTL_ENT
-  ),
-
-  /* Linux Qwerty
-   * .---------------------------------------------------------------------------------------------------------------------------------------.
-   * | `     |   1   |   2   |   3   |   4   |   5   |   -   |                       |   =   |   6   |   7   |   8   |   9   |   0   |BSpace |
-   * |-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-   * | Tab   |   Q   |   W   |   E   |   R   |   T   |   [   |                       |   ]   |   Y   |   U   |   I   |   O   |   P   |   \   |
-   * |-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-   * | Esc   |   A   |   S   |   D   |   F   |   G   | Home  |                       | Del   |   H   |   J   |   K   |   L   |   :   |   '   |
-   * |-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-   * | Shift |   Z   |   X   |   C   |   V   |   B   |   -   |                       |   =   |   N   |   M   |   ,   |   .   |   /   | Shift |
-   * |-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-   * | LCtrl | LGUI  | LAlt  |Numpad ||||||||| Space | Lower | Enter ||||||||| Enter | Raise |BSpace ||||||||| Shell | RAlt  | RGui  |Ctl/Ent|
-   * .---------------------------------------------------------------------------------------------------------------------------------------.
-   */
-  [_LINUX] = LAYOUT(
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_MINS,                            KC_EQL,  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
-    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_LBRC,                            KC_RBRC, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
-    KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_HOME,                            KC_DEL,  KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_MINS,                            KC_EQL,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-    KC_LCTL, KC_LGUI, KC_LALT, NUMPAD,           KC_SPC,  LOWER,   KC_ENT,           KC_ENT,  RAISE,   KC_BSPC,          SHELL,   KC_RALT, KC_RGUI, CTL_ENT
-  ),
-
-  /* Numpad
-   * .---------------------------------------------------------------------------------------------------------------------------------------.
-   * |XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|                       |XXXXXXX|XXXXXXX|NumLock|   /   |   *   |   -   |XXXXXXX|
-   * |-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-   * |XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|                       |XXXXXXX|XXXXXXX|   7   |   8   |   9   |       |XXXXXXX|
-   * |-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+   +   +-------|
-   * |XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|                       |XXXXXXX|XXXXXXX|   4   |   5   |   6   |       |XXXXXXX|
-   * |-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-   * |XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|                       |XXXXXXX|XXXXXXX|   1   |   2   |   3   |       |XXXXXXX|
-   * |-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+ Enter +-------|
-   * |XXXXXXX|XXXXXXX|XXXXXXX|Numpad |||||||||XXXXXXX|XXXXXXX|XXXXXXX|||||||||XXXXXXX|XXXXXXX|XXXXXXX|||||||||   0   |   .   |       | Enter |
-   * .---------------------------------------------------------------------------------------------------------------------------------------.
-   */
-  [_NUMPAD] = LAYOUT(
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                            XXXXXXX, XXXXXXX, KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS, KC_BSPC,
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                            XXXXXXX, XXXXXXX, KC_KP_7, KC_KP_8, KC_KP_9, KC_PPLS, XXXXXXX,
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                            XXXXXXX, XXXXXXX, KC_KP_4, KC_KP_5, KC_KP_6, KC_PPLS, XXXXXXX,
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                            XXXXXXX, XXXXXXX, KC_KP_1, KC_KP_2, KC_KP_3, KC_PENT, XXXXXXX,
-    XXXXXXX, XXXXXXX, XXXXXXX, NUMPAD,           XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX,          KC_KP_0, KC_PDOT, KC_PENT, KC_PENT
-  ),
-
-  /* Lower
-   * .---------------------------------------------------------------------------------------------------------------------------------------.
-   * | F11   | F1    | F2    | F3    | F4    | F5    |       |                       |       | F6    | F7    | F8    | F9    | F10   | F12   |
-   * |-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-   * |       |       |       |   (   |   {   |   [   |       |                       |       |   ]   |   }   |   )   |       |       |       |
-   * |-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-   * |       |       |       |       |       |PageUp |       |                       |       |       |       |       |       |       |       |
-   * |-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-   * |       |VolDown| VolUp |       |       |PageDwn|       |                       |       |       |       |       |       |       |       |
-   * |-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-   * |       |       |       |       |||||||||       | Lower |       |||||||||       | Raise |       |||||||||       |       |       |       |
-   * .---------------------------------------------------------------------------------------------------------------------------------------.
-   */
-  [_LOWER] = LAYOUT(
-    KC_F11,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   _______,                            _______, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F12,
-    _______, _______, _______, KC_LPRN, KC_LCBR, KC_LBRC, _______,                            _______, KC_RBRC, KC_RCBR, KC_RPRN, _______, _______, _______,
-    _______, _______, _______, _______, _______, KC_PGUP, _______,                            _______, _______, _______, _______, _______, _______, _______,
-    KC_CAPS, KC_VOLD, KC_VOLU, _______, _______, KC_PGDN, _______,                            _______, _______, _______, _______, _______, _______, KC_CAPS,
-    _______, _______, _______, _______,          _______, LOWER,   _______,          _______, RAISE,   _______,          _______, _______, _______, _______
-  ),
-
-  /* Raise
-   * .---------------------------------------------------------------------------------------------------------------------------------------.
-   * | F11   | F1    | F2    | F3    | F4    | F5    |       |                       |       | F6    | F7    | F8    | F9    | F10   | F12   |
-   * |-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-   * |       |       |       |   (   |   {   |   [   |       |                       |       |   ]   |   }   |   )   |       |       |       |
-   * |-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-   * |       |       |       |       |       |       | End   |                       |       | Left  | Down  | Up    | Right |       |       |
-   * |-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-   * |       |       |       |       |       |       |       |                       |       |       |       |       |       |       |       |
-   * |-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-   * |       |       |       |       |||||||||       | Lower |       |||||||||       | Raise |       |||||||||       |       |       |       |
-   * .---------------------------------------------------------------------------------------------------------------------------------------.
-   */
-  [_RAISE] = LAYOUT(
-    KC_F11,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   _______,                            _______, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F12,
-    _______, _______, _______, KC_LPRN, KC_LCBR, KC_LBRC, _______,                            _______, KC_RBRC, KC_RCBR, KC_RPRN, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, KC_END,                             _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______,
-    KC_CAPS, _______, _______, _______, _______, _______, _______,                            _______, _______, _______, KC_MPRV, KC_MNXT, KC_MPLY, KC_CAPS,
-    _______, _______, _______, _______,          _______, LOWER,   _______,          _______, RAISE,            _______, _______, _______, _______, _______
-  ),
-
-  /* Adjust
-   * .---------------------------------------------------------------------------------------------------------------------------------------.
-   * |XXXXXXX|Windows| Linux |XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|                       |XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|
-   * |-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-   * |XXXXXXX|XXXXXXX|XXXXXXX| Cycle |On/Off |XXXXXXX|XXXXXXX|                       |XXXXXXX|XXXXXXX|On/Off | Cycle |XXXXXXX|XXXXXXX|XXXXXXX|
-   * |-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-   * | Reset |XXXXXXX|XXXXXXX|Breathe| Inc   |XXXXXXX|XXXXXXX|                       |XXXXXXX|XXXXXXX|Hue inc|Sat inc| Inc   |XXXXXXX|XXXXXXX|
-   * |-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-   * |XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX| Dec   |XXXXXXX|XXXXXXX|                       |XXXXXXX|XXXXXXX|Hue dec|Sat dec| Dec   |XXXXXXX|XXXXXXX|
-   * |-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-   * |XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|||||||||XXXXXXX| Lower |XXXXXXX|||||||||XXXXXXX| Raise |XXXXXXX|||||||||XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|
-   * .---------------------------------------------------------------------------------------------------------------------------------------.
-   */
-  [_ADJUST] = LAYOUT(
-    XXXXXXX, WINDOWS, LINUX,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                            XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    XXXXXXX, XXXXXXX, XXXXXXX, BL_STEP, BL_TOGG, XXXXXXX, XXXXXXX,                            XXXXXXX, XXXXXXX, RGB_TOG, RGB_MOD, XXXXXXX, XXXXXXX, XXXXXXX,
-    QK_BOOT, XXXXXXX, XXXXXXX, BL_BRTG, BL_UP,   XXXXXXX, XXXXXXX,                            XXXXXXX, XXXXXXX, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, XXXXXXX,
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DOWN, XXXXXXX, XXXXXXX,                            XXXXXXX, XXXXXXX, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, XXXXXXX,
-    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, LOWER,   XXXXXXX,          XXXXXXX, RAISE,   XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
-  )
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case WINDOWS:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_WINDOWS);
-      }
-      return false;
-      break;
-    case LINUX:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_LINUX);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case ADJUST:
-      if (record->event.pressed) {
-        layer_on(_ADJUST);
-      } else {
-        layer_off(_ADJUST);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/omkbd/ergodash/rev1/keymaps/shadowprogr/readme.md b/keyboards/omkbd/ergodash/rev1/keymaps/shadowprogr/readme.md
deleted file mode 100644
index 7ab665a8d41..00000000000
--- a/keyboards/omkbd/ergodash/rev1/keymaps/shadowprogr/readme.md
+++ /dev/null
@@ -1,89 +0,0 @@
-# ShadowProgr's layout for ErgoDash
-
-There are 2 different QWERTY base layers for use with Windows and Linux OSes. Beside those 2 there are also a numpad layer and 3 modifier layers (lower, raise and adjust).
-
-## Layouts
-### Windows
-```
-.---------------------------------------------------------------------------------------------------------------------------------------.
-| `     |   1   |   2   |   3   |   4   |   5   |   -   |                       |   =   |   6   |   7   |   8   |   9   |   0   |BSpace |
-|-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-| Tab   |   Q   |   W   |   E   |   R   |   T   |   [   |                       |   ]   |   Y   |   U   |   I   |   O   |   P   |   \   |
-|-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-| Esc   |   A   |   S   |   D   |   F   |   G   | Home  |                       | Del   |   H   |   J   |   K   |   L   |   :   |   '   |
-|-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-| Shift |   Z   |   X   |   C   |   V   |   B   |   -   |                       |   =   |   N   |   M   |   ,   |   .   |   /   | Shift |
-|-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-| LCtrl | LGUI  | LAlt  |Numpad ||||||||| Space | Lower | Enter ||||||||| Enter | Raise |BSpace ||||||||| F5    | RAlt  | RGui  |Ctl/Ent|
-.---------------------------------------------------------------------------------------------------------------------------------------.
-```
-### Linux
-```
-.---------------------------------------------------------------------------------------------------------------------------------------.
-| `     |   1   |   2   |   3   |   4   |   5   |   -   |                       |   =   |   6   |   7   |   8   |   9   |   0   |BSpace |
-|-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-| Tab   |   Q   |   W   |   E   |   R   |   T   |   [   |                       |   ]   |   Y   |   U   |   I   |   O   |   P   |   \   |
-|-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-| Esc   |   A   |   S   |   D   |   F   |   G   | Home  |                       | Del   |   H   |   J   |   K   |   L   |   :   |   '   |
-|-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-| Shift |   Z   |   X   |   C   |   V   |   B   |   -   |                       |   =   |   N   |   M   |   ,   |   .   |   /   | Shift |
-|-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-| LCtrl | LGUI  | LAlt  |Numpad ||||||||| Space | Lower | Enter ||||||||| Enter | Raise |BSpace ||||||||| Shell | RAlt  | RGui  |Ctl/Ent|
-.---------------------------------------------------------------------------------------------------------------------------------------.
-```
-### Numpad
-```
-.---------------------------------------------------------------------------------------------------------------------------------------.
-|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|                       |XXXXXXX|XXXXXXX|NumLock|   /   |   *   |   -   |XXXXXXX|
-|-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|                       |XXXXXXX|XXXXXXX|   7   |   8   |   9   |       |XXXXXXX|
-|-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+   +   +-------|
-|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|                       |XXXXXXX|XXXXXXX|   4   |   5   |   6   |       |XXXXXXX|
-|-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|                       |XXXXXXX|XXXXXXX|   1   |   2   |   3   |       |XXXXXXX|
-|-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+ Enter +-------|
-|XXXXXXX|XXXXXXX|XXXXXXX|Numpad |||||||||XXXXXXX|XXXXXXX|XXXXXXX|||||||||XXXXXXX|XXXXXXX|XXXXXXX|||||||||   0   |   .   |       | Enter |
-.---------------------------------------------------------------------------------------------------------------------------------------.
-```
-### Lower
-```
-.---------------------------------------------------------------------------------------------------------------------------------------.
-| F11   | F1    | F2    | F3    | F4    | F5    |       |                       |       | F6    | F7    | F8    | F9    | F10   | F12   |
-|-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-|       |       |       |   (   |   {   |   [   |       |                       |       |   ]   |   }   |   )   |       |       |       |
-|-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-|       |       |       |       |       |PageUp |       |                       |       |       |       |       |       |       |       |
-|-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-|       |VolDown| VolUp |       |       |PageDwn|       |                       |       |       |       |       |       |       |       |
-|-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-|       |       |       |       |||||||||       | Lower |       |||||||||       | Raise |       |||||||||       |       |       |       |
-.---------------------------------------------------------------------------------------------------------------------------------------.
-```
-### Raise
-```
-.---------------------------------------------------------------------------------------------------------------------------------------.
-| F11   | F1    | F2    | F3    | F4    | F5    |       |                       |       | F6    | F7    | F8    | F9    | F10   | F12   |
-|-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-|       |       |       |   (   |   {   |   [   |       |                       |       |   ]   |   }   |   )   |       |       |       |
-|-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-|       |       |       |       |       |       | End   |                       |       | Left  | Down  | Up    | Right |       |       |
-|-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-|       |       |       |       |       |       |       |                       |       |       |       |       |       |       |       |
-|-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-|       |       |       |       |||||||||       | Lower |       |||||||||       | Raise |       |||||||||       |       |       |       |
-.---------------------------------------------------------------------------------------------------------------------------------------.
-```
-### Adjust
-```
-.---------------------------------------------------------------------------------------------------------------------------------------.
-|XXXXXXX|Windows| Linux |XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|                       |XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|
-|-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-|XXXXXXX|XXXXXXX|XXXXXXX| Cycle |On/Off |XXXXXXX|XXXXXXX|                       |XXXXXXX|XXXXXXX|On/Off | Cycle |XXXXXXX|XXXXXXX|XXXXXXX|
-|-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-| Reset |XXXXXXX|XXXXXXX|Breathe| Inc   |XXXXXXX|XXXXXXX|                       |XXXXXXX|XXXXXXX|Hue inc|Sat inc| Inc   |XXXXXXX|XXXXXXX|
-|-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX| Dec   |XXXXXXX|XXXXXXX|                       |XXXXXXX|XXXXXXX|Hue dec|Sat dec| Dec   |XXXXXXX|XXXXXXX|
-|-------+-------+-------+-------+-------+-------+-------+-----------------------+-------+-------+-------+-------+-------+-------+-------|
-|XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|||||||||XXXXXXX| Lower |XXXXXXX|||||||||XXXXXXX| Raise |XXXXXXX|||||||||XXXXXXX|XXXXXXX|XXXXXXX|XXXXXXX|
-.---------------------------------------------------------------------------------------------------------------------------------------.
-```
\ No newline at end of file
diff --git a/keyboards/omkbd/ergodash/rev1/keymaps/shadowprogr/rules.mk b/keyboards/omkbd/ergodash/rev1/keymaps/shadowprogr/rules.mk
deleted file mode 100644
index 30d8419904e..00000000000
--- a/keyboards/omkbd/ergodash/rev1/keymaps/shadowprogr/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-BACKLIGHT_ENABLE = yes
-RGBLIGHT_ENABLE = yes
-AUDIO_ENABLE = no
\ No newline at end of file
diff --git a/keyboards/omkbd/ergodash/rev1/keymaps/tw1t611/config.h b/keyboards/omkbd/ergodash/rev1/keymaps/tw1t611/config.h
deleted file mode 100644
index a597d848e2e..00000000000
--- a/keyboards/omkbd/ergodash/rev1/keymaps/tw1t611/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
diff --git a/keyboards/omkbd/ergodash/rev1/keymaps/tw1t611/keymap.c b/keyboards/omkbd/ergodash/rev1/keymaps/tw1t611/keymap.c
deleted file mode 100644
index 938f3950fda..00000000000
--- a/keyboards/omkbd/ergodash/rev1/keymaps/tw1t611/keymap.c
+++ /dev/null
@@ -1,24 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "keymap_german.h"
-
-enum layers {
-  _QWERTZ,
-  _MOD,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTZ] = LAYOUT(
-    _______ ,KC_1    ,KC_2    ,KC_3    ,KC_4    ,KC_5    ,_______ ,                        KC_RSFT ,KC_6    ,KC_7    ,KC_8    ,KC_9    ,KC_0    ,_______ ,
-    KC_ESC  ,KC_Q    ,KC_W    ,KC_E    ,KC_R    ,KC_T    ,KC_BSPC ,                        KC_DEL  ,KC_Y    ,KC_U    ,KC_I    ,KC_O    ,KC_P    ,DE_ADIA   ,
-    KC_TAB  ,KC_A    ,KC_S    ,KC_D    ,KC_F    ,KC_G    ,DE_UNDS ,                        KC_LALT ,KC_H    ,KC_J    ,KC_K    ,KC_L    ,DE_EQL  ,DE_ODIA ,
-    _______ ,KC_Z    ,KC_X    ,KC_C    ,KC_V    ,KC_B    ,KC_SPC  ,                        KC_ENT  ,KC_N    ,KC_M    ,KC_COMM ,KC_DOT  ,DE_SS   ,DE_UDIA ,
-    _______ ,_______ ,_______ ,_______ ,         KC_LCTL ,KC_SPC  ,KC_LSFT ,      MO(_MOD),KC_ENT  ,KC_LGUI ,         _______ ,_______ ,_______ ,_______
-  ),
-  [_MOD] = LAYOUT(
-    KC_F11  ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,RGB_MOD ,                        QK_BOOT,KC_F6   ,KC_F7   ,KC_F8   ,KC_F9   ,KC_F10  ,KC_F12  ,
-    DE_CIRC ,DE_QUOT ,DE_DQUO ,DE_LCBR ,DE_RCBR ,DE_GRV  ,RGB_TOG ,                        _______ ,DE_PERC ,DE_PLUS ,DE_MINS ,DE_ASTR ,DE_SLSH ,DE_BSLS ,
-    DE_TILD ,DE_EXLM ,DE_DLR  ,DE_LPRN ,DE_RPRN ,DE_AMPR ,RGB_M_P ,                        _______ ,KC_LEFT ,KC_DOWN ,KC_UP   ,KC_RGHT ,DE_QUES ,DE_PIPE ,
-    _______ ,DE_AT   ,DE_EURO ,DE_LBRC ,DE_RBRC ,_______ ,_______ ,                        _______ ,DE_HASH ,DE_LABK ,DE_SCLN ,DE_COLN ,DE_RABK ,DE_SECT ,
-    _______ ,_______ ,_______ ,_______ ,         _______ ,_______ ,_______ ,      _______ ,_______ ,_______ ,         _______ ,_______ ,_______ ,_______ 
-  ),
-};
\ No newline at end of file
diff --git a/keyboards/omkbd/ergodash/rev1/keymaps/tw1t611/readme.md b/keyboards/omkbd/ergodash/rev1/keymaps/tw1t611/readme.md
deleted file mode 100644
index 54ee4d4f1fa..00000000000
--- a/keyboards/omkbd/ergodash/rev1/keymaps/tw1t611/readme.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# Tw1t611 Ergodash Layout
-
-This is a german layout for the ergodash keyboard. The Umlauts are placed on the right side.
-It uses two layers and has vim like aligned arrow keys.
diff --git a/keyboards/omkbd/ergodash/rev1/keymaps/tw1t611/rules.mk b/keyboards/omkbd/ergodash/rev1/keymaps/tw1t611/rules.mk
deleted file mode 100644
index bb9e33b0829..00000000000
--- a/keyboards/omkbd/ergodash/rev1/keymaps/tw1t611/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-BACKLIGHT_ENABLE = no
-RGBLIGHT_ENABLE = no
-AUDIO_ENABLE = no
diff --git a/keyboards/omkbd/runner3680/5x6_5x8/keymaps/derekhsu/config.h b/keyboards/omkbd/runner3680/5x6_5x8/keymaps/derekhsu/config.h
deleted file mode 100644
index 818ea7d4af4..00000000000
--- a/keyboards/omkbd/runner3680/5x6_5x8/keymaps/derekhsu/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2021 omkbd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-//#define USE_MATRIX_I2C
-
-/* Select hand configuration */
-
-// #define MASTER_LEFT
-// #define MASTER_RIGHT
-#define EE_HANDS
diff --git a/keyboards/omkbd/runner3680/5x6_5x8/keymaps/derekhsu/keymap.c b/keyboards/omkbd/runner3680/5x6_5x8/keymaps/derekhsu/keymap.c
deleted file mode 100644
index e23ba19d7a1..00000000000
--- a/keyboards/omkbd/runner3680/5x6_5x8/keymaps/derekhsu/keymap.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/* Copyright 2021 omkbd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-enum layer_number {
-    _QWERTY = 0,
-    _NAV,
-    _SYMBOL,
-    _MEDIA
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
- [_QWERTY] = LAYOUT(
-    KC_GRV,  KC_1,    KC_2,    KC_3,  KC_4,  KC_5,          KC_6,   KC_7,  KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
-    KC_TAB,  KC_Q,    KC_W,    KC_E,  KC_R,  KC_T,          KC_Y,   KC_U,  KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
-    KC_ESC,  KC_A,    KC_S,    KC_D,  KC_F,  KC_G,          KC_H,   KC_J,  KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,  KC_ENT,
-    KC_LSFT, KC_Z,    KC_X,    KC_C,  KC_V,  KC_B,          KC_N,   KC_M,  KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_DEL,
-    KC_LCTL, KC_LALT, KC_LGUI, MO(2), MO(1), KC_SPC,        KC_SPC, MO(1), MO(2),   KC_RGUI, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT
-),
-
-[_NAV] = LAYOUT(
-    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,         KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
-    KC_TRNS, KC_NO,   KC_UP,   KC_NO,   KC_NO,   KC_NO,         KC_NO,   KC_NO,   KC_UP,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
-    KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT, KC_NO,   KC_NO,         KC_NO,   KC_LEFT, KC_DOWN, KC_RGHT, KC_NO,   KC_NO,   KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,         KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_TRNS, KC_PGUP, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, MO(3),   KC_TRNS, KC_TRNS,       KC_TRNS, KC_TRNS, MO(3),   KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END
-),
-
-[_SYMBOL] = LAYOUT(
-    KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC,          KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_UNDS, KC_PLUS, KC_BSPC,
-    KC_TRNS, KC_NO,   KC_P7, KC_P8,   KC_P9,  KC_NO,            KC_LPRN, KC_RPRN, KC_UNDS, KC_PLUS, KC_NO,   KC_LCBR, KC_RCBR, KC_PIPE,
-    KC_ESC,  KC_NO,   KC_P4, KC_P5,   KC_P6,  KC_NO,            KC_LCBR, KC_RCBR, KC_MINS, KC_EQL,  KC_COLN, KC_DQUO, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_NO,   KC_P1, KC_P2,   KC_P3,  KC_NO,            KC_LBRC, KC_RBRC, KC_LT,   KC_GT,   KC_QUES, KC_TRNS, KC_UP,   KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_P0, KC_TRNS, MO(3),  KC_TRNS,          KC_TRNS, MO(3),   KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT
-),
-
-[_MEDIA] = LAYOUT(
-    KC_NO,   KC_SCRL,  KC_PAUS, KC_NO,    KC_NO,   RGB_VAD,         RGB_VAI, KC_MRWD, KC_MPLY, KC_MFFD, KC_MUTE, KC_VOLD, KC_VOLU, KC_NO,
-    RGB_TOG, RGB_MOD,  RGB_HUI, RGB_SAI,  RGB_VAI, RGB_SPI,         KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_MPLY, KC_NO,   KC_NO,   KC_NO,
-    KC_NO,   RGB_RMOD, RGB_HUD, RGB_SAD,  RGB_VAD, RGB_SPD,         KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
-    KC_NO,   RGB_M_P,  RGB_M_B, RGB_M_SW, RGB_M_G, KC_NO,           KC_NO,   KC_MUTE, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_VOLU, KC_NO,
-    KC_NO,   KC_NO,    KC_NO,   KC_TRNS,  KC_TRNS, KC_NO,           KC_NO,   KC_TRNS, KC_TRNS, KC_NO,   KC_NO,   KC_MRWD, KC_VOLD, KC_MFFD
-)
-
-};
diff --git a/keyboards/omkbd/runner3680/5x6_5x8/keymaps/derekhsu/rules.mk b/keyboards/omkbd/runner3680/5x6_5x8/keymaps/derekhsu/rules.mk
deleted file mode 100644
index 8110dbaa1f9..00000000000
--- a/keyboards/omkbd/runner3680/5x6_5x8/keymaps/derekhsu/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-RGB_MATRIX_ENABLE = yes
-EXTRAKEY_ENABLE = yes
-VIA_ENABLE = yes
diff --git a/keyboards/org60/keymaps/boardy/keymap.c b/keyboards/org60/keymaps/boardy/keymap.c
deleted file mode 100644
index 48373de3758..00000000000
--- a/keyboards/org60/keymaps/boardy/keymap.c
+++ /dev/null
@@ -1,114 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "action_layer.h"
-
-// Keyboard Layers
-enum keyboard_layers {
-  _BASE,        // Base Layer
-  _FUNCTION,    // Function Layer
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [_BASE] = LAYOUT(
-  /*
-    0: Base Layer
-    .--------------------------------------------------------------------------------------------------------------------------------------.
-    | ~      | !      | @      | #      | $      | %      | ^      | &      | *      | (      | )      | _      | +      |                 |
-    |        |        |        |        |        |        |        |        |        |        |        |        |        |                 |
-    | Esc    | 1      | 2      | 3      | 4      | 5      | 6      | 7      | 8      | 9      | 0      | -      | =      | Backspace       |
-    |--------------------------------------------------------------------------------------------------------------------------------------|
-    |            |        |        |        |        |        |        |        |        |        |        | {      | ]      | |           |
-    |            |        |        |        |        |        |        |        |        |        |        |        |        |             |
-    | Tab        | Q      | W      | E      | R      | T      | Y      | U      | I      | O      | P      | [      | ]      | \           |
-    |--------------------------------------------------------------------------------------------------------------------------------------|
-    |               |        |        |        |        |        |        |        |        |        | :      | "      |                   |
-    |               |        |        |        |        |        |        |        |        |        |        |        |                   |
-    | PrntScr       | A      | S      | D      | F      | G      | H      | J      | K      | L      | ;      | '      | Enter             |
-    |--------------------------------------------------------------------------------------------------------------------------------------|
-    |                   |        |        |        |        |        |        |        | <      | >      | ?      |░░░░░░|        |░░░░░░░░|
-    |                   |        |        |        |        |        |        |        |        |        |        |░░░░░░|        |░░░░░░░░|
-    | Shift             | Z      | X      | C      | V      | B      | N      | M      | ,      | .      | /      |░░░░░░| Up     |░░░░░░░░|
-    |--------------------------------------------------------------------------------------------------------------------------------------|
-    |          |          |          |                                                        |          |░░░░░░|        |        |        |
-    |          |          |          |                                                        |          |░░░░░░|        |        |        |
-    | Ctrl     | Win      | Alt      | Space                                                  | FnO      |░░░░░░| Left   | Down   | Right  |
-    '--------------------------------------------------------------------------------------------------------------------------------------'
-  */
-
-   //--------------------------------------------------------------------------------------------------------------------------------------.
-   //        |        |        |        |        |        |        |        |        |        |        |        |        |                 |
-   //        |        |        |        |        |        |        |        |        |        |        |        |        |                 |
-     QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_NO,   
-   //--------------------------------------------------------------------------------------------------------------------------------------|
-   //            |        |        |        |        |        |        |        |        |        |        |        |        |             |
-   //            |        |        |        |        |        |        |        |        |        |        |        |        |             |
-     KC_TAB,      KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,      
-   //--------------------------------------------------------------------------------------------------------------------------------------|
-   //               |        |        |        |        |        |        |        |        |        |        |        |                   |
-   //               |        |        |        |        |        |        |        |        |        |        |        |                   |
-     KC_PSCR,        KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NO, KC_ENT,      
-   //--------------------------------------------------------------------------------------------------------------------------------------|
-   //                   |        |        |        |        |        |        |        |        |        |        |░░░░░░|        |░░░░░░░░|
-   //                   |        |        |        |        |        |        |        |        |        |        |░░░░░░|        |░░░░░░░░|
-     KC_LSFT, KC_NO,     KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_NO, KC_UP,   KC_NO,   
-   //--------------------------------------------------------------------------------------------------------------------------------------|
-   //          |          |          |                                                        |          |░░░░░░|        |        |        |
-   //          |          |          |                                                        |          |░░░░░░|        |        |        |
-     KC_LCTL,   KC_LGUI,   KC_LALT,   KC_SPC,                                               MO(_FUNCTION),KC_NO, KC_LEFT, KC_DOWN, KC_RIGHT),
-   //--------------------------------------------------------------------------------------------------------------------------------------'
-
-
-  [_FUNCTION] = LAYOUT(
-  /*
-    1: Function Layer
-    .--------------------------------------------------------------------------------------------------------------------------------------.
-    |        |        |        |        |        |        |        |        |        |        |        |        |        |                 |
-    |        |        |        |        |        |        |        |        |        |        |        |        |        |                 |
-    | Esc    | F1     | F2     | F3     | F4     | F5     | F6     | F7     | F8     | F9     | F10    | F11    | F12    | Delete          |
-    |--------------------------------------------------------------------------------------------------------------------------------------|
-    |            |        |        |        |        |        |        |        |        |        |        |        |        |             |
-    |            |        |        |        | RGB    | RGB    | RGB    | RGB    |        |        |        |        |        |             |
-    | Reset      | 7      | 8      | 9      | Toggle | Mode   | Pwr+   | Pwr-   |        | Insert | Pause  | Home   | End    | Sleep       |
-    |--------------------------------------------------------------------------------------------------------------------------------------|
-    |               |        |        |        |        |        |        |        |        |        |        |        |                   |
-    |               |        |        |        | RGB    | RGB    | RGB    | RGB    |        |        | Page   | Page   |                   |
-    | Caps Lock     | 4      | 5      | 6      | Hue+   | Hue-   | Sat+   | Sat-   |        |        | Up     | Down   | Enter             |
-    |--------------------------------------------------------------------------------------------------------------------------------------|
-    |                   |        |        |        |        |        |        |        |        |        |        |░░░░░░|        |░░░░░░░░|
-    |                   |        |        |        |        | Back   | Back   |        | Prev   | Next   |        |░░░░░░|        |░░░░░░░░|
-    | Shift             | 1      | 2      | 3      |        | Light+ | Light- |        | Track  | Track  |        |░░░░░░| Up     |░░░░░░░░|
-    |--------------------------------------------------------------------------------------------------------------------------------------|
-    |          |          |          |                                                        |          |░░░░░░|        |        |        |
-    |          |          |          |                                                        |          |░░░░░░|        |        |        |
-    | Ctrl     | Win      | Alt      | 0                                                      | Fn0      |░░░░░░| Mute   | Down   | Right  |
-    '--------------------------------------------------------------------------------------------------------------------------------------'
-  */
-
-   //--------------------------------------------------------------------------------------------------------------------------------------.
-   //        |        |        |        |        |        |        |        |        |        |        |        |        |                 |
-   //        |        |        |        |        |        |        |        |        |        |        |        |        |                 |
-     KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_NO,   
-   //--------------------------------------------------------------------------------------------------------------------------------------|
-   //            |        |        |        |        |        |        |        |        |        |        |        |        |             |
-   //            |        |        |        |        |        |        |        |        |        |        |        |        |             |
-     QK_BOOT,     KC_7,    KC_8,    KC_9,    RGB_TOG, RGB_MOD, RGB_VAI, RGB_VAD, KC_NO,   KC_INS,  KC_PAUS, KC_HOME, KC_END,  KC_SLEP,      
-   //--------------------------------------------------------------------------------------------------------------------------------------|
-   //               |        |        |        |        |        |        |        |        |        |        |        |                   |
-   //               |        |        |        |        |        |        |        |        |        |        |        |                   |
-     KC_CAPS,        KC_4,    KC_5,    KC_6,    RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_NO,   KC_NO,   KC_PGUP, KC_PGDN, KC_NO, KC_ENT,      
-   //--------------------------------------------------------------------------------------------------------------------------------------|
-   //                   |        |        |        |        |        |        |        |        |        |        |░░░░░░|        |░░░░░░░░|
-   //                   |        |        |        |        |        |        |        |        |        |        |░░░░░░|        |░░░░░░░░|
-     KC_LSFT, KC_NO,     KC_1,    KC_2,    KC_3,    KC_NO,   BL_UP,   BL_DOWN, KC_NO,   KC_MPRV, KC_MNXT, KC_NO,   KC_NO, KC_VOLU, KC_NO,   
-   //--------------------------------------------------------------------------------------------------------------------------------------|
-   //          |          |          |                                                        |          |░░░░░░|        |        |        |
-   //          |          |          |                                                        |          |░░░░░░|        |        |        |
-     KC_LCTL,   KC_LGUI,   KC_LALT,   KC_0,                                                 MO(_FUNCTION),KC_NO, KC_MUTE, KC_VOLD, KC_MPLY),
-   //--------------------------------------------------------------------------------------------------------------------------------------'
-
-};
-
-// Loop
-void matrix_scan_user(void) {
-  // Empty
-};
diff --git a/keyboards/org60/keymaps/boardy/readme.md b/keyboards/org60/keymaps/boardy/readme.md
deleted file mode 100644
index 3643fbce30e..00000000000
--- a/keyboards/org60/keymaps/boardy/readme.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Boardy layout
-
-![Uses this layout](http://i.imgur.com/k3g488o.jpg)
-
-This is my custom layout for my board Boardy designed to be used with an [Org60] and custom plate.
-
-[Org60]: https://world.taobao.com/item/544441405112.htm
diff --git a/keyboards/org60/keymaps/boardy/rules.mk b/keyboards/org60/keymaps/boardy/rules.mk
deleted file mode 100644
index 88ac79ecad5..00000000000
--- a/keyboards/org60/keymaps/boardy/rules.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-
-# QMK Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-CONSOLE_ENABLE = no         # Enable debugging console
-COMMAND_ENABLE = no         # Commands for debug and configuration
-TAP_DANCE_ENABLE = no 		# Tap Dance skills
-UNICODE_ENABLE = no         # Unicode
-
diff --git a/keyboards/orthodox/keymaps/rfvizarra/config.h b/keyboards/orthodox/keymaps/rfvizarra/config.h
deleted file mode 100644
index 92b3713350c..00000000000
--- a/keyboards/orthodox/keymaps/rfvizarra/config.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-Copyright 2017 Art Ortenburger
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-
-#ifdef AUDIO_ENABLE
-#define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \
-                                  SONG(COLEMAK_SOUND), \
-                                  SONG(DVORAK_SOUND) \
-}
-#endif
-
-#define USE_I2C
-
-/* Select hand configuration */
-
-// #define MASTER_LEFT
-// #define MASTER_RIGHT
-#define EE_HANDS
-
-#endif
diff --git a/keyboards/orthodox/keymaps/rfvizarra/keymap.c b/keyboards/orthodox/keymaps/rfvizarra/keymap.c
deleted file mode 100644
index af9f8d5e20c..00000000000
--- a/keyboards/orthodox/keymaps/rfvizarra/keymap.c
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
-This is the keymap for the keyboard
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-Copyright 2017 Art Ortenburger
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-// The underscores don't mean anything - you can have a layer called STUFF or any other name.
-// Layer names don't all need to be of the same length, obviously, and you can also skip them
-// entirely and just use numbers.
-#define _QWERTY  0
-#define _COLEMAK 1
-#define _DVORAK  2
-#define _LOWER   3
-#define _RAISE   4
-#define _NAV     5
-#define _NAV2    6
-#define _MEDIA   7
-#define _ADJUST 16
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  DVORAK
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [_QWERTY] = LAYOUT(
-    KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                                                                                KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-    KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                  KC_LGUI,      KC_LALT,            MO(_MEDIA)  , KC_DEL,               KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-    MO(_NAV),KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    MO(_LOWER),   KC_LSFT, CTL_T(KC_ENT),           KC_RALT,      KC_SPC, MO(_RAISE),   KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LGUI
-  ),
-
-  [_COLEMAK] = LAYOUT(
-    KC_TAB,   KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,                                                                             KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN,  KC_BSPC,
-    KC_ESC,   KC_A,    KC_R,    KC_S,    KC_T,    KC_D,      KC_UP,    KC_DOWN,                    KC_LEFT, KC_RIGHT,               KC_H,    KC_N,    KC_E,    KC_I,    KC_O,     KC_QUOT,
-    KC_LCTL,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,      MO(_LOWER), KC_SPACE, KC_BSPC,        KC_DEL,  KC_ENT,  MO(_RAISE),    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLASH, KC_LGUI
-  ),
-
-  [_DVORAK] = LAYOUT(
-    KC_TAB,   KC_QUOT, KC_COMM, KC_DOT, KC_P,     KC_Y,                                                                             KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC,
-    KC_ESC,   KC_A,    KC_O,    KC_E,   KC_U,     KC_I,                  KC_UP,    KC_DOWN,        KC_LEFT, KC_RIGHT,               KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_MINS,
-    KC_LCTL,  KC_SCLN, KC_Q,    KC_J,   KC_K,     KC_X,      MO(_LOWER), KC_SPACE, KC_BSPC,        KC_DEL,  KC_ENT,  MO(_RAISE),    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_LGUI
-  ),
-
-  [_LOWER] = LAYOUT(
-    KC_TILD,   KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                                                              KC_CIRC, KC_AMPR,    KC_ASTR,    KC_LPRN, KC_RPRN, KC_BSPC,
-    KC_DEL,    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,          KC_LCTL, _______,          _______, KC_RCTL,          KC_F6,   KC_UNDS,    KC_PLUS,    KC_LCBR, KC_RCBR, KC_PIPE,
-    _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  _______, _______, _______,          _______, _______, _______, KC_F12,  KC_HOME,    KC_COMM,    KC_DOT,  KC_END,  _______
-  ),
-
-  [_RAISE] = LAYOUT(
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                                                                   KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
-    KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,            _______, _______,          _______, _______,          KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
-    _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  _______, _______, _______,          _______, _______, _______, KC_F12,  KC_PGUP, KC_COMM, KC_DOT,  KC_PGDN, _______
-  ),
-
-  [_NAV] =  LAYOUT(
-    _______, _______, _______, _______, _______, _______,                                                                _______, _______, KC_UP,   _______,  _______, _______,
-    _______, _______, _______, _______, _______, _______,          _______, _______,          _______, _______,          _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______,  _______, _______
-  ),
-
-  [_NAV2] =  LAYOUT(
-    _______, _______, _______, _______, _______, _______,                                                                _______, _______, KC_PGUP, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______,          _______, _______,          _______, _______,          _______, KC_HOME, KC_PGDN, KC_END,  _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______
-  ),
-
-  [_MEDIA] =  LAYOUT(
-    _______, _______, _______, _______, _______, _______,                                                                _______, _______, KC_VOLU, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______,          _______, _______,          _______, _______,          _______, KC_MNXT, KC_VOLD, KC_MPLY, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______
-  ),
-
-  [_ADJUST] =  LAYOUT(
-    _______, QK_BOOT, _______, _______, _______, _______,                                                                _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM,          _______, _______,          _______, _______,          AG_SWAP, QWERTY , COLEMAK, DVORAK,  _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-  )
-
-
-};
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  state = update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-  state = update_tri_layer_state(state, _LOWER, _NAV, _NAV2);
-  return state;
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-  case QWERTY:
-    if (record->event.pressed) {
-      set_single_persistent_default_layer(_QWERTY);
-    }
-    return false;
-    break;
-  case COLEMAK:
-    if (record->event.pressed) {
-      set_single_persistent_default_layer(_COLEMAK);
-    }
-    return false;
-    break;
-  case DVORAK:
-    if (record->event.pressed) {
-      set_single_persistent_default_layer(_DVORAK);
-    }
-    return false;
-    break;
-  }
-  return true;
-}
-
diff --git a/keyboards/orthodox/keymaps/rfvizarra/readme.md b/keyboards/orthodox/keymaps/rfvizarra/readme.md
deleted file mode 100644
index 10a60ebfd34..00000000000
--- a/keyboards/orthodox/keymaps/rfvizarra/readme.md
+++ /dev/null
@@ -1,19 +0,0 @@
-# A personal Orthodox Layout
-
-![Orthodox](https://i.imgur.com/RQ5SKj4.jpg)
-
-This is the layout for my daily driver orthodox. It's based on a custom handwire keyboard that I've been using for quite some time. It's based on Plank's/Let's split layouts for the lower/raise layers. I added the shift, control/enter, alt/altgr and del to the thumb cluster.
-
-To build the firmware run from qmk's project folder
-
-    make orthodox/rev3:rfvizarra
-
-And to flash it, run
-
-    make orthodox/rev3:rfvizarra:avrdude
-
-reset your keyboard pro micro while connected to the PC with a micro usb cable.
-
-Repeat on both halves.
-
-See [install build tools](https://docs.qmk.fm/install-build-tools) then the [build/compile instructions](https://docs.qmk.fm/build-compile-instructions) for more information.
diff --git a/keyboards/orthograph/info.json b/keyboards/orthograph/info.json
index 19d3f6b2fbb..ad37b0c723c 100644
--- a/keyboards/orthograph/info.json
+++ b/keyboards/orthograph/info.json
@@ -140,90 +140,100 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"matrix": [0, 0], "label":"Esc", "x":0.75, "y":0, "w":1.5},
-                {"matrix": [0, 1], "label":"F1", "x":2.25, "y":0},
-                {"matrix": [0, 2], "label":"F2", "x":3.25, "y":0},
-                {"matrix": [0, 3], "label":"F3", "x":4.25, "y":0},
-                {"matrix": [0, 4], "label":"F4", "x":5.25, "y":0},
-                {"matrix": [0, 5], "label":"F5", "x":6.25, "y":0},
-                {"matrix": [6, 0], "label":"F6", "x":12.5, "y":0},
-                {"matrix": [6, 1], "label":"F7", "x":13.5, "y":0},
-                {"matrix": [6, 2], "label":"F8", "x":14.5, "y":0},
-                {"matrix": [6, 3], "label":"F9", "x":15.5, "y":0},
-                {"matrix": [6, 4], "label":"F10", "x":16.5, "y":0},
-                {"matrix": [6, 5], "label":"F11", "x":17.5, "y":0},
-                {"matrix": [6, 6], "label":"F12", "x":18.5, "y":0},
-                {"matrix": [1, 0], "label":"~", "x":0.75, "y":1, "w":1.5},
-                {"matrix": [1, 1], "label":"1", "x":2.25, "y":1},
-                {"matrix": [1, 2], "label":"2", "x":3.25, "y":1},
-                {"matrix": [1, 3], "label":"3", "x":4.25, "y":1},
-                {"matrix": [1, 4], "label":"4", "x":5.25, "y":1},
-                {"matrix": [1, 5], "label":"5", "x":6.25, "y":1},
-                {"matrix": [7, 0], "label":"^", "x":12.5, "y":1},
-                {"matrix": [7, 1], "label":"&", "x":13.5, "y":1},
-                {"matrix": [7, 2], "label":"*", "x":14.5, "y":1},
-                {"matrix": [7, 3], "label":"(", "x":15.5, "y":1},
-                {"matrix": [7, 4], "label":")", "x":16.5, "y":1},
-                {"matrix": [7, 5], "label":"_", "x":17.5, "y":1},
-                {"matrix": [7, 6], "label":"+", "x":18.5, "y":1},
-                {"matrix": [7, 7], "label":"Backspace", "x":19.5, "y":1, "w":1.5},
-                {"matrix": [2, 0], "label":"Tab", "x":0.75, "y":2, "w":1.5},
-                {"matrix": [2, 1], "label":"Q", "x":2.25, "y":2},
-                {"matrix": [2, 2], "label":"W", "x":3.25, "y":2},
-                {"matrix": [2, 3], "label":"E", "x":4.25, "y":2},
-                {"matrix": [2, 4], "label":"R", "x":5.25, "y":2},
-                {"matrix": [2, 5], "label":"T", "x":6.25, "y":2},
-                {"matrix": [8, 0], "label":"Y", "x":12.5, "y":2},
-                {"matrix": [8, 1], "label":"U", "x":13.5, "y":2},
-                {"matrix": [8, 2], "label":"I", "x":14.5, "y":2},
-                {"matrix": [8, 3], "label":"O", "x":15.5, "y":2},
-                {"matrix": [8, 4], "label":"P", "x":16.5, "y":2},
-                {"matrix": [8, 5], "label":"{", "x":17.5, "y":2},
-                {"matrix": [8, 6], "label":"}", "x":18.5, "y":2},
-                {"matrix": [8, 7], "label":"|", "x":19.5, "y":2, "w":1.5},
-                {"matrix": [3, 0], "label":"Caps", "x":0.75, "y":3, "w":1.5},
-                {"matrix": [3, 1], "label":"A", "x":2.25, "y":3},
-                {"matrix": [3, 2], "label":"S", "x":3.25, "y":3},
-                {"matrix": [3, 3], "label":"D", "x":4.25, "y":3},
-                {"matrix": [3, 4], "label":"F", "x":5.25, "y":3},
-                {"matrix": [3, 5], "label":"G", "x":6.25, "y":3},
-                {"matrix": [9, 0], "label":"H", "x":12.5, "y":3},
-                {"matrix": [9, 1], "label":"J", "x":13.5, "y":3},
-                {"matrix": [9, 2], "label":"K", "x":14.5, "y":3},
-                {"matrix": [9, 3], "label":"L", "x":15.5, "y":3},
-                {"matrix": [9, 4], "label":":", "x":16.5, "y":3},
-                {"matrix": [9, 5], "label":"\"", "x":17.5, "y":3},
-                {"matrix": [9, 6], "label":"Enter", "x":18.5, "y":3, "w":2.25},
-                {"matrix": [4, 0], "label":"Shift", "x":0.75, "y":4, "w":1.5},
-                {"matrix": [4, 1], "label":"Z", "x":2.25, "y":4},
-                {"matrix": [4, 2], "label":"X", "x":3.25, "y":4},
-                {"matrix": [4, 3], "label":"C", "x":4.25, "y":4},
-                {"matrix": [4, 4], "label":"V", "x":5.25, "y":4},
-                {"matrix": [4, 5], "label":"B", "x":6.25, "y":4},
-                {"matrix": [10, 0], "label":"N", "x":12.5, "y":4},
-                {"matrix": [10, 1], "label":"M", "x":13.5, "y":4},
-                {"matrix": [10, 2], "label":"<", "x":14.5, "y":4},
-                {"matrix": [10, 3], "label":">", "x":15.5, "y":4},
-                {"matrix": [10, 4], "label":"?", "x":16.5, "y":4},
-                {"matrix": [10, 5], "label":"Shift", "x":17.5, "y":4, "w":1.5},
-                {"matrix": [10, 6], "label":"\u2191", "x":19, "y":4},
-                {"matrix": [10, 7], "label":"mx", "x":20, "y":4},
-                {"matrix": [5, 0], "label":"Ctrl", "x":1, "y":5, "w":1.25},
-                {"matrix": [5, 1], "label":"Win", "x":2.25, "y":5, "w":1.25},
-                {"matrix": [5, 2], "label":"Alt", "x":3.5, "y":5, "w":1.25},
-                {"matrix": [5, 3], "label":"Menu", "x":4.75, "y":5, "w":1.25},
-                {"matrix": [5, 4], "label":"space", "x":0, "y":4.75, "h":2},
-                {"matrix": [5, 5], "label":"fn", "x":1, "y":4.75, "h":2},
-                {"matrix": [11, 0], "label":"space2", "x":-2, "y":4.5, "h":2},
-                {"matrix": [11, 1], "label":"fn", "x":-1.0, "y":4.5, "h":2},
-                {"matrix": [11, 2], "label":"Alt", "x":14.25, "y":5, "w":1.25},
-                {"matrix": [11, 3], "label":"Win", "x":15.5, "y":5, "w":1.25},
-                {"matrix": [11, 4], "label":"Ctrl", "x":16.75, "y":5, "w":1.25},
-                {"matrix": [11, 5], "label":"\u2190", "x":18, "y":5},
-                {"matrix": [11, 6], "label":"\u2193", "x":19, "y":5},
-                {"matrix": [11, 7], "label":"\u2192", "x":20, "y":5}
+                {"matrix": [0, 0], "label": "Esc", "x": 0, "y": 0, "w": 1.5},
+                {"matrix": [0, 1], "label": "F1", "x": 1.5, "y": 0},
+                {"matrix": [0, 2], "label": "F2", "x": 2.5, "y": 0},
+                {"matrix": [0, 3], "label": "F3", "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "label": "F4", "x": 4.5, "y": 0},
+                {"matrix": [0, 5], "label": "F5", "x": 5.5, "y": 0},
 
+                {"matrix": [6, 0], "label": "F6", "x": 11.75, "y": 0},
+                {"matrix": [6, 1], "label": "F7", "x": 12.75, "y": 0},
+                {"matrix": [6, 2], "label": "F8", "x": 13.75, "y": 0},
+                {"matrix": [6, 3], "label": "F9", "x": 14.75, "y": 0},
+                {"matrix": [6, 4], "label": "F10", "x": 15.75, "y": 0},
+                {"matrix": [6, 5], "label": "F11", "x": 16.75, "y": 0},
+                {"matrix": [6, 6], "label": "F12", "x": 17.75, "y": 0},
+
+                {"matrix": [1, 0], "label": "~", "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "label": "1", "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "label": "2", "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "label": "3", "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "label": "4", "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "label": "5", "x": 5.5, "y": 1},
+
+                {"matrix": [7, 0], "label": "^", "x": 11.75, "y": 1},
+                {"matrix": [7, 1], "label": "&", "x": 12.75, "y": 1},
+                {"matrix": [7, 2], "label": "*", "x": 13.75, "y": 1},
+                {"matrix": [7, 3], "label": "(", "x": 14.75, "y": 1},
+                {"matrix": [7, 4], "label": ")", "x": 15.75, "y": 1},
+                {"matrix": [7, 5], "label": "_", "x": 16.75, "y": 1},
+                {"matrix": [7, 6], "label": "+", "x": 17.75, "y": 1},
+                {"matrix": [7, 7], "label": "Backspace", "x": 18.75, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "label": "Tab", "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "label": "Q", "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "label": "W", "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "label": "E", "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "label": "R", "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "label": "T", "x": 5.5, "y": 2},
+
+                {"matrix": [8, 0], "label": "Y", "x": 11.75, "y": 2},
+                {"matrix": [8, 1], "label": "U", "x": 12.75, "y": 2},
+                {"matrix": [8, 2], "label": "I", "x": 13.75, "y": 2},
+                {"matrix": [8, 3], "label": "O", "x": 14.75, "y": 2},
+                {"matrix": [8, 4], "label": "P", "x": 15.75, "y": 2},
+                {"matrix": [8, 5], "label": "{", "x": 16.75, "y": 2},
+                {"matrix": [8, 6], "label": "}", "x": 17.75, "y": 2},
+                {"matrix": [8, 7], "label": "|", "x": 18.75, "y": 2, "w": 1.5},
+
+                {"matrix": [3, 0], "label": "Caps", "x": 0, "y": 3, "w": 1.5},
+                {"matrix": [3, 1], "label": "A", "x": 1.5, "y": 3},
+                {"matrix": [3, 2], "label": "S", "x": 2.5, "y": 3},
+                {"matrix": [3, 3], "label": "D", "x": 3.5, "y": 3},
+                {"matrix": [3, 4], "label": "F", "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "label": "G", "x": 5.5, "y": 3},
+
+                {"matrix": [9, 0], "label": "H", "x": 11.75, "y": 3},
+                {"matrix": [9, 1], "label": "J", "x": 12.75, "y": 3},
+                {"matrix": [9, 2], "label": "K", "x": 13.75, "y": 3},
+                {"matrix": [9, 3], "label": "L", "x": 14.75, "y": 3},
+                {"matrix": [9, 4], "label": ":", "x": 15.75, "y": 3},
+                {"matrix": [9, 5], "label": "\"", "x": 16.75, "y": 3},
+                {"matrix": [9, 6], "label": "Enter", "x": 17.75, "y": 3, "w": 2.25},
+
+                {"matrix": [4, 0], "label": "Shift", "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "label": "Z", "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "label": "X", "x": 2.5, "y": 4},
+                {"matrix": [4, 3], "label": "C", "x": 3.5, "y": 4},
+                {"matrix": [4, 4], "label": "V", "x": 4.5, "y": 4},
+                {"matrix": [4, 5], "label": "B", "x": 5.5, "y": 4},
+
+                {"matrix": [10, 0], "label": "N", "x": 11.75, "y": 4},
+                {"matrix": [10, 1], "label": "M", "x": 12.75, "y": 4},
+                {"matrix": [10, 2], "label": "<", "x": 13.75, "y": 4},
+                {"matrix": [10, 3], "label": ">", "x": 14.75, "y": 4},
+                {"matrix": [10, 4], "label": "?", "x": 15.75, "y": 4},
+                {"matrix": [10, 5], "label": "Shift", "x": 16.75, "y": 4, "w": 1.5},
+                {"matrix": [10, 6], "label": "\u2191", "x": 18.25, "y": 4},
+                {"matrix": [10, 7], "label": "mx", "x": 19.25, "y": 4},
+
+                {"matrix": [5, 0], "label": "Ctrl", "x": 0.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "label": "Win", "x": 1.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 2], "label": "Alt", "x": 2.75, "y": 5, "w": 1.25},
+                {"matrix": [5, 3], "label": "Menu", "x": 4, "y": 5, "w": 1.25},
+                {"matrix": [5, 4], "label": "space", "x": 5.5, "y": 5.25, "h": 2},
+                {"matrix": [5, 5], "label": "fn", "x": 6.5, "y": 5.25, "h": 2},
+
+                {"matrix": [11, 0], "label": "space2", "x": 11.25, "y": 5.25, "h": 2},
+                {"matrix": [11, 1], "label": "fn", "x": 12.25, "y": 5.25, "h": 2},
+                {"matrix": [11, 2], "label": "Alt", "x": 13.5, "y": 5, "w": 1.25},
+                {"matrix": [11, 3], "label": "Win", "x": 14.75, "y": 5, "w": 1.25},
+                {"matrix": [11, 4], "label": "Ctrl", "x": 16, "y": 5, "w": 1.25},
+                {"matrix": [11, 5], "label": "\u2190", "x": 17.25, "y": 5},
+                {"matrix": [11, 6], "label": "\u2193", "x": 18.25, "y": 5},
+                {"matrix": [11, 7], "label": "\u2192", "x": 19.25, "y": 5}
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/keyboards/orthograph/orthograph.c b/keyboards/orthograph/orthograph.c
index 04d25829370..9d824574d10 100644
--- a/keyboards/orthograph/orthograph.c
+++ b/keyboards/orthograph/orthograph.c
@@ -24,105 +24,105 @@ const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-{0, A_6, B_6, C_6},
-{0, A_5, B_5, C_5},
-{0, A_4, B_4, C_4},
-{0, A_3, B_3, C_3},
-{0, A_2, B_2, C_2},
-{0, A_1, B_1, C_1},
+{0, SW1_CS6, SW2_CS6, SW3_CS6},
+{0, SW1_CS5, SW2_CS5, SW3_CS5},
+{0, SW1_CS4, SW2_CS4, SW3_CS4},
+{0, SW1_CS3, SW2_CS3, SW3_CS3},
+{0, SW1_CS2, SW2_CS2, SW3_CS2},
+{0, SW1_CS1, SW2_CS1, SW3_CS1},
 
-{0, D_6, E_6, F_6},
-{0, D_5, E_5, F_5},
-{0, D_4, E_4, F_4},
-{0, D_3, E_3, F_3},
-{0, D_2, E_2, F_2},
-{0, D_1, E_1, F_1},
+{0, SW4_CS6, SW5_CS6, SW6_CS6},
+{0, SW4_CS5, SW5_CS5, SW6_CS5},
+{0, SW4_CS4, SW5_CS4, SW6_CS4},
+{0, SW4_CS3, SW5_CS3, SW6_CS3},
+{0, SW4_CS2, SW5_CS2, SW6_CS2},
+{0, SW4_CS1, SW5_CS1, SW6_CS1},
 
-{0, G_6, H_6, I_6},
-{0, G_5, H_5, I_5},
-{0, G_4, H_4, I_4},
-{0, G_3, H_3, I_3},
-{0, G_2, H_2, I_2},
-{0, G_1, H_1, I_1},
+{0, SW7_CS6, SW8_CS6, SW9_CS6},
+{0, SW7_CS5, SW8_CS5, SW9_CS5},
+{0, SW7_CS4, SW8_CS4, SW9_CS4},
+{0, SW7_CS3, SW8_CS3, SW9_CS3},
+{0, SW7_CS2, SW8_CS2, SW9_CS2},
+{0, SW7_CS1, SW8_CS1, SW9_CS1},
 
-{0, A_14, B_14, C_14},
-{0, A_13, B_13, C_13},
-{0, A_12, B_12, C_12},
-{0, A_11, B_11, C_11},
-{0, A_10, B_10, C_10},
-{0, A_9, B_9, C_9},
+{0, SW1_CS14, SW2_CS14, SW3_CS14},
+{0, SW1_CS13, SW2_CS13, SW3_CS13},
+{0, SW1_CS12, SW2_CS12, SW3_CS12},
+{0, SW1_CS11, SW2_CS11, SW3_CS11},
+{0, SW1_CS10, SW2_CS10, SW3_CS10},
+{0, SW1_CS9, SW2_CS9, SW3_CS9},
 
-{0, D_14, E_14, F_14},
-{0, D_13, E_13, F_13},
-{0, D_12, E_12, F_12},
-{0, D_11, E_11, F_11},
-{0, D_10, E_10, F_10},
-{0, D_9, E_9, F_9},
+{0, SW4_CS14, SW5_CS14, SW6_CS14},
+{0, SW4_CS13, SW5_CS13, SW6_CS13},
+{0, SW4_CS12, SW5_CS12, SW6_CS12},
+{0, SW4_CS11, SW5_CS11, SW6_CS11},
+{0, SW4_CS10, SW5_CS10, SW6_CS10},
+{0, SW4_CS9, SW5_CS9, SW6_CS9},
 
-{0, G_14, H_14, I_14},
-{0, G_13, H_13, I_13},
-{0, G_12, H_12, I_12},
-{0, G_11, H_11, I_11},
-{0, G_10, H_10, I_10},
-{0, G_9, H_9, I_9},
+{0, SW7_CS14, SW8_CS14, SW9_CS14},
+{0, SW7_CS13, SW8_CS13, SW9_CS13},
+{0, SW7_CS12, SW8_CS12, SW9_CS12},
+{0, SW7_CS11, SW8_CS11, SW9_CS11},
+{0, SW7_CS10, SW8_CS10, SW9_CS10},
+{0, SW7_CS9, SW8_CS9, SW9_CS9},
 
 //----------------
 
 
-{0, A_6, B_6, C_6},
-{0, A_5, B_5, C_5},
-{0, A_4, B_4, C_4},
-{0, A_3, B_3, C_3},
-{0, A_2, B_2, C_2},
-{0, A_1, B_1, C_1},
-{0, A_16, B_16, C_16},
-// {0, A_15, B_15, C_15},
+{0, SW1_CS6, SW2_CS6, SW3_CS6},
+{0, SW1_CS5, SW2_CS5, SW3_CS5},
+{0, SW1_CS4, SW2_CS4, SW3_CS4},
+{0, SW1_CS3, SW2_CS3, SW3_CS3},
+{0, SW1_CS2, SW2_CS2, SW3_CS2},
+{0, SW1_CS1, SW2_CS1, SW3_CS1},
+{0, SW1_CS16, SW2_CS16, SW3_CS16},
+// {0, SW1_CS15, SW2_CS15, SW3_CS15},
 
 
-{0, D_6, E_6, F_6},
-{0, D_5, E_5, F_5},
-{0, D_4, E_4, F_4},
-{0, D_3, E_3, F_3},
-{0, D_2, E_2, F_2},
-{0, D_1, E_1, F_1},
-{0, D_16, E_16, F_16},
-{0, D_15, E_15, F_15},
+{0, SW4_CS6, SW5_CS6, SW6_CS6},
+{0, SW4_CS5, SW5_CS5, SW6_CS5},
+{0, SW4_CS4, SW5_CS4, SW6_CS4},
+{0, SW4_CS3, SW5_CS3, SW6_CS3},
+{0, SW4_CS2, SW5_CS2, SW6_CS2},
+{0, SW4_CS1, SW5_CS1, SW6_CS1},
+{0, SW4_CS16, SW5_CS16, SW6_CS16},
+{0, SW4_CS15, SW5_CS15, SW6_CS15},
 
-{0, G_6, H_6, I_6},
-{0, G_5, H_5, I_5},
-{0, G_4, H_4, I_4},
-{0, G_3, H_3, I_3},
-{0, G_2, H_2, I_2},
-{0, G_1, H_1, I_1},
-{0, G_16, H_16, I_16},
-{0, G_15, H_15, I_15},
+{0, SW7_CS6, SW8_CS6, SW9_CS6},
+{0, SW7_CS5, SW8_CS5, SW9_CS5},
+{0, SW7_CS4, SW8_CS4, SW9_CS4},
+{0, SW7_CS3, SW8_CS3, SW9_CS3},
+{0, SW7_CS2, SW8_CS2, SW9_CS2},
+{0, SW7_CS1, SW8_CS1, SW9_CS1},
+{0, SW7_CS16, SW8_CS16, SW9_CS16},
+{0, SW7_CS15, SW8_CS15, SW9_CS15},
 
-{0, A_14, B_14, C_14},
-{0, A_13, B_13, C_13},
-{0, A_12, B_12, C_12},
-{0, A_11, B_11, C_11},
-{0, A_10, B_10, C_10},
-{0, A_9,  B_9,  C_9},
-{0, A_8,  B_8, C_8},
-// {0, A_7,  B_7, C_7},
+{0, SW1_CS14, SW2_CS14, SW3_CS14},
+{0, SW1_CS13, SW2_CS13, SW3_CS13},
+{0, SW1_CS12, SW2_CS12, SW3_CS12},
+{0, SW1_CS11, SW2_CS11, SW3_CS11},
+{0, SW1_CS10, SW2_CS10, SW3_CS10},
+{0, SW1_CS9,  SW2_CS9,  SW3_CS9},
+{0, SW1_CS8,  SW2_CS8, SW3_CS8},
+// {0, SW1_CS7,  SW2_CS7, SW3_CS7},
 
-{0, D_14, E_14, F_14},
-{0, D_13, E_13, F_13},
-{0, D_12, E_12, F_12},
-{0, D_11, E_11, F_11},
-{0, D_10, E_10, F_10},
-{0, D_9,  E_9,  F_9},
-{0, D_8, E_8, F_8},
-{0, D_7, E_7, F_7},
+{0, SW4_CS14, SW5_CS14, SW6_CS14},
+{0, SW4_CS13, SW5_CS13, SW6_CS13},
+{0, SW4_CS12, SW5_CS12, SW6_CS12},
+{0, SW4_CS11, SW5_CS11, SW6_CS11},
+{0, SW4_CS10, SW5_CS10, SW6_CS10},
+{0, SW4_CS9,  SW5_CS9,  SW6_CS9},
+{0, SW4_CS8, SW5_CS8, SW6_CS8},
+{0, SW4_CS7, SW5_CS7, SW6_CS7},
 
-{0, G_14, H_14, I_14},
-{0, G_13, H_13, I_13},
-{0, G_12, H_12, I_12},
-{0, G_11, H_11, I_11},
-{0, G_10, H_10, I_10},
-{0, G_9, H_9, I_9},
-{0, G_8, H_8, I_8},
-{0, G_7, H_7, I_7}
+{0, SW7_CS14, SW8_CS14, SW9_CS14},
+{0, SW7_CS13, SW8_CS13, SW9_CS13},
+{0, SW7_CS12, SW8_CS12, SW9_CS12},
+{0, SW7_CS11, SW8_CS11, SW9_CS11},
+{0, SW7_CS10, SW8_CS10, SW9_CS10},
+{0, SW7_CS9, SW8_CS9, SW9_CS9},
+{0, SW7_CS8, SW8_CS8, SW9_CS8},
+{0, SW7_CS7, SW8_CS7, SW9_CS7}
 };
 
 #endif
diff --git a/keyboards/owlab/voice65/hotswap/hotswap.c b/keyboards/owlab/voice65/hotswap/hotswap.c
index 107952d3706..79179d16616 100644
--- a/keyboards/owlab/voice65/hotswap/hotswap.c
+++ b/keyboards/owlab/voice65/hotswap/hotswap.c
@@ -18,73 +18,73 @@
 
 #ifdef RGB_MATRIX_ENABLE
 const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
-    {0, CS3_SW1,  CS2_SW1,  CS1_SW1},  /* RGB0-ESC ROW0*/
-    {0, CS6_SW1,  CS5_SW1,  CS4_SW1},  /* RGB1-1 */
-    {0, CS9_SW1,  CS8_SW1,  CS7_SW1},  /* RGB2-2 */
-    {0, CS12_SW1,  CS11_SW1,  CS10_SW1},  /* RGB3-3 */
-    {0, CS15_SW1,  CS14_SW1,  CS13_SW1},  /* RGB4-4 */
-    {0, CS18_SW1,  CS17_SW1,  CS16_SW1},  /* RGB5-5 */
-    {0, CS21_SW1,  CS20_SW1,  CS19_SW1},  /* RGB6-6 */
-    {0, CS24_SW1,  CS23_SW1,  CS22_SW1},  /* RGB7-7 */
-    {0, CS27_SW1,  CS26_SW1,  CS25_SW1},  /* RGB8-8 */
-    {0, CS30_SW1,  CS29_SW1,  CS28_SW1},  /* RGB9-9 */
-    {0, CS33_SW1,  CS32_SW1,  CS31_SW1},  /* RGB10-0 */
-    {0, CS36_SW1,  CS35_SW1,  CS34_SW1},  /* RGB11--- */
-    {0, CS39_SW1,  CS38_SW1,  CS37_SW1},  /* RGB12-+= */
-    {0, CS36_SW6,  CS35_SW6,  CS34_SW6},  /* RGB13-BS */
-    {0, CS27_SW7,  CS26_SW7,  CS25_SW7},  /* RGB14-DEL */
-    {0, CS3_SW2,  CS2_SW2,  CS1_SW2},  /* RGB15-TAB ----ROW1*/
-    {0, CS6_SW2,  CS5_SW2,  CS4_SW2}, /* RGB16-Q */
-    {0, CS9_SW2,  CS8_SW2,  CS7_SW2}, /* RGB17-W */
-    {0, CS12_SW2,  CS11_SW2,  CS10_SW2}, /* RGB18-E */
-    {0, CS15_SW2,  CS14_SW2,  CS13_SW2}, /* RGB19-R */
-    {0, CS18_SW2,  CS17_SW2,  CS16_SW2}, /* RGB20-T */
-    {0, CS21_SW2,  CS20_SW2,  CS19_SW2}, /* RGB21-Y */
-    {0, CS24_SW2,  CS23_SW2,  CS22_SW2}, /* RGB22-U */
-    {0, CS27_SW2,  CS26_SW2,  CS25_SW2}, /* RGB23-I */
-    {0, CS30_SW2,  CS29_SW2,  CS28_SW2}, /* RGB24-O */
-    {0, CS33_SW2,  CS32_SW2,  CS31_SW2}, /* RGB25-P */
-    {0, CS36_SW2,  CS35_SW2,  CS34_SW2}, /* RGB26-[ */
-    {0, CS39_SW2,  CS38_SW2,  CS37_SW2}, /* RGB27-] */
-    {0, CS39_SW6,  CS38_SW6,  CS37_SW6}, /* RGB28-\ */
-    {0, CS30_SW7,  CS29_SW7,  CS28_SW7},  /* RGB29-PGUP */
-    {0, CS3_SW3,  CS2_SW3,  CS1_SW3},  /* RGB30-CAPS---ROW2*/
-    {0, CS6_SW3,  CS5_SW3,  CS4_SW3},  /* RGB31-A-- */
-    {0, CS9_SW3,  CS8_SW3,  CS7_SW3},  /* RGB32-S-- */
-    {0, CS12_SW3,  CS11_SW3,  CS10_SW3},  /* RGB33-D-- */
-    {0, CS15_SW3,  CS14_SW3,  CS13_SW3},  /* RGB34-F-- */
-    {0, CS18_SW3,  CS17_SW3,  CS16_SW3},  /* RGB35-G-- */
-    {0, CS21_SW3,  CS20_SW3,  CS19_SW3},  /* RGB36-H-- */
-    {0, CS24_SW3,  CS23_SW3,  CS22_SW3},  /* RGB37-J-- */
-    {0, CS27_SW3,  CS26_SW3,  CS25_SW3},  /* RGB38-K-- */
-    {0, CS30_SW3,  CS29_SW3,  CS28_SW3},  /* RGB39-L-- */
-    {0, CS33_SW3,  CS32_SW3,  CS31_SW3},  /* RGB40-;:- */
-    {0, CS36_SW3,  CS35_SW3,  CS34_SW3},  /* RGB41-''- */
-    {0, CS39_SW3,  CS38_SW3,  CS37_SW3},  /* RGB42-ENTER- */
-    {0, CS33_SW7,  CS32_SW7,  CS31_SW7},  /* RGB43-PGDN */
-    {0, CS3_SW4,  CS2_SW4,  CS1_SW4},  /* RGB44-LSF --ROW3*/
-    {0, CS6_SW4,  CS5_SW4,  CS4_SW4},  /* RGB45-Z -*/
-    {0, CS9_SW4,  CS8_SW4,  CS7_SW4},  /* RGB46-X -*/
-    {0, CS12_SW4,  CS11_SW4,  CS10_SW4},  /* RGB47-C -*/
-    {0, CS15_SW4,  CS14_SW4,  CS13_SW4},  /* RGB48-V -*/
-    {0, CS18_SW4,  CS17_SW4,  CS16_SW4},  /* RGB49-B -*/
-    {0, CS21_SW4,  CS20_SW4,  CS19_SW4},  /* RGB50-N -*/
-    {0, CS24_SW4,  CS23_SW4,  CS22_SW4},  /* RGB51-M -*/
-    {0, CS27_SW4,  CS26_SW4,  CS25_SW4},  /* RGB52-,< -*/
-    {0, CS30_SW4,  CS29_SW4,  CS28_SW4},  /* RGB53->. -*/
-    {0, CS33_SW4,  CS32_SW4,  CS31_SW4},  /* RGB54-? -*/
-    {0, CS36_SW4,  CS35_SW4,  CS34_SW4},  /* RGB55-RSF -*/
-    {0, CS39_SW4,  CS38_SW4,  CS37_SW4},  /* RGB56-UP -*/
-    {0, CS36_SW7, CS35_SW7, CS34_SW7}, /* RGB57--MO-- */
-    {0, CS3_SW5, CS2_SW5, CS1_SW5}, /* RGB58-lct-- row4*/
-    {0, CS6_SW5, CS5_SW5, CS4_SW5}, /* RGB59-lwin- */
-    {0, CS9_SW5, CS8_SW5, CS7_SW5}, /* RGB60-lalt- */
-    {0, CS18_SW5, CS17_SW5, CS16_SW5}, /* RGB61-sp- */
-    {0, CS30_SW5, CS29_SW5, CS28_SW5}, /* RGB62-ralt- */
-    {0, CS33_SW5, CS32_SW5, CS31_SW5}, /* RGB63-rct- */
-    {0, CS36_SW5, CS35_SW5, CS34_SW5}, /* RGB64-left- */
-    {0, CS39_SW5, CS38_SW5, CS37_SW5}, /* RGB65-dn- */
-    {0, CS39_SW7, CS38_SW7, CS37_SW7}, /* RGB66-right- */
+    {0, SW1_CS3,  SW1_CS2,  SW1_CS1},  /* RGB0-ESC ROW0*/
+    {0, SW1_CS6,  SW1_CS5,  SW1_CS4},  /* RGB1-1 */
+    {0, SW1_CS9,  SW1_CS8,  SW1_CS7},  /* RGB2-2 */
+    {0, SW1_CS12,  SW1_CS11,  SW1_CS10},  /* RGB3-3 */
+    {0, SW1_CS15,  SW1_CS14,  SW1_CS13},  /* RGB4-4 */
+    {0, SW1_CS18,  SW1_CS17,  SW1_CS16},  /* RGB5-5 */
+    {0, SW1_CS21,  SW1_CS20,  SW1_CS19},  /* RGB6-6 */
+    {0, SW1_CS24,  SW1_CS23,  SW1_CS22},  /* RGB7-7 */
+    {0, SW1_CS27,  SW1_CS26,  SW1_CS25},  /* RGB8-8 */
+    {0, SW1_CS30,  SW1_CS29,  SW1_CS28},  /* RGB9-9 */
+    {0, SW1_CS33,  SW1_CS32,  SW1_CS31},  /* RGB10-0 */
+    {0, SW1_CS36,  SW1_CS35,  SW1_CS34},  /* RGB11--- */
+    {0, SW1_CS39,  SW1_CS38,  SW1_CS37},  /* RGB12-+= */
+    {0, SW6_CS36,  SW6_CS35,  SW6_CS34},  /* RGB13-BS */
+    {0, SW7_CS27,  SW7_CS26,  SW7_CS25},  /* RGB14-DEL */
+    {0, SW2_CS3,  SW2_CS2,  SW2_CS1},  /* RGB15-TAB ----ROW1*/
+    {0, SW2_CS6,  SW2_CS5,  SW2_CS4}, /* RGB16-Q */
+    {0, SW2_CS9,  SW2_CS8,  SW2_CS7}, /* RGB17-W */
+    {0, SW2_CS12,  SW2_CS11,  SW2_CS10}, /* RGB18-E */
+    {0, SW2_CS15,  SW2_CS14,  SW2_CS13}, /* RGB19-R */
+    {0, SW2_CS18,  SW2_CS17,  SW2_CS16}, /* RGB20-T */
+    {0, SW2_CS21,  SW2_CS20,  SW2_CS19}, /* RGB21-Y */
+    {0, SW2_CS24,  SW2_CS23,  SW2_CS22}, /* RGB22-U */
+    {0, SW2_CS27,  SW2_CS26,  SW2_CS25}, /* RGB23-I */
+    {0, SW2_CS30,  SW2_CS29,  SW2_CS28}, /* RGB24-O */
+    {0, SW2_CS33,  SW2_CS32,  SW2_CS31}, /* RGB25-P */
+    {0, SW2_CS36,  SW2_CS35,  SW2_CS34}, /* RGB26-[ */
+    {0, SW2_CS39,  SW2_CS38,  SW2_CS37}, /* RGB27-] */
+    {0, SW6_CS39,  SW6_CS38,  SW6_CS37}, /* RGB28-\ */
+    {0, SW7_CS30,  SW7_CS29,  SW7_CS28},  /* RGB29-PGUP */
+    {0, SW3_CS3,  SW3_CS2,  SW3_CS1},  /* RGB30-CAPS---ROW2*/
+    {0, SW3_CS6,  SW3_CS5,  SW3_CS4},  /* RGB31-A-- */
+    {0, SW3_CS9,  SW3_CS8,  SW3_CS7},  /* RGB32-S-- */
+    {0, SW3_CS12,  SW3_CS11,  SW3_CS10},  /* RGB33-D-- */
+    {0, SW3_CS15,  SW3_CS14,  SW3_CS13},  /* RGB34-F-- */
+    {0, SW3_CS18,  SW3_CS17,  SW3_CS16},  /* RGB35-G-- */
+    {0, SW3_CS21,  SW3_CS20,  SW3_CS19},  /* RGB36-H-- */
+    {0, SW3_CS24,  SW3_CS23,  SW3_CS22},  /* RGB37-J-- */
+    {0, SW3_CS27,  SW3_CS26,  SW3_CS25},  /* RGB38-K-- */
+    {0, SW3_CS30,  SW3_CS29,  SW3_CS28},  /* RGB39-L-- */
+    {0, SW3_CS33,  SW3_CS32,  SW3_CS31},  /* RGB40-;:- */
+    {0, SW3_CS36,  SW3_CS35,  SW3_CS34},  /* RGB41-''- */
+    {0, SW3_CS39,  SW3_CS38,  SW3_CS37},  /* RGB42-ENTER- */
+    {0, SW7_CS33,  SW7_CS32,  SW7_CS31},  /* RGB43-PGDN */
+    {0, SW4_CS3,  SW4_CS2,  SW4_CS1},  /* RGB44-LSF --ROW3*/
+    {0, SW4_CS6,  SW4_CS5,  SW4_CS4},  /* RGB45-Z -*/
+    {0, SW4_CS9,  SW4_CS8,  SW4_CS7},  /* RGB46-X -*/
+    {0, SW4_CS12,  SW4_CS11,  SW4_CS10},  /* RGB47-C -*/
+    {0, SW4_CS15,  SW4_CS14,  SW4_CS13},  /* RGB48-V -*/
+    {0, SW4_CS18,  SW4_CS17,  SW4_CS16},  /* RGB49-B -*/
+    {0, SW4_CS21,  SW4_CS20,  SW4_CS19},  /* RGB50-N -*/
+    {0, SW4_CS24,  SW4_CS23,  SW4_CS22},  /* RGB51-M -*/
+    {0, SW4_CS27,  SW4_CS26,  SW4_CS25},  /* RGB52-,< -*/
+    {0, SW4_CS30,  SW4_CS29,  SW4_CS28},  /* RGB53->. -*/
+    {0, SW4_CS33,  SW4_CS32,  SW4_CS31},  /* RGB54-? -*/
+    {0, SW4_CS36,  SW4_CS35,  SW4_CS34},  /* RGB55-RSF -*/
+    {0, SW4_CS39,  SW4_CS38,  SW4_CS37},  /* RGB56-UP -*/
+    {0, SW7_CS36, SW7_CS35, SW7_CS34}, /* RGB57--MO-- */
+    {0, SW5_CS3, SW5_CS2, SW5_CS1}, /* RGB58-lct-- row4*/
+    {0, SW5_CS6, SW5_CS5, SW5_CS4}, /* RGB59-lwin- */
+    {0, SW5_CS9, SW5_CS8, SW5_CS7}, /* RGB60-lalt- */
+    {0, SW5_CS18, SW5_CS17, SW5_CS16}, /* RGB61-sp- */
+    {0, SW5_CS30, SW5_CS29, SW5_CS28}, /* RGB62-ralt- */
+    {0, SW5_CS33, SW5_CS32, SW5_CS31}, /* RGB63-rct- */
+    {0, SW5_CS36, SW5_CS35, SW5_CS34}, /* RGB64-left- */
+    {0, SW5_CS39, SW5_CS38, SW5_CS37}, /* RGB65-dn- */
+    {0, SW7_CS39, SW7_CS38, SW7_CS37}, /* RGB66-right- */
 };
 
 led_config_t g_led_config = { {
diff --git a/keyboards/owlab/voice65/soldered/soldered.c b/keyboards/owlab/voice65/soldered/soldered.c
index eb3b68515a9..23144914fef 100644
--- a/keyboards/owlab/voice65/soldered/soldered.c
+++ b/keyboards/owlab/voice65/soldered/soldered.c
@@ -18,77 +18,77 @@
 
 #ifdef RGB_MATRIX_ENABLE
 const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
-    {0, CS3_SW1,  CS2_SW1,  CS1_SW1},  /* RGB0-ESC ROW0*/
-    {0, CS6_SW1,  CS5_SW1,  CS4_SW1},  /* RGB1-1 */
-    {0, CS9_SW1,  CS8_SW1,  CS7_SW1},  /* RGB2-2 */
-    {0, CS12_SW1,  CS11_SW1,  CS10_SW1},  /* RGB3-3 */
-    {0, CS15_SW1,  CS14_SW1,  CS13_SW1},  /* RGB4-4 */
-    {0, CS18_SW1,  CS17_SW1,  CS16_SW1},  /* RGB5-5 */
-    {0, CS21_SW1,  CS20_SW1,  CS19_SW1},  /* RGB6-6 */
-    {0, CS24_SW1,  CS23_SW1,  CS22_SW1},  /* RGB7-7 */
-    {0, CS27_SW1,  CS26_SW1,  CS25_SW1},  /* RGB8-8 */
-    {0, CS30_SW1,  CS29_SW1,  CS28_SW1},  /* RGB9-9 */
-    {0, CS33_SW1,  CS32_SW1,  CS31_SW1},  /* RGB10-0 */
-    {0, CS36_SW1,  CS35_SW1,  CS34_SW1},  /* RGB11--- */
-    {0, CS39_SW6,  CS38_SW6,  CS37_SW6},  /* RGB12-+= */
-    {0, CS36_SW6,  CS35_SW6,  CS34_SW6},  /* RGB13-BS */
-    {0, CS27_SW6,  CS26_SW6,  CS25_SW6},  /* RGB14-BACKSPACE SPLIT */
-    {0, CS36_SW8,  CS35_SW8,  CS34_SW8},  /* RGB15-DEL */
-    {0, CS3_SW2,  CS2_SW2,  CS1_SW2},  /* RGB16-TAB ----ROW1*/
-    {0, CS6_SW2,  CS5_SW2,  CS4_SW2}, /* RGB17-Q */
-    {0, CS9_SW2,  CS8_SW2,  CS7_SW2}, /* RGB18-W */
-    {0, CS12_SW2,  CS11_SW2,  CS10_SW2}, /* RGB19-E */
-    {0, CS15_SW2,  CS14_SW2,  CS13_SW2}, /* RGB20-R */
-    {0, CS18_SW2,  CS17_SW2,  CS16_SW2}, /* RGB21-T */
-    {0, CS21_SW2,  CS20_SW2,  CS19_SW2}, /* RGB22-Y */
-    {0, CS24_SW2,  CS23_SW2,  CS22_SW2}, /* RGB23-U */
-    {0, CS27_SW2,  CS26_SW2,  CS25_SW2}, /* RGB24-I */
-    {0, CS30_SW2,  CS29_SW2,  CS28_SW2}, /* RGB25-O */
-    {0, CS33_SW2,  CS32_SW2,  CS31_SW2}, /* RGB26-P */
-    {0, CS36_SW2,  CS35_SW2,  CS34_SW2}, /* RGB27-[ */
-    {0, CS39_SW7,  CS38_SW7,  CS37_SW7}, /* RGB28-] */
-    {0, CS36_SW7,  CS35_SW7,  CS34_SW7}, /* RGB29-\ */
-    {0, CS27_SW7,  CS26_SW7,  CS25_SW7},  /* RGB30-PGUP */
-    {0, CS3_SW3,  CS2_SW3,  CS1_SW3},  /* RGB31-CAPS---ROW2*/
-    {0, CS6_SW3,  CS5_SW3,  CS4_SW3},  /* RGB32-A-- */
-    {0, CS9_SW3,  CS8_SW3,  CS7_SW3},  /* RGB33-S-- */
-    {0, CS12_SW3,  CS11_SW3,  CS10_SW3},  /* RGB34-D-- */
-    {0, CS15_SW3,  CS14_SW3,  CS13_SW3},  /* RGB35-F-- */
-    {0, CS18_SW3,  CS17_SW3,  CS16_SW3},  /* RGB36-G-- */
-    {0, CS21_SW3,  CS20_SW3,  CS19_SW3},  /* RGB37-H-- */
-    {0, CS24_SW3,  CS23_SW3,  CS22_SW3},  /* RGB38-J-- */
-    {0, CS27_SW3,  CS26_SW3,  CS25_SW3},  /* RGB39-K-- */
-    {0, CS30_SW3,  CS29_SW3,  CS28_SW3},  /* RGB40-L-- */
-    {0, CS33_SW3,  CS32_SW3,  CS31_SW3},  /* RGB41-;:- */
-    {0, CS36_SW3,  CS35_SW3,  CS34_SW3},  /* RGB42-''- */
-    {0, CS39_SW8,  CS38_SW8,  CS37_SW8},  /* RGB43-ENTER- */
-    {0, CS27_SW8,  CS26_SW8,  CS25_SW8},  /* RGB44-PGDN */
-    {0, CS3_SW4,  CS2_SW4,  CS1_SW4},  /* RGB45-LSF --ROW3*/
-    {0, CS6_SW4,  CS5_SW4,  CS4_SW4},  /* RGB46-LSF split -*/
-    {0, CS9_SW4,  CS8_SW4,  CS7_SW4},  /* RGB47-Z -*/
-    {0, CS12_SW4,  CS11_SW4,  CS10_SW4},  /* RGB48-X -*/
-    {0, CS15_SW4,  CS14_SW4,  CS13_SW4},  /* RGB49-C -*/
-    {0, CS18_SW4,  CS17_SW4,  CS16_SW4},  /* RGB50-V -*/
-    {0, CS21_SW4,  CS20_SW4,  CS19_SW4},  /* RGB51-B -*/
-    {0, CS24_SW4,  CS23_SW4,  CS22_SW4},  /* RGB52-N -*/
-    {0, CS27_SW4,  CS26_SW4,  CS25_SW4},  /* RGB53-M -*/
-    {0, CS30_SW4,  CS29_SW4,  CS28_SW4},  /* RGB54-<, -*/
-    {0, CS33_SW4,  CS32_SW4,  CS31_SW4},  /* RGB55->. -*/
-    {0, CS36_SW4,  CS35_SW4,  CS34_SW4},  /* RGB56-?/ -*/
-    {0, CS39_SW9,  CS38_SW9,  CS37_SW9},  /* RGB57-RSF -*/
-    {0, CS36_SW9,  CS35_SW9,  CS34_SW9},  /* RGB58-UP -*/
-    {0, CS27_SW9,  CS26_SW9,  CS25_SW9}, /* RGB59--MO-- */
-    {0, CS3_SW5, CS2_SW5, CS1_SW5}, /* RGB60-lct-- row4*/
-    {0, CS6_SW5, CS5_SW5, CS4_SW5}, /* RGB61-lwin- */
-    {0, CS9_SW5, CS8_SW5, CS7_SW5}, /* RGB62-lalt- */
-    {0, CS12_SW5, CS11_SW5, CS10_SW5}, /* RGB63-sp2.25- */
-    {0, CS15_SW5, CS14_SW5, CS13_SW5}, /* RGB64-sp7U6.25U1.25U- */
-    {0, CS21_SW5, CS20_SW5, CS19_SW5}, /* RGB65-sp2.75U- */
-    {0, CS30_SW5, CS29_SW5, CS28_SW5}, /* RGB66-ralt- */
-    {0, CS33_SW5, CS32_SW5, CS31_SW5}, /* RGB67-rctrl- */
-    {0, CS36_SW5, CS35_SW5, CS34_SW5}, /* RGB68-left- */
-    {0, CS39_SW5, CS38_SW5, CS37_SW5}, /* RGB69-dn- */
-    {0, CS27_SW5, CS26_SW5, CS25_SW5}, /* RGB70-right- */
+    {0, SW1_CS3,  SW1_CS2,  SW1_CS1},  /* RGB0-ESC ROW0*/
+    {0, SW1_CS6,  SW1_CS5,  SW1_CS4},  /* RGB1-1 */
+    {0, SW1_CS9,  SW1_CS8,  SW1_CS7},  /* RGB2-2 */
+    {0, SW1_CS12,  SW1_CS11,  SW1_CS10},  /* RGB3-3 */
+    {0, SW1_CS15,  SW1_CS14,  SW1_CS13},  /* RGB4-4 */
+    {0, SW1_CS18,  SW1_CS17,  SW1_CS16},  /* RGB5-5 */
+    {0, SW1_CS21,  SW1_CS20,  SW1_CS19},  /* RGB6-6 */
+    {0, SW1_CS24,  SW1_CS23,  SW1_CS22},  /* RGB7-7 */
+    {0, SW1_CS27,  SW1_CS26,  SW1_CS25},  /* RGB8-8 */
+    {0, SW1_CS30,  SW1_CS29,  SW1_CS28},  /* RGB9-9 */
+    {0, SW1_CS33,  SW1_CS32,  SW1_CS31},  /* RGB10-0 */
+    {0, SW1_CS36,  SW1_CS35,  SW1_CS34},  /* RGB11--- */
+    {0, SW6_CS39,  SW6_CS38,  SW6_CS37},  /* RGB12-+= */
+    {0, SW6_CS36,  SW6_CS35,  SW6_CS34},  /* RGB13-BS */
+    {0, SW6_CS27,  SW6_CS26,  SW6_CS25},  /* RGB14-BACKSPACE SPLIT */
+    {0, SW8_CS36,  SW8_CS35,  SW8_CS34},  /* RGB15-DEL */
+    {0, SW2_CS3,  SW2_CS2,  SW2_CS1},  /* RGB16-TAB ----ROW1*/
+    {0, SW2_CS6,  SW2_CS5,  SW2_CS4}, /* RGB17-Q */
+    {0, SW2_CS9,  SW2_CS8,  SW2_CS7}, /* RGB18-W */
+    {0, SW2_CS12,  SW2_CS11,  SW2_CS10}, /* RGB19-E */
+    {0, SW2_CS15,  SW2_CS14,  SW2_CS13}, /* RGB20-R */
+    {0, SW2_CS18,  SW2_CS17,  SW2_CS16}, /* RGB21-T */
+    {0, SW2_CS21,  SW2_CS20,  SW2_CS19}, /* RGB22-Y */
+    {0, SW2_CS24,  SW2_CS23,  SW2_CS22}, /* RGB23-U */
+    {0, SW2_CS27,  SW2_CS26,  SW2_CS25}, /* RGB24-I */
+    {0, SW2_CS30,  SW2_CS29,  SW2_CS28}, /* RGB25-O */
+    {0, SW2_CS33,  SW2_CS32,  SW2_CS31}, /* RGB26-P */
+    {0, SW2_CS36,  SW2_CS35,  SW2_CS34}, /* RGB27-[ */
+    {0, SW7_CS39,  SW7_CS38,  SW7_CS37}, /* RGB28-] */
+    {0, SW7_CS36,  SW7_CS35,  SW7_CS34}, /* RGB29-\ */
+    {0, SW7_CS27,  SW7_CS26,  SW7_CS25},  /* RGB30-PGUP */
+    {0, SW3_CS3,  SW3_CS2,  SW3_CS1},  /* RGB31-CAPS---ROW2*/
+    {0, SW3_CS6,  SW3_CS5,  SW3_CS4},  /* RGB32-A-- */
+    {0, SW3_CS9,  SW3_CS8,  SW3_CS7},  /* RGB33-S-- */
+    {0, SW3_CS12,  SW3_CS11,  SW3_CS10},  /* RGB34-D-- */
+    {0, SW3_CS15,  SW3_CS14,  SW3_CS13},  /* RGB35-F-- */
+    {0, SW3_CS18,  SW3_CS17,  SW3_CS16},  /* RGB36-G-- */
+    {0, SW3_CS21,  SW3_CS20,  SW3_CS19},  /* RGB37-H-- */
+    {0, SW3_CS24,  SW3_CS23,  SW3_CS22},  /* RGB38-J-- */
+    {0, SW3_CS27,  SW3_CS26,  SW3_CS25},  /* RGB39-K-- */
+    {0, SW3_CS30,  SW3_CS29,  SW3_CS28},  /* RGB40-L-- */
+    {0, SW3_CS33,  SW3_CS32,  SW3_CS31},  /* RGB41-;:- */
+    {0, SW3_CS36,  SW3_CS35,  SW3_CS34},  /* RGB42-''- */
+    {0, SW8_CS39,  SW8_CS38,  SW8_CS37},  /* RGB43-ENTER- */
+    {0, SW8_CS27,  SW8_CS26,  SW8_CS25},  /* RGB44-PGDN */
+    {0, SW4_CS3,  SW4_CS2,  SW4_CS1},  /* RGB45-LSF --ROW3*/
+    {0, SW4_CS6,  SW4_CS5,  SW4_CS4},  /* RGB46-LSF split -*/
+    {0, SW4_CS9,  SW4_CS8,  SW4_CS7},  /* RGB47-Z -*/
+    {0, SW4_CS12,  SW4_CS11,  SW4_CS10},  /* RGB48-X -*/
+    {0, SW4_CS15,  SW4_CS14,  SW4_CS13},  /* RGB49-C -*/
+    {0, SW4_CS18,  SW4_CS17,  SW4_CS16},  /* RGB50-V -*/
+    {0, SW4_CS21,  SW4_CS20,  SW4_CS19},  /* RGB51-B -*/
+    {0, SW4_CS24,  SW4_CS23,  SW4_CS22},  /* RGB52-N -*/
+    {0, SW4_CS27,  SW4_CS26,  SW4_CS25},  /* RGB53-M -*/
+    {0, SW4_CS30,  SW4_CS29,  SW4_CS28},  /* RGB54-<, -*/
+    {0, SW4_CS33,  SW4_CS32,  SW4_CS31},  /* RGB55->. -*/
+    {0, SW4_CS36,  SW4_CS35,  SW4_CS34},  /* RGB56-?/ -*/
+    {0, SW9_CS39,  SW9_CS38,  SW9_CS37},  /* RGB57-RSF -*/
+    {0, SW9_CS36,  SW9_CS35,  SW9_CS34},  /* RGB58-UP -*/
+    {0, SW9_CS27,  SW9_CS26,  SW9_CS25}, /* RGB59--MO-- */
+    {0, SW5_CS3, SW5_CS2, SW5_CS1}, /* RGB60-lct-- row4*/
+    {0, SW5_CS6, SW5_CS5, SW5_CS4}, /* RGB61-lwin- */
+    {0, SW5_CS9, SW5_CS8, SW5_CS7}, /* RGB62-lalt- */
+    {0, SW5_CS12, SW5_CS11, SW5_CS10}, /* RGB63-sp2.25- */
+    {0, SW5_CS15, SW5_CS14, SW5_CS13}, /* RGB64-sp7U6.25U1.25U- */
+    {0, SW5_CS21, SW5_CS20, SW5_CS19}, /* RGB65-sp2.75U- */
+    {0, SW5_CS30, SW5_CS29, SW5_CS28}, /* RGB66-ralt- */
+    {0, SW5_CS33, SW5_CS32, SW5_CS31}, /* RGB67-rctrl- */
+    {0, SW5_CS36, SW5_CS35, SW5_CS34}, /* RGB68-left- */
+    {0, SW5_CS39, SW5_CS38, SW5_CS37}, /* RGB69-dn- */
+    {0, SW5_CS27, SW5_CS26, SW5_CS25}, /* RGB70-right- */
 };
 
 led_config_t g_led_config = { {
diff --git a/keyboards/p3d/q4z/keymaps/rjboone/config.h b/keyboards/p3d/q4z/keymaps/rjboone/config.h
deleted file mode 100644
index 9264f33bae9..00000000000
--- a/keyboards/p3d/q4z/keymaps/rjboone/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright 2021 rjboone
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#undef TAPPING_TERM
-#define TAPPING_TERM 300
-
-#define COMBO_TERM 50
diff --git a/keyboards/p3d/q4z/keymaps/rjboone/keymap.c b/keyboards/p3d/q4z/keymaps/rjboone/keymap.c
deleted file mode 100644
index c54ec014ec9..00000000000
--- a/keyboards/p3d/q4z/keymaps/rjboone/keymap.c
+++ /dev/null
@@ -1,107 +0,0 @@
-/* Copyright 2021 rjboone
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-
-enum layers{
-  _BASE,
-  _NUM_SYM,
-  _NAV,
-  _GAME
-};
-
-enum combo_events {
-  COMBO_BSPC,
-  COMBO_NUMBAK,
-  COMBO_TAB,
-  COMBO_ESC,
-  COMBO_DEL,
-};
-
-#define KC_GA LGUI_T(KC_A)
-#define KC_AS LALT_T(KC_S)
-#define KC_CD LCTL_T(KC_D)
-#define KC_SF LSFT_T(KC_F)
-#define KC_SJ RSFT_T(KC_J)
-#define KC_CK RCTL_T(KC_K)
-#define KC_AL RALT_T(KC_L)
-#define KC_GSCLN RGUI_T(KC_SCLN)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_BASE] = LAYOUT(
-   KC_1, KC_2, KC_3, KC_4, KC_5,
-   KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,
-   KC_A, KC_S, KC_D, KC_SF, KC_G, KC_H, KC_SJ, KC_K, KC_L, KC_SCLN,
-   KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT,
-   KC_LCTL, KC_LALT, KC_LGUI, LT(_NUM_SYM, KC_ENT), KC_SPC, MO(_NAV), TG(_GAME), KC_SLSH
-  ),
-
-  [_NUM_SYM] = LAYOUT(
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_MINS, KC_LBRC, KC_RBRC, KC_EQL, KC_TRNS, KC_TRNS, KC_QUOT,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_RSFT, KC_TRNS, KC_TRNS, KC_BSLS
-  ),
-
-  [_NAV] = LAYOUT(
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-  ),
-
-  [_GAME] = LAYOUT(
-    KC_1, KC_2, KC_3, KC_4, KC_5,
-    KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_NO, KC_NO, KC_NO, KC_NO,
-    KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_NO, KC_NO, KC_NO, KC_NO,
-    KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_NO, KC_NO, KC_NO,
-    KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_ENT, KC_NO, TG(_GAME), KC_NO
-  ),
-};
-
-#ifdef COMBO_ENABLE
-const uint16_t PROGMEM combo_bspc[] = {KC_O, KC_P, COMBO_END};
-const uint16_t PROGMEM combo_numbak[] = {KC_0, KC_9, COMBO_END};
-const uint16_t PROGMEM combo_tab[] = {KC_A, KC_S, COMBO_END};
-const uint16_t PROGMEM combo_esc[] = {KC_Q, KC_W, COMBO_END};
-const uint16_t PROGMEM combo_del[] = {KC_MINS, KC_EQL, COMBO_END};
-
-combo_t key_combos[] = {
-  [COMBO_BSPC] = COMBO(combo_bspc,KC_BSPC),
-  [COMBO_NUMBAK] = COMBO(combo_numbak,KC_BSPC),
-  [COMBO_TAB] = COMBO(combo_tab,KC_TAB),
-  [COMBO_ESC] = COMBO(combo_esc,KC_ESC),
-  [COMBO_DEL] = COMBO(combo_del,KC_DEL),
-
-};
-#endif
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-
-#ifdef COMBO_ENABLE
-    switch(get_highest_layer(state)) {
-    case _GAME:
-      combo_disable();
-      break;
-    default:
-      combo_enable();
-      break;
-    }
-#endif // COMBO_ENABLE
-
-    return state;
-}
diff --git a/keyboards/p3d/q4z/keymaps/rjboone/readme.md b/keyboards/p3d/q4z/keymaps/rjboone/readme.md
deleted file mode 100644
index 29f2d31f6ff..00000000000
--- a/keyboards/p3d/q4z/keymaps/rjboone/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# Default Le Chiffre Keymap
diff --git a/keyboards/p3d/q4z/keymaps/rjboone/rules.mk b/keyboards/p3d/q4z/keymaps/rjboone/rules.mk
deleted file mode 100644
index ab1e438182a..00000000000
--- a/keyboards/p3d/q4z/keymaps/rjboone/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-COMBO_ENABLE = yes
diff --git a/keyboards/pearl/keymaps/phil/keymap.c b/keyboards/pearl/keymaps/phil/keymap.c
deleted file mode 100755
index 79dfd4ce379..00000000000
--- a/keyboards/pearl/keymaps/phil/keymap.c
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
-Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-// Layer shorthand
-#define COLEMAK 0
-#define QWERTY 1
-#define WIN 2
-#define _FN1 3
-#define _FN2 4
-#define LIGHT 5
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [COLEMAK] = LAYOUT_all(
-      KC_TAB,           KC_Q,    KC_W,    KC_F,    KC_P,   KC_G,   KC_J,   KC_L,   KC_U,    KC_Y,    KC_SCLN,  KC_NO, KC_BSPC,
-      LGUI_T(KC_ESC),   KC_A,    KC_R,    KC_S,    KC_T,   KC_D,   KC_H,   KC_N,   KC_E,    KC_I,    KC_O,     KC_QUOT,
-      LSFT_T(KC_DEL),   KC_Z,    KC_X,    KC_C,    KC_V,   KC_B,   KC_K,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH,  RSFT_T(KC_ENT),
-      KC_LCTL,          KC_LGUI, KC_LALT,    LT(_FN1, KC_SPC),    KC_NO,        LT(_FN2, KC_SPC), TG(QWERTY),  TG(WIN)
-      ),
-  [QWERTY] = LAYOUT_all(
-      KC_TRNS,   KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I,    KC_O,   KC_P,    KC_NO, KC_TRNS,
-      KC_TRNS,   KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K,    KC_L,   KC_SCLN, KC_TRNS,
-      KC_TRNS,   KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_TRNS,
-      KC_TRNS,          KC_TRNS, KC_TRNS,    KC_TRNS,    KC_NO,        KC_TRNS, KC_TRNS,  KC_TRNS
-      ),
-  [WIN] = LAYOUT_all(
-      KC_TRNS,        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO,  KC_TRNS,
-      LCTL_T(KC_ESC), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS,        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_LGUI, KC_LALT, KC_LCTL, KC_TRNS, KC_NO,  KC_TRNS,  KC_TRNS,  KC_TRNS
-      ),
-  [_FN1] = LAYOUT_all(
-      KC_GRV,  KC_MNXT, KC_NO, KC_PIPE, KC_PLUS,  KC_LBRC, KC_RBRC, KC_HOME, KC_UP,   KC_END,  KC_PGUP,   KC_NO,  KC_TRNS,
-      KC_TRNS, KC_MPLY, KC_SPC, KC_UNDS, KC_EQUAL, KC_LPRN, KC_RPRN, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN,  KC_TRNS,
-      KC_TRNS, KC_MPRV, KC_NO, KC_BSLS, KC_MINUS, KC_LCBR, KC_RCBR, KC_NO,   KC_MUTE, KC_VOLU, KC_VOLD,   KC_CAPS,
-      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO,  KC_TRNS,  KC_TRNS,  KC_TRNS
-      ),
-  [_FN2] = LAYOUT_all(
-      KC_TILD,   KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LBRC, KC_RBRC, KC_NO,  KC_TRNS,
-      KC_TRNS,   KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_TRNS,
-      KC_TRNS,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_CAPS,
-      TG(LIGHT), KC_TRNS, KC_TRNS, KC_TRNS, KC_NO,  KC_TRNS,  KC_TRNS,  KC_TRNS
-      ),
-  [LIGHT] = LAYOUT_all(
-      QK_BOOT, KC_NO,  BL_ON,   BL_UP,   BL_BRTG, RGB_M_P,  RGB_M_B, RGB_MOD,  RGB_HUI,  RGB_SAI, RGB_VAI, KC_NO,  KC_NO,
-      KC_NO, KC_NO,  BL_TOGG, BL_STEP, KC_NO,   RGB_M_SN, RGB_M_K, RGB_TOG,  RGB_HUD,  RGB_SAD, RGB_VAD, KC_NO,
-      KC_NO, KC_NO,  BL_OFF,  BL_DOWN, KC_NO,   KC_NO,    KC_NO,   RGB_RMOD, RGB_M_SW, RGB_M_R, RGB_M_G, KC_NO,
-      TG(LIGHT), KC_NO, KC_NO, KC_NO, KC_NO,  KC_NO,  KC_NO,  KC_NO
-      ),
-};
-
-layer_state_t layer_state_set_kb(layer_state_t state) {
-  if (state & (1<<QWERTY)){
-    PORTD &= ~(1 << PD0);
-  } else {
-    PORTD |= (1 << PD0);
-  }
-
-  if (state & (1<<WIN)){
-    PORTD &= ~(1 << PD1);
-  }
-  else{
-    PORTD |= (1 << PD1);
-  }
-
-  if (state & (1<<LIGHT)){
-    PORTD &= ~(1 << PD6);
-  }
-  else{
-    PORTD |= (1 << PD6);
-  }
-    return state;
-}
diff --git a/keyboards/percent/skog_lite/keymaps/binman/keymap.c b/keyboards/percent/skog_lite/keymaps/binman/keymap.c
deleted file mode 100755
index 67f74eeb90a..00000000000
--- a/keyboards/percent/skog_lite/keymaps/binman/keymap.c
+++ /dev/null
@@ -1,20 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT_tkl_ansi(
-        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,     KC_DEL,  RGB_TOG, MO(1),   
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_MUTE, KC_VOLU, KC_MPLY, 
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,    KC_MRWD, KC_VOLD, KC_MFFD, 
-        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,     
-        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,             KC_UP,   
-        KC_LCTL, KC_NO,   KC_LGUI,                            KC_SPC,                             KC_RGUI, KC_NO,   KC_RALT, KC_RALT,    KC_LEFT, KC_DOWN, KC_RGHT  
-    ),
-    [1] = LAYOUT_tkl_ansi(
-        KC_NO,            KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,      RGB_MOD, RGB_RMOD, KC_TRNS, 
-        KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,      RGB_VAI, RGB_HUI,  RGB_SAI, 
-        KC_NO,   KC_NO,   KC_NO,   KC_NO,   QK_BOOT, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,      RGB_VAD, RGB_HUD,  RGB_SAD, 
-        KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,            KC_NO,      
-        KC_NO,            KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,            KC_NO,               RGB_SPI, 
-        KC_NO,   KC_NO,   KC_NO,                              KC_NO,                              KC_NO,   KC_NO,   KC_NO,   KC_NO,      KC_NO,   RGB_SPD, KC_NO     
-    )
-};
diff --git a/keyboards/percent/skog_lite/keymaps/binman/readme.md b/keyboards/percent/skog_lite/keymaps/binman/readme.md
deleted file mode 100755
index d4bf1929d67..00000000000
--- a/keyboards/percent/skog_lite/keymaps/binman/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# binman Skog Lite layout
-
-This mostly just changes the "TKL" section of the board to be media and lighting controls. Bottom row has also been modified a bit.
\ No newline at end of file
diff --git a/keyboards/phentech/rpk_001/rpk_001.c b/keyboards/phentech/rpk_001/rpk_001.c
index b24c0c6c0e7..5ccd8d73930 100644
--- a/keyboards/phentech/rpk_001/rpk_001.c
+++ b/keyboards/phentech/rpk_001/rpk_001.c
@@ -14,77 +14,77 @@ const aw20216s_led_t PROGMEM g_aw20216s_leds[AW20216S_LED_COUNT] = {
  *   |     |          G location
  *   |     |          |          B location
  *   |     |          |          | */
-    {0, CS1_SW1,   CS2_SW1,   CS3_SW1   },  //  0  Esc
-    {0, CS1_SW2,   CS2_SW2,   CS3_SW2   },  //  1  1
-    {0, CS1_SW3,   CS2_SW3,   CS3_SW3   },  //  2  2
-    {0, CS1_SW4,   CS2_SW4,   CS3_SW4   },  //  3  3
-    {0, CS1_SW5,   CS2_SW5,   CS3_SW5   },  //  4  4
-    {0, CS1_SW6,   CS2_SW6,   CS3_SW6   },  //  5  5
-    {0, CS1_SW7,   CS2_SW7,   CS3_SW7   },  //  6  6
-    {0, CS1_SW8,   CS2_SW8,   CS3_SW8   },  //  7  7
-    {0, CS1_SW9,   CS2_SW9,   CS3_SW9   },  //  8  8
-    {0, CS1_SW10,  CS2_SW10,  CS3_SW10  },  //  9  9
-    {0, CS1_SW11,  CS2_SW11,  CS3_SW11  },  //  10 0
-    {0, CS1_SW12,  CS2_SW12,  CS3_SW12  },  //  11 -
-    {0, CS16_SW1,  CS17_SW1,  CS18_SW1  },  //  12 =
-    {0, CS16_SW2,  CS17_SW2,  CS18_SW2  },  //  13 Backspace
+    {0, SW1_CS1,   SW1_CS2,   SW1_CS3   },  //  0  Esc
+    {0, SW2_CS1,   SW2_CS2,   SW2_CS3   },  //  1  1
+    {0, SW3_CS1,   SW3_CS2,   SW3_CS3   },  //  2  2
+    {0, SW4_CS1,   SW4_CS2,   SW4_CS3   },  //  3  3
+    {0, SW5_CS1,   SW5_CS2,   SW5_CS3   },  //  4  4
+    {0, SW6_CS1,   SW6_CS2,   SW6_CS3   },  //  5  5
+    {0, SW7_CS1,   SW7_CS2,   SW7_CS3   },  //  6  6
+    {0, SW8_CS1,   SW8_CS2,   SW8_CS3   },  //  7  7
+    {0, SW9_CS1,   SW9_CS2,   SW9_CS3   },  //  8  8
+    {0, SW10_CS1,  SW10_CS2,  SW10_CS3  },  //  9  9
+    {0, SW11_CS1,  SW11_CS2,  SW11_CS3  },  //  10 0
+    {0, SW12_CS1,  SW12_CS2,  SW12_CS3  },  //  11 -
+    {0, SW1_CS16,  SW1_CS17,  SW1_CS18  },  //  12 =
+    {0, SW2_CS16,  SW2_CS17,  SW2_CS18  },  //  13 Backspace
 
-    {0, CS4_SW1,   CS5_SW1,   CS6_SW1   },  //  14 Tab
-    {0, CS4_SW2,   CS5_SW2,   CS6_SW2   },  //  15 Q
-    {0, CS4_SW3,   CS5_SW3,   CS6_SW3   },  //  16 W
-    {0, CS4_SW4,   CS5_SW4,   CS6_SW4   },  //  17 E
-    {0, CS4_SW5,   CS5_SW5,   CS6_SW5   },  //  18 R
-    {0, CS4_SW6,   CS5_SW6,   CS6_SW6   },  //  19 T
-    {0, CS4_SW7,   CS5_SW7,   CS6_SW7   },  //  20 Y
-    {0, CS4_SW8,   CS5_SW8,   CS6_SW8   },  //  21 U
-    {0, CS4_SW9,   CS5_SW9,   CS6_SW9   },  //  22 I
-    {0, CS4_SW10,  CS5_SW10,  CS6_SW10  },  //  23 O
-    {0, CS4_SW11,  CS5_SW11,  CS6_SW11  },  //  24 P
-    {0, CS4_SW12,  CS5_SW12,  CS6_SW12  },  //  25 [
-    {0, CS16_SW4,  CS17_SW4,  CS18_SW4  },  //  26 ]
-    {0, CS16_SW5,  CS17_SW5,  CS18_SW5  },  //  27 \|
-    {0, CS16_SW3,  CS17_SW3,  CS18_SW3  },  //  28 Del
+    {0, SW1_CS4,   SW1_CS5,   SW1_CS6   },  //  14 Tab
+    {0, SW2_CS4,   SW2_CS5,   SW2_CS6   },  //  15 Q
+    {0, SW3_CS4,   SW3_CS5,   SW3_CS6   },  //  16 W
+    {0, SW4_CS4,   SW4_CS5,   SW4_CS6   },  //  17 E
+    {0, SW5_CS4,   SW5_CS5,   SW5_CS6   },  //  18 R
+    {0, SW6_CS4,   SW6_CS5,   SW6_CS6   },  //  19 T
+    {0, SW7_CS4,   SW7_CS5,   SW7_CS6   },  //  20 Y
+    {0, SW8_CS4,   SW8_CS5,   SW8_CS6   },  //  21 U
+    {0, SW9_CS4,   SW9_CS5,   SW9_CS6   },  //  22 I
+    {0, SW10_CS4,  SW10_CS5,  SW10_CS6  },  //  23 O
+    {0, SW11_CS4,  SW11_CS5,  SW11_CS6  },  //  24 P
+    {0, SW12_CS4,  SW12_CS5,  SW12_CS6  },  //  25 [
+    {0, SW4_CS16,  SW4_CS17,  SW4_CS18  },  //  26 ]
+    {0, SW5_CS16,  SW5_CS17,  SW5_CS18  },  //  27 \|
+    {0, SW3_CS16,  SW3_CS17,  SW3_CS18  },  //  28 Del
 
-    {0, CS7_SW1,   CS8_SW1,   CS9_SW1   },  //  29 Caps Lock
-    {0, CS7_SW2,   CS8_SW2,   CS9_SW2   },  //  30 A
-    {0, CS7_SW3,   CS8_SW3,   CS9_SW3   },  //  31 S
-    {0, CS7_SW4,   CS8_SW4,   CS9_SW4   },  //  32 D
-    {0, CS7_SW5,   CS8_SW5,   CS9_SW5   },  //  33 F
-    {0, CS7_SW6,   CS8_SW6,   CS9_SW6   },  //  34 G
-    {0, CS7_SW7,   CS8_SW7,   CS9_SW7   },  //  35 H
-    {0, CS7_SW8,   CS8_SW8,   CS9_SW8   },  //  36 J
-    {0, CS7_SW9,   CS8_SW9,   CS9_SW9   },  //  37 K
-    {0, CS7_SW10,  CS8_SW10,  CS9_SW10  },  //  38 L
-    {0, CS7_SW11,  CS8_SW11,  CS9_SW11  },  //  39 ;
-    {0, CS7_SW12,  CS8_SW12,  CS9_SW12  },  //  40 '
-    {0, CS16_SW7,  CS17_SW7,  CS18_SW7  },  //  41 Enter
-    {0, CS16_SW6,  CS17_SW6,  CS18_SW6  },  //  42 Home
+    {0, SW1_CS7,   SW1_CS8,   SW1_CS9   },  //  29 Caps Lock
+    {0, SW2_CS7,   SW2_CS8,   SW2_CS9   },  //  30 A
+    {0, SW3_CS7,   SW3_CS8,   SW3_CS9   },  //  31 S
+    {0, SW4_CS7,   SW4_CS8,   SW4_CS9   },  //  32 D
+    {0, SW5_CS7,   SW5_CS8,   SW5_CS9   },  //  33 F
+    {0, SW6_CS7,   SW6_CS8,   SW6_CS9   },  //  34 G
+    {0, SW7_CS7,   SW7_CS8,   SW7_CS9   },  //  35 H
+    {0, SW8_CS7,   SW8_CS8,   SW8_CS9   },  //  36 J
+    {0, SW9_CS7,   SW9_CS8,   SW9_CS9   },  //  37 K
+    {0, SW10_CS7,  SW10_CS8,  SW10_CS9  },  //  38 L
+    {0, SW11_CS7,  SW11_CS8,  SW11_CS9  },  //  39 ;
+    {0, SW12_CS7,  SW12_CS8,  SW12_CS9  },  //  40 '
+    {0, SW7_CS16,  SW7_CS17,  SW7_CS18  },  //  41 Enter
+    {0, SW6_CS16,  SW6_CS17,  SW6_CS18  },  //  42 Home
 
-    {0, CS10_SW1,  CS11_SW1,  CS12_SW1  },  //  43 Shift_L
-    {0, CS10_SW3,  CS11_SW3,  CS12_SW3  },  //  44 Z
-    {0, CS10_SW4,  CS11_SW4,  CS12_SW4  },  //  45 X
-    {0, CS10_SW5,  CS11_SW5,  CS12_SW5  },  //  46 C
-    {0, CS10_SW6,  CS11_SW6,  CS12_SW6  },  //  47 V
-    {0, CS10_SW7,  CS11_SW7,  CS12_SW7  },  //  48 B
-    {0, CS10_SW8,  CS11_SW8,  CS12_SW8  },  //  49 N
-    {0, CS10_SW9,  CS11_SW9,  CS12_SW9  },  //  50 M
-    {0, CS10_SW10, CS11_SW10, CS12_SW10 },  //  51 ,
-    {0, CS10_SW11, CS11_SW11, CS12_SW11 },  //  52 .
-    {0, CS10_SW12, CS11_SW12, CS12_SW12 },  //  53 /
-    {0, CS16_SW9,  CS17_SW9,  CS18_SW9  },  //  54 Shift_R
-    {0, CS16_SW10, CS17_SW10, CS18_SW10 },  //  55 Up
-    {0, CS16_SW8,  CS17_SW8,  CS18_SW8  },  //  56 END
+    {0, SW1_CS10,  SW1_CS11,  SW1_CS12  },  //  43 Shift_L
+    {0, SW3_CS10,  SW3_CS11,  SW3_CS12  },  //  44 Z
+    {0, SW4_CS10,  SW4_CS11,  SW4_CS12  },  //  45 X
+    {0, SW5_CS10,  SW5_CS11,  SW5_CS12  },  //  46 C
+    {0, SW6_CS10,  SW6_CS11,  SW6_CS12  },  //  47 V
+    {0, SW7_CS10,  SW7_CS11,  SW7_CS12  },  //  48 B
+    {0, SW8_CS10,  SW8_CS11,  SW8_CS12  },  //  49 N
+    {0, SW9_CS10,  SW9_CS11,  SW9_CS12  },  //  50 M
+    {0, SW10_CS10, SW10_CS11, SW10_CS12 },  //  51 ,
+    {0, SW11_CS10, SW11_CS11, SW11_CS12 },  //  52 .
+    {0, SW12_CS10, SW12_CS11, SW12_CS12 },  //  53 /
+    {0, SW9_CS16,  SW9_CS17,  SW9_CS18  },  //  54 Shift_R
+    {0, SW10_CS16, SW10_CS17, SW10_CS18 },  //  55 Up
+    {0, SW8_CS16,  SW8_CS17,  SW8_CS18  },  //  56 END
 
-    {0, CS13_SW1,  CS14_SW1,  CS15_SW1  },  //  57 Ctrl_L
-    {0, CS13_SW2,  CS14_SW2,  CS15_SW2  },  //  58 Win_L
-    {0, CS13_SW3,  CS14_SW3,  CS15_SW3  },  //  59 Alt_L
-    {0, CS13_SW6,  CS14_SW6,  CS15_SW6  },  //  60 Space
-    {0, CS13_SW9,  CS14_SW9,  CS15_SW9  },  //  61 Alt_R
-    {0, CS13_SW10, CS14_SW10, CS15_SW10 },  //  62 Ctrl_R
-    {0, CS13_SW11, CS14_SW11, CS15_SW11 },  //  63 FN
-    {0, CS13_SW12, CS14_SW12, CS15_SW12 },  //  64 Left
-    {0, CS16_SW12, CS17_SW12, CS18_SW12 },  //  65 Down
-    {0, CS16_SW11, CS17_SW11, CS18_SW11 },  //  66 Right
+    {0, SW1_CS13,  SW1_CS14,  SW1_CS15  },  //  57 Ctrl_L
+    {0, SW2_CS13,  SW2_CS14,  SW2_CS15  },  //  58 Win_L
+    {0, SW3_CS13,  SW3_CS14,  SW3_CS15  },  //  59 Alt_L
+    {0, SW6_CS13,  SW6_CS14,  SW6_CS15  },  //  60 Space
+    {0, SW9_CS13,  SW9_CS14,  SW9_CS15  },  //  61 Alt_R
+    {0, SW10_CS13, SW10_CS14, SW10_CS15 },  //  62 Ctrl_R
+    {0, SW11_CS13, SW11_CS14, SW11_CS15 },  //  63 FN
+    {0, SW12_CS13, SW12_CS14, SW12_CS15 },  //  64 Left
+    {0, SW12_CS16, SW12_CS17, SW12_CS18 },  //  65 Down
+    {0, SW11_CS16, SW11_CS17, SW11_CS18 },  //  66 Right
 };
 
 // clang-format on
diff --git a/keyboards/phoenix/phoenix.c b/keyboards/phoenix/phoenix.c
index 706a65b4dee..e870f987f4c 100644
--- a/keyboards/phoenix/phoenix.c
+++ b/keyboards/phoenix/phoenix.c
@@ -2,7 +2,7 @@
 #include "usb_main.h"
 #include "phoenix.h"
 
-void bootmagic_lite(void) {
+void bootmagic_scan(void) {
     matrix_scan();
     wait_ms(5);
     matrix_scan();
diff --git a/keyboards/pica40/rev2/post_rules.mk b/keyboards/pica40/rev2/post_rules.mk
deleted file mode 100644
index e4dda1925ba..00000000000
--- a/keyboards/pica40/rev2/post_rules.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-# if ENCODER_ENABLE is set, add defines but avoid adding encoder.c as it's replaced by custom code in rev2.c
-ifeq ($(strip $(ENCODER_ENABLE)), yes)
-	ENCODER_ENABLE := no
-    OPT_DEFS += -DENCODER_ENABLE
-    ifeq ($(strip $(ENCODER_MAP_ENABLE)), yes)
-        OPT_DEFS += -DENCODER_MAP_ENABLE
-    endif
-endif
diff --git a/keyboards/pica40/rev2/rev2.c b/keyboards/pica40/rev2/rev2.c
index c585ec56d66..2ee73dcc6b8 100644
--- a/keyboards/pica40/rev2/rev2.c
+++ b/keyboards/pica40/rev2/rev2.c
@@ -2,99 +2,29 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "rev2.h"
+#include "gpio.h"
 
 #ifdef ENCODER_ENABLE // code based on encoder.c
 
-static const pin_t encoders_pad_a[] = ENCODERS_PAD_A;
-static const pin_t encoders_pad_b[] = ENCODERS_PAD_B;
-
-static int8_t  encoder_LUT[]  = {0, -1, 1, 0, 1, 0, 0, -1, -1, 0, 0, 1, 0, 1, -1, 0};
-static uint8_t encoder_state  = 3;
-static int8_t  encoder_pulses = 0;
-static uint8_t encoder_value  = 0;
-
-typedef struct encoder_sync_data {
-    int value;
-} encoder_sync_data;
+#define ENCODER_PIN_A (((pin_t[])ENCODERS_PAD_A)[0])
+#define ENCODER_PIN_B (((pin_t[])ENCODERS_PAD_B)[0])
 
 // custom handler that returns encoder B pin status from slave side
 void encoder_sync_slave_handler(uint8_t in_buflen, const void *in_data, uint8_t out_buflen, void *out_data) {
-    encoder_sync_data *data = (encoder_sync_data *)out_data;
-    data->value = readPin(encoders_pad_b[0]);
+    *(uint8_t *)out_data = readPin(ENCODER_PIN_B) ? 1 : 0;
 }
 
-__attribute__((weak)) bool encoder_update_user(uint8_t index, bool clockwise) {
-    return true;
-}
+void encoder_quadrature_init_pin(uint8_t index, bool pad_b) {}
 
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) return false;
-
-    tap_code(clockwise ? KC_VOLU : KC_VOLD);
-
-    return false;
-}
-
-#ifdef ENCODER_MAP_ENABLE
-static void encoder_exec_mapping(uint8_t index, bool clockwise) {
-    action_exec(clockwise ? ENCODER_CW_EVENT(index, true) : ENCODER_CCW_EVENT(index, true));
-    wait_ms(ENCODER_MAP_KEY_DELAY);
-    action_exec(clockwise ? ENCODER_CW_EVENT(index, false) : ENCODER_CCW_EVENT(index, false));
-    wait_ms(ENCODER_MAP_KEY_DELAY);
-}
-#endif // ENCODER_MAP_ENABLE
-
-void encoder_init(void) {
-    setPinInputHigh(encoders_pad_a[0]);
-    setPinInputHigh(encoders_pad_b[0]);
-    wait_us(100);
-    transaction_register_rpc(ENCODER_SYNC, encoder_sync_slave_handler);
-}
-
-bool encoder_read(void) {
-    // ignore if running on slave side
-    if (!is_keyboard_master()) return false;
-
-    bool changed = false;
-    encoder_sync_data data = {0};
-    // request pin B status from slave side
-    if (transaction_rpc_recv(ENCODER_SYNC, sizeof(data), &data)) {
-        uint8_t new_status = (readPin(encoders_pad_a[0]) << 0) | (data.value << 1);
-        if ((encoder_state & 0x3) != new_status) {
-            encoder_state <<= 2;
-            encoder_state |= new_status;
-            encoder_pulses += encoder_LUT[encoder_state & 0xF];
-
-            if (encoder_pulses >= ENCODER_RESOLUTION) {
-                encoder_value++;
-                changed = true;
-#ifdef ENCODER_MAP_ENABLE
-                encoder_exec_mapping(0, false);
-#else  // ENCODER_MAP_ENABLE
-                encoder_update_kb(0, false);
-#endif // ENCODER_MAP_ENABLE
-            }
-
-            if (encoder_pulses <= -ENCODER_RESOLUTION) {
-                encoder_value--;
-                changed = true;
-#ifdef ENCODER_MAP_ENABLE
-                encoder_exec_mapping(0, true);
-#else  // ENCODER_MAP_ENABLE
-                encoder_update_kb(0, true);
-#endif // ENCODER_MAP_ENABLE
-            }
-
-            encoder_pulses %= ENCODER_RESOLUTION;
-        }
+uint8_t encoder_quadrature_read_pin(uint8_t index, bool pad_b) {
+    if(pad_b) {
+        uint8_t data = 0;
+        transaction_rpc_recv(ENCODER_SYNC, sizeof(data), &data);
+        return data;
     }
-    return changed;
+    return readPin(ENCODER_PIN_A) ? 1 : 0;
 }
 
-// do not use standard split encoder transactions
-void encoder_state_raw(uint8_t *slave_state) {}
-void encoder_update_raw(uint8_t *slave_state) {}
-
 #endif // ENCODER_ENABLE
 
 #ifdef PICA40_RGBLIGHT_TIMEOUT
@@ -125,6 +55,12 @@ bool should_set_rgblight = false;
 void keyboard_post_init_kb(void) {
     setPinOutput(PICA40_RGB_POWER_PIN);
 
+#ifdef ENCODER_ENABLE
+    setPinInputHigh(ENCODER_PIN_A);
+    setPinInputHigh(ENCODER_PIN_B);
+    transaction_register_rpc(ENCODER_SYNC, encoder_sync_slave_handler);
+#endif // ENCODER_ENABLE
+
 #ifdef PICA40_RGBLIGHT_TIMEOUT
     idle_timer = timer_read();
     check_rgblight_timer = timer_read();
diff --git a/keyboards/pierce/keymaps/durken1/config.h b/keyboards/pierce/keymaps/durken1/config.h
deleted file mode 100644
index ecc59f31bd3..00000000000
--- a/keyboards/pierce/keymaps/durken1/config.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* Copyright 2022 durken (https://github.com/durken1/)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-// default but important
-#define TAPPING_TERM 220
-
-// Enable rapid switch from tap to hold, disables double tap hold auto-repeat.
-#define QUICK_TAP_TERM 0
-
-#define PERMISSIVE_HOLD
-
-// Combo settings
-#define COMBO_TERM 35
-
-#ifdef PS2_DRIVER_USART
-#define PS2_CLOCK_PIN   D5
-#define PS2_DATA_PIN    D2
-
-/* synchronous, odd parity, 1-bit stop, 8-bit data, sample at falling edge */
-/* set DDR of CLOCK as input to be slave */
-#define PS2_MOUSE_ROTATE 270 // compensate for east-facing device orientation
-#define PS2_USART_INIT() do {   \
-    PS2_CLOCK_DDR &= ~(1<<PS2_CLOCK_BIT);   \
-    PS2_DATA_DDR &= ~(1<<PS2_DATA_BIT);     \
-    UCSR1C = ((1 << UMSEL10) |  \
-            (3 << UPM10)   |  \
-            (0 << USBS1)   |  \
-            (3 << UCSZ10)  |  \
-            (0 << UCPOL1));   \
-    UCSR1A = 0;                 \
-    UBRR1H = 0;                 \
-    UBRR1L = 0;                 \
-} while (0)
-#define PS2_USART_RX_INT_ON() do {  \
-    UCSR1B = ((1 << RXCIE1) |       \
-            (1 << RXEN1));        \
-} while (0)
-#define PS2_USART_RX_POLL_ON() do { \
-    UCSR1B = (1 << RXEN1);          \
-} while (0)
-#define PS2_USART_OFF() do {    \
-    UCSR1C = 0;                 \
-    UCSR1B &= ~((1 << RXEN1) |  \
-            (1 << TXEN1));  \
-} while (0)
-#define PS2_USART_RX_READY      (UCSR1A & (1<<RXC1))
-#define PS2_USART_RX_DATA       UDR1
-#define PS2_USART_ERROR         (UCSR1A & ((1<<FE1) | (1<<DOR1) | (1<<UPE1)))
-#define PS2_USART_RX_VECT       USART1_RX_vect
-#endif
-
-#ifdef AUTO_BUTTONS
-  #define AUTO_BUTTONS_TIMEOUT 750
-#endif
diff --git a/keyboards/pierce/keymaps/durken1/keymap.c b/keyboards/pierce/keymaps/durken1/keymap.c
deleted file mode 100644
index 5bc2f4d3077..00000000000
--- a/keyboards/pierce/keymaps/durken1/keymap.c
+++ /dev/null
@@ -1,159 +0,0 @@
-/* Copyright 2022 durken (https://github.com/durken1/)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-#include "keymap_swedish.h"
-
-enum layers {
-    BASE,
-    MBO,
-    SYM,
-    NUM,
-    FN
-};
-
-enum combos {
-    WF_ARNG,
-    EI_ADIA,
-    UK_ODIA
-};
-
-#if defined PS2_MOUSE_ENABLE
-#include "ps2_mouse.h"
-#endif
-
-#if defined AUTO_BUTTONS && defined PS2_MOUSE_ENABLE
-
-static uint16_t auto_buttons_timer;
-extern int tp_buttons; // mousekey button state set in action.c and used in ps2_mouse.c
-
-void ps2_mouse_moved_user(report_mouse_t *mouse_report) {
-    if (auto_buttons_timer) {
-        auto_buttons_timer = timer_read();
-    } else {
-        if (!tp_buttons) {
-            layer_on(MBO);
-            auto_buttons_timer = timer_read();
-        }
-    }
-}
-
-void matrix_scan_user(void) {
-    if (auto_buttons_timer && (timer_elapsed(auto_buttons_timer) > AUTO_BUTTONS_TIMEOUT)) {
-        if (!tp_buttons) {
-            layer_off(MBO);
-            auto_buttons_timer = 0;
-        }
-    }
-}
-
-#endif // defined AUTO_BUTTONS && defined PS2_MOUSE_ENABLE
-
-// Left-hand home row mods
-#define GUI_A LGUI_T(KC_A)
-#define ALT_R LALT_T(KC_R)
-#define SFT_S LSFT_T(KC_S)
-#define CTRL_T LCTL_T(KC_T)
-
-// Right-hand home row mods
-#define CTL_N RCTL_T(KC_N)
-#define SFT_E RSFT_T(KC_E)
-#define ALT_I LALT_T(KC_I)
-#define GUI_O LGUI_T(KC_O)
-
-#define NUM_SPC LT(NUM, KC_SPC)
-#define FN_ENT LT(FN, KC_ENT)
-#define SYM_BSP LT(SYM, KC_BSPC)
-
-const uint16_t PROGMEM arng_combo[] = {ALT_R, SFT_S, COMBO_END};
-const uint16_t PROGMEM adia_combo[] = {SFT_E, ALT_I, COMBO_END};
-const uint16_t PROGMEM odia_combo[] = {SE_U, SE_K, COMBO_END};
-
-combo_t key_combos[] = {
-	[WF_ARNG] = COMBO(arng_combo, SE_ARNG),
-	[EI_ADIA] = COMBO(adia_combo, SE_ADIA),
-	[UK_ODIA] = COMBO(odia_combo, SE_ODIA)
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [BASE] = LAYOUT_split_3x5_3(
- // BASE
-  //,--------------------------------------------,                    ,--------------------------------------------.
-         SE_Q,    SE_W,    SE_F,    SE_P,    SE_B,                         SE_Y,    SE_L,    SE_U,    SE_K, SE_QUOT,
-  //|--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------|
-        GUI_A,   ALT_R,   SFT_S,  CTRL_T,    SE_G,                         SE_M,   CTL_N,   SFT_E,   ALT_I,   GUI_O,
-  //|--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------|
-         SE_Z,    SE_X,    SE_C,    SE_D,    SE_V,                         SE_J,    SE_H, SE_COMM,  SE_DOT, SE_MINS,
-  //|--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------|
-                                  KC_ESC, NUM_SPC,  KC_TAB,     FN_ENT, SYM_BSP,  KC_DEL
-                             //`--------------------------'  '--------------------------'
-
-  ),
-
-
-  [MBO] = LAYOUT_split_3x5_3(
-  // Mouse
-  //,--------------------------------------------,                    ,--------------------------------------------.
-      _______, _______, _______, _______, _______,                      KC_BTN1, KC_BTN2, _______, _______, _______,
-  //|--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------|
-      _______, _______, _______, _______, _______,                      KC_BTN3, _______, _______, _______, _______,
-  //|--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------|
-      _______, _______, _______, _______, _______,                      _______, _______, _______, _______, _______,
-  //|--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------|
-                                 _______, _______, _______,    _______, KC_BSPC, _______
-                             //`--------------------------'  '--------------------------'
-
-  ),
-
-  [SYM] = LAYOUT_split_3x5_3(
-  // Symbols
-  //,--------------------------------------------,                    ,--------------------------------------------.
-      SE_SECT, SE_ACUT, SE_SLSH, SE_TILD, _______,                      _______, SE_PIPE, SE_BSLS, SE_DIAE, SE_CIRC,
-  //|--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------|
-      SE_EXLM,  SE_DLR, SE_LPRN, SE_LBRC, _______,                      _______, SE_RBRC, SE_RPRN, SE_HASH, SE_QUES,
-  //|--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------|
-      _______, SE_PERC, SE_LCBR, SE_LABK, _______,                      _______, SE_RABK, SE_RCBR, SE_AMPR, _______,
-  //|--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------|
-                                   SE_AT,  SE_EQL, SE_DQUO,    _______, _______, _______
-                             //`--------------------------'  '--------------------------'
-  ),
-
-  [NUM] = LAYOUT_split_3x5_3(
-  // Numbers
-  //,--------------------------------------------,                    ,--------------------------------------------.
-      _______, KC_MPRV, KC_MPLY, KC_MNXT, _______,                      _______,    SE_7,    SE_8,    SE_9, SE_QUOT,
-  //|--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------|
-      SE_PLUS, SE_MINS, SE_ASTR, SE_SLSH, SE_CIRC,                      _______,    SE_4,    SE_5,    SE_6, _______,
-  //|--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------|
-      _______, _______, KC_VOLD, KC_VOLU, _______,                       KC_SPC,    SE_1,    SE_2,    SE_3, _______,
-  //|--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------|
-                                 _______, _______, _______,    SE_COMM,   SE_0,  SE_DOT
-                             //`--------------------------'  '--------------------------'
-  ),
-
-  [FN] = LAYOUT_split_3x5_3(
-  // FN
-  //,--------------------------------------------,                    ,--------------------------------------------.
-      _______, _______, _______, _______, _______,                      _______,   KC_F7,   KC_F8,   KC_F9,  KC_F10,
-  //|--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------|
-      KC_LEFT, KC_DOWN,   KC_UP, KC_RGHT, _______,                      _______,   KC_F4,   KC_F5,   KC_F6,  KC_F11,
-  //|--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------|
-      _______, _______, _______, _______, _______,                      _______,   KC_F1,   KC_F2,   KC_F3,  KC_F12,
-  //|--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------|
-                                 KC_PSCR, KC_CAPS, _______,    _______, _______, _______
-                             //`--------------------------'  '--------------------------'
-  )
-};
diff --git a/keyboards/pierce/keymaps/durken1/rules.mk b/keyboards/pierce/keymaps/durken1/rules.mk
deleted file mode 100644
index bea18c02d1f..00000000000
--- a/keyboards/pierce/keymaps/durken1/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-EXTRAKEY_ENABLE = yes
-TRACKPOINT = yes
-AUTO_BUTTONS = yes
-COMBO_ENABLE = yes
diff --git a/keyboards/planck/ez/config.h b/keyboards/planck/ez/config.h
index 74d8d21155d..e4fa0924d3a 100644
--- a/keyboards/planck/ez/config.h
+++ b/keyboards/planck/ez/config.h
@@ -46,8 +46,8 @@
 // #define WS2812_TIM_CH 2
 // #define PORT_WS2812     GPIOA
 // #define PIN_WS2812      1
-// #define WS2812_DMA_STREAM STM32_DMA1_STREAM2  // DMA stream for TIMx_UP (look up in reference manual under DMA Channel selection)
-//#define WS2812_DMA_CHANNEL 7                  // DMA channel for TIMx_UP
+// #define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM2  // DMA stream for TIMx_UP (look up in reference manual under DMA Channel selection)
+//#define WS2812_PWM_DMA_CHANNEL 7                  // DMA channel for TIMx_UP
 //#define WS2812_EXTERNAL_PULLUP
 
 #define IS31FL3737_I2C_ADDRESS_1 IS31FL3737_I2C_ADDRESS_GND
diff --git a/keyboards/planck/ez/ez.c b/keyboards/planck/ez/ez.c
index 532558a2941..522fd700338 100644
--- a/keyboards/planck/ez/ez.c
+++ b/keyboards/planck/ez/ez.c
@@ -28,60 +28,60 @@ const is31fl3737_led_t PROGMEM g_is31fl3737_leds[IS31FL3737_LED_COUNT] = {
  *   |  |      G location
  *   |  |      |      B location
  *   |  |      |      | */
-    {0, B_12,  A_12,  C_12},
-    {0, B_11,  A_11,  C_11},
-    {0, B_10,  A_10,  C_10},
-    {0, B_9,   A_9,   C_9},
-    {0, B_8,   A_8,   C_8},
-    {0, B_7,   A_7,   C_7},
+    {0, SW2_CS12,  SW1_CS12,  SW3_CS12},
+    {0, SW2_CS11,  SW1_CS11,  SW3_CS11},
+    {0, SW2_CS10,  SW1_CS10,  SW3_CS10},
+    {0, SW2_CS9,   SW1_CS9,   SW3_CS9},
+    {0, SW2_CS8,   SW1_CS8,   SW3_CS8},
+    {0, SW2_CS7,   SW1_CS7,   SW3_CS7},
 
-    {0, H_12,  G_12,  I_12},
-    {0, H_11,  G_11,  I_11},
-    {0, H_10,  G_10,  I_10},
-    {0, H_9,   G_9,   I_9},
-    {0, H_8,   G_8,   I_8},
-    {0, H_7,   G_7,   I_7},
+    {0, SW8_CS12,  SW7_CS12,  SW9_CS12},
+    {0, SW8_CS11,  SW7_CS11,  SW9_CS11},
+    {0, SW8_CS10,  SW7_CS10,  SW9_CS10},
+    {0, SW8_CS9,   SW7_CS9,   SW9_CS9},
+    {0, SW8_CS8,   SW7_CS8,   SW9_CS8},
+    {0, SW8_CS7,   SW7_CS7,   SW9_CS7},
 
-    {0, B_6,   A_6,   C_6},
-    {0, B_5,   A_5,   C_5},
-    {0, B_4,   A_4,   C_4},
-    {0, B_3,   A_3,   C_3},
-    {0, B_2,   A_2,   C_2},
-    {0, B_1,   A_1,   C_1},
+    {0, SW2_CS6,   SW1_CS6,   SW3_CS6},
+    {0, SW2_CS5,   SW1_CS5,   SW3_CS5},
+    {0, SW2_CS4,   SW1_CS4,   SW3_CS4},
+    {0, SW2_CS3,   SW1_CS3,   SW3_CS3},
+    {0, SW2_CS2,   SW1_CS2,   SW3_CS2},
+    {0, SW2_CS1,   SW1_CS1,   SW3_CS1},
 
-    {0, H_6,   G_6,   I_6},
-    {0, H_5,   G_5,   I_5},
-    {0, H_4,   G_4,   I_4},
-    {0, H_3,   G_3,   I_3},
-    {0, H_2,   G_2,   I_2},
-    {0, H_1,   G_1,   I_1},
+    {0, SW8_CS6,   SW7_CS6,   SW9_CS6},
+    {0, SW8_CS5,   SW7_CS5,   SW9_CS5},
+    {0, SW8_CS4,   SW7_CS4,   SW9_CS4},
+    {0, SW8_CS3,   SW7_CS3,   SW9_CS3},
+    {0, SW8_CS2,   SW7_CS2,   SW9_CS2},
+    {0, SW8_CS1,   SW7_CS1,   SW9_CS1},
 
-    {0, E_12,  D_12,  F_12},
-    {0, E_11,  D_11,  F_11},
-    {0, E_10,  D_10,  F_10},
-    {0, E_9,   D_9,   F_9},
-    {0, E_8,   D_8,   F_8},
-    {0, E_7,   D_7,   F_7},
+    {0, SW5_CS12,  SW4_CS12,  SW6_CS12},
+    {0, SW5_CS11,  SW4_CS11,  SW6_CS11},
+    {0, SW5_CS10,  SW4_CS10,  SW6_CS10},
+    {0, SW5_CS9,   SW4_CS9,   SW6_CS9},
+    {0, SW5_CS8,   SW4_CS8,   SW6_CS8},
+    {0, SW5_CS7,   SW4_CS7,   SW6_CS7},
 
-    {0, K_12,  J_12,  L_12},
-    {0, K_11,  J_11,  L_11},
-    {0, K_10,  J_10,  L_10},
-    {0, K_9,   J_9,   L_9},
-    {0, K_8,   J_8,   L_8},
-    {0, K_7,   J_7,   L_7},
+    {0, SW11_CS12,  SW10_CS12,  SW12_CS12},
+    {0, SW11_CS11,  SW10_CS11,  SW12_CS11},
+    {0, SW11_CS10,  SW10_CS10,  SW12_CS10},
+    {0, SW11_CS9,   SW10_CS9,   SW12_CS9},
+    {0, SW11_CS8,   SW10_CS8,   SW12_CS8},
+    {0, SW11_CS7,   SW10_CS7,   SW12_CS7},
 
-    {0, E_6,   D_6,   F_6},
-    {0, E_5,   D_5,   F_5},
-    {0, E_4,   D_4,   F_4},
-    {0, E_3,   D_3,   F_3},
-    {0, E_2,   D_2,   F_2},
-    {0, E_1,   D_1,   F_1},
+    {0, SW5_CS6,   SW4_CS6,   SW6_CS6},
+    {0, SW5_CS5,   SW4_CS5,   SW6_CS5},
+    {0, SW5_CS4,   SW4_CS4,   SW6_CS4},
+    {0, SW5_CS3,   SW4_CS3,   SW6_CS3},
+    {0, SW5_CS2,   SW4_CS2,   SW6_CS2},
+    {0, SW5_CS1,   SW4_CS1,   SW6_CS1},
 
-    {0, K_6,   J_6,   L_6},
-    {0, K_5,   J_5,   L_5},
-    {0, K_4,   J_4,   L_4},
-    {0, K_3,   J_3,   L_3},
-    {0, K_2,   J_2,   L_2},
+    {0, SW11_CS6,   SW10_CS6,   SW12_CS6},
+    {0, SW11_CS5,   SW10_CS5,   SW12_CS5},
+    {0, SW11_CS4,   SW10_CS4,   SW12_CS4},
+    {0, SW11_CS3,   SW10_CS3,   SW12_CS3},
+    {0, SW11_CS2,   SW10_CS2,   SW12_CS2},
 
 };
 
diff --git a/keyboards/planck/rev6/config.h b/keyboards/planck/rev6/config.h
index 7fec8be56bc..0935fad3588 100644
--- a/keyboards/planck/rev6/config.h
+++ b/keyboards/planck/rev6/config.h
@@ -46,5 +46,5 @@
 #define WS2812_PWM_DRIVER PWMD2
 #define WS2812_PWM_CHANNEL 2
 #define WS2812_PWM_PAL_MODE 1
-#define WS2812_DMA_STREAM STM32_DMA1_STREAM2
-#define WS2812_DMA_CHANNEL 2
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM2
+#define WS2812_PWM_DMA_CHANNEL 2
diff --git a/keyboards/planck/rev6_drop/config.h b/keyboards/planck/rev6_drop/config.h
index 7fec8be56bc..0935fad3588 100644
--- a/keyboards/planck/rev6_drop/config.h
+++ b/keyboards/planck/rev6_drop/config.h
@@ -46,5 +46,5 @@
 #define WS2812_PWM_DRIVER PWMD2
 #define WS2812_PWM_CHANNEL 2
 #define WS2812_PWM_PAL_MODE 1
-#define WS2812_DMA_STREAM STM32_DMA1_STREAM2
-#define WS2812_DMA_CHANNEL 2
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM2
+#define WS2812_PWM_DMA_CHANNEL 2
diff --git a/keyboards/planck/rev7/config.h b/keyboards/planck/rev7/config.h
index a5e49c8a532..9ccbf4cc8a8 100644
--- a/keyboards/planck/rev7/config.h
+++ b/keyboards/planck/rev7/config.h
@@ -27,8 +27,8 @@
 #define WS2812_PWM_DRIVER PWMD2
 #define WS2812_PWM_CHANNEL 2
 #define WS2812_PWM_PAL_MODE 1
-#define WS2812_DMA_STREAM STM32_DMA1_STREAM2
-#define WS2812_DMA_CHANNEL 2
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM2
+#define WS2812_PWM_DMA_CHANNEL 2
 
 /*
  * Feature disable options
diff --git a/keyboards/planck/rev7/info.json b/keyboards/planck/rev7/info.json
index 2275965ebda..d674af98d17 100644
--- a/keyboards/planck/rev7/info.json
+++ b/keyboards/planck/rev7/info.json
@@ -26,7 +26,14 @@
   },
   "encoder": {
     "rotary": [
-      {"pin_a": "B12", "pin_b": "B13"}
+        {"pin_a": "B12", "pin_b": "B13"},
+        {"pin_a": "B12", "pin_b": "B13"},
+        {"pin_a": "B12", "pin_b": "B13"},
+        {"pin_a": "B12", "pin_b": "B13"},
+        {"pin_a": "B12", "pin_b": "B13"},
+        {"pin_a": "B12", "pin_b": "B13"},
+        {"pin_a": "B12", "pin_b": "B13"},
+        {"pin_a": "B12", "pin_b": "B13"}
     ]
   },
   "features": {
diff --git a/keyboards/planck/rev7/matrix.c b/keyboards/planck/rev7/matrix.c
index c89c399a40d..350ce93ce04 100644
--- a/keyboards/planck/rev7/matrix.c
+++ b/keyboards/planck/rev7/matrix.c
@@ -32,31 +32,16 @@
 #define STM32_IWDG_RL_MS(s) STM32_IWDG_RL_US(s * 1000.0)
 #define STM32_IWDG_RL_S(s) STM32_IWDG_RL_US(s * 1000000.0)
 
-#if !defined(PLANCK_ENCODER_RESOLUTION)
-#    define PLANCK_ENCODER_RESOLUTION 4
-#endif
-
 #if !defined(PLANCK_WATCHDOG_TIMEOUT)
 #   define PLANCK_WATCHDOG_TIMEOUT 1.0
 #endif
 
-#ifdef ENCODER_MAP_ENABLE
-#error "The encoder map feature is not currently supported by the Planck's encoder matrix"
-#endif
-
 /* matrix state(1:on, 0:off) */
 static pin_t matrix_row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
 static pin_t matrix_col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
 
 static matrix_row_t matrix_inverted[MATRIX_COLS];
 
-#ifdef ENCODER_ENABLE
-int8_t  encoder_LUT[]     = {0, -1, 1, 0, 1, 0, 0, -1, -1, 0, 0, 1, 0, 1, -1, 0};
-uint8_t encoder_state[8]  = {0};
-int8_t  encoder_pulses[8] = {0};
-uint8_t encoder_value[8]  = {0};
-#endif
-
 void matrix_init_custom(void) {
     // actual matrix setup - cols
     for (int i = 0; i < MATRIX_COLS; i++) {
@@ -84,31 +69,6 @@ void matrix_init_custom(void) {
 #endif
 }
 
-#ifdef ENCODER_ENABLE
-bool encoder_update(uint8_t index, uint8_t state) {
-    bool    changed = false;
-    uint8_t i       = index;
-
-    encoder_pulses[i] += encoder_LUT[state & 0xF];
-
-    if (encoder_pulses[i] >= PLANCK_ENCODER_RESOLUTION) {
-        encoder_value[index]++;
-        changed = true;
-        encoder_update_kb(index, false);
-    }
-    if (encoder_pulses[i] <= -PLANCK_ENCODER_RESOLUTION) {
-        encoder_value[index]--;
-        changed = true;
-        encoder_update_kb(index, true);
-    }
-    encoder_pulses[i] %= PLANCK_ENCODER_RESOLUTION;
-#ifdef ENCODER_DEFAULT_POS
-    encoder_pulses[i] = 0;
-#endif
-    return changed;
-}
-#endif
-
 bool matrix_scan_custom(matrix_row_t current_matrix[]) {
 #ifndef PLANCK_WATCHDOG_DISABLE
     // reset watchdog
@@ -149,40 +109,16 @@ bool matrix_scan_custom(matrix_row_t current_matrix[]) {
         changed |= old != current_matrix[row];
     }
 
-#ifdef ENCODER_ENABLE
-    // encoder-matrix functionality
-
-    // set up C/rows for encoder read
-    for (int i = 0; i < MATRIX_ROWS; i++) {
-        setPinOutput(matrix_row_pins[i]);
-        writePinHigh(matrix_row_pins[i]);
-    }
-
-    // set up A & B for reading
-    setPinInputHigh(B12);
-    setPinInputHigh(B13);
-
-    for (int i = 0; i < MATRIX_ROWS; i++) {
-        writePinLow(matrix_row_pins[i]);
-        wait_us(10);
-        uint8_t new_status = (palReadPad(GPIOB, 12) << 0) | (palReadPad(GPIOB, 13) << 1);
-        if ((encoder_state[i] & 0x3) != new_status) {
-            encoder_state[i] <<= 2;
-            encoder_state[i] |= new_status;
-            encoder_update(i, encoder_state[i]);
-        }
-        writePinHigh(matrix_row_pins[i]);
-    }
-
-    // revert A & B to matrix state
-    setPinInputLow(B12);
-    setPinInputLow(B13);
-
-    // revert C/rows to matrix state
-    for (int i = 0; i < MATRIX_ROWS; i++) {
-        setPinInputLow(matrix_row_pins[i]);
-    }
-#endif
-
     return changed;
 }
+
+uint8_t encoder_quadrature_read_pin(uint8_t index, bool pad_b) {
+    pin_t pin = pad_b ? B13: B12;
+    setPinInputHigh(pin);
+    writePinLow(matrix_row_pins[index]);
+    wait_us(10);
+    uint8_t ret = readPin(pin) ? 1 : 0;
+    setPinInputLow(matrix_row_pins[index]);
+    setPinInputLow(pin);
+    return ret;
+}
diff --git a/keyboards/playkbtw/pk60/keymaps/rfvizarra/keymap.c b/keyboards/playkbtw/pk60/keymaps/rfvizarra/keymap.c
deleted file mode 100644
index b6988e1cdc5..00000000000
--- a/keyboards/playkbtw/pk60/keymaps/rfvizarra/keymap.c
+++ /dev/null
@@ -1,29 +0,0 @@
-#include QMK_KEYBOARD_H
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    [0] = LAYOUT_minila(
-        KC_ESC,  KC_1,    KC_2,     KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRAVE, KC_BSPC,
-        KC_TAB,  KC_Q,    KC_W,     KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
-        KC_CAPS, KC_A,    KC_S,     KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
-        KC_LSFT, KC_Z,    KC_X,     KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT, KC_UP,   KC_DEL,
-        KC_LCTL, KC_LGUI, KC_LALT,  MO(1),                              KC_SPC,  MO(2),   KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT
-    ),
-
-    [1] = LAYOUT_minila(
-        QK_BOOT, KC_F1,    KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______,
-        _______, RGB_TOG,  RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______,
-        _______, RGB_MOD,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, RGB_RMOD, _______, BL_DOWN, BL_TOGG, BL_UP,   _______, _______, _______, _______, _______, _______, KC_VOLU, _______,
-        _______, _______,  _______, _______,                            _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_MPLY 
-    ),
-
-    [2] = LAYOUT_minila(
-        _______, KC_F1,    KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______,
-        _______, RGB_TOG,  RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______,
-        _______, RGB_MOD,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, RGB_RMOD, _______, BL_DOWN, BL_TOGG, BL_UP,   _______, _______, _______, _______, _______, _______, KC_PGUP, _______,
-        _______, _______,  _______, _______,                            _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END 
-    ),
-};
diff --git a/keyboards/playkbtw/pk60/keymaps/rfvizarra/readme.md b/keyboards/playkbtw/pk60/keymaps/rfvizarra/readme.md
deleted file mode 100644
index cd9a2210879..00000000000
--- a/keyboards/playkbtw/pk60/keymaps/rfvizarra/readme.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# A personal keymap for Play Keyboard60 based on the minila layout
-
-![Mininla layout](https://i.imgur.com/K7ONE1k.jpg)
-
-To build the firmware use
-
-    make playkbtw/pk60:rfvizarra
-
-or if you prefer to use docker
-
-    util/docker_build.sh playkbtw/pk60:rfvizarra
diff --git a/keyboards/playkbtw/pk64rgb/pk64rgb.c b/keyboards/playkbtw/pk64rgb/pk64rgb.c
index 17b8c74b182..b745c82b9d5 100644
--- a/keyboards/playkbtw/pk64rgb/pk64rgb.c
+++ b/keyboards/playkbtw/pk64rgb/pk64rgb.c
@@ -25,74 +25,74 @@ const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
  *   |  |      |      B location
  *   |  |      |      | */
 
-   {0, A_1,   B_1,   C_1},
-   {0, D_1,   E_1,   F_1},
-   {0, G_1,   H_1,   I_1},
-   {0, J_1,   K_1,   L_1},
-   {0, A_6,   B_6,   C_6},
-   {0, D_6,   E_6,   F_6},
-   {0, G_6,   H_6,   I_6},
-   {0, J_6,   K_6,   L_6},
-   {0, A_11,  B_11,  C_11},
-   {0, D_11,  E_11,  F_11},
-   {0, G_11,  H_11,  I_11},
-   {0, J_11,  K_11,  L_11},
-   {0, A_16,  B_16,  C_16},
-   {0, D_16,  E_16,  F_16},
+   {0, SW1_CS1,   SW2_CS1,   SW3_CS1},
+   {0, SW4_CS1,   SW5_CS1,   SW6_CS1},
+   {0, SW7_CS1,   SW8_CS1,   SW9_CS1},
+   {0, SW10_CS1,   SW11_CS1,   SW12_CS1},
+   {0, SW1_CS6,   SW2_CS6,   SW3_CS6},
+   {0, SW4_CS6,   SW5_CS6,   SW6_CS6},
+   {0, SW7_CS6,   SW8_CS6,   SW9_CS6},
+   {0, SW10_CS6,   SW11_CS6,   SW12_CS6},
+   {0, SW1_CS11,  SW2_CS11,  SW3_CS11},
+   {0, SW4_CS11,  SW5_CS11,  SW6_CS11},
+   {0, SW7_CS11,  SW8_CS11,  SW9_CS11},
+   {0, SW10_CS11,  SW11_CS11,  SW12_CS11},
+   {0, SW1_CS16,  SW2_CS16,  SW3_CS16},
+   {0, SW4_CS16,  SW5_CS16,  SW6_CS16},
       
-   {0, A_2,   B_2,   C_2},
-   {0, D_2,   E_2,   F_2},
-   {0, G_2,   H_2,   I_2},
-   {0, J_2,   K_2,   L_2},
-   {0, A_7,   B_7,   C_7},
-   {0, D_7,   E_7,   F_7},
-   {0, G_7,   H_7,   I_7},
-   {0, J_7,   K_7,   L_7},
-   {0, A_12,  B_12,  C_12},
-   {0, D_12,  E_12,  F_12},
-   {0, G_12,  H_12,  I_12},
-   {0, J_12,  K_12,  L_12},
-   {0, G_16,  H_16,  I_16},
-   {0, J_16,  K_16,  L_16},
+   {0, SW1_CS2,   SW2_CS2,   SW3_CS2},
+   {0, SW4_CS2,   SW5_CS2,   SW6_CS2},
+   {0, SW7_CS2,   SW8_CS2,   SW9_CS2},
+   {0, SW10_CS2,   SW11_CS2,   SW12_CS2},
+   {0, SW1_CS7,   SW2_CS7,   SW3_CS7},
+   {0, SW4_CS7,   SW5_CS7,   SW6_CS7},
+   {0, SW7_CS7,   SW8_CS7,   SW9_CS7},
+   {0, SW10_CS7,   SW11_CS7,   SW12_CS7},
+   {0, SW1_CS12,  SW2_CS12,  SW3_CS12},
+   {0, SW4_CS12,  SW5_CS12,  SW6_CS12},
+   {0, SW7_CS12,  SW8_CS12,  SW9_CS12},
+   {0, SW10_CS12,  SW11_CS12,  SW12_CS12},
+   {0, SW7_CS16,  SW8_CS16,  SW9_CS16},
+   {0, SW10_CS16,  SW11_CS16,  SW12_CS16},
 
-   {0, A_3,   B_3,   C_3},
-   {0, D_3,   E_3,   F_3},
-   {0, G_3,   H_3,   I_3},
-   {0, J_3,   K_3,   L_3},
-   {0, A_8,   B_8,   C_8},
-   {0, D_8,   E_8,   F_8},
-   {0, G_8,   H_8,   I_8},
-   {0, J_8,   K_8,   L_8},
-   {0, A_13,  B_13,  C_13},
-   {0, D_13,  E_13,  F_13},
-   {0, G_13,  H_13,  I_13},
-   {0, J_13,  K_13,  L_13},
-   {0, A_15,  B_15,  C_15},
+   {0, SW1_CS3,   SW2_CS3,   SW3_CS3},
+   {0, SW4_CS3,   SW5_CS3,   SW6_CS3},
+   {0, SW7_CS3,   SW8_CS3,   SW9_CS3},
+   {0, SW10_CS3,   SW11_CS3,   SW12_CS3},
+   {0, SW1_CS8,   SW2_CS8,   SW3_CS8},
+   {0, SW4_CS8,   SW5_CS8,   SW6_CS8},
+   {0, SW7_CS8,   SW8_CS8,   SW9_CS8},
+   {0, SW10_CS8,   SW11_CS8,   SW12_CS8},
+   {0, SW1_CS13,  SW2_CS13,  SW3_CS13},
+   {0, SW4_CS13,  SW5_CS13,  SW6_CS13},
+   {0, SW7_CS13,  SW8_CS13,  SW9_CS13},
+   {0, SW10_CS13,  SW11_CS13,  SW12_CS13},
+   {0, SW1_CS15,  SW2_CS15,  SW3_CS15},
 
-   {0, A_4,   B_4,   C_4},
-   {0, D_4,   E_4,   F_4},
-   {0, G_4,   H_4,   I_4},
-   {0, J_4,   K_4,   L_4},
-   {0, A_9,   B_9,   C_9},
-   {0, D_9,   E_9,   F_9},
-   {0, G_9,   H_9,   I_9},
-   {0, J_9,   K_9,   L_9},
-   {0, A_14,  B_14,  C_14},
-   {0, D_14,  E_14,  F_14},
-   {0, G_14,  H_14,  I_14},
-   {0, J_14,  K_14,  L_14},
-   {0, D_15,  E_15,  F_15},
-   {0, G_15,  H_15,  I_15},
+   {0, SW1_CS4,   SW2_CS4,   SW3_CS4},
+   {0, SW4_CS4,   SW5_CS4,   SW6_CS4},
+   {0, SW7_CS4,   SW8_CS4,   SW9_CS4},
+   {0, SW10_CS4,   SW11_CS4,   SW12_CS4},
+   {0, SW1_CS9,   SW2_CS9,   SW3_CS9},
+   {0, SW4_CS9,   SW5_CS9,   SW6_CS9},
+   {0, SW7_CS9,   SW8_CS9,   SW9_CS9},
+   {0, SW10_CS9,   SW11_CS9,   SW12_CS9},
+   {0, SW1_CS14,  SW2_CS14,  SW3_CS14},
+   {0, SW4_CS14,  SW5_CS14,  SW6_CS14},
+   {0, SW7_CS14,  SW8_CS14,  SW9_CS14},
+   {0, SW10_CS14,  SW11_CS14,  SW12_CS14},
+   {0, SW4_CS15,  SW5_CS15,  SW6_CS15},
+   {0, SW7_CS15,  SW8_CS15,  SW9_CS15},
 
-   {0, A_5,   B_5,   C_5},
-   {0, D_5,   E_5,   F_5},
-   {0, G_5,   H_5,   I_5},
-   {0, J_5,   K_5,   L_5},
-   {0, A_10,  B_10,  C_10},
-   {0, D_10,  E_10,  F_10},
-   {0, G_10,  H_10,  I_10},
-   {0, J_10,  K_10,  L_10},
-   {0, J_15,  K_15,  L_15}
+   {0, SW1_CS5,   SW2_CS5,   SW3_CS5},
+   {0, SW4_CS5,   SW5_CS5,   SW6_CS5},
+   {0, SW7_CS5,   SW8_CS5,   SW9_CS5},
+   {0, SW10_CS5,   SW11_CS5,   SW12_CS5},
+   {0, SW1_CS10,  SW2_CS10,  SW3_CS10},
+   {0, SW4_CS10,  SW5_CS10,  SW6_CS10},
+   {0, SW7_CS10,  SW8_CS10,  SW9_CS10},
+   {0, SW10_CS10,  SW11_CS10,  SW12_CS10},
+   {0, SW10_CS15,  SW11_CS15,  SW12_CS15}
 };
 
 led_config_t g_led_config = {{
diff --git a/keyboards/ploopyco/mouse/config.h b/keyboards/ploopyco/mouse/config.h
index 94bd6ef6af6..86af11fc94b 100644
--- a/keyboards/ploopyco/mouse/config.h
+++ b/keyboards/ploopyco/mouse/config.h
@@ -32,3 +32,6 @@
 
 /* PMW33XX Settings */
 #define PMW33XX_CS_PIN B0
+
+/* Custom encoder needs to specify just how many encoders we have */
+#define NUM_ENCODERS 1
diff --git a/keyboards/ploopyco/mouse/info.json b/keyboards/ploopyco/mouse/info.json
index 5dc53392ff2..1f110aad71f 100644
--- a/keyboards/ploopyco/mouse/info.json
+++ b/keyboards/ploopyco/mouse/info.json
@@ -31,6 +31,12 @@
             ["D4", "D2", "E6", "B6", "D7", "C6", "C7", "B7"]
         ]
     },
+    "features": {
+        "encoder": true
+    },
+    "encoder": {
+        "driver": "custom"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/ploopyco/mouse/mouse.c b/keyboards/ploopyco/mouse/mouse.c
index e2dada4a155..5f4a82e474c 100644
--- a/keyboards/ploopyco/mouse/mouse.c
+++ b/keyboards/ploopyco/mouse/mouse.c
@@ -66,8 +66,6 @@ uint8_t  OptLowPin         = OPT_ENC1;
 bool     debug_encoder     = false;
 bool     is_drag_scroll    = false;
 
-__attribute__((weak)) bool encoder_update_user(uint8_t index, bool clockwise) { return true; }
-
 bool encoder_update_kb(uint8_t index, bool clockwise) {
     if (!encoder_update_user(index, clockwise)) {
         return false;
@@ -83,7 +81,14 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
     return true;
 }
 
-void process_wheel(void) {
+void encoder_driver_init(void) {
+    setPinInput(OPT_ENC1);
+    setPinInput(OPT_ENC2);
+
+    opt_encoder_init();
+}
+
+void encoder_driver_task(void) {
     // Lovingly ripped from the Ploopy Source
 
     // If the mouse wheel was just released, do not scroll.
@@ -111,12 +116,10 @@ void process_wheel(void) {
     int dir = opt_encoder_handler(p1, p2);
 
     if (dir == 0) return;
-    encoder_update_kb(0, dir > 0);
+    encoder_queue_event(0, dir == 1);
 }
 
 report_mouse_t pointing_device_task_kb(report_mouse_t mouse_report) {
-    process_wheel();
-
     if (is_drag_scroll) {
         mouse_report.h = mouse_report.x;
 #ifdef PLOOPY_DRAGSCROLL_INVERT
@@ -177,9 +180,6 @@ void keyboard_pre_init_kb(void) {
     // debug_mouse   = true;
     // debug_encoder = true;
 
-    setPinInput(OPT_ENC1);
-    setPinInput(OPT_ENC2);
-
     /* Ground all output pins connected to ground. This provides additional
      * pathways to ground. If you're messing with this, know this: driving ANY
      * of these pins high will cause a short. On the MCU. Ka-blooey.
@@ -204,8 +204,6 @@ void keyboard_pre_init_kb(void) {
 
 void pointing_device_init_kb(void) {
     pointing_device_set_cpi(dpi_array[keyboard_config.dpi_config]);
-    // initialize the scroll wheel's optical encoder
-    opt_encoder_init();
 }
 
 void eeconfig_init_kb(void) {
diff --git a/keyboards/ploopyco/mouse/rules.mk b/keyboards/ploopyco/mouse/rules.mk
index 17df9cc3c90..63569507805 100644
--- a/keyboards/ploopyco/mouse/rules.mk
+++ b/keyboards/ploopyco/mouse/rules.mk
@@ -16,9 +16,6 @@ POINTING_DEVICE_ENABLE = yes
 POINTING_DEVICE_DRIVER = pmw3360
 MOUSEKEY_ENABLE = yes       # Mouse keys
 
-ENCODER_ENABLE := no
-OPTS_DEF += -DENCODER_ENABLE
-
 ANALOG_DRIVER_REQUIRED = yes
 
 SRC += opt_encoder.c
diff --git a/keyboards/ploopyco/trackball/config.h b/keyboards/ploopyco/trackball/config.h
index de0ed1ebece..a1f3695d815 100644
--- a/keyboards/ploopyco/trackball/config.h
+++ b/keyboards/ploopyco/trackball/config.h
@@ -31,3 +31,6 @@
 /* PMW33XX Settings */
 #define PMW33XX_CS_PIN             B0
 #define POINTING_DEVICE_INVERT_Y
+
+/* Custom encoder needs to specify just how many encoders we have */
+#define NUM_ENCODERS 1
diff --git a/keyboards/ploopyco/trackball/info.json b/keyboards/ploopyco/trackball/info.json
index 2c30755aa1e..110264ef1c6 100644
--- a/keyboards/ploopyco/trackball/info.json
+++ b/keyboards/ploopyco/trackball/info.json
@@ -12,6 +12,12 @@
     "bootmagic": {
         "matrix": [0, 3]
     },
+    "features": {
+        "encoder": true
+    },
+    "encoder": {
+        "driver": "custom"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/ploopyco/trackball/rules.mk b/keyboards/ploopyco/trackball/rules.mk
index ce7c4f29c86..ca1a8fd17a1 100644
--- a/keyboards/ploopyco/trackball/rules.mk
+++ b/keyboards/ploopyco/trackball/rules.mk
@@ -16,9 +16,6 @@ POINTING_DEVICE_ENABLE = yes
 POINTING_DEVICE_DRIVER = pmw3360
 MOUSEKEY_ENABLE = yes       # Mouse keys
 
-ENCODER_ENABLE := no
-OPTS_DEF += -DENCODER_ENABLE
-
 ANALOG_DRIVER_REQUIRED = yes
 
 SRC += opt_encoder.c
diff --git a/keyboards/ploopyco/trackball/trackball.c b/keyboards/ploopyco/trackball/trackball.c
index 8fd5b8650d3..0c606bab070 100644
--- a/keyboards/ploopyco/trackball/trackball.c
+++ b/keyboards/ploopyco/trackball/trackball.c
@@ -66,8 +66,6 @@ uint8_t  OptLowPin         = OPT_ENC1;
 bool     debug_encoder     = false;
 bool     is_drag_scroll    = false;
 
-__attribute__((weak)) bool encoder_update_user(uint8_t index, bool clockwise) { return true; }
-
 bool encoder_update_kb(uint8_t index, bool clockwise) {
     if (!encoder_update_user(index, clockwise)) {
         return false;
@@ -83,7 +81,15 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
     return true;
 }
 
-void process_wheel(void) {
+
+void encoder_driver_init(void) {
+    setPinInput(OPT_ENC1);
+    setPinInput(OPT_ENC2);
+
+    opt_encoder_init();
+}
+
+void encoder_driver_task(void) {
     // TODO: Replace this with interrupt driven code,  polling is S L O W
     // Lovingly ripped from the Ploopy Source
 
@@ -112,11 +118,10 @@ void process_wheel(void) {
     int dir = opt_encoder_handler(p1, p2);
 
     if (dir == 0) return;
-    encoder_update_kb(0, dir > 0);
+    encoder_queue_event(0, dir == 1);
 }
 
 report_mouse_t pointing_device_task_kb(report_mouse_t mouse_report) {
-    process_wheel();
 
     if (is_drag_scroll) {
 #ifdef PLOOPY_DRAGSCROLL_H_INVERT
@@ -189,9 +194,6 @@ void keyboard_pre_init_kb(void) {
     // debug_mouse   = true;
     // debug_encoder = true;
 
-    setPinInput(OPT_ENC1);
-    setPinInput(OPT_ENC2);
-
     /* Ground all output pins connected to ground. This provides additional
      * pathways to ground. If you're messing with this, know this: driving ANY
      * of these pins high will cause a short. On the MCU. Ka-blooey.
@@ -216,8 +218,6 @@ void keyboard_pre_init_kb(void) {
 
 void pointing_device_init_kb(void) {
     pointing_device_set_cpi(dpi_array[keyboard_config.dpi_config]);
-    // initialize the scroll wheel's optical encoder
-    opt_encoder_init();
 }
 
 void eeconfig_init_kb(void) {
diff --git a/keyboards/ploopyco/trackball_mini/config.h b/keyboards/ploopyco/trackball_mini/config.h
index 789deb5a5f1..6b92563fa9e 100644
--- a/keyboards/ploopyco/trackball_mini/config.h
+++ b/keyboards/ploopyco/trackball_mini/config.h
@@ -32,3 +32,6 @@
 #define ADNS5050_CS_PIN           B4
 
 #define POINTING_DEVICE_ROTATION_270
+
+/* Custom encoder needs to specify just how many encoders we have */
+#define NUM_ENCODERS 1
diff --git a/keyboards/ploopyco/trackball_mini/info.json b/keyboards/ploopyco/trackball_mini/info.json
index 301c8d18ec5..0e7b12d20d3 100644
--- a/keyboards/ploopyco/trackball_mini/info.json
+++ b/keyboards/ploopyco/trackball_mini/info.json
@@ -14,6 +14,12 @@
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "features": {
+        "encoder": true
+    },
+    "encoder": {
+        "driver": "custom"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/ploopyco/trackball_mini/rules.mk b/keyboards/ploopyco/trackball_mini/rules.mk
index bcede0676ca..d2bacc39740 100644
--- a/keyboards/ploopyco/trackball_mini/rules.mk
+++ b/keyboards/ploopyco/trackball_mini/rules.mk
@@ -13,9 +13,6 @@ POINTING_DEVICE_ENABLE = yes
 POINTING_DEVICE_DRIVER = adns5050
 MOUSEKEY_ENABLE = yes        # Mouse keys
 
-ENCODER_ENABLE := no
-OPTS_DEF += -DENCODER_ENABLE
-
 ANALOG_DRIVER_REQUIRED = yes
 
 SRC += opt_encoder.c
diff --git a/keyboards/ploopyco/trackball_mini/trackball_mini.c b/keyboards/ploopyco/trackball_mini/trackball_mini.c
index 8bc0ab99c23..8517a54e708 100644
--- a/keyboards/ploopyco/trackball_mini/trackball_mini.c
+++ b/keyboards/ploopyco/trackball_mini/trackball_mini.c
@@ -74,8 +74,6 @@ uint8_t  OptLowPin         = OPT_ENC1;
 bool     debug_encoder     = false;
 bool     is_drag_scroll    = false;
 
-__attribute__((weak)) bool encoder_update_user(uint8_t index, bool clockwise) { return true; }
-
 bool encoder_update_kb(uint8_t index, bool clockwise) {
     if (!encoder_update_user(index, clockwise)) {
         return false;
@@ -91,7 +89,14 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
     return true;
 }
 
-void process_wheel(void) {
+void encoder_driver_init(void) {
+    setPinInput(OPT_ENC1);
+    setPinInput(OPT_ENC2);
+
+    opt_encoder_init();
+}
+
+void encoder_driver_task(void) {
     uint16_t p1 = adc_read(OPT_ENC1_MUX);
     uint16_t p2 = adc_read(OPT_ENC2_MUX);
 
@@ -113,21 +118,17 @@ void process_wheel(void) {
     }
 
     if (dir == 0) return;
-    encoder_update_kb(0, dir > 0);
+    encoder_queue_event(0, dir == 1);
 
     lastScroll = timer_read();
 }
 
 void pointing_device_init_kb(void) {
-    opt_encoder_init();
-
     // set the DPI.
     pointing_device_set_cpi(dpi_array[keyboard_config.dpi_config]);
 }
 
 report_mouse_t pointing_device_task_kb(report_mouse_t mouse_report) {
-    process_wheel();
-
     if (is_drag_scroll) {
         mouse_report.h = mouse_report.x;
 #ifdef PLOOPY_DRAGSCROLL_INVERT
@@ -180,9 +181,6 @@ void keyboard_pre_init_kb(void) {
     // debug_mouse = true;
     // debug_encoder = true;
 
-    setPinInput(OPT_ENC1);
-    setPinInput(OPT_ENC2);
-
     /* Ground all output pins connected to ground. This provides additional
      * pathways to ground. If you're messing with this, know this: driving ANY
      * of these pins high will cause a short. On the MCU. Ka-blooey.
diff --git a/keyboards/ploopyco/trackball_nano/keymaps/maddie/keymap.c b/keyboards/ploopyco/trackball_nano/keymaps/maddie/keymap.c
deleted file mode 100644
index 370eb95aa03..00000000000
--- a/keyboards/ploopyco/trackball_nano/keymaps/maddie/keymap.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/* Copyright 2021 Colin Lam (Ploopy Corporation)
- * Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
- * Copyright 2019 Sunjun Kim
- * Copyright 2019 Hiroyuki Okada
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-
-// Configuration options
-#define SCROLL_TIMEOUT 25
-#define DELTA_X_THRESHOLD 60
-#define DELTA_Y_THRESHOLD 15
-
-bool scroll_enabled = false;
-bool lock_state     = false;
-
-// State
-static int8_t delta_x = 0;
-static int8_t delta_y = 0;
-
-// Dummy
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {{{ KC_NO }}};
-
-report_mouse_t pointing_device_task_user(report_mouse_t mouse_report) {
-    if (scroll_enabled) {
-        delta_x += mouse_report.x;
-        delta_y += mouse_report.y;
-
-        if (delta_x > DELTA_X_THRESHOLD) {
-            mouse_report.h = 1;
-            delta_x        = 0;
-        } else if (delta_x < -DELTA_X_THRESHOLD) {
-            mouse_report.h = -1;
-            delta_x        = 0;
-        }
-
-        if (delta_y > DELTA_Y_THRESHOLD) {
-            mouse_report.v = -1;
-            delta_y        = 0;
-        } else if (delta_y < -DELTA_Y_THRESHOLD) {
-            mouse_report.v = 1;
-            delta_y        = 0;
-        }
-        mouse_report.x = 0;
-        mouse_report.y = 0;
-    }
-    return mouse_report;
-}
-
-void keyboard_post_init_user(void) {
-	lock_state = host_keyboard_led_state().num_lock;
-}
-
-bool led_update_user(led_t led_state) {
-	static uint8_t lock_count = 0;
-	static uint16_t scroll_timer = 0;
-
-	if (timer_elapsed(scroll_timer) > SCROLL_TIMEOUT) {
-		scroll_timer = timer_read();
-		lock_count = 0;
-	}
-
-	if (led_state.num_lock != lock_state) {
-		lock_count++;
-
-		if (lock_count == 2) {
-			scroll_enabled = !scroll_enabled;
-			lock_count = 0;
-		}
-	}
-
-	lock_state = led_state.num_lock;
-	return true;
-}
diff --git a/keyboards/ploopyco/trackball_nano/keymaps/maddie/readme.md b/keyboards/ploopyco/trackball_nano/keymaps/maddie/readme.md
deleted file mode 100644
index 3a597e38d81..00000000000
--- a/keyboards/ploopyco/trackball_nano/keymaps/maddie/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-toggles scroll mode when numlock is double-tapped within 25ms. add a macro or something, unless you have ungodly fast fingers.
diff --git a/keyboards/ploopyco/trackball_thumb/config.h b/keyboards/ploopyco/trackball_thumb/config.h
index 8fc084c38ce..316755f6866 100644
--- a/keyboards/ploopyco/trackball_thumb/config.h
+++ b/keyboards/ploopyco/trackball_thumb/config.h
@@ -31,3 +31,6 @@
 
 /* PMW3360 Settings */
 #define POINTING_DEVICE_CS_PIN B0
+
+/* Custom encoder needs to specify just how many encoders we have */
+#define NUM_ENCODERS 1
diff --git a/keyboards/ploopyco/trackball_thumb/info.json b/keyboards/ploopyco/trackball_thumb/info.json
index 72e236a5bbf..e27bf472521 100644
--- a/keyboards/ploopyco/trackball_thumb/info.json
+++ b/keyboards/ploopyco/trackball_thumb/info.json
@@ -18,7 +18,10 @@
         "mousekey": true,
         "nkro": true,
         "pointing_device": true,
-        "encoder": false
+        "encoder": true
+    },
+    "encoder": {
+        "driver": "custom"
     },
     "layouts": {
         "LAYOUT": {
diff --git a/keyboards/ploopyco/trackball_thumb/post_rules.mk b/keyboards/ploopyco/trackball_thumb/post_rules.mk
deleted file mode 100644
index d922afd9cd7..00000000000
--- a/keyboards/ploopyco/trackball_thumb/post_rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# Force encoder to be disabled
-# But enable the defines for it
-ENCODER_ENABLE := no
-OPT_DEFS += -DENCODER_ENABLE
diff --git a/keyboards/ploopyco/trackball_thumb/trackball_thumb.c b/keyboards/ploopyco/trackball_thumb/trackball_thumb.c
index bbc782da457..326410cf136 100644
--- a/keyboards/ploopyco/trackball_thumb/trackball_thumb.c
+++ b/keyboards/ploopyco/trackball_thumb/trackball_thumb.c
@@ -17,6 +17,7 @@
  */
 
 #include "trackball_thumb.h"
+#include "encoder.h"
 
 #ifndef OPT_DEBOUNCE
 #    define OPT_DEBOUNCE 5  // (ms) 			Time between scroll events
@@ -57,9 +58,6 @@ uint16_t last_mid_click    = 0;  // Stops scrollwheel from being read if it was
 bool     debug_encoder     = false;
 bool     is_drag_scroll    = false;
 
-// require, since core encoder.c (where is is normally defined isn't present
-__attribute__((weak)) bool encoder_update_user(uint8_t index, bool clockwise) { return true; }
-
 bool encoder_update_kb(uint8_t index, bool clockwise) {
     if (!encoder_update_user(index, clockwise)) {
         return false;
@@ -75,25 +73,25 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
     return true;
 }
 
-void encoder_init(void) { opt_encoder_init(); }
+void encoder_driver_init(void) { opt_encoder_init(); }
 
-bool encoder_read(void) {
+void encoder_driver_task(void) {
     // Lovingly ripped from the Ploopy Source
 
     // If the mouse wheel was just released, do not scroll.
     if (timer_elapsed(last_mid_click) < SCROLL_BUTT_DEBOUNCE) {
-        return false;
+        return;
     }
 
     // Limit the number of scrolls per unit time.
     if (timer_elapsed(last_scroll) < OPT_DEBOUNCE) {
-        return false;
+        return;
     }
 
     // Don't scroll if the middle button is depressed.
     if (is_scroll_clicked) {
 #ifndef IGNORE_SCROLL_CLICK
-        return false;
+        return;
 #endif
     }
 
@@ -104,10 +102,8 @@ bool encoder_read(void) {
 
     int dir = opt_encoder_handler(p1, p2);
 
-    if (dir == 0) return false;
-    ;
-    encoder_update_kb(0, dir == 1);
-    return true;
+    if (dir == 0) return;
+    encoder_queue_event(0, dir == 1);
 }
 
 report_mouse_t pointing_device_task_kb(report_mouse_t mouse_report) {
diff --git a/keyboards/ploopyco/trackball_thumb/trackball_thumb.h b/keyboards/ploopyco/trackball_thumb/trackball_thumb.h
index 8ee17634f11..50a71601cf2 100644
--- a/keyboards/ploopyco/trackball_thumb/trackball_thumb.h
+++ b/keyboards/ploopyco/trackball_thumb/trackball_thumb.h
@@ -28,9 +28,6 @@
 #define OPT_ENC1_MUX 4
 #define OPT_ENC2_MUX 0
 
-bool encoder_update_kb(uint8_t index, bool clockwise);
-bool encoder_update_user(uint8_t index, bool clockwise);
-
 typedef union {
     uint32_t raw;
     struct {
diff --git a/keyboards/preonic/rev3/config.h b/keyboards/preonic/rev3/config.h
index 7800131a90d..6a842105b2b 100644
--- a/keyboards/preonic/rev3/config.h
+++ b/keyboards/preonic/rev3/config.h
@@ -44,5 +44,5 @@
 #define WS2812_PWM_DRIVER PWMD2
 #define WS2812_PWM_CHANNEL 2
 #define WS2812_PWM_PAL_MODE 1
-#define WS2812_DMA_STREAM STM32_DMA1_STREAM2
-#define WS2812_DMA_CHANNEL 2
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM2
+#define WS2812_PWM_DMA_CHANNEL 2
diff --git a/keyboards/preonic/rev3_drop/config.h b/keyboards/preonic/rev3_drop/config.h
index 7800131a90d..6a842105b2b 100644
--- a/keyboards/preonic/rev3_drop/config.h
+++ b/keyboards/preonic/rev3_drop/config.h
@@ -44,5 +44,5 @@
 #define WS2812_PWM_DRIVER PWMD2
 #define WS2812_PWM_CHANNEL 2
 #define WS2812_PWM_PAL_MODE 1
-#define WS2812_DMA_STREAM STM32_DMA1_STREAM2
-#define WS2812_DMA_CHANNEL 2
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM2
+#define WS2812_PWM_DMA_CHANNEL 2
diff --git a/keyboards/primekb/prime_e/keymaps/gwillad/keymap.c b/keyboards/primekb/prime_e/keymaps/gwillad/keymap.c
deleted file mode 100644
index 5dbdc4cfc8d..00000000000
--- a/keyboards/primekb/prime_e/keymaps/gwillad/keymap.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/* Copyright 2018 Holten Campbell
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-
-enum primee_layers {
-  _DEFAULT,
-  _LOWER,
-  _RAISE,
-  _ADJUST
-};
-
-#define CTLESC MT(MOD_LCTL, KC_ESC)
-#define LWRSPC LT(_LOWER, KC_SPC)
-#define RSEENT LT(_RAISE, KC_ENT)
-#define MOADJ  MO(_ADJUST)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_DEFAULT] = LAYOUT(
-		KC_TAB,    KC_Q,      KC_W,      KC_E,      KC_R,       KC_T,             KC_Y,     KC_U,        KC_I,      KC_O,      KC_P,      KC_DEL,    KC_BSPC,
-		CTLESC,    KC_A,      KC_S,      KC_D,      KC_F,       KC_G,             KC_H,     KC_J,        KC_K,      KC_L,      KC_SCLN,   KC_QUOT,
-		KC_LSFT,   KC_Z,      KC_X,      KC_C,      KC_V,       KC_B,             MOADJ,    KC_N,        KC_M,      KC_COMM,   KC_DOT,    KC_SLSH,   KC_RSFT,
-		KC_LCTL,   KC_LGUI,                         KC_LALT,    LWRSPC,	          RSEENT,   KC_RALT,                                      KC_RCTL,   KC_RGUI
-    ),
-
-    [_LOWER] = LAYOUT(
-		KC_TRNS,   KC_EXLM,   KC_AT,     KC_HASH,   KC_DLR,     KC_PERC,          KC_CIRC,   KC_AMPR,    KC_ASTR,   KC_LPRN,   KC_RPRN,   KC_TRNS,   KC_TRNS,
-		KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,          KC_TRNS,   KC_LBRC,    KC_RBRC,   KC_MINS,   KC_EQL,    KC_TRNS,
-		KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,          KC_TRNS,   KC_TRNS,    KC_GRV,    KC_BSLS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
-		KC_TRNS,   KC_TRNS,                         KC_TRNS,    KC_TRNS,	      KC_TRNS,   KC_TRNS,                                     KC_TRNS,   KC_TRNS
-    ),
-
-    [_RAISE] = LAYOUT(
-		KC_TRNS,   KC_1,      KC_2,      KC_3,      KC_4,       KC_5,             KC_6,      KC_7,       KC_8,      KC_9,      KC_0,      KC_TRNS,   KC_TRNS,
-		KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,          KC_TRNS,   KC_TRNS,    KC_UP,     KC_TRNS,   KC_TRNS,   KC_TRNS,
-		KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,          KC_TRNS,   KC_TRNS,    KC_LEFT,   KC_DOWN,   KC_RGHT,   KC_TRNS,   KC_TRNS,
-		KC_TRNS,   KC_TRNS,                         KC_TRNS,    KC_TRNS,	      KC_TRNS,   KC_TRNS,                                     KC_TRNS,   KC_TRNS
-    ),
-
-    [_ADJUST] = LAYOUT(
-		KC_TRNS,   KC_F1,     KC_F2,     KC_F3,     KC_F4,      KC_F5,            KC_F6,     KC_F7,      KC_F8,     KC_F9,     KC_F10,    KC_F11,    KC_F12,
-		KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,          KC_TRNS,   KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
-		KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,          KC_TRNS,   KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
-		QK_BOOT,   KC_TRNS,                         KC_TRNS,    KC_TRNS,	      KC_TRNS,   KC_TRNS,                                     KC_TRNS,   KC_TRNS
-    )
-};
-
-void matrix_init_user(void) {
-  // set CapsLock LED to output and low
-  setPinOutput(B1);
-  writePinLow(B1);
-  // set NumLock LED to output and low
-  setPinOutput(B2);
-  writePinLow(B2);
-  // set ScrollLock LED to output and low
-  setPinOutput(B3);
-  writePinLow(B3);
-}
-
-//function for layer indicator LED
-layer_state_t layer_state_set_user(layer_state_t state) {
-    writePin(B3, layer_state_cmp(state, 1));
-    writePin(B2, layer_state_cmp(state, 2));
-    writePin(B1, layer_state_cmp(state, 3));
-
-    return state;
-}
diff --git a/keyboards/primekb/prime_e/keymaps/gwillad/readme.md b/keyboards/primekb/prime_e/keymaps/gwillad/readme.md
deleted file mode 100644
index 7886d3962e6..00000000000
--- a/keyboards/primekb/prime_e/keymaps/gwillad/readme.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Gwillad keymap for prime e 
-This is gwillad's keymap for prime e
-
-Besides using a tweaked version of my prefered layout, this also includes:
-
-* code to use the prime e leds for layers (instead of caps lock or num lock or anything else), which I thought made more sense on a 40%
-* via enabled so people can still adjust their code without having to recompile
diff --git a/keyboards/primekb/prime_o/keymaps/reasonsandreasons/config.h b/keyboards/primekb/prime_o/keymaps/reasonsandreasons/config.h
deleted file mode 100644
index 4bcfa2ce5c6..00000000000
--- a/keyboards/primekb/prime_o/keymaps/reasonsandreasons/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright 2018 Jumail Mundekkat
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#define TAPPING_TERM 200
-
-// place overrides here
diff --git a/keyboards/primekb/prime_o/keymaps/reasonsandreasons/keymap.c b/keyboards/primekb/prime_o/keymaps/reasonsandreasons/keymap.c
deleted file mode 100644
index 2f0290dc033..00000000000
--- a/keyboards/primekb/prime_o/keymaps/reasonsandreasons/keymap.c
+++ /dev/null
@@ -1,174 +0,0 @@
-/* Copyright 2018 Jumail Mundekkat
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-#define L1BS LT(2, KC_BSPC)
-#define LSUP LSFT_T(KC_UP)
-#define CTLL LCTL_T(KC_LEFT)
-#define ECTL LCTL_T(KC_ESC)
-#define ALLM ALL_T(KC_MINS)
-#define SCLS LT(3, KC_SCLN)
-
-// Establishes tap dance keys
-enum {
-  TD_SPC_ENT = 0
-};
-
-tap_dance_action_t tap_dance_actions[] = {
-  [TD_SPC_ENT] = ACTION_TAP_DANCE_DOUBLE(KC_SPC, KC_ENT)
-
-};
-
-// Defines the keycodes used by our macros in process_record_user
-enum custom_keycodes {
-  QMKBEST = SAFE_RANGE,
-  QMKURL
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* BASE
- * ,---------------------------------------------------------------------------------------------------------------,
- * |  `   |  1   |  2   |  3   |  4   |  5   |  6   |  7   |  8   |  9   |  0   | Del  | NMLK |  /   |  *   |  -   |
- * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * | Tab  |  Q   |  W   |  E   |  R   |  T   |  Y   |  U   |  I   |  O   |  P   |  \   |  7   |  8   |  9   |  +   |
- * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * | Esc  |  A   |  S   |  D   |  F   |  G   |  H   |  J   |  K   |  L   |  ;   |  '   |  4   |  5   |  6   |  =   |
- * | Ctrl |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |  Z   |  X   |  C   |  V   |  B   |  N   |  M   |  ,   |  .   |  /   |  Up  |  1   |  2   |  3   |      |
- * | Shift|      |      |      |      |      |      |      |      |      |      | Shift|      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+ Enter|
- * |  -   |      |      |      |  Backspace  |    Space    |      |      | Left | Down | Right|  0   |  .   |      |
- * | ALL  | Ctrl | Alt  | GUI  |     Fn1     |             | GUI  | Alt  | Ctrl |      |      |      |      |      |
- * `---------------------------------------------------------------------------------------------------------------'
- */
-
-  [0] = LAYOUT(
-    KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,  KC_5,  KC_6,    KC_7,    KC_8,     KC_9,     KC_0,     KC_DEL,   KC_NUM,    KC_PSLS,  KC_PAST,  KC_PMNS,
-    KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,  KC_T,  KC_Y,    KC_U,    KC_I,     KC_O,     KC_P,     KC_BSLS,  KC_7,      KC_8,     KC_9,     KC_PPLS,
-    ECTL,     KC_A,     KC_S,     KC_D,     KC_F,  KC_G,  KC_H,    KC_J,    KC_K,     KC_L,     SCLS,     KC_QUOT,  KC_4,      KC_5,     KC_6,     KC_PEQL,
-    KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,  KC_B,  KC_N,    KC_M,    KC_COMM,  KC_DOT,   KC_SLSH,  LSUP,     KC_1,      KC_2,     KC_3,     KC_ENT,
-    ALLM,     KC_LCTL,  KC_LALT,  KC_LGUI,  L1BS,  L1BS,  KC_SPC,  KC_SPC,  KC_RGUI,  KC_RALT,  CTLL,     KC_DOWN,  KC_RIGHT,  KC_0,     KC_PDOT,  KC_ENT
-  ),
-
-/* GAME
- * ,---------------------------------------------------------------------------------------------------------------,
- * | Esc  |  1   |  2   |  3   |  4   |  5   |  6   |  7   |  8   |  9   |  0   | Del  | NMLK |  /   |  *   |  -   |
- * |  `   |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * | Tab  |  Q   |  W   |  E   |  R   |  T   |  Y   |  U   |  I   |  O   |  P   | '    |  7   |  8   |  9   |  +   |
- * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * | Caps |  A   |  S   |  D   |  F   |  G   |  H   |  J   |  K   |  L   |  ;   | Rtrn |  4   |  5   |  6   |  =   |
- * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |  Z   |  X   |  C   |  V   |  B   |  N   |  M   |  ,   |  .   |  /   |  Up  |  1   |  2   |  3   |      |
- * | Shift|      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+ Enter|
- * |      |      |      |      |    Space    |  Backspace  |      |      | Left | Down | Right|  0   |  .   |      |
- * | Fn1  | Ctrl | Alt  | Alt  |             |             | GUI  | DF(0)|      |      |      |      |      |      |
- * `---------------------------------------------------------------------------------------------------------------'
- */
-
-  [1] = LAYOUT(
-    QK_GESC,  KC_1,     KC_2,     KC_3,     KC_4,    KC_5,    KC_6,     KC_7,     KC_8,     KC_9,    KC_0,     KC_DEL,   KC_NUM,    KC_PSLS,  KC_PAST,  KC_PMNS,
-    KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,    KC_T,    KC_Y,     KC_U,     KC_I,     KC_O,    KC_P,     KC_QUOT,  KC_7,      KC_8,     KC_9,     KC_PPLS,
-    KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,    KC_G,    KC_H,     KC_J,     KC_K,     KC_L,    KC_SCLN,  KC_ENT,   KC_4,      KC_5,     KC_6,     KC_PEQL,
-    KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,    KC_B,    KC_N,     KC_M,     KC_COMM,  KC_DOT,  KC_SLSH,  KC_UP,    KC_1,      KC_2,     KC_3,     KC_ENT,
-    MO(2),    KC_LCTL,  KC_LALT,  KC_LALT,  KC_SPC,  KC_SPC,  KC_BSPC,  KC_BSPC,  KC_RGUI,  DF(0),   KC_LEFT,  KC_DOWN,  KC_RIGHT,  KC_0,     KC_PDOT,  KC_ENT
-  ),
-
-/* SYMBOL
- * ,---------------------------------------------------------------------------------------------------------------,
- * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |      |      |      |      |
- * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+-------------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |  #   |  [   |  <   |  >   |  ]   |  _   |  |   |      |      |      |      |      |      |
- * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------|------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |  ~   |  (   |  {   |  }   |  )   |  @   |  -   |      |      |      |      |      |      |
- * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------|------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
- * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------|------+------+------+------+------+------+------+------+------+------+------+------+------+      |
- * |      |      |      |      |             |    Enter    |      |      |      |      |      |      |      |      |
- * |      |      |      |      |             |             |      |      |      |      |      |      |      |      |
- * `---------------------------------------------------------------------------------------------------------------'
- */
-
-	[2] = LAYOUT(
-    KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   _______,  _______,  _______,  _______,
-    _______,  _______,  _______,  KC_HASH,  KC_LBRC,  KC_LT,    KC_GT,    KC_RBRC,  KC_UNDS,  KC_PIPE,  _______,  _______,  _______,  _______,  _______,  _______,
-    _______,  _______,  _______,  KC_TILD,  KC_LPRN,  KC_LCBR,  KC_RCBR,  KC_RPRN,  KC_AT,    KC_MINS,  _______,  _______,  _______,  _______,  _______,  _______,
-    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-    _______,  _______,  _______,  _______,  _______,  _______,  KC_ENT,   KC_ENT,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______
-  ),
-
-/* SYSTEM
- * ,---------------------------------------------------------------------------------------------------------------,
- * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
- * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+-------------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * |      | PgUp | Home |  Up  | End  |      |      | Vol- | Vol+ | Mute |      |      |      |      |      |      |
- * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------|------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * |      | PgDn | Left | Down |Right |      |      | Play | Prev | Next |      |      |      |      |      | QK_BOOT|
- * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------|------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
- * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
- * |------+------|------+------+------+------+------+------+------+------+------+------+------+------+------+  BL  |
- * |      |      |      |      |             |             |      |      |      |      |      |      |  BL  | TGGL |
- * | GAME |      |      |      |             |             |      |      |      |      |      |      | STEP |      |
- * `---------------------------------------------------------------------------------------------------------------'
- */
-
-	[3] = LAYOUT(
-    _______,  _______,  _______,  _______,  _______, _______,  _______,  _______,      _______,    _______,   _______,  _______,  _______,  _______,  _______,   _______,
-    _______,  KC_PGUP,  KC_HOME,  KC_UP,    KC_END,  _______,  _______,  KC_VOLD,      KC_VOLU,    KC_MUTE,   _______,  _______,  _______,  _______,  _______,   _______,
-    _______,  KC_PGDN,  KC_LEFT,  KC_DOWN,  KC_RGHT,  _______,  _______,  KC_MPLY,     KC_MRWD,    KC_MFFD,   _______,  _______,  _______,  _______,  _______,   QK_BOOT,
-    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,     _______,    _______,   _______,  _______,  _______,  _______,  _______,   BL_TOGG,
-    DF(1),    _______,  _______,  _______,  _______,  _______,  _______,  _______,     _______,    _______,   _______,  _______,  _______,  _______,  BL_STEP,  BL_TOGG
-  ),
-
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QMKBEST:
-      if (record->event.pressed) {
-        // when keycode QMKBEST is pressed
-        SEND_STRING("QMK is the best thing ever!");
-      } else {
-        // when keycode QMKBEST is released
-      }
-      break;
-    case QMKURL:
-      if (record->event.pressed) {
-        // when keycode QMKURL is pressed
-        SEND_STRING("https://qmk.fm/" SS_TAP(X_ENTER));
-      } else {
-        // when keycode QMKURL is released
-      }
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/primekb/prime_o/keymaps/reasonsandreasons/readme.md b/keyboards/primekb/prime_o/keymaps/reasonsandreasons/readme.md
deleted file mode 100644
index e14e989e322..00000000000
--- a/keyboards/primekb/prime_o/keymaps/reasonsandreasons/readme.md
+++ /dev/null
@@ -1,5 +0,0 @@
-![reasonsandreasons Layout Image](https://imgur.com/a/xIpn2U5)
-
-# reasonsandreasons's Prime_O Layout
-
-This is a relatively simple layout for the Prime_O, designed for mostly typing use and occasional gaming. I'm still testing it and there will likely be minor changes, but most of the bones of it will likely stay the same.
diff --git a/keyboards/primekb/prime_o/keymaps/reasonsandreasons/rules.mk b/keyboards/primekb/prime_o/keymaps/reasonsandreasons/rules.mk
deleted file mode 100644
index 645e8d523f6..00000000000
--- a/keyboards/primekb/prime_o/keymaps/reasonsandreasons/rules.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no            # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes           # Audio control and System control(+450)
-CONSOLE_ENABLE = no             # Console for debug(+400)
-COMMAND_ENABLE = no             # Commands for debug and configuration
-NKRO_ENABLE = no                # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no           # Enable keyboard backlight functionality
-MIDI_ENABLE = no                # MIDI controls
-AUDIO_ENABLE = no               # Audio output on port C6
-UNICODE_ENABLE = no             # Unicode
-BLUETOOTH_ENABLE = no           # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no            # Enable WS2812 RGB underlight.  Do not enable this with audio at the same time.
-TAP_DANCE_ENABLE=yes            # Enable Tap Dance
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no           # Breathing sleep LED during USB suspend
diff --git a/keyboards/projectd/65/projectd_65_ansi/projectd_65_ansi.c b/keyboards/projectd/65/projectd_65_ansi/projectd_65_ansi.c
index c5b513447b9..e2a85a75c39 100644
--- a/keyboards/projectd/65/projectd_65_ansi/projectd_65_ansi.c
+++ b/keyboards/projectd/65/projectd_65_ansi/projectd_65_ansi.c
@@ -25,84 +25,84 @@ const aw20216s_led_t PROGMEM g_aw20216s_leds[AW20216S_LED_COUNT] = {
  *   |     |          G location
  *   |     |          |          B location
  *   |     |          |          | */
-    //{0, CS1_SW4,   CS2_SW4,   CS3_SW4},   //   0, Esc
+    //{0, SW4_CS1,   SW4_CS2,   SW4_CS3},   //   0, Esc
 
-    {0, CS1_SW1,   CS2_SW1,   CS3_SW1},   //  0, Esc
-    {0, CS4_SW2,   CS5_SW2,   CS6_SW2},   //  1, 1
-    {0, CS4_SW3,   CS5_SW3,   CS6_SW3},   //  2, 2
-    {0, CS4_SW4,   CS5_SW4,   CS6_SW4},   //  3, 3
-    {0, CS4_SW5,   CS5_SW5,   CS6_SW5},   //  4, 4
-    {0, CS4_SW6,   CS5_SW6,   CS6_SW6},   //  5, 5
-    {0, CS4_SW7,   CS5_SW7,   CS6_SW7},   //  6, 6
-    {0, CS4_SW8,   CS5_SW8,   CS6_SW8},   //  7, 7
-    {0, CS4_SW9,   CS5_SW9,   CS6_SW9},   //  8, 8
-    {0, CS4_SW10,  CS5_SW10,  CS6_SW10},  //  9, 9
-    {0, CS4_SW11,  CS5_SW11,  CS6_SW11},  //  10, 0
-    {0, CS4_SW12,  CS5_SW12,  CS6_SW12},  //  11, -
-    {0, CS1_SW9,   CS2_SW9,   CS3_SW9},   //  12, =
-    {0, CS1_SW10,  CS2_SW10,  CS3_SW10},  //  13, Backspace
-    {0, CS1_SW5,   CS2_SW5,   CS3_SW5},   //  14, Del
+    {0, SW1_CS1,   SW1_CS2,   SW1_CS3},   //  0, Esc
+    {0, SW2_CS4,   SW2_CS5,   SW2_CS6},   //  1, 1
+    {0, SW3_CS4,   SW3_CS5,   SW3_CS6},   //  2, 2
+    {0, SW4_CS4,   SW4_CS5,   SW4_CS6},   //  3, 3
+    {0, SW5_CS4,   SW5_CS5,   SW5_CS6},   //  4, 4
+    {0, SW6_CS4,   SW6_CS5,   SW6_CS6},   //  5, 5
+    {0, SW7_CS4,   SW7_CS5,   SW7_CS6},   //  6, 6
+    {0, SW8_CS4,   SW8_CS5,   SW8_CS6},   //  7, 7
+    {0, SW9_CS4,   SW9_CS5,   SW9_CS6},   //  8, 8
+    {0, SW10_CS4,  SW10_CS5,  SW10_CS6},  //  9, 9
+    {0, SW11_CS4,  SW11_CS5,  SW11_CS6},  //  10, 0
+    {0, SW12_CS4,  SW12_CS5,  SW12_CS6},  //  11, -
+    {0, SW9_CS1,   SW9_CS2,   SW9_CS3},   //  12, =
+    {0, SW10_CS1,  SW10_CS2,  SW10_CS3},  //  13, Backspace
+    {0, SW5_CS1,   SW5_CS2,   SW5_CS3},   //  14, Del
 
-    {0, CS4_SW1,   CS5_SW1,   CS6_SW1},   //  15, Tab
-    {0, CS7_SW2,   CS8_SW2,   CS9_SW2},   //  16, Q
-    {0, CS7_SW3,   CS8_SW3,   CS9_SW3},   //  17, W
-    {0, CS7_SW4,   CS8_SW4,   CS9_SW4},   //  18, E
-    {0, CS7_SW5,   CS8_SW5,   CS9_SW5},   //  19, R
-    {0, CS7_SW6,   CS8_SW6,   CS9_SW6},   //  20, T
-    {0, CS7_SW7,   CS8_SW7,   CS9_SW7},   //  21, Y
-    {0, CS7_SW8,   CS8_SW8,   CS9_SW8},   //  22, U
-    {0, CS7_SW9,   CS8_SW9,   CS9_SW9},   //  23, I
-    {0, CS7_SW10,  CS8_SW10,  CS9_SW10},  //  24, O
-    {0, CS7_SW11,  CS8_SW11,  CS9_SW11},  //  25, P
-    {0, CS7_SW12,  CS8_SW12,  CS9_SW12},  //  26, [
-    {0, CS1_SW11,  CS2_SW11,  CS3_SW11},  //  27, ]
-    {0, CS1_SW12,  CS2_SW12,  CS3_SW12},  //  28, "\\"
-    {0, CS1_SW4,   CS2_SW4,   CS3_SW4},   //  29, PGUP
+    {0, SW1_CS4,   SW1_CS5,   SW1_CS6},   //  15, Tab
+    {0, SW2_CS7,   SW2_CS8,   SW2_CS9},   //  16, Q
+    {0, SW3_CS7,   SW3_CS8,   SW3_CS9},   //  17, W
+    {0, SW4_CS7,   SW4_CS8,   SW4_CS9},   //  18, E
+    {0, SW5_CS7,   SW5_CS8,   SW5_CS9},   //  19, R
+    {0, SW6_CS7,   SW6_CS8,   SW6_CS9},   //  20, T
+    {0, SW7_CS7,   SW7_CS8,   SW7_CS9},   //  21, Y
+    {0, SW8_CS7,   SW8_CS8,   SW8_CS9},   //  22, U
+    {0, SW9_CS7,   SW9_CS8,   SW9_CS9},   //  23, I
+    {0, SW10_CS7,  SW10_CS8,  SW10_CS9},  //  24, O
+    {0, SW11_CS7,  SW11_CS8,  SW11_CS9},  //  25, P
+    {0, SW12_CS7,  SW12_CS8,  SW12_CS9},  //  26, [
+    {0, SW11_CS1,  SW11_CS2,  SW11_CS3},  //  27, ]
+    {0, SW12_CS1,  SW12_CS2,  SW12_CS3},  //  28, "\\"
+    {0, SW4_CS1,   SW4_CS2,   SW4_CS3},   //  29, PGUP
 
-    {0, CS7_SW1,   CS8_SW1,   CS9_SW1},   //  30, CapsLock
-    {0, CS10_SW2,  CS11_SW2,  CS12_SW2},  //  31, A
-    {0, CS10_SW3,  CS11_SW3,  CS12_SW3},  //  32, S
-    {0, CS10_SW4,  CS11_SW4,  CS12_SW4},  //  33, D
-    {0, CS10_SW5,  CS11_SW5,  CS12_SW5},  //  34, F
-    {0, CS10_SW6,  CS11_SW6,  CS12_SW6},  //  35, G
-    {0, CS10_SW7,  CS11_SW7,  CS12_SW7},  //  36, H
-    {0, CS10_SW8,  CS11_SW8,  CS12_SW8},  //  37, J
-    {0, CS10_SW9,  CS11_SW9,  CS12_SW9},  //  38, K
-    {0, CS10_SW10, CS11_SW10, CS12_SW10}, //  39, L
-    {0, CS10_SW11, CS11_SW11, CS12_SW11}, //  40, ;
-    {0, CS10_SW12, CS11_SW12, CS12_SW12}, //  41, '
-    {0, CS13_SW12, CS14_SW12, CS15_SW12}, //  42, Enter
-    {0, CS1_SW7,   CS2_SW7,   CS3_SW7},   //  43, PGDN
+    {0, SW1_CS7,   SW1_CS8,   SW1_CS9},   //  30, CapsLock
+    {0, SW2_CS10,  SW2_CS11,  SW2_CS12},  //  31, A
+    {0, SW3_CS10,  SW3_CS11,  SW3_CS12},  //  32, S
+    {0, SW4_CS10,  SW4_CS11,  SW4_CS12},  //  33, D
+    {0, SW5_CS10,  SW5_CS11,  SW5_CS12},  //  34, F
+    {0, SW6_CS10,  SW6_CS11,  SW6_CS12},  //  35, G
+    {0, SW7_CS10,  SW7_CS11,  SW7_CS12},  //  36, H
+    {0, SW8_CS10,  SW8_CS11,  SW8_CS12},  //  37, J
+    {0, SW9_CS10,  SW9_CS11,  SW9_CS12},  //  38, K
+    {0, SW10_CS10, SW10_CS11, SW10_CS12}, //  39, L
+    {0, SW11_CS10, SW11_CS11, SW11_CS12}, //  40, ;
+    {0, SW12_CS10, SW12_CS11, SW12_CS12}, //  41, '
+    {0, SW12_CS13, SW12_CS14, SW12_CS15}, //  42, Enter
+    {0, SW7_CS1,   SW7_CS2,   SW7_CS3},   //  43, PGDN
 
-    {0, CS10_SW1,  CS11_SW1,  CS12_SW1},  //  44, LShift
-    {0, CS13_SW2,  CS14_SW2,  CS15_SW2},  //  45, Z
-    {0, CS13_SW3,  CS14_SW3,  CS15_SW3},  //  46, X
-    {0, CS13_SW4,  CS14_SW4,  CS15_SW4},  //  47, C
-    {0, CS13_SW5,  CS14_SW5,  CS15_SW5},  //  48, V
-    {0, CS13_SW6,  CS14_SW6,  CS15_SW6},  //  49, B
-    {0, CS13_SW7,  CS14_SW7,  CS15_SW7},  //  50, N
-    {0, CS13_SW8,  CS14_SW8,  CS15_SW8},  //  51, M
-    {0, CS13_SW9,  CS14_SW9,  CS15_SW9},  //  52, ,
-    {0, CS13_SW10, CS14_SW10, CS15_SW10}, //  53, .
-    {0, CS13_SW11, CS14_SW11, CS15_SW11}, //  54, /
-    {0, CS16_SW8,  CS17_SW8,  CS18_SW8},  //  55, RShift
-    {0, CS16_SW9,  CS17_SW9,  CS18_SW9},  //  56, Up
-    {0,  CS1_SW6,   CS2_SW6,   CS3_SW6},  //  57, END
+    {0, SW1_CS10,  SW1_CS11,  SW1_CS12},  //  44, LShift
+    {0, SW2_CS13,  SW2_CS14,  SW2_CS15},  //  45, Z
+    {0, SW3_CS13,  SW3_CS14,  SW3_CS15},  //  46, X
+    {0, SW4_CS13,  SW4_CS14,  SW4_CS15},  //  47, C
+    {0, SW5_CS13,  SW5_CS14,  SW5_CS15},  //  48, V
+    {0, SW6_CS13,  SW6_CS14,  SW6_CS15},  //  49, B
+    {0, SW7_CS13,  SW7_CS14,  SW7_CS15},  //  50, N
+    {0, SW8_CS13,  SW8_CS14,  SW8_CS15},  //  51, M
+    {0, SW9_CS13,  SW9_CS14,  SW9_CS15},  //  52, ,
+    {0, SW10_CS13, SW10_CS14, SW10_CS15}, //  53, .
+    {0, SW11_CS13, SW11_CS14, SW11_CS15}, //  54, /
+    {0, SW8_CS16,  SW8_CS17,  SW8_CS18},  //  55, RShift
+    {0, SW9_CS16,  SW9_CS17,  SW9_CS18},  //  56, Up
+    {0,  SW6_CS1,   SW6_CS2,   SW6_CS3},  //  57, END
 
-    {0, CS16_SW1,  CS17_SW1,  CS18_SW1},  //  58, LCtrl
-    {0, CS16_SW2,  CS17_SW2,  CS18_SW2},  //  59, LWin
-    {0, CS16_SW3,  CS17_SW3,  CS18_SW3},  //  60, LAlt
-    {0,  CS1_SW2,   CS2_SW2,   CS3_SW2},  //  61, LED71
-    {0,  CS1_SW3,   CS2_SW3,   CS3_SW3},  //  62, LED72
-    {0, CS16_SW4,  CS17_SW4,  CS18_SW4},  //  63, Space
-    {0, CS16_SW7,  CS17_SW7,  CS18_SW7},  //  64, LED73
-    {0,  CS1_SW8,   CS2_SW8,   CS3_SW8},  //  65, LED74
-    {0, CS16_SW5,  CS17_SW5,  CS18_SW5},  //  66, RAlt
-    {0, CS16_SW6,  CS17_SW6,  CS18_SW6},  //  67, FN
+    {0, SW1_CS16,  SW1_CS17,  SW1_CS18},  //  58, LCtrl
+    {0, SW2_CS16,  SW2_CS17,  SW2_CS18},  //  59, LWin
+    {0, SW3_CS16,  SW3_CS17,  SW3_CS18},  //  60, LAlt
+    {0,  SW2_CS1,   SW2_CS2,   SW2_CS3},  //  61, LED71
+    {0,  SW3_CS1,   SW3_CS2,   SW3_CS3},  //  62, LED72
+    {0, SW4_CS16,  SW4_CS17,  SW4_CS18},  //  63, Space
+    {0, SW7_CS16,  SW7_CS17,  SW7_CS18},  //  64, LED73
+    {0,  SW8_CS1,   SW8_CS2,   SW8_CS3},  //  65, LED74
+    {0, SW5_CS16,  SW5_CS17,  SW5_CS18},  //  66, RAlt
+    {0, SW6_CS16,  SW6_CS17,  SW6_CS18},  //  67, FN
 
-    {0, CS16_SW10, CS17_SW10, CS18_SW10}, //  68, Left
-    {0, CS16_SW11, CS17_SW11, CS18_SW11}, //  69, Down
-    {0, CS16_SW12, CS17_SW12, CS18_SW12}, //  70, Right
+    {0, SW10_CS16, SW10_CS17, SW10_CS18}, //  68, Left
+    {0, SW11_CS16, SW11_CS17, SW11_CS18}, //  69, Down
+    {0, SW12_CS16, SW12_CS17, SW12_CS18}, //  70, Right
 
 };
 
diff --git a/keyboards/projectd/75/ansi/ansi.c b/keyboards/projectd/75/ansi/ansi.c
index 7dd38569dad..f32bf369a90 100644
--- a/keyboards/projectd/75/ansi/ansi.c
+++ b/keyboards/projectd/75/ansi/ansi.c
@@ -25,101 +25,101 @@ const aw20216s_led_t PROGMEM g_aw20216s_leds[AW20216S_LED_COUNT] = {
  *   |     |          G location
  *   |     |          |          B location
  *   |     |          |          | */
-    //{0, CS1_SW4,   CS2_SW4,   CS3_SW4},   //   0, k00, Esc
+    //{0, SW4_CS1,   SW4_CS2,   SW4_CS3},   //   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, SW1_CS1,   SW1_CS2,   SW1_CS3},   //  Esc
+    {0, SW2_CS1,   SW2_CS2,   SW2_CS3},   //  F1
+    {0, SW3_CS1,   SW3_CS2,   SW3_CS3},   //  F2
+    {0, SW4_CS1,   SW4_CS2,   SW4_CS3},   //  F3
+    {0, SW5_CS1,   SW5_CS2,   SW5_CS3},   //  F4
+    {0, SW6_CS1,   SW6_CS2,   SW6_CS3},   //  F5
+    {0, SW7_CS1,   SW7_CS2,   SW7_CS3},   //  F6
+    {0, SW8_CS1,   SW8_CS2,   SW8_CS3},   //  F7
+    {0, SW9_CS1,   SW9_CS2,   SW9_CS3},   //  F8
+    {0, SW10_CS1,  SW10_CS2,  SW10_CS3},  //  F9
+    {0, SW11_CS1,  SW11_CS2,  SW11_CS3},  //  F10
+    {0, SW12_CS1,  SW12_CS2,  SW12_CS3},  //  F11
+    {1, SW1_CS1,   SW1_CS2,   SW1_CS3},   //  F12
+    {1, SW1_CS4,   SW1_CS5,   SW1_CS6},   //  Printscreen
+    {1, SW3_CS4,   SW3_CS5,   SW3_CS6},   //  Delete
 
-    {0, 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, SW1_CS4,   SW1_CS5,   SW1_CS6},   //  `
+    {0, SW2_CS4,   SW2_CS5,   SW2_CS6},   //  1
+    {0, SW3_CS4,   SW3_CS5,   SW3_CS6},   //  2
+    {0, SW4_CS4,   SW4_CS5,   SW4_CS6},   //  3
+    {0, SW5_CS4,   SW5_CS5,   SW5_CS6},   //  4
+    {0, SW6_CS4,   SW6_CS5,   SW6_CS6},   //  5
+    {0, SW7_CS4,   SW7_CS5,   SW7_CS6},   //  6
+    {0, SW8_CS4,   SW8_CS5,   SW8_CS6},   //  7
+    {0, SW9_CS4,   SW9_CS5,   SW9_CS6},   //  8
+    {0, SW10_CS4,  SW10_CS5,  SW10_CS6},  //  9
+    {0, SW11_CS4,  SW11_CS5,  SW11_CS6},  //  0
+    {0, SW12_CS4,  SW12_CS5,  SW12_CS6},  //  -
+    {1, SW5_CS1,   SW5_CS2,   SW5_CS3},   //  =
+    {1, SW7_CS1,   SW7_CS2,   SW7_CS3},   //  Backspace
+    {1, SW5_CS4,   SW5_CS5,   SW5_CS6},   //  Home
 
-    {0, 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, SW1_CS7,   SW1_CS8,   SW1_CS9},   //  Tab
+    {0, SW2_CS7,   SW2_CS8,   SW2_CS9},   //  Q
+    {0, SW3_CS7,   SW3_CS8,   SW3_CS9},   //  W
+    {0, SW4_CS7,   SW4_CS8,   SW4_CS9},   //  E
+    {0, SW5_CS7,   SW5_CS8,   SW5_CS9},   //  R
+    {0, SW6_CS7,   SW6_CS8,   SW6_CS9},   //  T
+    {0, SW7_CS7,   SW7_CS8,   SW7_CS9},   //  Y
+    {0, SW8_CS7,   SW8_CS8,   SW8_CS9},   //  U
+    {0, SW9_CS7,   SW9_CS8,   SW9_CS9},   //  I
+    {0, SW10_CS7,  SW10_CS8,  SW10_CS9},  //  O
+    {0, SW11_CS7,  SW11_CS8,  SW11_CS9},  //  P
+    {0, SW12_CS7,  SW12_CS8,  SW12_CS9},  //  [
+    {1, SW8_CS1,   SW8_CS2,   SW8_CS3},   //  ]
+    {1, SW9_CS1,   SW9_CS2,   SW9_CS3},   //  "\\"
+    {1, SW4_CS4,   SW4_CS5,   SW4_CS6},   //  PGUP
 
-    {0, 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, SW1_CS10,  SW1_CS11,  SW1_CS12},  //  Caps Lock
+    {0, SW2_CS10,  SW2_CS11,  SW2_CS12},  //  A
+    {0, SW3_CS10,  SW3_CS11,  SW3_CS12},  //  S
+    {0, SW4_CS10,  SW4_CS11,  SW4_CS12},  //  D
+    {0, SW5_CS10,  SW5_CS11,  SW5_CS12},  //  F
+    {0, SW6_CS10,  SW6_CS11,  SW6_CS12},  //  G
+    {0, SW7_CS10,  SW7_CS11,  SW7_CS12},  //  H
+    {0, SW8_CS10,  SW8_CS11,  SW8_CS12},  //  J
+    {0, SW9_CS10,  SW9_CS11,  SW9_CS12},  //  K
+    {0, SW10_CS10, SW10_CS11, SW10_CS12}, //  L
+    {0, SW11_CS10, SW11_CS11, SW11_CS12}, //  ;
+    {0, SW12_CS10, SW12_CS11, SW12_CS12}, //  '
+    {1, SW11_CS1,  SW11_CS2,  SW11_CS3},  //  Enter
+    {1, SW7_CS4,   SW7_CS5,   SW7_CS6},   //  PGDN
 
-    {0, 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, SW1_CS13,  SW1_CS14,  SW1_CS15},  //  L Shift
+    {0, SW2_CS13,  SW2_CS14,  SW2_CS15},  //  Z
+    {0, SW3_CS13,  SW3_CS14,  SW3_CS15},  //  X
+    {0, SW4_CS13,  SW4_CS14,  SW4_CS15},  //  C
+    {0, SW5_CS13,  SW5_CS14,  SW5_CS15},  //  V
+    {0, SW6_CS13,  SW6_CS14,  SW6_CS15},  //  B
+    {0, SW7_CS13,  SW7_CS14,  SW7_CS15},  //  N
+    {0, SW8_CS13,  SW8_CS14,  SW8_CS15},  //  M
+    {0, SW9_CS13,  SW9_CS14,  SW9_CS15},  //  ,
+    {0, SW10_CS13, SW10_CS14, SW10_CS15}, //  .
+    {0, SW11_CS13, SW11_CS14, SW11_CS15}, //  "/""
+    {1, SW8_CS4,   SW8_CS5,   SW8_CS6},   //  R Shift
+    {1, SW9_CS4,   SW9_CS5,   SW9_CS6},   //  Up
+    {1, SW6_CS4,   SW6_CS5,   SW6_CS6},   //  END
 
-    {0, 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
+    {0, SW1_CS16,  SW1_CS17,  SW1_CS18},  //  L Ctrl
+    {0, SW2_CS16,  SW2_CS17,  SW2_CS18},  //  L Win
+    {0, SW3_CS16,  SW3_CS17,  SW3_CS18},  //  L Alt
+    {0, SW4_CS16,  SW4_CS17,  SW4_CS18},  //  LED1
+    {0, SW5_CS16,  SW5_CS17,  SW5_CS18},  //  LED2
+    {0, SW6_CS16,  SW6_CS17,  SW6_CS18},  //  Space
+    {0, SW7_CS16,  SW7_CS17,  SW7_CS18},  //  LED3
+    {0, SW8_CS16,  SW8_CS17,  SW8_CS18},  //  LED4
+    {0, SW9_CS16,  SW9_CS17,  SW9_CS18},  //  R Alt
+    {0, SW10_CS16, SW10_CS17, SW10_CS18}, //  FN
+    {0, SW12_CS16, SW12_CS17, SW12_CS18}, //  R Ctrl
 
-    {1, CS4_SW10,  CS5_SW10,  CS6_SW10},  //  Left
-    {1, CS4_SW11,  CS5_SW11,  CS6_SW11},  //  Down
-    {1, CS10_SW5,  CS11_SW5,  CS12_SW5},  //  Right
+    {1, SW10_CS4,  SW10_CS5,  SW10_CS6},  //  Left
+    {1, SW11_CS4,  SW11_CS5,  SW11_CS6},  //  Down
+    {1, SW5_CS10,  SW5_CS11,  SW5_CS12},  //  Right
 };
 
 #endif
diff --git a/keyboards/protozoa/p01/config.h b/keyboards/protozoa/p01/config.h
index fd58bda9123..3b14a164f6d 100644
--- a/keyboards/protozoa/p01/config.h
+++ b/keyboards/protozoa/p01/config.h
@@ -21,5 +21,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define WS2812_PWM_DRIVER PWMD1
 #define WS2812_PWM_CHANNEL 2
 #define WS2812_PWM_PAL_MODE 2
-#define WS2812_DMA_STREAM STM32_DMA1_STREAM5
-#define WS2812_DMA_CHANNEL 5  
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM5
+#define WS2812_PWM_DMA_CHANNEL 5  
diff --git a/keyboards/psuieee/pluto12/keymaps/wymcg/keymap.c b/keyboards/psuieee/pluto12/keymaps/wymcg/keymap.c
deleted file mode 100644
index 96499b8789c..00000000000
--- a/keyboards/psuieee/pluto12/keymaps/wymcg/keymap.c
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright 2021-22 Will McGLoughlin (wymcg)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-
-// Defines names for use in layer keycodes and the keymap
-enum layer_names {
-    _BASE,
-    _NAV,
-    _PROD
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_BASE] = LAYOUT(
-    KC_MUTE,    KC_MPRV,    KC_MPLY,    KC_MNXT,
-    TO(_NAV),   G(KC_1),    G(KC_2),    G(KC_3),
-    TO(_PROD),  G(KC_4),    G(KC_5),    G(KC_6)
-  ),
-  [_NAV] = LAYOUT(
-    TO(_BASE),  KC_HOME,    KC_UP,      KC_END,
-    A(KC_TAB),  KC_LEFT,    KC_DOWN,    KC_RIGHT,
-    G(KC_TAB),  KC_PGDN,    KC_PGUP,    MO(_BASE)
-  ),
-  [_PROD] = LAYOUT(
-    TO(_BASE),  KC_NO,      KC_NO,      KC_NO,
-    C(KC_Z),    C(KC_X),    C(KC_C),    C(KC_V),
-    C(KC_A),    C(KC_LEFT), C(KC_RIGHT),MO(_BASE)
-  )
-};
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    switch (biton32(layer_state)) {
-        case _BASE:
-            if (clockwise) {
-                tap_code(KC_VOLU);
-            } else {
-                tap_code(KC_VOLD);
-            }
-            break;
-        case _NAV:
-            if (clockwise) {
-                tap_code16(C(G(KC_RIGHT)));
-            } else {
-                tap_code16(C(G(KC_LEFT)));
-            }
-            break;
-        case _PROD:
-            if (clockwise) {
-                tap_code16(C(KC_Y));
-            } else {
-                tap_code16(C(KC_Z));
-            }
-            break;
-    }
-    return false;
-}
diff --git a/keyboards/psuieee/pluto12/keymaps/wymcg/readme.md b/keyboards/psuieee/pluto12/keymaps/wymcg/readme.md
deleted file mode 100644
index 60d2f19be3c..00000000000
--- a/keyboards/psuieee/pluto12/keymaps/wymcg/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# wymcg's custom keymap
diff --git a/keyboards/qvex/lynepad2/keymaps/mcrosson/keymap.c b/keyboards/qvex/lynepad2/keymaps/mcrosson/keymap.c
deleted file mode 100644
index ead8ab40a6d..00000000000
--- a/keyboards/qvex/lynepad2/keymaps/mcrosson/keymap.c
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
-Copyright 2023 QVEX Tech
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include QMK_KEYBOARD_H
-
-#define RGB_HUE_LAYER0 0 //default layer
-#define RGB_HUE_LAYER1 50
-#define RGB_HUE_LAYER2 100
-#define RGB_HUE_LAYER3 150
-#define RGB_HUE_LAYER4 200
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT //Default
-    (
-        KC_MS_BTN4,   KC_MS_BTN2,   KC_MS_UP,    KC_MS_BTN1,
-        KC_MS_BTN5,   KC_MS_LEFT,   KC_MS_DOWN,  KC_MS_RIGHT,
-        KC_MS_ACCEL0, KC_MS_ACCEL1, KC_MS_ACCEL2,
-
-        KC_VOLU,   KC_VOLD,   KC_MPRV,   KC_MNXT,   //joystick up, down, left, right
-        KC_MPLY,   MO(4)                            //joystick center push, thumbwheel push
-    ),
-
-    [1] = LAYOUT //KiCad
-    (
-        XXXXXXX,   XXXXXXX,   XXXXXXX,   XXXXXXX,
-        XXXXXXX,   XXXXXXX,   XXXXXXX,   XXXXXXX,
-        XXXXXXX,   XXXXXXX,   XXXXXXX,
-
-        XXXXXXX,   XXXXXXX,   XXXXXXX,   XXXXXXX,  //joystick up, down, left, right
-        XXXXXXX,   MO(4)                           //joystick center push, thumbwheel push
-    ),
-
-    [2] = LAYOUT
-    (
-        XXXXXXX,   XXXXXXX,   XXXXXXX,   XXXXXXX,
-        XXXXXXX,   XXXXXXX,   XXXXXXX,   XXXXXXX,
-        XXXXXXX,   XXXXXXX,   XXXXXXX,
-
-        XXXXXXX,   XXXXXXX,   XXXXXXX,   XXXXXXX,   //joystick up, down, left, right
-        XXXXXXX,   MO(4)                            //joystick center push, thumbwheel push
-    ),
-
-    [3] = LAYOUT
-    (
-        XXXXXXX,   XXXXXXX,   XXXXXXX,   XXXXXXX,
-        XXXXXXX,   XXXXXXX,   XXXXXXX,   XXXXXXX,
-        XXXXXXX,   XXXXXXX,   XXXXXXX,
-
-        XXXXXXX,   XXXXXXX,   XXXXXXX,   XXXXXXX,   //joystick up, down, left, right
-        XXXXXXX,   MO(4)                            //joystick center push, thumbwheel push
-    ),
-
-    [4] = LAYOUT
-    (
-        TO(0),     TO(1),     TO(2),     TO(3),
-        BL_TOGG,   BL_STEP,   XXXXXXX,   XXXXXXX,
-        QK_RBT,    EE_CLR,    QK_BOOT,
-
-        XXXXXXX,   XXXXXXX,   XXXXXXX,   XXXXXXX,   //joystick up, down, left, right
-        RGB_TOG,   XXXXXXX                          //joystick center push, thumbwheel push
-    )
-};
-
-#if defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
-    [0] = { 
-        ENCODER_CCW_CW(KC_VOLD, KC_VOLU), 
-        ENCODER_CCW_CW(KC_MS_WH_DOWN, KC_MS_WH_UP)  
-    },
-
-    [1] = { 
-        ENCODER_CCW_CW(XXXXXXX, XXXXXXX), 
-        ENCODER_CCW_CW(XXXXXXX, XXXXXXX)  
-    },
-
-    [2] = { 
-        ENCODER_CCW_CW(XXXXXXX, XXXXXXX), 
-        ENCODER_CCW_CW(XXXXXXX, XXXXXXX)  
-    },
-
-    [3] = { 
-        ENCODER_CCW_CW(XXXXXXX, XXXXXXX), 
-        ENCODER_CCW_CW(XXXXXXX, XXXXXXX)  
-    },
-
-    [4] = { 
-        ENCODER_CCW_CW(RGB_VAD, RGB_VAI), 
-        ENCODER_CCW_CW(XXXXXXX, XXXXXXX)  
-    }
-};
-#endif
-
-//set only hue, retain saturation, and value
-void rgblight_sethue_noeeprom(uint8_t hue) {
-    //only if rgb led ring is on
-    if (rgblight_get_mode()) {
-        rgblight_sethsv_noeeprom(hue,rgblight_get_sat(),rgblight_get_val());
-    }     
-}
-
-//set correct layer hue on layer change
-layer_state_t layer_state_set_user(layer_state_t state) {
-    switch (get_highest_layer(state)) {
-        case 1:
-            rgblight_sethue_noeeprom(RGB_HUE_LAYER1);
-            break;
-        case 2:
-            rgblight_sethue_noeeprom(RGB_HUE_LAYER2);
-            break;
-        case 3:
-            rgblight_sethue_noeeprom(RGB_HUE_LAYER3);
-            break;
-        case 4:
-            rgblight_sethue_noeeprom(RGB_HUE_LAYER4);
-            break;
-        default:
-            rgblight_sethue_noeeprom(RGB_HUE_LAYER0);
-            break;
-
-    }
-    return state;
-}
-
-//set default layer hue upon init
-void keyboard_post_init_user(void) {
-  rgblight_init();
-  rgblight_sethue_noeeprom(RGB_HUE_LAYER0);
-}
\ No newline at end of file
diff --git a/keyboards/qvex/lynepad2/keymaps/mcrosson/rules.mk b/keyboards/qvex/lynepad2/keymaps/mcrosson/rules.mk
deleted file mode 100644
index a40474b4d5c..00000000000
--- a/keyboards/qvex/lynepad2/keymaps/mcrosson/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-ENCODER_MAP_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/qwertykeys/qk100/ansi/ansi.c b/keyboards/qwertykeys/qk100/ansi/ansi.c
index 06f7c11fb2d..e1102aab516 100644
--- a/keyboards/qwertykeys/qk100/ansi/ansi.c
+++ b/keyboards/qwertykeys/qk100/ansi/ansi.c
@@ -18,107 +18,107 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifdef RGB_MATRIX_ENABLE
 const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_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- . */
+    {0, SW1_CS2, SW1_CS3, SW1_CS1},    /* RGB0-ESC ROW0*/
+    {0, SW1_CS5, SW1_CS6, SW1_CS4},    /* RGB1-F1 */
+    {0, SW1_CS8, SW1_CS9, SW1_CS7},    /* RGB2-F2 */
+    {0, SW1_CS11, SW1_CS12, SW1_CS10}, /* RGB3-F3 */
+    {0, SW1_CS14, SW1_CS15, SW1_CS13}, /* RGB4-F4 */
+    {0, SW1_CS17, SW1_CS18, SW1_CS16}, /* RGB5-F5 */
+    {0, SW1_CS20, SW1_CS21, SW1_CS19}, /* RGB6-F6 */
+    {0, SW1_CS23, SW1_CS24, SW1_CS22}, /* RGB7-F7 */
+    {0, SW1_CS26, SW1_CS27, SW1_CS25}, /* RGB8-F8 */
+    {0, SW1_CS29, SW1_CS30, SW1_CS28}, /* RGB9-F9 */
+    {0, SW1_CS32, SW1_CS33, SW1_CS31}, /* RGB10-F10 */
+    {0, SW1_CS35, SW1_CS36, SW1_CS34}, /* RGB11-F11 */
+    {0, SW1_CS38, SW1_CS39, SW1_CS37}, /* RGB12-F12 */
+    {0, SW7_CS29, SW7_CS30, SW7_CS28}, /* RGB13-Delete */
+    {0, SW7_CS32, SW7_CS33, SW7_CS31}, /* RGB14-End */
+    {0, SW7_CS35, SW7_CS36, SW7_CS34}, /* RGB15-Insert */
+    {0, SW7_CS38, SW7_CS39, SW7_CS37}, /* RGB16-Home */
+    {0, SW2_CS2, SW2_CS3, SW2_CS1},    /* RGB17-~ ----ROW1*/
+    {0, SW2_CS5, SW2_CS6, SW2_CS4},    /* RGB18-1 */
+    {0, SW2_CS8, SW2_CS9, SW2_CS7},    /* RGB19-2 */
+    {0, SW2_CS11, SW2_CS12, SW2_CS10}, /* RGB20-3 */
+    {0, SW2_CS14, SW2_CS15, SW2_CS13}, /* RGB21-4 */
+    {0, SW2_CS17, SW2_CS18, SW2_CS16}, /* RGB22-5 */
+    {0, SW2_CS20, SW2_CS21, SW2_CS19}, /* RGB23-6 */
+    {0, SW2_CS23, SW2_CS24, SW2_CS22}, /* RGB24-7 */
+    {0, SW2_CS26, SW2_CS27, SW2_CS25}, /* RGB25-8 */
+    {0, SW2_CS29, SW2_CS30, SW2_CS28}, /* RGB26-9 */
+    {0, SW2_CS32, SW2_CS33, SW2_CS31}, /* RGB27-0 */
+    {0, SW2_CS35, SW2_CS36, SW2_CS34}, /* RGB28--- */
+    {0, SW2_CS38, SW2_CS39, SW2_CS37}, /* RGB29-+= */
+    {0, SW7_CS26, SW7_CS27, SW7_CS25}, /* RGB30-BS */
+    {0, SW8_CS29, SW8_CS30, SW8_CS28}, /* RGB31-Num Lock */
+    {0, SW8_CS32, SW8_CS33, SW8_CS31}, /* RGB32- / */
+    {0, SW8_CS35, SW8_CS36, SW8_CS34}, /* RGB33- * */
+    {0, SW8_CS38, SW8_CS39, SW8_CS37}, /* RGB34- - */
+    {0, SW3_CS2, SW3_CS3, SW3_CS1},    /* RGB35-TAB ----ROW2*/
+    {0, SW3_CS5, SW3_CS6, SW3_CS4},    /* RGB36-Q */
+    {0, SW3_CS8, SW3_CS9, SW3_CS7},    /* RGB37-W */
+    {0, SW3_CS11, SW3_CS12, SW3_CS10}, /* RGB38-E */
+    {0, SW3_CS14, SW3_CS15, SW3_CS13}, /* RGB39-R */
+    {0, SW3_CS17, SW3_CS18, SW3_CS16}, /* RGB40-T */
+    {0, SW3_CS20, SW3_CS21, SW3_CS19}, /* RGB41-Y */
+    {0, SW3_CS23, SW3_CS24, SW3_CS22}, /* RGB42-U */
+    {0, SW3_CS26, SW3_CS27, SW3_CS25}, /* RGB43-I */
+    {0, SW3_CS29, SW3_CS30, SW3_CS28}, /* RGB44-O */
+    {0, SW3_CS32, SW3_CS33, SW3_CS31}, /* RGB45-P */
+    {0, SW3_CS35, SW3_CS36, SW3_CS34}, /* RGB46-[ */
+    {0, SW3_CS38, SW3_CS39, SW3_CS37}, /* RGB47-] */
+    {0, SW9_CS26, SW9_CS27, SW9_CS25}, /* RGB48-\ */
+    {0, SW9_CS29, SW9_CS30, SW9_CS28}, /* RGB49-page up */
+    {0, SW9_CS32, SW9_CS33, SW9_CS31}, /* RGB50-7 */
+    {0, SW9_CS35, SW9_CS36, SW9_CS34}, /* RGB51-8 */
+    {0, SW9_CS38, SW9_CS39, SW9_CS37}, /* RGB52-9 */
+    {0, SW4_CS2, SW4_CS3, SW4_CS1},    /* RGB53-CAPS---ROW3*/
+    {0, SW4_CS5, SW4_CS6, SW4_CS4},    /* RGB54-A-- */
+    {0, SW4_CS8, SW4_CS9, SW4_CS7},    /* RGB55-S-- */
+    {0, SW4_CS11, SW4_CS12, SW4_CS10}, /* RGB56-D */
+    {0, SW4_CS14, SW4_CS15, SW4_CS13}, /* RGB57-F */
+    {0, SW4_CS17, SW4_CS18, SW4_CS16}, /* RGB58-G */
+    {0, SW4_CS20, SW4_CS21, SW4_CS19}, /* RGB59-H */
+    {0, SW4_CS23, SW4_CS24, SW4_CS22}, /* RGB60-J */
+    {0, SW4_CS26, SW4_CS27, SW4_CS25}, /* RGB61-K */
+    {0, SW4_CS29, SW4_CS30, SW4_CS28}, /* RGB62-L */
+    {0, SW4_CS32, SW4_CS33, SW4_CS31}, /* RGB63-;: */
+    {0, SW4_CS35, SW4_CS36, SW4_CS34}, /* RGB64-'" */
+    {0, SW4_CS38, SW4_CS39, SW4_CS37}, /* RGB65-ENTER */
+    {0, SW7_CS11, SW7_CS12, SW7_CS10}, /* RGB66-Page Down */
+    {0, SW7_CS14, SW7_CS15, SW7_CS13}, /* RGB67-4 */
+    {0, SW7_CS17, SW7_CS18, SW7_CS16}, /* RGB68-5 */
+    {0, SW7_CS20, SW7_CS21, SW7_CS19}, /* RGB69-6 */
+    {0, SW7_CS23, SW7_CS24, SW7_CS22}, /* RGB70-+ */
+    {0, SW5_CS2, SW5_CS3, SW5_CS1},    /* RGB71-LSF --ROW4*/
+    {0, SW5_CS5, SW5_CS6, SW5_CS4},    /* RGB72-Z */
+    {0, SW5_CS8, SW5_CS9, SW5_CS7},    /* RGB73-X */
+    {0, SW5_CS11, SW5_CS12, SW5_CS10}, /* RGB74-C */
+    {0, SW5_CS14, SW5_CS15, SW5_CS13}, /* RGB75-V */
+    {0, SW5_CS17, SW5_CS18, SW5_CS16}, /* RGB76-B */
+    {0, SW5_CS20, SW5_CS21, SW5_CS19}, /* RGB77-N */
+    {0, SW5_CS23, SW5_CS24, SW5_CS22}, /* RGB78-M */
+    {0, SW5_CS26, SW5_CS27, SW5_CS25}, /* RGB79-,< */
+    {0, SW5_CS29, SW5_CS30, SW5_CS28}, /* RGB80->. */
+    {0, SW5_CS32, SW5_CS33, SW5_CS31}, /* RGB81-?/ */
+    {0, SW5_CS35, SW5_CS36, SW5_CS34}, /* RGB82-RSF */
+    {0, SW5_CS38, SW5_CS39, SW5_CS37}, /* RGB83-UP */
+    {0, SW8_CS14, SW8_CS15, SW8_CS13}, /* RGB84-1*/
+    {0, SW8_CS17, SW8_CS18, SW8_CS16}, /* RGB85-2 */
+    {0, SW8_CS20, SW8_CS21, SW8_CS19}, /* RGB86-3 */
+    {0, SW8_CS23, SW8_CS24, SW8_CS22}, /* RGB87-Enter */
+    {0, SW6_CS2, SW6_CS3, SW6_CS1},    /* RGB88-lct-- ROW5*/
+    {0, SW6_CS5, SW6_CS6, SW6_CS4},    /* RGB89-lwin */
+    {0, SW6_CS8, SW6_CS9, SW6_CS7},    /* RGB90-lalt */
+    {0, SW6_CS11, SW6_CS12, SW6_CS10}, /* RGB91-sp0 */
+    {0, SW6_CS17, SW6_CS18, SW6_CS16}, /* RGB92-sp */
+    {0, SW6_CS26, SW6_CS27, SW6_CS25}, /* RGB93-sp2 */
+    {0, SW6_CS29, SW6_CS30, SW6_CS28}, /* RGB94-ralt */
+    {0, SW6_CS32, SW6_CS33, SW6_CS31}, /* RGB95- fn */
+    {0, SW6_CS35, SW6_CS36, SW6_CS34}, /* RGB96-left */
+    {0, SW6_CS38, SW6_CS39, SW6_CS37}, /* RGB97-down */
+    {0, SW9_CS11, SW9_CS12, SW9_CS10}, /* RGB98-right */
+    {0, SW9_CS14, SW9_CS15, SW9_CS13}, /* RGB99- 0 */
+    {0, SW9_CS20, SW9_CS21, SW9_CS19}  /* RGB100- . */
 };
 
 bool process_record_kb(uint16_t keycode, keyrecord_t* record) {
diff --git a/keyboards/qwertykeys/qk100/ansi/info.json b/keyboards/qwertykeys/qk100/ansi/info.json
index 3469f1c62e2..fb52f388de1 100644
--- a/keyboards/qwertykeys/qk100/ansi/info.json
+++ b/keyboards/qwertykeys/qk100/ansi/info.json
@@ -140,7 +140,6 @@
             "hue_breathing": true,
             "hue_pendulum": true,
             "hue_wave": true,
-            "pixel_fractal": true,
             "pixel_flow": true,
             "pixel_rain": true,
             "typing_heatmap": true,
@@ -148,15 +147,11 @@
             "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
+            "solid_splash": true
         },
         "default": {
             "val": 128
@@ -270,4 +265,4 @@
             ]
         }
     }
-}
\ 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
index 43061db1dd4..1e5b99807cb 100644
--- a/keyboards/qwertykeys/qk100/ansi/keymaps/via/rules.mk
+++ b/keyboards/qwertykeys/qk100/ansi/keymaps/via/rules.mk
@@ -1,2 +1 @@
 VIA_ENABLE = yes
-LTO_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/qwertykeys/qk100/info.json b/keyboards/qwertykeys/qk100/info.json
index d020ca8ad20..6edea6dff7d 100644
--- a/keyboards/qwertykeys/qk100/info.json
+++ b/keyboards/qwertykeys/qk100/info.json
@@ -1,6 +1,5 @@
 {
     "manufacturer": "Qwertykeys",
-    "url": "",
     "maintainer": "Qwertykeys",
     "usb": {
         "vid": "0x4F53"
@@ -17,6 +16,9 @@
         "rgblight": true,
         "nkro": true
     },
+    "build": {
+        "lto": true
+    },
     "processor": "STM32F103",
     "bootloader": "stm32duino",
     "ws2812": {
@@ -47,4 +49,4 @@
     "dynamic_keymap": {
         "layer_count": 2
     }
-}
\ No newline at end of file
+}
diff --git a/keyboards/recompile_keys/nomu30/keymaps/center_sprit/config.h b/keyboards/recompile_keys/nomu30/keymaps/center_sprit/config.h
index e7ca3c17601..42b68131be9 100644
--- a/keyboards/recompile_keys/nomu30/keymaps/center_sprit/config.h
+++ b/keyboards/recompile_keys/nomu30/keymaps/center_sprit/config.h
@@ -61,5 +61,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define WS2812_DI_PIN B5
   #define RGBLIGHT_TIMER
 
-  #define RGBLED_NUM 6
+  #define RGBLIGHT_LED_COUNT 6
 #endif
diff --git a/keyboards/recompile_keys/nomu30/keymaps/like_jis/config.h b/keyboards/recompile_keys/nomu30/keymaps/like_jis/config.h
index e7ca3c17601..42b68131be9 100644
--- a/keyboards/recompile_keys/nomu30/keymaps/like_jis/config.h
+++ b/keyboards/recompile_keys/nomu30/keymaps/like_jis/config.h
@@ -61,5 +61,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define WS2812_DI_PIN B5
   #define RGBLIGHT_TIMER
 
-  #define RGBLED_NUM 6
+  #define RGBLIGHT_LED_COUNT 6
 #endif
diff --git a/keyboards/redragon/k667/k667.c b/keyboards/redragon/k667/k667.c
index a1930f3b85b..b84bfa40c1d 100644
--- a/keyboards/redragon/k667/k667.c
+++ b/keyboards/redragon/k667/k667.c
@@ -18,95 +18,95 @@
 
 #ifdef RGB_MATRIX_ENABLE
 const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_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}
+    {0, SW7_CS1,    SW9_CS1,    SW8_CS1},            
+    {0, SW7_CS3,    SW9_CS3,    SW8_CS3},    
+    {0, SW7_CS4,    SW9_CS4,    SW8_CS4},    
+    {0, SW7_CS5,    SW9_CS5,    SW8_CS5},    
+    {0, SW7_CS6,    SW9_CS6,    SW8_CS6},    
+    {0, SW7_CS7,    SW9_CS7,    SW8_CS7},    
+    {0, SW7_CS8,    SW9_CS8,    SW8_CS8},    
+    {0, SW7_CS9,    SW9_CS9,    SW8_CS9},    
+    {0, SW7_CS10,   SW9_CS10,   SW8_CS10},    
+    {0, SW7_CS11,   SW9_CS11,   SW8_CS11},    
+    {0, SW7_CS12,   SW9_CS12,   SW8_CS12},    
+    {0, SW7_CS13,   SW9_CS13,   SW8_CS13},    
+    {0, SW7_CS14,   SW9_CS14,   SW8_CS14},    
+    {0, SW7_CS15,   SW9_CS15,   SW8_CS15},    
+    {0, SW4_CS1,    SW6_CS1,    SW5_CS1},        
+    {0, SW4_CS2,    SW6_CS2,    SW5_CS2},   
+    {0, SW4_CS3,    SW6_CS3,    SW5_CS3},    
+    {0, SW4_CS4,    SW6_CS4,    SW5_CS4},    
+    {0, SW4_CS5,    SW6_CS5,    SW5_CS5},    
+    {0, SW4_CS6,    SW6_CS6,    SW5_CS6},    
+    {0, SW4_CS7,    SW6_CS7,    SW5_CS7},    
+    {0, SW4_CS8,    SW6_CS8,    SW5_CS8},    
+    {0, SW4_CS9,    SW6_CS9,    SW5_CS9},    
+    {0, SW4_CS10,   SW6_CS10,   SW5_CS10},    
+    {0, SW4_CS11,   SW6_CS11,   SW5_CS11},    
+    {0, SW4_CS12,   SW6_CS12,   SW5_CS12},    
+    {0, SW4_CS13,   SW6_CS13,   SW5_CS13},    
+    {0, SW4_CS14,   SW6_CS14,   SW5_CS14},    
+    {0, SW4_CS15,   SW6_CS15,   SW5_CS15},    
+    {0, SW1_CS1,    SW3_CS1,    SW2_CS1},        
+    {0, SW1_CS2,    SW3_CS2,    SW2_CS2},   
+    {0, SW1_CS3,    SW3_CS3,    SW2_CS3},    
+    {0, SW1_CS4,    SW3_CS4,    SW2_CS4},    
+    {0, SW1_CS5,    SW3_CS5,    SW2_CS5},    
+    {0, SW1_CS6,    SW3_CS6,    SW2_CS6},    
+    {0, SW1_CS7,    SW3_CS7,    SW2_CS7},    
+    {0, SW1_CS8,    SW3_CS8,    SW2_CS8},    
+    {0, SW1_CS9,    SW3_CS9,    SW2_CS9},    
+    {0, SW1_CS10,   SW3_CS10,   SW2_CS10},    
+    {0, SW1_CS11,   SW3_CS11,   SW2_CS11},    
+    {0, SW1_CS12,   SW3_CS12,   SW2_CS12},    
+    {0, SW1_CS13,   SW3_CS13,   SW2_CS13},    
+    {0, SW1_CS14,   SW3_CS14,   SW2_CS14},    
+    {0, SW1_CS15,   SW3_CS15,   SW2_CS15},        
+    {1, SW7_CS1,    SW9_CS1,    SW8_CS1},        
+    {1, SW7_CS2,    SW9_CS2,    SW8_CS2},   
+    {1, SW7_CS3,    SW9_CS3,    SW8_CS3},    
+    {1, SW7_CS4,    SW9_CS4,    SW8_CS4},    
+    {1, SW7_CS5,    SW9_CS5,    SW8_CS5},    
+    {1, SW7_CS6,    SW9_CS6,    SW8_CS6},    
+    {1, SW7_CS7,    SW9_CS7,    SW8_CS7},    
+    {1, SW7_CS8,    SW9_CS8,    SW8_CS8},    
+    {1, SW7_CS9,    SW9_CS9,    SW8_CS9},    
+    {1, SW7_CS10,   SW9_CS10,   SW8_CS10},    
+    {1, SW7_CS11,   SW9_CS11,   SW8_CS11},    
+    {1, SW7_CS12,   SW9_CS12,   SW8_CS12},    
+    {1, SW7_CS13,   SW9_CS13,   SW8_CS13},    
+    {1, SW7_CS14,   SW9_CS14,   SW8_CS14},    
+    {1, SW7_CS15,   SW9_CS15,   SW8_CS15},    
+    {1, SW4_CS1,    SW6_CS1,    SW5_CS1},        
+    {1, SW4_CS2,    SW6_CS2,    SW5_CS2},   
+    {1, SW4_CS3,    SW6_CS3,    SW5_CS3},    
+    {1, SW4_CS4,    SW6_CS4,    SW5_CS4},    
+    {1, SW4_CS5,    SW6_CS5,    SW5_CS5},    
+    {1, SW4_CS6,    SW6_CS6,    SW5_CS6},    
+    {1, SW4_CS7,    SW6_CS7,    SW5_CS7},    
+    {1, SW4_CS8,    SW6_CS8,    SW5_CS8},    
+    {1, SW4_CS9,    SW6_CS9,    SW5_CS9},    
+    {1, SW4_CS10,   SW6_CS10,   SW5_CS10},    
+    {1, SW4_CS11,   SW6_CS11,   SW5_CS11},    
+    {1, SW4_CS12,   SW6_CS12,   SW5_CS12},    
+    {1, SW4_CS13,   SW6_CS13,   SW5_CS13},    
+    {1, SW4_CS14,   SW6_CS14,   SW5_CS14},    
+    {1, SW4_CS15,   SW6_CS15,   SW5_CS15},    
+    {1, SW1_CS1,    SW3_CS1,    SW2_CS1},        
+    {1, SW1_CS2,    SW3_CS2,    SW2_CS2},   
+    {1, SW1_CS3,    SW3_CS3,    SW2_CS3},        
+    {1, SW1_CS5,    SW3_CS5,    SW2_CS5},    
+    {1, SW1_CS6,    SW3_CS6,    SW2_CS6},    
+    {1, SW1_CS7,    SW3_CS7,    SW2_CS7},    
+    {1, SW1_CS8,    SW3_CS8,    SW2_CS8},    
+    {1, SW1_CS9,    SW3_CS9,    SW2_CS9},    
+    {1, SW1_CS10,   SW3_CS10,   SW2_CS10},    
+    {1, SW1_CS11,   SW3_CS11,   SW2_CS11},    
+    {1, SW1_CS12,   SW3_CS12,   SW2_CS12},    
+    {1, SW1_CS13,   SW3_CS13,   SW2_CS13},    
+    {1, SW1_CS14,   SW3_CS14,   SW2_CS14},    
+    {1, SW1_CS15,   SW3_CS15,   SW2_CS15},      
+    {0, SW7_CS2,    SW9_CS2,    SW8_CS2},
+    {1, SW1_CS4,    SW3_CS4,    SW2_CS4}
 };
 #endif
diff --git a/keyboards/redscarf_iiplus/verd/keymaps/alittlepeace/keymap.c b/keyboards/redscarf_iiplus/verd/keymaps/alittlepeace/keymap.c
deleted file mode 100644
index e6019db2ee0..00000000000
--- a/keyboards/redscarf_iiplus/verd/keymaps/alittlepeace/keymap.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/* Copyright 2019 Andy Lee <alee@alittlepeacemusic.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-
-// Defines the keycodes used by our macros in process_record_user
-enum custom_keycodes {
-    KC_P00 = SAFE_RANGE,
-    
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    [0] = LAYOUT_60_ansi_numpad_split0(
-        QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, TG(1), KC_PSLS, KC_PAST, KC_PMNS, 
-        KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_INS, KC_HOME, KC_PGUP, 
-        KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_DEL, KC_END, KC_PGDN, KC_PPLS, 
-        KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, C(S(KC_TAB)), KC_UP, LCTL(KC_TAB), 
-        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(2), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_PENT
-    ),
-
-    [1] = LAYOUT_60_ansi_numpad_split0(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_7,    KC_8,    KC_9,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_4,    KC_5,    KC_6,    _______,
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_1,    KC_2,    KC_3,
-        _______, _______, _______,                            _______,                            _______, _______, _______, _______, KC_0,    KC_P00,  KC_DOT,  _______
-    ),
-    
-    [2] = LAYOUT_60_ansi_numpad_split0(
-        _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______,
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______, _______, _______
-    ),
-};
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case KC_P00:
-            if (record->event.pressed) {
-                SEND_STRING("00");
-                 }
-        break;
-         case TG(1):
-           if (record->event.pressed) {
-                tap_code(KC_NUM_LOCK);
-		return true;
-		}
-	   break;
-
-    }
-    return true;
-}
-
-void matrix_init_user (void) {
-  if (!host_keyboard_led_state ().num_lock) {
-      tap_code(KC_NUM_LOCK);
-  }
-}
-
-bool led_update_user(led_t led_state) {
-    if (led_state.num_lock) {
-        layer_on(1);
-    } else {
-        layer_off(1);
-    }
-    return true;
-}
diff --git a/keyboards/reviung/reviung41/keymaps/ciutadellla/config.h b/keyboards/reviung/reviung41/keymaps/ciutadellla/config.h
deleted file mode 100644
index 1d7ad67a629..00000000000
--- a/keyboards/reviung/reviung41/keymaps/ciutadellla/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2021 @Ciutadellla
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-#define RGBLIGHT_LAYERS
-    // /*== or choose animations ==*/
-    #define RGBLIGHT_EFFECT_BREATHING
-    #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-    #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-
-#define TAPPING_TERM 200
-#define UNICODE_SELECTED_MODES UNICODE_MODE_MACOS, UNICODE_MODE_LINUX, UNICODE_MODE_WINCOMPOSE
diff --git a/keyboards/reviung/reviung41/keymaps/ciutadellla/keymap.c b/keyboards/reviung/reviung41/keymaps/ciutadellla/keymap.c
deleted file mode 100644
index a4279821ccc..00000000000
--- a/keyboards/reviung/reviung41/keymaps/ciutadellla/keymap.c
+++ /dev/null
@@ -1,333 +0,0 @@
-/* Copyright 2021 @Ciutadellla
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
- #include QMK_KEYBOARD_H
-
- enum layer_names {
-     _BASE,
-     _LOWER,
-     _RAISE,
-     _MOVE,
-     _ADJUST
- };
-
- //UNICODES
- #include "process_unicode.h"
-
- enum unicode_names {
-     CKC_EUR,
-     N_TILDE,
-     COMB_ACUTE_ACCENT,
-     GRINNING_FACE, // 😃
-     BEAMING_FACE, // 😁
-     GRINNING_FACE_WITH_SWEAT, // 😅
-     ROLLING_LAUGHING, // 🤣
-     FACE_TEARS_JOY, // 😂
-     WINKING_FACE, // 😉
-     SMILING_FACE_HALO, // 😇
-     SMILING_FACE_HEARTS, // 🥰
-     SMILING_FACE_HEART_EYES, // 😍
-     FACE_BLOWING_KISS, // 😘
-     FACE_SAVORING_FOOD, // 😋
-     ZANY_FACE, // 🤪
-     HUGGING_FACE, // 🤗
-     SHUSHING_FACE, // 🤫
-     THINKING_FACE, // 🤔
-     FACE_RAISED_EYEBROW, // 🤨
-     NEUTRAL_FACE, // 😐
-     SMIRKING_FACE, // 😏
-     FACE_ROLLING_EYES, // 🙄
-     PENSIVE_FACE, // 😔
-     FACE_VOMITING, // 🤮
-     WOOZY_FACE, // 🥴
-     PLEADING_FACE, // 🥺
-     LOUDLY_CRYING_FACE, // 😭
-     DISAPPOINTED_FACE, // 😞
-     FACE_SYMBOLS_MOUTH, // 🤬
-     SMILING_FACE_HORNS, // 😈
-     SKULL, // 💀
-     PILE_POO, // 💩
-     GHOST, // 👻
-     ALIEN_MONSTER, // 👾
-     RED_HEART, // ❤
-     BOMB, // 💣
-     WAVING_HAND, // 👋
-     OK_HAND, // 👌
-     CLAPPING_HANDS, // 👏
-     EYES, // 👀
-     MAN_FACEPALMING, // 🤦
-     TURTLE, // 🐢
-     SNAKE, // 🐍
-     SPOUTING_WHALE, // 🐳
-     DRAGON, // 🐉
-     TREX, // 🦖
-     THUMBSDOWN, // 👍
-     THUMBSUP, // 👎
- };
-
- //https://unicode-table.com/en/#00F1
- const uint32_t unicode_map[] PROGMEM = {
-     [CKC_EUR] = 0x20AC, //€
-     [N_TILDE] = 0x00F1,  // ñ
-     [COMB_ACUTE_ACCENT] = 0x0301,  // ´
-     [GRINNING_FACE] = 0x1F603,
-     [BEAMING_FACE] = 0x1F601,
-     [GRINNING_FACE_WITH_SWEAT] = 0x1F605,
-     [ROLLING_LAUGHING] = 0x1F923,
-     [FACE_TEARS_JOY] = 0x1F602,
-     [WINKING_FACE] = 0x1F609,
-     [SMILING_FACE_HALO] = 0x1F607,
-     [SMILING_FACE_HEARTS] = 0x1F970,
-     [SMILING_FACE_HEART_EYES] = 0x1F60D,
-     [FACE_BLOWING_KISS] = 0x1F618,
-     [FACE_SAVORING_FOOD] = 0x1F60B,
-     [ZANY_FACE] = 0x1F92A,
-     [HUGGING_FACE] = 0x1F917,
-     [SHUSHING_FACE] = 0x1F92B,
-     [THINKING_FACE] = 0x1F914,
-     [FACE_RAISED_EYEBROW] = 0x1F928,
-     [NEUTRAL_FACE] = 0x1F610,
-     [SMIRKING_FACE] = 0x1F60F,
-     [FACE_ROLLING_EYES] = 0x1F644,
-     [PENSIVE_FACE] = 0x1F614,
-     [FACE_VOMITING] = 0x1F92E,
-     [WOOZY_FACE] = 0x1F974,
-     [PLEADING_FACE] = 0x1F97A,
-     [LOUDLY_CRYING_FACE] = 0x1F62D,
-     [DISAPPOINTED_FACE] = 0x1F61E,
-     [FACE_SYMBOLS_MOUTH] = 0x1F92C,
-     [SMILING_FACE_HORNS] = 0x1F608,
-     [SKULL] = 0x1F480,
-     [PILE_POO] = 0x1F4A9,
-     [GHOST] = 0x1F47B,
-     [ALIEN_MONSTER] = 0x1F47E,
-     [RED_HEART] = 0x2764,
-     [BOMB] = 0x1F4A3,
-     [WAVING_HAND] = 0x1F44B,
-     [OK_HAND] = 0x1F44C,
-     [CLAPPING_HANDS] = 0x1F44F,
-     [EYES] = 0x1F440,
-     [MAN_FACEPALMING] = 0x1F926,
-     [TURTLE] = 0x1F422,
-     [SNAKE] = 0x1F40D,
-     [SPOUTING_WHALE] = 0x1F433,
-     [DRAGON] = 0x1F409,
-     [TREX] = 0x1F996,
-     [THUMBSDOWN] = 0x1F44E,
-     [THUMBSUP] = 0x1F44D,
- };
-
-
- void matrix_init_user(void){
-     set_unicode_input_mode(UNICODE_MODE_MACOS);
- }
-
-
- // Shortcut to make keymap more readable
- #define KC_OSX_EJECT 0x66
- #define LOCK_OSX LSFT(LCTL(KC_OSX_EJECT))
- #define SLEEP_OSX LALT(LGUI(KC_OSX_EJECT))
- #define KC_C_LF  RCTL(KC_LEFT)     // control + left
- #define KC_C_RT  RCTL(KC_RGHT)     // control + right
-
- // tap dance declarations
- enum {
-     _TD_TAB_ESC = 0,
-     _TD_BSPC_WDEL,
-     _TD_SFT_CAPS,
-     _TD_SPC_ENT,
-     _TD_N_NTILDE,
-     _TD_CTRL_LANG,
-     _TD_SCLN_NTILDE
- };
-
- #define TD_TAB_ESC TD(_TD_TAB_ESC)
- #define TD_BSPC_WDEL TD(_TD_BSPC_WDEL)
- #define TD_SFT_CAPS TD(_TD_SFT_CAPS)
- #define TD_SPC_ENT TD(_TD_SPC_ENT)
- #define TD_N_NTILDE TD(_TD_N_NTILDE)
- #define TD_CTRL_LANG TD(_TD_CTRL_LANG)
- #define TD_SCLN_NTILDE TD(_TD_SCLN_NTILDE) //TP with costum keycodes has to be a funtion
-
- void td_scln_ntilde(tap_dance_state_t *state, void *user_data) {
-      if (state->count == 1) {
-         register_code(KC_SCLN);
-         unregister_code(KC_SCLN);
-      } else {
-         send_unicode_string("ñ");
-      }
-      reset_tap_dance(state);
- }
-
- // Tap Dance Definitions
- tap_dance_action_t tap_dance_actions[] = {
-     [_TD_TAB_ESC] = ACTION_TAP_DANCE_DOUBLE(KC_TAB, KC_ESC),
-     [_TD_BSPC_WDEL] = ACTION_TAP_DANCE_DOUBLE(KC_BSPC, LALT(KC_BSPC)),
-     [_TD_SFT_CAPS] = ACTION_TAP_DANCE_DOUBLE(KC_LSFT, KC_CAPS),
-     [_TD_SPC_ENT] = ACTION_TAP_DANCE_DOUBLE(KC_SPC, KC_ENT),
-     [_TD_CTRL_LANG] = ACTION_TAP_DANCE_DOUBLE(KC_LCTL, LCTL(LSFT(KC_SPACE))),
-     [_TD_SCLN_NTILDE] = ACTION_TAP_DANCE_FN(td_scln_ntilde),
- };
-
-
- const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-
-     /* Qwerty 0
-    * ,-----------------------------------------+         +-----------------------------------------.
-    * | Tab  |   Q  |   W  |   E  |   R  |   T  |         |   Y  |   U  |   I  |   O  |   P  | Bksp |
-    * |------+------+------+------+------+------+         +------+------+------+------+------+------|
-    * |CtlLNG|   A  |   S  |   D  |   F  |   G  |         |   H  |   J  |   K  |   L  |   ;  |   "  |
-    * |------+------+------+------+------+------+         +------+------+------+------+------+------|
-    * | Shift|   Z  |   X  |   C  |   V  |   B  |         |   N  |   M  |   ,  |   .  |   /  | Shift|
-    * |------+------+------+------+------+------+         +------+------+------+------+------+------|
-    *                             | GUI  | Lower|  Space  | Raise| Alt  |
-    *                             +-------------/         \--------------+
-    */
-     [_BASE] =  LAYOUT_reviung41(TD_TAB_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, TD_BSPC_WDEL, TD_CTRL_LANG, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, TD_SCLN_NTILDE, KC_QUOT, TD_SFT_CAPS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, RSFT_T(KC_ENT), KC_LGUI, MO(1), TD_SPC_ENT, MO(2), LT(4,KC_NO)),
-
-
-     /* LOWER 1
-    * ,-----------------------------------------+         +-----------------------------------------.
-    * | Tab  |   !  |  @   |   #  |   $  |   %  |         |   ^  |   &  |   *  |  ()  |   )  |  Del |
-    * |------+------+------+------+------+------+         +------+------+------+------+------+------|
-    * | Ctl  |   _  |  +   |  {}  |   }  |   |  |         | LEFT | DOWN |  UP  | RIGHT|  ´   |   "  |
-    * |------+------+------+------+------+------+         +------+------+------+------+------+------|
-    * | Shift| Esc  |  Gui |  Alt |  =   |  ""  |         | HOME | END  | PGUP | PDOWN|   /  | Shft |
-    * |------+------+------+------+------+------+         +------+------+------+------+------+------|
-    *                             | GUI  | Lower|  Space  | Raise| Alt  |
-    *                             +-------------/         \--------------+
-    */
-         [_LOWER] = LAYOUT_reviung41(KC_TRNS, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_ESC, KC_LGUI, KC_LALT, KC_LCTL, KC_TRNS, KC_HOME, KC_END, KC_PGUP, KC_PGDN, KC_PSCR, MT(MOD_LSFT | MOD_RSFT,KC_SPC), KC_TRNS, KC_TRNS, KC_ENT, MO(3), KC_TRNS),
-
-   /* Raise 2
-    * ,-----------------------------------------+         +-----------------------------------------.
-    * |      |   1  |   2  |   3  |   4  |   5  |         |   6  |   7  |   8  |   9  |   0  | DEL  |
-    * |------+------+------+------+------+------+         +------+------+------+------+------+------|
-    * |      | MINS |  EQL | LBRC | RBRC | BSLS |         |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |
-    * |------+------+------+------+------+------+         +------+------+------+------+------+------|
-    * |      |      |      |      |      | QUOT |         |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
-    * |------+------+------+------+------+------+         +------+------+------+------+------+------|
-    *                             | ____ | MO(3)|   BSPC  | ____  | ____ |
-    *                             +-------------/         \--------------+
-    */
-
-            // [_RAISE] = LAYOUT_reviung41(
-     //     KC_TRNS, KC_P1, KC_P2, KC_P3, KC_P4, KC_P5,                 KC_P6, KC_P7, KC_P8, KC_P9, KC_P0, KC_DEL,
-     //     KC_TRNS, KC_LPRN, KC_RPRN, KC_LT, KC_GT, KC_AMPR,           KC_PMNS, KC_PPLS, KC_HASH, KC_PERC, KC_COLN, KC_PEQL,
-     //     KC_TRNS, KC_LCBR, KC_RCBR, KC_SLSH, KC_INT1, KC_PIPE,       KC_PSLS, KC_PAST, KC_PCMM, KC_PDOT, KC_HASH, KC_PENT,
-     //                                     KC_TRNS, MO(3), KC_BSPC, KC_TRNS, KC_TRNS
-     // ),
-
-     [_RAISE] = LAYOUT_reviung41(
-         KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_P7, KC_P8, KC_P9, KC_P0, KC_PPLS, KC_PMNS,
-         KC_COLN, KC_DQUO, KC_LCBR, KC_RCBR, KC_LT, KC_GT, KC_P4, KC_P5, KC_P6, KC_PERC, KC_PAST, KC_PSLS,
-         KC_AMPR, KC_PIPE, KC_LPRN, KC_RPRN, KC_LBRC, KC_RBRC, KC_P1, KC_P2, KC_P3, KC_PCMM, KC_PDOT, KC_PEQL,
-         KC_TRNS, MO(3), KC_PENT, KC_TRNS, KC_TRNS
-         ),
-
-
-   /* _MOVE 3
-    * ,---------------------------------------------------+     +------------------------------------------.
-    * |       |       |       |         |       |         |     |      | WHD  |  WHU |      |      |  LOCK |
-    * |-------+-------+-------+---------+-------+---------+     +------+------+------+------+------+-------|
-    * |       |       |       |         |       |         |     | M_L  | M_D  | M_I  | M_R  |      | SLEEP |
-    * |-------+-------+-------+---------+-------+---------+     +------+------+------+------+------+-------|
-    * |       |       |       |         | SCRLFT| SCRRGHT |     | M_B1 |  M_B2|  M0  |  M2  |      | QK_BOOT |
-    * |-------+-------+-------+---------+-------+---------+     +------+------+------+------+------+-------|
-    *                                   | ____ | ____ |    BSPC   | ____  | ____ |
-    *                                   +-------------/            \--------------+
-    */
-     [_MOVE] = LAYOUT_reviung41(KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_WH_L, KC_WH_D, KC_WH_U, KC_WH_R, KC_ACL2, LOCK_OSX, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_ACL0, SLEEP_OSX, KC_F13, KC_F14, KC_F15, KC_F16, KC_C_LF, KC_C_RT, KC_BTN1, KC_BTN2, KC_BTN3, KC_BTN4, KC_BTN5, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-     /* _ADJUST 4
-    * ,----------------------------------------+         +---------------------------------------------------.
-    * |  😃  |   😅 |  🤣  |  😉  |  😇  |  🥰  |          | RGBUP | HUEUP  | RGB_MOD |  BRIU  | PLAY  | VOLU |
-    * |------+-----+------+------+------+------+         +-------+--------+----------+-------+-------+------|
-    * |  😍  |  😘  |  🙄  |  😔  |  😭  |  💩  |          | RGBDWN| HUEDWN | RGB_TOG |  BRID  | STOP  | VOLD |
-    * |------+-----+------+------+------+------+         +-------+--------+----------+--------+------+------|
-    * |  👍  |  👎  |  👏  |  👀  |  🤦  |  👻  |          | RGB_TG|        |         |        |       | MUTE |
-    * |------+------+------+------+------+------+        +-------+--------+----------+--------+------+------|
-    *                             | GUI  | Lower|  BSPC   | Raise| Alt  |
-    *                             +-------------/         \--------------+
-    */
-
-     [_ADJUST] = LAYOUT_reviung41(UM(GRINNING_FACE), UM(GRINNING_FACE_WITH_SWEAT), UM(ROLLING_LAUGHING), UM(WINKING_FACE), UM(SMILING_FACE_HALO), UM(SMILING_FACE_HEARTS), RGB_VAI, RGB_HUI, RGB_MOD, KC_BRIU, KC_MPLY, KC_VOLU, UM(SMILING_FACE_HEART_EYES), UM(FACE_BLOWING_KISS), UM(FACE_ROLLING_EYES), UM(PENSIVE_FACE), UM(LOUDLY_CRYING_FACE), UM(PILE_POO), RGB_VAD, RGB_HUD, RGB_RMOD, KC_BRID, KC_MSTP, KC_VOLD, UM(THUMBSUP), UM(THUMBSDOWN), UM(CLAPPING_HANDS), UM(EYES), UM(MAN_FACEPALMING), UM(GHOST), RGB_TOG, RGB_SAD, RGB_SAI, RGB_SPD, RGB_SPI, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
-
- };
-
-
-
- #ifdef RGBLIGHT_ENABLE
- // RGB LED Indicators
- const rgblight_segment_t PROGMEM my_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-     {0, 11, HSV_RED}    // Light 1 LED, starting with LED 0
- );
-
- // RGB LED Indicators
- const rgblight_segment_t PROGMEM my_base_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-     {0, 11, HSV_CYAN}    // Light 1 LED, starting with LED 0
- );
-
- const rgblight_segment_t PROGMEM my_lower_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-     {0, 11, HSV_GREEN}  // Light 1 LED, starting with LED 1
- );
-
- // RGB LED Indicators
- const rgblight_segment_t PROGMEM my_rise_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-     {0, 11, HSV_MAGENTA}    // Light 1 LED, starting with LED 0
- );
-
- // RGB LED Indicators
- const rgblight_segment_t PROGMEM my_MOVE_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-     {0, 11, HSV_YELLOW}    // Light 1 LED, starting with LED 0
- );
-
-
- // RGB LED Indicators
- const rgblight_segment_t PROGMEM my_ADJUST_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-     {0, 11, HSV_AZURE}    // Light 1 LED, starting with LED 0
- );
-
- // Now define the array of layers. Later layers take precedence
- const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
-     my_base_layer,          // 0
-     my_lower_layer,         // 1
-     my_rise_layer,          // 2
-     my_MOVE_layer,        // 3
-     my_ADJUST_layer,   // 4
-     my_capslock_layer       // 5
- );
-
- // Enable the LED layers
- void keyboard_post_init_user(void) {
-     rgblight_layers = my_rgb_layers;
- }
-
- layer_state_t layer_state_set_user(layer_state_t state) {
-     rgblight_set_layer_state(1, layer_state_cmp(state, _LOWER));
-     rgblight_set_layer_state(2, layer_state_cmp(state, _RAISE));
-     rgblight_set_layer_state(3, layer_state_cmp(state, _MOVE));
-     rgblight_set_layer_state(4, layer_state_cmp(state, _ADJUST));
-     return state;
- }
-
- bool led_update_user(led_t led_state) {
-     rgblight_set_layer_state(5, led_state.caps_lock);
-     return true;
- }
- #endif
-
diff --git a/keyboards/reviung/reviung41/keymaps/ciutadellla/rules.mk b/keyboards/reviung/reviung41/keymaps/ciutadellla/rules.mk
deleted file mode 100644
index eeafc120062..00000000000
--- a/keyboards/reviung/reviung41/keymaps/ciutadellla/rules.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-# MCU name
-MCU = atmega32u4
-BOOTLOADER = atmel-dfu
-MOUSEKEY_ENABLE = yes        # Mouse keys
-CONSOLE_ENABLE = no        # Console for debug
-COMMAND_ENABLE = no        # Commands for debug and configuration
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-UNICODEMAP_ENABLE = yes         # Unicode
-TAP_DANCE_ENABLE = yes
diff --git a/keyboards/rgbkb/mun/config.h b/keyboards/rgbkb/mun/config.h
index b247fa91cd0..74db14c0611 100644
--- a/keyboards/rgbkb/mun/config.h
+++ b/keyboards/rgbkb/mun/config.h
@@ -54,8 +54,8 @@
 #define WS2812_PWM_DRIVER PWMD3
 #define WS2812_PWM_CHANNEL 2
 #define WS2812_PWM_PAL_MODE 2
-#define WS2812_DMA_STREAM STM32_DMA1_STREAM3
-#define WS2812_DMA_CHANNEL 3
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM3
+#define WS2812_PWM_DMA_CHANNEL 3
 
 #define TOUCH_UPDATE_INTERVAL 33
 #define OLED_UPDATE_INTERVAL 33
diff --git a/keyboards/rgbkb/mun/keymaps/xulkal2/config.h b/keyboards/rgbkb/mun/keymaps/xulkal2/config.h
deleted file mode 100644
index b34b40c7859..00000000000
--- a/keyboards/rgbkb/mun/keymaps/xulkal2/config.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * ----------------------------------------------------------------------------
- * "THE BEER-WARE LICENSE" (Revision 42):
- * <https://github.com/Legonut> wrote this file.  As long as you retain this
- * notice you can do whatever you want with this stuff. If we meet some day, and
- * you think this stuff is worth it, you can buy me a beer in return. David Rauseo
- * ----------------------------------------------------------------------------
- */
-
-#pragma once
-
-// Xulkal custom stuff
-#undef QUICK_TAP_TERM
-
-#undef TAPPING_TERM
-#define TAPPING_TERM 175
-
-#define SPACE_CADET_MODIFIER_CARRYOVER
-#define LSPO_KEYS KC_LSFT, KC_TRNS, KC_LBRC
-#define RSPC_KEYS KC_RSFT, KC_TRNS, KC_RBRC
-#define LCPO_KEYS KC_LCTL, KC_TRNS, KC_MINS
-#define RCPC_KEYS KC_RCTL, KC_TRNS, KC_EQL
-
-// No need for the single versions when multi performance isn't a problem =D
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-#undef ENABLE_RGB_MATRIX_SPLASH
-#undef ENABLE_RGB_MATRIX_SOLID_SPLASH
-
-// 20m timeout (20m * 60s * 1000mil)
-// #define RGB_MATRIX_TIMEOUT 1200000
-#define RGB_MATRIX_SLEEP
-#define OLED_SCROLL_TIMEOUT 20000
-#define ONESHOT_TAP_TOGGLE 2
-
-#define RGB_MATRIX_HUE_STEP 8
-#define RGB_MATRIX_SAT_STEP 8
-#define RGB_MATRIX_VAL_STEP 8
-#define RGB_MATRIX_SPD_STEP 8
-
-#define ENCODER_RESOLUTION 2
diff --git a/keyboards/rgbkb/mun/keymaps/xulkal2/keymap.c b/keyboards/rgbkb/mun/keymaps/xulkal2/keymap.c
deleted file mode 100644
index eefb59e676a..00000000000
--- a/keyboards/rgbkb/mun/keymaps/xulkal2/keymap.c
+++ /dev/null
@@ -1,248 +0,0 @@
-/*
- * ----------------------------------------------------------------------------
- * "THE BEER-WARE LICENSE" (Revision 42):
- * <https://github.com/Legonut> wrote this file.  As long as you retain this
- * notice you can do whatever you want with this stuff. If we meet some day, and
- * you think this stuff is worth it, you can buy me a beer in return. David Rauseo
- * ----------------------------------------------------------------------------
- */
-
-#include QMK_KEYBOARD_H
-#include "common_oled.h"
-
-enum keymap_layers {
-    _QWERTY,
-    _FUNCTION,
-    _ADJUST
-};
-
-enum keymap_keycodes {
-    // Disables touch processing
-    TCH_TOG = SAFE_RANGE,
-    MENU_BTN,
-    MENU_UP,
-    MENU_DN,
-    RGB_RST
-};
-
-// Default Layers
-#define QWERTY   DF(_QWERTY)
-
-// Momentary Layers
-#define FN       OSL(_FUNCTION)
-#define ADJ      OSL(_ADJUST)
-
-// clang-format off
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* QWERTY
-     * .--------------------------------------------------------------.  .--------------------------------------------------------------.
-     * | `~/ESC | 1      | 2      | 3      | 4      | 5      |        |  |        | 6      | 7      | 8      | 9      | 0      | Bckspc |
-     * |--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-     * | Tab    | Q      | W      | E      | R      | T      |        |  |        | Y      | U      | I      | O      | P      | \      |
-     * |--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-     * | Caps   | A      | S      | D      | F      | G      | Play   |  | MN BTN | H      | J      | K      | L      | :      | Enter  |
-     * |--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-     * | Shft[  | Z      | X      | C      | V      | B      | {      |  | }      | N      | M      | ,      | .      | /      | Shft]  |
-     * |--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-     * | Ctrl-  | Win    | Alt    | Del    | Space  |        | ADJ    |  | FN     |        | Space  | '"     | Alt    | App    | Ctrl=  |
-     * '--------+--------+--------+--------|--------+--------+--------'  '--------+--------+--------+--------+--------+--------+--------'
-     * |--------+--------+--------+--------+--------.                                      .--------+--------+--------+--------+--------|
-     * | VolDn  | VolUp  | Next   | Play   | Prev   | Touch Encoder          Touch Encoder | RgbHuI | RgbHuD | RgbMdD | RgbTog | RgbMdI |
-     * '--------+--------+--------+--------+--------'                                      '--------+--------+--------+--------+--------'
-     */
-    [_QWERTY] = LAYOUT(
-        QK_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_NO,      KC_NO,   KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_NO,      KC_NO,   KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
-        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_MPLY,    MENU_BTN,KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT,
-        SC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_LCBR,    KC_RCBR, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SC_RSPC,
-        SC_LCPO, KC_LGUI, KC_LALT, KC_DEL,  KC_SPC,  KC_NO,   ADJ,        FN,      KC_NO,   KC_SPC,  KC_QUOTE,KC_RALT, KC_APP,  SC_RCPC,
-
-        KC_VOLD, KC_VOLU, KC_MNXT, KC_MPLY, KC_MPRV,                                        RGB_HUI, RGB_HUD, RGB_RMOD,RGB_TOG, RGB_MOD
-    ),
-
-    /* Function
-     * .--------------------------------------------------------------.  .--------------------------------------------------------------.
-     * | F12    | F1     | F2     | F3     | F4     | F5     |        |  |        | F6     | F7     | F8     | F9     | F10    | F11    |
-     * |--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-     * |        | SPDI   | SAI    | VAI    | HUI    | RGBMD  |        |  |        |        |        | PrtScr | ScrLck | PseBrk |        |
-     * |--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-     * |        | SPDD   | SAD    | VAD    | HUD    | RGBRMD |        |  |        |        |        | Ins    | Home   | PgUp   |        |
-     * |--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-     * |        | RGBRST |        |        |        | RGBTOG |        |  |        |        |        | Del    | End    | PgDn   |        |
-     * |--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-     * |        |        |        |        |        |        |        |  |        |        | Play   | Prev   | Next   | VolUp  | VolDn  |
-     * '--------+--------+--------+--------+--------+--------+--------'  '--------+--------+--------+--------+--------+--------+--------'
-     * |--------+--------+--------+--------+--------.                                      .--------+--------+--------+--------+--------|
-     * |        |        |        |        |        | Touch Encoder          Touch Encoder |        |        |        |        |        |
-     * '--------+--------+--------+--------+--------'                                      '--------+--------+--------+--------+--------'
-     */
-    [_FUNCTION] = LAYOUT(
-        KC_F12,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   _______,    _______, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
-        _______, RGB_SPI, RGB_SAI, RGB_VAI, RGB_HUI, RGB_MOD, _______,    _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______,
-        _______, RGB_SPD, RGB_SAD, RGB_VAD, RGB_HUD, RGB_RMOD,_______,    _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP, _______,
-        _______, RGB_RST, _______, _______, _______, RGB_TOG, _______,    _______, _______, _______, KC_DEL,  KC_END,  KC_PGDN, _______,
-        _______, _______, _______, _______, _______, _______, _______,    _______, _______, KC_MPLY, KC_MPRV, KC_MNXT, KC_VOLU, KC_VOLD,
-
-        _______, _______, _______, _______, _______,                                        _______, _______, _______, _______, _______
-    ),
-
-    /* Adjust
-     * .--------------------------------------------------------------.  .--------------------------------------------------------------.
-     * |        |        |        |        |        |        |        |  |        |        | NumLck | /      | *      | -      | Del    |
-     * |--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-     * |        | Home   | Up     | End    | Reset  | T_TOG  |        |  |        |        | 7      | 8      | 9      | +      |        |
-     * |--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-     * |        | Left   | Down   | Right  |        |        |        |  |        |        | 4      | 5      | 6      | +      |        |
-     * |--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-     * |        |        |        |        |        | EepRst |        |  |        |        | 1      | 2      | 3      | Enter  |        |
-     * |--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-     * |        |        |        |        |        |        |        |  |        |        |        | 0      | .      | Enter  |        |
-     * '--------+--------+--------+--------+--------+--------+--------'  '--------+--------+--------+--------+--------+--------+--------'
-     *      Encoder 1         Encoder 2                                                                  Encoder 3         Encoder 4
-     * .-----------------------------------.                                                        .-----------------------------------.
-     * |        |        |        |        |                                                        |        |        |        |        |
-     * |--------+--------+--------+--------+--------.                                      .--------+--------+--------+--------+--------|
-     * |        |        |        |        |        | Touch Encoder          Touch Encoder |        |        |        |        |        |
-     * '--------+--------+--------+--------+--------'                                      '--------+--------+--------+--------+--------'
-     */
-    [_ADJUST] = LAYOUT(
-        KC_GRV,  _______, _______, _______, _______, _______, _______,    _______, _______, KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS, KC_DEL,
-        _______, KC_HOME, KC_UP,   KC_END,  QK_BOOT, TCH_TOG, _______,    _______, _______, KC_KP_7, KC_KP_8, KC_KP_9, KC_PPLS, _______,
-        _______, KC_LEFT, KC_DOWN, KC_RIGHT,_______, _______, _______,    _______, _______, KC_KP_4, KC_KP_5, KC_KP_6, KC_PPLS, _______,
-        _______, _______, _______, _______, _______, EE_CLR,  _______,    _______, _______, KC_KP_1, KC_KP_2, KC_KP_3, KC_PENT, _______,
-        _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______, KC_KP_0, KC_PDOT, KC_PENT, _______,
-
-        _______, _______, _______, _______, _______,                                        _______, _______, _______, _______, _______
-    )
-};
-// clang-format on
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode)
-    {
-        case MENU_BTN:
-            if (record->event.pressed) {
-                rgb_menu_selection();
-            }
-            return false;
-        case MENU_UP:
-            if (record->event.pressed) {
-                rgb_menu_action(true);
-            }
-            return false;
-        case MENU_DN:
-            if (record->event.pressed) {
-                rgb_menu_action(false);
-            }
-            return false;
-        case RGB_RST:
-            if (record->event.pressed) {
-                eeconfig_update_rgb_matrix_default();
-            }
-            return false;
-        case TCH_TOG:
-            if (record->event.pressed) {
-                touch_encoder_toggle();
-            }
-            return false;  // Skip all further processing of this key
-        default:
-            return true;
-    }
-}
-
-//#define MATRIX_SCAN_DEBUG
-#if !defined(MATRIX_SCAN_DEBUG)
-static void render_layer(void) {
-    // Host Keyboard Layer Status
-    oled_write_P(PSTR("Layer"), false);
-    switch (get_highest_layer(layer_state)) {
-        case _QWERTY:
-            oled_write_ln_P(PSTR("BASE "), false);
-            break;
-        case _FUNCTION:
-            oled_write_ln_P(PSTR("FUNC "), false);
-            break;
-        case _ADJUST:
-            oled_write_ln_P(PSTR("ADJS "), false);
-            break;
-    }
-}
-
-static void render_leds(void)
-{
-    // Host Keyboard LED Status
-    led_t led_state = host_keyboard_led_state();
-    oled_write_P(led_state.num_lock ? PSTR("NUMLK")     : PSTR("     "), false);
-    oled_write_P(led_state.caps_lock ? PSTR("CAPLK")    : PSTR("     "), false);
-    oled_write_P(led_state.scroll_lock ? PSTR("SCRLK")  : PSTR("     "), false);
-}
-
-static void render_touch(void)
-{
-    // Host Touch LED Status
-    oled_write_P(touch_encoder_is_on() ? PSTR("TOUCH")  : PSTR("     "), false);
-    oled_write_P(touch_encoder_is_calibrating() ? PSTR("CLBRT")  : PSTR("     "), false);
-}
-#else
-static uint32_t scan_counter = 0;
-static uint32_t scan_value = 0;
-static uint16_t scan_timer = 1000;
-
-void do_counters(void) {
-    scan_counter++;
-    uint16_t now = sync_timer_read();
-    if (timer_expired(now, scan_timer))
-    {
-        scan_timer += 1000;
-        scan_value = (scan_value + scan_counter) / 2;
-        scan_counter = 0;
-    }
-}
-
-void matrix_scan_user(void) {
-    do_counters();
-}
-
-void matrix_slave_scan_user(void) {
-    do_counters();
-}
-
-void render_debug_scan(void) {
-    static char buffer[6] = {0};
-    snprintf(buffer, sizeof(buffer), "%5d", scan_value);
-    oled_write_ln_P(buffer, false);
-}
-#endif
-
-bool oled_task_user(void) {
-#if !defined(MATRIX_SCAN_DEBUG)
-    if (is_keyboard_left()) {
-        render_layer();
-        oled_write_P(PSTR("     "), false);
-        render_leds();
-        oled_write_P(PSTR("     "), false);
-        render_touch();
-    }
-    else {
-        render_rgb_menu();
-    }
-#else
-    oled_write_P(PSTR("     "), false);
-    render_debug_scan();
-#endif
-    oled_set_cursor(0, 12);
-    render_icon();
-    return false;
-}
-
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-    return OLED_ROTATION_270;
-}
-
-#ifdef ENCODER_MAP_ENABLE
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
-    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(MENU_DN, MENU_UP), ENCODER_CCW_CW(MENU_DN, MENU_UP) },
-    [1] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) },
-    [2] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) }
-};
-#endif
diff --git a/keyboards/rgbkb/mun/keymaps/xulkal2/rules.mk b/keyboards/rgbkb/mun/keymaps/xulkal2/rules.mk
deleted file mode 100644
index e6b71e56d17..00000000000
--- a/keyboards/rgbkb/mun/keymaps/xulkal2/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-MOUSEKEY_ENABLE = yes	# using for mouse wheel up and down, more granular than page up/down
-
-OPT_DEFS += -DRGB_UNLIMITED_POWER
-
-ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/rgbkb/sol/keymaps/brianweyer/keymap.c b/keyboards/rgbkb/sol/keymaps/brianweyer/keymap.c
deleted file mode 100644
index 194ec4de2f0..00000000000
--- a/keyboards/rgbkb/sol/keymaps/brianweyer/keymap.c
+++ /dev/null
@@ -1,272 +0,0 @@
-#include QMK_KEYBOARD_H
-#ifdef PROTOCOL_LUFA
-#include "lufa.h"
-#include "split_util.h"
-#endif
-
-extern keymap_config_t keymap_config;
-
-#ifdef RGBLIGHT_ENABLE
-//Following line allows macro to read current RGB settings
-extern rgblight_config_t rgblight_config;
-#endif
-
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-// The underscores don't mean anything - you can have a layer called STUFF or any other name.
-// Layer names don't all need to be of the same length, obviously, and you can also skip them
-// entirely and just use numbers.
-enum layer_number {
-    _QWERTY = 0,
-    _FN,
-    _ADJ
-};
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  FN,
-  ADJ,
-  RGBRST
-};
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* QWERTY
-   * ,------------------------------------------------.  ,------------------------------------------------.
-   * |   `  |   1  |   2  |   3  |   4  |   5  |   -  |  |   =  |   6  |   7  |   8  |   9  |   0  | Bspc |
-   * |------+------+------+------+------+------|------|  |------|------+------+------+------+------+------|
-   * |  Tab |   Q  |   W  |   E  |   R  |   T  |   [  |  |   ]  |   Y  |   U  |   I  |   O  |   P  |   \  |
-   * |------+------+------+------+------+------|------|  |------|------+------+------+------+------+------|
-   * |  Esc |   A  |   S  |   D  |   F  |   G  |      |  |      |   H  |   J  |   K  |   L  |   ;  |   '  |
-   * |------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-   * | Shift|   Z  |   X  |   C  |   V  |   B  |      |  |      |   N  |   M  |   ,  |   .  |   /  | Shift|
-   * |------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-   * | Ctrl |  Alt |  FN  | LGui |  RGB |  Spc |  Del |  | Bspc |  Spc |  Adj | LGui |  FN  |  Alt | Ctrl |
-   * |------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-   *                                    |  Spc |  Ent |  |  Ent |  Spc |
-   *                                    `-------------'  `-------------'
-   */
-  [_QWERTY] = LAYOUT(
-  //,--------+--------+--------+--------+--------+--------+--+--------+.   ,--------+--+--------+--------+--------+--------+--------+--------+
-          KC_GRV,       KC_1,       KC_2,       KC_3,       KC_4,       KC_5,       KC_MINS,          KC_EQL,          KC_6,       KC_7,       KC_8,       KC_9,       KC_0,    KC_BSPC,
-  //|--------+--------+--------+--------+--------+--------+--+--------|    |--------+--+--------+--------+--------+--------+--------+--------|
-          KC_TAB,       KC_Q,       KC_W,       KC_E,       KC_R,       KC_T,       KC_LBRC,         KC_RBRC,          KC_Y,       KC_U,       KC_I,       KC_O,       KC_P,    KC_BSLS,
-  //|--------+--------+--------+--------+--------+--------+--+--------|    |--------+--+--------+--------+--------+--------+--------+--------|
-          KC_ESC,       KC_A,       KC_S,       KC_D,       KC_F,       KC_G,    _______,      _______,          KC_H,       KC_J,       KC_K,       KC_L,    KC_SCLN,    KC_QUOT,
-  //|--------+--------+--------+--------+--------+--------+--+--------|    |--------+--+--------+--------+--------+--------+--------+--------|
-         SC_LSPO,       KC_Z,       KC_X,       KC_C,       KC_V,       KC_B,    _______,      _______,          KC_N,       KC_M,    KC_COMM,     KC_DOT,    KC_SLSH,    SC_RSPC,
-  //|--------+--------+--------+--------+--------+--------+--+--------|    |--------+--+--------+--------+--------+--------+--------+--------|
-         KC_LCTL,    KC_LALT,      FN,    KC_LGUI, RGB_MOD,        KC_SPC,     KC_DEL,         KC_BSPC,        KC_SPC,     ADJ,    KC_LGUI,      FN,    KC_LALT,    KC_LCTL,
-  //|--------+--------+--------+--------+--------+--+--------+--------|    |--------+--+--------+--------+--------+--------+--------+--------|
-                                                          KC_SPC,     KC_ENT,          KC_ENT,        KC_SPC
-  //                                                |--------+--------|    |--------+-----------+
-      ),
-
-  /* FN
-   * ,------------------------------------------------.  ,------------------------------------------------.
-   * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |      |  |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
-   * |------+------+------+------+------+------|------|  |------|------+------+------+------+------+------|
-   * |      |      |      |  Up  |      |      |      |  |      |      |      |      |      |      |      |
-   * |------+------+------+------+------+------|------|  |------|------+------+------+------+------+------|
-   * |      |      | Left | Down | Right|      |      |  |      | Play | Next | Mute | V-Up |V-Down|      |
-   * |------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-   * |      |      |      |      |      |      |      |  |      |      |      |      |      |      |      |
-   * |------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-   * |      |      |      |      |      |      |      |  |      |      |      |      |      |      |      |
-   * |------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-   *                                    |      |      |  |      |      |
-   *                                    `-------------'  `-------------'
-   */
-  [_FN] = LAYOUT(
-  //,--------+--------+--------+--------+--------+--------+--+--------+.   ,--------+--+--------+--------+--------+--------+--------+--------+
-           KC_F1,      KC_F2,      KC_F3,      KC_F4,      KC_F5,      KC_F6,    _______,      _______,         KC_F7,      KC_F8,      KC_F9,     KC_F10,     KC_F11,     KC_F12,
-  //|--------+--------+--------+--------+--------+--------+--+--------|    |--------+--+--------+--------+--------+--------+--------+--------|
-      _______, _______, _______,      KC_UP, _______, _______,    _______,      _______,    _______, _______, _______, _______, _______, _______,
-  //|--------+--------+--------+--------+--------+--------+--+--------|    |--------+--+--------+--------+--------+--------+--------+--------|
-      _______, _______,    KC_LEFT,    KC_DOWN,    KC_RGHT, _______,    _______,      _______,       KC_MPLY,    KC_MNXT,    KC_MUTE,    KC_VOLD,    KC_VOLU, _______,
-  //|--------+--------+--------+--------+--------+--------+--+--------|    |--------+--+--------+--------+--------+--------+--------+--------|
-      _______, _______, _______, _______, _______, _______,    _______,      _______,    _______, _______, _______, _______, _______, _______,
-  //|--------+--------+--------+--------+--------+--------+--+--------|    |--------+--+--------+--------+--------+--------+--------+--------|
-      _______, _______, _______, _______, _______,    _______, _______,      _______,    _______, _______, _______, _______, _______, _______,
-  //|--------+--------+--------+--------+--------+--+--------+--------|    |--------+--+--------+--------+--------+--------+--------+--------|
-                                                      _______, _______,      _______,    _______
-  //                                                |--------+--------|    |--------+-----------+
-      ),
-
-  /* ADJ
-   * ,------------------------------------------------.  ,------------------------------------------------.
-   * |      |      |      |      |      |      |      |  |      |      |      |      |      |      |      |
-   * |------+------+------+------+------+------|------|  |------|------+------+------+------+------+------|
-   * |      | Sat+ | Val+ | Hue+ |Speed+|Toggle|      |  |      |      |      |      |      |      |      |
-   * |------+------+------+------+------+------|------|  |------|------+------+------+------+------+------|
-   * |      | Sat- | Val- | Hue- |Speed-|Reset |      |  |      |      |QWERTY| COLE |      |      |      |
-   * |------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-   * |      |      |      |      |      |      |      |  |      |      |      |      |      |      |      |
-   * |------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-   * |      |      |      |      |      |      |      |  |      |      |      |      |      |      |      |
-   * |------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
-   *                                    |      |      |  |      |      |
-   *                                    `-------------'  `-------------'
-   */
-
-  [_ADJ] =  LAYOUT(
-  //,--------+--------+--------+--------+--------+--------+--+--------+.   ,--------+--+--------+--------+--------+--------+--------+--------+
-        QK_BOOT, _______, _______, _______, _______, _______,    _______,      _______,    _______, _______, _______, _______, _______,   QK_BOOT,
-  //|--------+--------+--------+--------+--------+--------+--+--------|    |--------+--+--------+--------+--------+--------+--------+--------|
-      _______, RGB_SAI, RGB_VAI, RGB_HUI, RGB_SPI, RGB_TOG,    _______,      _______,    _______, _______, _______, _______, _______, _______,
-  //|--------+--------+--------+--------+--------+--------+--+--------|    |--------+--+--------+--------+--------+--------+--------+--------|
-      _______, RGB_SAD, RGB_VAD, RGB_HUD, RGB_SPD,  RGBRST,    _______,      _______,    _______, _______, _______, _______, _______, _______,
-  //|--------+--------+--------+--------+--------+--------+--+--------|    |--------+--+--------+--------+--------+--------+--------+--------|
-      _______, _______, _______, _______, _______, _______,    _______,      _______,    _______, _______, _______, _______, _______, _______,
-  //|--------+--------+--------+--------+--------+--------+--+--------|    |--------+--+--------+--------+--------+--------+--------+--------|
-      _______, _______, _______, _______, _______,    _______, _______,      _______, _______,    _______, _______, _______, _______, _______,
-  //|--------+--------+--------+--------+--------+--+--------+--------|    |--------+--------+--+--------+--------+--------+--------+--------|
-                                                      _______, _______,      _______, _______
-  //                                                |--------+--------|    |--------+--------+
-      )
-};
-
-
-// define variables for reactive RGB
-bool TOG_STATUS = false;
-int RGB_current_mode;
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_user(uint8_t index, bool clockwise) {
-  if (index == 0) { /* First encoder */
-    if (clockwise) {
-      tap_code(KC_VOLU);
-    } else {
-      tap_code(KC_VOLD);
-    }
-  } else if (index == 1) { /* Second encoder*/
-    if (clockwise) {
-      tap_code(KC_UP);
-    } else {
-      tap_code(KC_DOWN);
-    }
-  }
-    return true;
-}
-#endif
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case FN:
-      if (record->event.pressed) {
-        layer_on(_FN);
-      } else {
-        layer_off(_FN);
-      }
-      return false;
-      break;
-    case ADJ:
-        if (record->event.pressed) {
-          layer_on(_ADJ);
-        } else {
-          layer_off(_ADJ);
-        }
-        return false;
-        break;
-      //led operations - RGB mode change now updates the RGB_current_mode to allow the right RGB mode to be set after reactive keys are released
-    case RGBRST:
-      #ifdef RGBLIGHT_ENABLE
-        if (record->event.pressed) {
-          eeconfig_update_rgblight_default();
-          rgblight_enable();
-          RGB_current_mode = rgblight_config.mode;
-        }
-      #endif
-      break;
-  }
-  return true;
-}
-
-void matrix_init_user(void) {
-#ifdef RGBLIGHT_ENABLE
-  RGB_current_mode = rgblight_config.mode;
-#endif
-}
-
-
-// OLED Driver Logic
-#ifdef OLED_ENABLE
-
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-  if (!is_keyboard_master())
-    return OLED_ROTATION_180;  // flip 180 for offhand
-  return rotation;
-}
-
-static void render_logo(void) {
-  static const char PROGMEM sol_logo[] = {
-    0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,0x90,0x91,0x92,0x93,0x94,
-    0xa0,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf,0xb0,0xb1,0xb2,0xb3,0xb4,
-    0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xce,0xcf,0xd0,0xd1,0xd2,0xd3,0xd4,0};
-
-  oled_write_P(sol_logo, false);
-}
-
-//assign the right code to your layers for OLED display
-#define L_BASE 0
-#define L_FN (1<<_FN)
-#define L_ADJ (1<<_ADJ)
-#define L_ADJ_TRI (L_ADJ|L_FN)
-
-static void render_status(void) {
-  // Render to mode icon
-  static const char PROGMEM mode_logo[4][4] = {
-    {0x95,0x96,0x0a,0},
-    {0xb5,0xb6,0x0a,0},
-    {0x97,0x98,0x0a,0},
-    {0xb7,0xb8,0x0a,0} };
-
-  if (keymap_config.swap_lalt_lgui != false) {
-    oled_write_P(mode_logo[0], false);
-    oled_write_P(mode_logo[1], false);
-  } else {
-    oled_write_P(mode_logo[2], false);
-    oled_write_P(mode_logo[3], false);
-  }
-
-  // Define layers here, Have not worked out how to have text displayed for each layer. Copy down the number you see and add a case for it below
-
-  oled_write_P(PSTR("Layer: "), false);
-  switch (layer_state) {
-    case L_BASE:
-      oled_write_P(PSTR("Laser     \n"), false);
-      break;
-    case L_FN:
-      oled_write_P(PSTR("Function  \n"), false);
-      break;
-    case L_ADJ:
-    case L_ADJ_TRI:
-      oled_write_P(PSTR("Adjustment\n"), false);
-      break;
-    default:
-      oled_write_P(PSTR("Undefined \n"), false);
-  }
-
-  // Host Keyboard LED Status
-  led_t led_state = host_keyboard_led_state();
-  oled_write_P(led_state.num_lock ? PSTR("NUMLOCK ") : PSTR("        "), false);
-  oled_write_P(led_state.caps_lock ? PSTR("CAPS ") : PSTR("     "), false);
-  oled_write_P(led_state.scroll_lock ? PSTR("SCLK ") : PSTR("     "), false);
-}
-
-bool oled_task_user(void) {
-  if (is_keyboard_master())
-    render_status();
-  else
-    render_logo();
-
-    return false;
-}
-
-#endif
diff --git a/keyboards/rgbkb/sol/keymaps/brianweyer/rules.mk b/keyboards/rgbkb/sol/keymaps/brianweyer/rules.mk
deleted file mode 100644
index f9832323b43..00000000000
--- a/keyboards/rgbkb/sol/keymaps/brianweyer/rules.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# Overridden build options from rev1
-
-# RGB Options
-LED_MIRRORED            = no        # Mirror LEDs across halves (enable DIP 1 on slave, and DIP 2 and 3 on master)
-
-# Misc
-OLED_ENABLE     = yes       # Enable the OLED Driver
-
-
-
-
-
-# Do not edit past here
-
-include keyboards/$(KEYBOARD)/post_rules.mk
diff --git a/keyboards/rgbkb/sol3/config.h b/keyboards/rgbkb/sol3/config.h
index 2d3caeea4e4..8348b44f96e 100644
--- a/keyboards/rgbkb/sol3/config.h
+++ b/keyboards/rgbkb/sol3/config.h
@@ -46,8 +46,8 @@
 #define WS2812_PWM_DRIVER PWMD3
 #define WS2812_PWM_CHANNEL 2
 #define WS2812_PWM_PAL_MODE 2
-#define WS2812_DMA_STREAM STM32_DMA1_STREAM3
-#define WS2812_DMA_CHANNEL 3
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM3
+#define WS2812_PWM_DMA_CHANNEL 3
 
 #define TOUCH_UPDATE_INTERVAL 33
 #define OLED_UPDATE_INTERVAL 33
diff --git a/keyboards/rgbkb/zen/rev1/keymaps/jwlawrence/config.h b/keyboards/rgbkb/zen/rev1/keymaps/jwlawrence/config.h
deleted file mode 100644
index ca7d19afabb..00000000000
--- a/keyboards/rgbkb/zen/rev1/keymaps/jwlawrence/config.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
-Copyright 2017 Danny Nguyen <danny@hexwire.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-// place overrides here
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-#undef RGBLED_NUM
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 16
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/rgbkb/zen/rev1/keymaps/jwlawrence/keymap.c b/keyboards/rgbkb/zen/rev1/keymaps/jwlawrence/keymap.c
deleted file mode 100644
index ece995075bc..00000000000
--- a/keyboards/rgbkb/zen/rev1/keymaps/jwlawrence/keymap.c
+++ /dev/null
@@ -1,97 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-// The underscores don't mean anything - you can have a layer called STUFF or any other name.
-// Layer names don't all need to be of the same length, obviously, and you can also skip them
-// entirely and just use numbers.
-#define _QWERTY 0
-#define _NAV 2
-
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  NAV,
-
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /* Qwerty
-   * ,-----------------------------------------.             .-----------------------------------------.
-   * | GESC |   1  |   2  |   3  |   4  |   5  |             |   6  |   7  |   8  |   9  |   0  | Bksp |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * | Tab  |   Q  |   W  |   E  |   R  |   T  |             |   Y  |   U  |   I  |   O  |   P  |   \  |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * |CAPS(NAV)|A  |   S  |   D  |   F  |   G  |             |   H  |   J  |   K  |   L  |   ;  |  "   |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * | Shift|   Z  |   X  |   C  |   V  |   B  |             |   N  |   M  |   ,  |   .  |   /  |Shift |
-   * |------+------+------+------+------+------+------..-----+------+------+------+------+------+------|
-   * | Ctrl | Alt  | GUI  | GUI  | NAV  |Space |Delete||Enter|Space |  NAV |   -  |   =  |RGBTOG|Enter |
-   * `------------------------------------------------''-----------------------------------------------'
-   */
-  [_QWERTY] = LAYOUT(
-    QK_GESC,          KC_1,    KC_2,    KC_3,    KC_4,     KC_5,                       KC_6,     KC_7,     KC_8,    KC_9,    KC_0,    KC_BSPC,
-    KC_TAB,           KC_Q,    KC_W,    KC_E,    KC_R,     KC_T,                       KC_Y,     KC_U,     KC_I,    KC_O,    KC_P,    KC_BSLS,
-    LT(_NAV, KC_CAPS),KC_A,    KC_S,    KC_D,    KC_F,     KC_G,                       KC_H,     KC_J,     KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-    KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,     KC_B,                       KC_N,     KC_M,     KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-    KC_LCTL,          KC_LALT, KC_LGUI, KC_LGUI, MO(_NAV), KC_SPC,  KC_DEL,  KC_ENT,   KC_SPACE, MO(_NAV), KC_MINS, KC_EQL,  RGB_TOG, KC_ENT
-  ),
-
-  /* NAV
-   * ,-----------------------------------------.             .-----------------------------------------.
-   * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |             |  F7  |  F8  |  F9  |  F10 |  F11 | F12  |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * |      |RGBSAI|RGBVAI|RGBSAD| QK_BOOT|  [   |             |   ]  | Pgup |  Up  | Pgdn |Insert| Home |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * |      |RGBHUD|RGBVAD|RGBHUI|RGBMOD|      |             |      | Left | Down | Right|Delete| End  |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * |Shift |      |      |      |      |      |             | NKRO |      |      | Pause| Back | Next |
-   * |------+------+------+------+------+------+------..-----+------+------+------+------+------+------|
-   * | Ctrl | Alt  | GUI  |      |      |      |      ||     |      |      |      | Mute | VOLUP| VOLDN|
-   * `------------------------------------------------''-----------------------------------------------'
-   */
-  [_NAV] = LAYOUT(
-    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                     KC_F7,             KC_F8,    KC_F9,   KC_F10,  KC_F11,  KC_F12,
-    _______, RGB_SAI, RGB_VAI, RGB_SAD, QK_BOOT, KC_LBRC,                   KC_RBRC,           KC_PGUP,  KC_UP,   KC_PGDN, KC_INS,  KC_HOME,
-    _______, RGB_HUD, RGB_VAD, RGB_HUI, RGB_MOD, _______,                   _______,           KC_LEFT,  KC_DOWN, KC_RGHT, KC_DEL,  KC_END,
-    KC_LSFT, _______, _______, _______, _______, _______,                   MAGIC_TOGGLE_NKRO, _______,  _______, KC_MPLY, KC_MPRV, KC_MNXT,
-    KC_LCTL, KC_LALT, KC_LGUI, _______, _______, _______, _______, _______, _______,           _______,  _______, KC_MUTE, KC_VOLU, KC_VOLD
-  ),
-
-};
-
-#ifdef AUDIO_ENABLE
-float tone_qwerty[][2]     = SONG(QWERTY_SOUND);
-float tone_colemak[][2]    = SONG(COLEMAK_SOUND);
-#endif
-
-void persistant_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_qwerty);
-        #endif
-        persistant_default_layer_set(1UL<<_QWERTY);
-      }
-      return false;
-      break;
-    //case COLEMAK:
-      //if (record->event.pressed) {
-        //#ifdef AUDIO_ENABLE
-          //PLAY_SONG(tone_colemak);
-        //#endif
-        //persistant_default_layer_set(1UL<<_COLEMAK);
-      //}
-      //return false;
-      //break;
-  }
-  return true;
-}
diff --git a/keyboards/rgbkb/zen/rev1/keymaps/jwlawrence/rules.mk b/keyboards/rgbkb/zen/rev1/keymaps/jwlawrence/rules.mk
deleted file mode 100644
index 1e3cebb1451..00000000000
--- a/keyboards/rgbkb/zen/rev1/keymaps/jwlawrence/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-RGBLIGHT_ENABLE = yes
diff --git a/keyboards/rgbkb/zen/rev1/keymaps/samae/config.h b/keyboards/rgbkb/zen/rev1/keymaps/samae/config.h
deleted file mode 100644
index b3521279cf0..00000000000
--- a/keyboards/rgbkb/zen/rev1/keymaps/samae/config.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-Copyright 2017 Danny Nguyen <danny@hexwire.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/* Select hand configuration */
-
-// #define MASTER_LEFT
-// #define MASTER_RIGHT
-#define EE_HANDS
-
-#undef RGBLED_NUM
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLED_NUM 16
-#define RGBLIGHT_HUE_STEP 4
-#define RGBLIGHT_SAT_STEP 4
-#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/rgbkb/zen/rev1/keymaps/samae/keymap.c b/keyboards/rgbkb/zen/rev1/keymaps/samae/keymap.c
deleted file mode 100644
index 19289846b65..00000000000
--- a/keyboards/rgbkb/zen/rev1/keymaps/samae/keymap.c
+++ /dev/null
@@ -1,79 +0,0 @@
- /* Copyright 2020 Martin J. Potier
-  *
-  * This program is free software: you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-  * the Free Software Foundation, either version 3 of the License, or
-  * (at your option) any later version.
-  *
-  * This program is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  * GNU General Public License for more details.
-  *
-  * You should have received a copy of the GNU General Public License
-  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
-  */
-
-#include QMK_KEYBOARD_H
-
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-// The underscores don't mean anything - you can have a layer called STUFF or any other name.
-// Layer names don't all need to be of the same length, obviously, and you can also skip them
-// entirely and just use numbers.
-enum layer_number {
-    _QWERTY = 0,
-    _NAV
-};
-
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  NAV,
-
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /* Qwerty
-   * ,-----------------------------------------.                              .-----------------------------------------.
-   * |   `  |   1  |   2  |   3  |   4  |   5  |                              |   6  |   7  |   8  |   9  |   0  | Bksp |
-   * |------+------+------+------+------+------|                              |------+------+------+------+------+------|
-   * | Tab  |   Q  |   W  |   E  |   R  |   T  |                              |   Y  |   U  |   I  |   O  |   P  |   \  |
-   * |------+------+------+------+------+------|                              |------+------+------+------+------+------|
-   * |DELETE|   A  |   S  |   D  |   F  |   G  |                              |   H  |   J  |   K  |   L  |   ;  |  "   |
-   * |------+------+------+------+------+------|                              |------+------+------+------+------+------|
-   * | Shift|   Z  |   X  |   C  |   V  |   B  |                              |   N  |   M  |   ,  |   .  |   /  |RGBMOD|
-   * |------+------+------+------+------+------+------.              .--------+------+------+------+------+------+------|
-   * | Ctrl | GUI  | Alt  |RGBTOG| NAV  |Space | ESC  |              |Enter|Space/NAV| AltGr|  NAV |      |   -  |   =  |
-   * `------------------------------------------------'              '--------------------------------------------------'
-   */
-  [_QWERTY] = LAYOUT(
-    KC_GRV,   KC_1,    KC_2,    KC_3,    KC_4,     KC_5,                      KC_6,               KC_7,     KC_8,    KC_9,    KC_0,    KC_BSPC,
-    KC_TAB,   KC_Q,    KC_W,    KC_E,    KC_R,     KC_T,                      KC_Y,               KC_U,     KC_I,    KC_O,    KC_P,    KC_BSLS,
-    KC_DEL,   KC_A,    KC_S,    KC_D,    KC_F,     KC_G,                      KC_H,               KC_J,     KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-    KC_LSFT,  KC_Z,    KC_X,    KC_C,    KC_V,     KC_B,                      KC_N,               KC_M,     KC_COMM, KC_DOT,  KC_SLSH, RGB_MOD,
-    KC_LCTL,  KC_LGUI, KC_LALT, RGB_TOG, MO(_NAV), KC_SPC, QK_GESC,  KC_ENT,  LT(_NAV, KC_SPACE), KC_RALT, MO(_NAV), _______, KC_MINS, KC_EQL
-  ),
-
-  /* NAV
-   * ,-----------------------------------------.                            .-----------------------------------------.
-   * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |                            |  F7  |  F8  |  F9  |  F10 |  F11 | F12  |
-   * |------+------+------+------+------+------|                            |------+------+------+------+------+------|
-   * |      |RGBSAI|RGBVAI|RGBSAD|      |  [   |                            |   ]  | Pgup |  Up  | Pgdn |Insert| Home |
-   * |------+------+------+------+------+------|                            |------+------+------+------+------+------|
-   * |      |RGBHUD|RGBVAD|RGBHUI|      |      |                            |      | Left | Down | Right|Delete| End  |
-   * |------+------+------+------+------+------|                            |------+------+------+------+------+------|
-   * |Shift |      |      |      |      |      |                            |      |      |      | Pause| Back | Next |
-   * |------+------+------+------+------+------+------.              .------+------+------+------+------+------+------|
-   * | Ctrl | GUI  | Alt  |RGBMOD|      |      |      |              | QK_BOOT|      |      |      | Mute | VOLUP| VOLDN|
-   * `------------------------------------------------'              '------------------------------------------------'
-   */
-  [_NAV] = LAYOUT(
-    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                     KC_F7,   KC_F8,    KC_F9,   KC_F10,  KC_F11,  KC_F12,
-    _______, RGB_SAI, RGB_VAI, RGB_SAD, _______, KC_LBRC,                   KC_RBRC, KC_PGUP,  KC_UP,   KC_PGDN, KC_INS,  KC_HOME,
-    _______, RGB_HUD, RGB_VAD, RGB_HUI, _______, _______,                   _______, KC_LEFT,  KC_DOWN, KC_RGHT, KC_DEL,  KC_END,
-    KC_LSFT, _______, _______, _______, _______, _______,                   _______, _______,  _______, KC_MPLY, KC_MPRV, KC_MNXT,
-    KC_LCTL, KC_LGUI, KC_LALT, RGB_MOD, _______, _______, _______, QK_BOOT, _______, _______,  _______, KC_MUTE, KC_VOLU, KC_VOLD
-  ),
-
-};
diff --git a/keyboards/rgbkb/zen/rev1/keymaps/samae/rules.mk b/keyboards/rgbkb/zen/rev1/keymaps/samae/rules.mk
deleted file mode 100644
index 1e3cebb1451..00000000000
--- a/keyboards/rgbkb/zen/rev1/keymaps/samae/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-RGBLIGHT_ENABLE = yes
diff --git a/keyboards/rgbkb/zen/rev1/keymaps/starcalleramethyst/config.h b/keyboards/rgbkb/zen/rev1/keymaps/starcalleramethyst/config.h
deleted file mode 100644
index d1fbe29c539..00000000000
--- a/keyboards/rgbkb/zen/rev1/keymaps/starcalleramethyst/config.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-Copyright 2019 starcalleramethyst
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-#undef RGBLED_NUM
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 16
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#define TAPPING_TERM 200
diff --git a/keyboards/rgbkb/zen/rev1/keymaps/starcalleramethyst/keymap.c b/keyboards/rgbkb/zen/rev1/keymaps/starcalleramethyst/keymap.c
deleted file mode 100644
index 47e8e3fa244..00000000000
--- a/keyboards/rgbkb/zen/rev1/keymaps/starcalleramethyst/keymap.c
+++ /dev/null
@@ -1,148 +0,0 @@
-#include QMK_KEYBOARD_H
-
-uint16_t copy_paste_timer;
-
-enum custom_keycodes {
-  S_H = SAFE_RANGE, // slack here
-  S_H_P,       // slack here + paste 
-  T_H_B,         // ticket header bike
-  T_H_T,       // ticket header tread 
-  E_OP,  	    // email open
-  E_CL,		    // email close 
-  E_FU,		    // email follow up 
-  E_SS,       // email service schedule
-  SCRN_C,	    // screen clip 
-  DC_C,       // double click + copy
-  KC_CCCV,    // one key copy/paste 
-  		
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-
-    case S_H:
-      if (record->event.pressed) {
-        SEND_STRING("@HERE");
-      }
- break;
-
-    case S_H_P:
-      if (record->event.pressed) {
-        SEND_STRING("@HERE" SS_TAP(X_SPC) SS_LCTL("v"));
-      }
- break;
-
- case T_H_B:
-      if (record->event.pressed) {
-        SEND_STRING("Your Peloton Bike - ");
-      }
- break;
-
- case T_H_T:
-      if (record->event.pressed) {
-        SEND_STRING("Your Peloton Tread - ");
-      }
- break;
-
-    case E_OP:
-      if (record->event.pressed) {
-        // when keycode E_OP is pressed
-        SEND_STRING("Hi , "SS_TAP(X_ENTER)SS_TAP(X_ENTER)"Thank you for contacting Peloton."SS_TAP(X_ENTER)SS_TAP(X_ENTER));
-      }
-break;
-
-    case E_CL:
-      if (record->event.pressed) {
-                SEND_STRING("Please let me know if you have any other questions."SS_TAP(X_ENTER)SS_TAP(X_ENTER)"Thank you for being the best part of Peloton."); 
-      }
-break;
-
-    case E_FU:
-      if (record->event.pressed) {
-                SEND_STRING("I will be personally watching this issue and will reach out to you after this is complete to make sure everything went smoothly."SS_TAP(X_ENTER)SS_TAP(X_ENTER)); 
-      }
-break;
-
-    case E_SS:
-      if (record->event.pressed) {
-                SEND_STRING("Please click here to schedule your service."SS_TAP(X_ENTER)SS_TAP(X_ENTER)); 
-      }
-break;
-
-    case SCRN_C:
-      if (record->event.pressed) {
-                tap_code16(C(S(KC_F5))); 
-      }
-break;
-
-   case DC_C:
-      if (record->event.pressed) {
-                tap_code(KC_BTN1);
-                tap_code(KC_BTN1);
-                tap_code16(C(KC_C)); 
-      }
-break;
-    
-    case KC_CCCV:  // One key copy/paste
-            if (record->event.pressed) {
-                copy_paste_timer = timer_read();
-            } else {
-                if (timer_elapsed(copy_paste_timer) > TAPPING_TERM) {  // Hold, copy
-                    tap_code16(C(KC_C));
-                } else {  // Tap, paste
-                    tap_code16(C(KC_V));
-                }
-            }
-break;
-
-  }
-  return true;
-};  
-
-//Tap Dance Declarations
-enum {
-  TD_SPC_DOT = 0
-};
-
-//Tap Dance Definitions
-tap_dance_action_t tap_dance_actions[] = {
-  //Tap once for Esc, twice for Caps Lock
-  [TD_SPC_DOT]  = ACTION_TAP_DANCE_DOUBLE(KC_SPC, KC_PDOT) 
-// Other declarations would go here, separated by commas, if you have them
-};
-
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	[0] = LAYOUT(
-QK_GESC, KC_1, 	KC_2, 	KC_3, 	KC_4, 	KC_5, 				KC_6, 	KC_7, 	KC_8, 	KC_9, 	KC_0, KC_BSLS, 
-KC_TAB,  KC_Q, 	KC_W, 	KC_E, 	KC_R, 	KC_T, 				KC_Y, 	KC_U, 	KC_I, 	KC_O, 	KC_P, KC_BSPC, 
-KC_LCTL, KC_A, 	KC_S, 	KC_D, 	KC_F, 	KC_G, 				KC_H, 	KC_J, 	KC_K, 	KC_L, 	KC_SCLN, KC_QUOT, 
-KC_LSFT, KC_Z, 	KC_X, 	KC_C, 	KC_V, 	KC_B, 				KC_N, 	KC_M, 	KC_COMM, KC_DOT, KC_SLSH, SC_SENT, 
-KC_CCCV,   KC_LGUI, KC_LALT, RGB_TOG, MO(1), TD(TD_SPC_DOT), KC_BSPC, KC_ENT, TD(TD_SPC_DOT), MO(2), KC_MINS, KC_EQL, KC_PGUP, KC_PGDN),
-
-	[1] = LAYOUT(
-KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5, KC_F6, 			KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, 
-KC_TRNS, RGB_SAI, RGB_VAI, RGB_SAD, QK_BOOT, KC_LBRC, 			KC_RBRC, KC_PGUP, KC_UP, KC_PGDN, KC_INS, KC_HOME, 
-KC_CAPS, RGB_HUD, RGB_VAD, RGB_HUI, KC_TRNS, KC_TRNS, 			KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_DEL, KC_END, 
-KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 			MAGIC_TOGGLE_NKRO, KC_TRNS, KC_TRNS, KC_MPLY, KC_MPRV, KC_MNXT, 
-KC_NO,   KC_LGUI, KC_LALT, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE, KC_VOLU, KC_VOLD),
-
-/*	[2] = LAYOUT(
-QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, 				KC_6,KC_7, KC_8, KC_9, KC_0, KC_BSLS, 
-KC_TAB,  KC_Q, KC_W, KC_F, KC_P, KC_G, 				KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC, 
-KC_LCTL, KC_A, KC_R, KC_S, KC_T, KC_D, 				KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, 
-KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, 				KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, 
-KC_LCTL, KC_LGUI, KC_LALT, KC_NO, TO(0), KC_SPC, KC_BSPC, KC_ENT, KC_SPC, TO(0), KC_MINS, KC_EQL, KC_PGUP, KC_PGDN),
-*/
-	[2] = LAYOUT(
-KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, 			KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, 
-KC_NO, KC_NO, KC_NO, KC_NO, S_H_P, KC_NO, 			KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, 
-KC_NO, E_CL,  E_FU,  E_OP,  S_H,   SCRN_C, 			KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, 
-KC_NO, DC_C, E_SS, T_H_T, T_H_B, KC_NO, 			KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, 
-KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO)
-
-};
-
-
diff --git a/keyboards/rgbkb/zen/rev1/keymaps/starcalleramethyst/rules.mk b/keyboards/rgbkb/zen/rev1/keymaps/starcalleramethyst/rules.mk
deleted file mode 100644
index 8e3e2151428..00000000000
--- a/keyboards/rgbkb/zen/rev1/keymaps/starcalleramethyst/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-RGBLIGHT_ENABLE = yes
-TAP_DANCE_ENABLE = yes 
-MOUSEKEY_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/rominronin/katana60/rev1/keymaps/josefadamcik/keymap.c b/keyboards/rominronin/katana60/rev1/keymaps/josefadamcik/keymap.c
deleted file mode 100644
index ca2be62a194..00000000000
--- a/keyboards/rominronin/katana60/rev1/keymaps/josefadamcik/keymap.c
+++ /dev/null
@@ -1,151 +0,0 @@
-/* Copyright 2019 Josef Adamcik
- *
- *  This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-
-enum katana_layers {
-    /* _M_XYZ = Mac Os, _W_XYZ = Win/Linux */
-    _M_COLEMAK,
-    _M_QWERTY,
-    _W_COLEMAK,
-    _W_QWERTY,
-    _NUMB,
-    _SYMB,
-    _M_EXT,
-    _W_EXT
-};
-
-enum katana_keycodes {
-    M_COLEMAK = SAFE_RANGE,
-    M_QWERTY,
-    W_COLEMAK,
-    W_QWERTY
-};
-
-#define K_SPCFN LT(_SYMB, KC_SPACE) /* Tap for space, hold for symbols layer */
-#define K_BSPFN LT(_SYMB, KC_BSPC)  /* Tap for backspace, hold for symbols layer */
-/* Linux/win variants */
-#define W_LEFT_MOD MT(MOD_RCTL, KC_LEFT)
-#define W_DOWN_MOD MT(MOD_RALT, KC_DOWN)
-#define W_UP_MOD MT(MOD_RGUI, KC_UP)
-#define W_UNDO    LCTL(KC_Z)
-#define W_CUT     LCTL(KC_X)
-#define W_COPY    LCTL(KC_C)
-#define W_PASTE   LCTL(KC_V)
-#define W_PRVWD LCTL(KC_LEFT)
-#define W_NXTWD LCTL(KC_RIGHT)
-#define W_LSTRT KC_HOME
-#define W_LEND KC_END
-/* Mac variants */
-#define M_LEFT_MOD MT(MOD_RGUI, KC_LEFT)
-#define M_DOWN_MOD MT(MOD_RALT, KC_DOWN)
-#define M_UP_MOD MT(MOD_RCTL, KC_UP)
-#define M_UNDO LGUI(KC_Z)
-#define M_CUT LGUI(KC_X)
-#define M_COPY LGUI(KC_C)
-#define M_PASTE LGUI(KC_V)
-#define M_PRVWD LALT(KC_LEFT)
-#define M_NXTWD LALT(KC_RIGHT)
-#define M_LSTRT LGUI(KC_LEFT)
-#define M_LEND LGUI(KC_RIGHT)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[_M_COLEMAK] = LAYOUT(
-    KC_ESC,    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,   TG(_NUMB),KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,
-    KC_TAB,    KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_LBRC,          KC_RBRC, KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-    MO(_M_EXT),KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_MINS,          KC_QUOT, KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_ENT,
-    KC_LSFT,   KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_EQL,  KC_DEL,  KC_BSLS, KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-    MO(_SYMB), KC_LCTL, KC_LALT, KC_LGUI,                   K_BSPFN, KC_ENT,  KC_SPACE,         M_LEFT_MOD,M_DOWN_MOD,M_UP_MOD,  KC_RIGHT,MO(_SYMB)
-),
-[_M_QWERTY] = LAYOUT(
-    KC_ESC,    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,   TG(_NUMB),KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,
-    KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_LBRC,          KC_RBRC, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-    MO(_M_EXT),KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_MINS,          KC_QUOT, KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT,
-    KC_LSFT,   KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_EQL,  KC_DEL,  KC_BSLS, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-    MO(_SYMB), KC_LCTL, KC_LALT, KC_LGUI,                   K_BSPFN, KC_ENT,  KC_SPACE,         M_LEFT_MOD,M_DOWN_MOD,M_UP_MOD,   KC_RIGHT,MO(_SYMB)
-),
-[_W_COLEMAK] = LAYOUT(
-    KC_ESC,    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,   TG(_NUMB),KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,
-    KC_TAB,    KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_LBRC,          KC_RBRC, KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-    MO(_W_EXT),KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_MINS,          KC_QUOT, KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_ENT,
-    KC_LSFT,   KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_EQL,  KC_DEL,  KC_BSLS, KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-    MO(_SYMB), KC_LGUI, KC_LALT, KC_LCTL,                   K_BSPFN, KC_ENT,  KC_SPACE,         W_LEFT_MOD,W_DOWN_MOD,W_UP_MOD,  KC_RIGHT,MO(_SYMB)
-),
-[_W_QWERTY] = LAYOUT(
-    KC_ESC,    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,   TG(_NUMB),KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,
-    KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_LBRC,          KC_RBRC, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-    MO(_W_EXT),KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_MINS,          KC_QUOT, KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT,
-    KC_LSFT,   KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_EQL,  KC_DEL,  KC_BSLS, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-    MO(_SYMB), KC_LGUI, KC_LALT, KC_LCTL,                   K_BSPFN, KC_ENT,  KC_SPACE,         W_LEFT_MOD,W_DOWN_MOD,W_UP_MOD,   KC_RIGHT,MO(_SYMB)
-),
-[_NUMB] = LAYOUT(
-    _______, _______, _______, _______, _______, _______, _______, _______, _______,_______, KC_PSLS, KC_PAST, KC_PMNS, _______, _______,
-    _______, _______, _______, KC_MS_U, _______, _______, _______,          _______,_______, KC_7,    KC_8,    KC_9,    KC_PPLS, _______,
-    _______, KC_BTN2, KC_MS_L, KC_MS_D, KC_MS_R, _______, _______,          _______,_______, KC_4,    KC_5,    KC_6,    KC_PPLS, _______,
-    _______, _______, KC_ACL0, KC_ACL1, KC_ACL2, _______, _______, _______, _______,_______, KC_1,    KC_2,    KC_3,    KC_PENT, _______,
-    _______, _______, _______, _______,                   KC_BTN1, _______, KC_P0,            KC_PDOT, _______, _______, _______, _______
-),
-[_SYMB] = LAYOUT(
-    QK_BOOT, _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   _______, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    _______,          _______, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL,
-    _______, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_VOLD,          KC_VOLU, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
-    _______, KC_PLUS, KC_MINS, KC_EQL,  KC_LCBR, KC_RCBR, KC_MPRV, KC_MPLY, KC_MNXT, KC_LBRC, KC_RBRC, KC_SCLN, KC_COLN, KC_BSLS, _______,
-    _______, _______, _______, _______,                   KC_DEL,  _______, _______,          _______, _______, _______, _______, _______
-),
-[_M_EXT] = LAYOUT(
-    QK_BOOT,M_COLEMAK,M_QWERTY,W_COLEMAK,W_QWERTY,_______,_______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______,          _______, KC_PGUP, M_PRVWD, KC_UP,   M_NXTWD, _______, _______,
-    _______, KC_LALT, KC_LCTL, KC_LSFT, _______, KC_CAPS, _______,          _______, KC_PGDN, KC_LEFT, KC_DOWN, KC_RIGHT,KC_DEL,  _______,
-    _______, M_UNDO,  M_CUT,   M_COPY,  M_PASTE, _______, _______, _______, _______, _______, M_LSTRT, _______, M_LEND,  _______, _______,
-    _______, _______, _______, _______,                   _______, _______, _______,          _______, _______, _______, _______, _______
-),
-[_W_EXT] = LAYOUT(
-    QK_BOOT,M_COLEMAK,M_QWERTY,W_COLEMAK,W_QWERTY,_______,_______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______,          _______, KC_PGUP, W_PRVWD, KC_UP,   W_NXTWD, _______, _______,
-    _______, KC_LALT, KC_LCTL, KC_LSFT, _______, KC_CAPS, _______,          _______, KC_PGDN, KC_LEFT, KC_DOWN, KC_RIGHT,KC_DEL,  _______,
-    _______, W_UNDO,  W_CUT,   W_COPY,  W_PASTE, _______, _______, _______, _______, _______, W_LSTRT, _______, W_LEND,  _______, _______,
-    _______, _______, _______, _______,                   _______, _______, _______,          _______, _______, _______, _______, _______
-)
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case M_QWERTY:
-            if (record->event.pressed) {
-                set_single_persistent_default_layer(_M_QWERTY);
-            }
-            return false;
-            break;
-        case M_COLEMAK:
-            if (record->event.pressed) {
-                set_single_persistent_default_layer(_M_COLEMAK);
-            }
-            return false;
-            break;
-        case W_QWERTY:
-            if (record->event.pressed) {
-                set_single_persistent_default_layer(_W_QWERTY);
-            }
-            return false;
-            break;
-        case W_COLEMAK:
-            if (record->event.pressed) {
-                set_single_persistent_default_layer(_W_COLEMAK);
-            }
-            return false;
-            break;
-    }
-    return true;
-}
diff --git a/keyboards/rominronin/katana60/rev1/keymaps/josefadamcik/readme.md b/keyboards/rominronin/katana60/rev1/keymaps/josefadamcik/readme.md
deleted file mode 100644
index 5d72b1defa0..00000000000
--- a/keyboards/rominronin/katana60/rev1/keymaps/josefadamcik/readme.md
+++ /dev/null
@@ -1,23 +0,0 @@
-![Multi OS Katana60 layout image](https://i.imgur.com/1w2OA1o.png)
-
-# Multi OS Katana60 layout
-
-Based on the default Katana60 layout, customized by [Josef Adamcik](https://josef-adamcik.cz) with several basic layers (Colemak vs Qwerty, Mac OS vs Linux/Win)
-
-- Supports 4 default layers: Colemak Mac, Qwerty Mac, Colemak Win/Linux, Qwerty Win/Linux. Switching between default layers is persisted. For more details about Mac vs Win/Linux see below.
-- There are arrows mapped to the right side of the bottom row on Katana6O. I kept this mapping but modified it a bit - when you press and hold any of the first three arrow keys it acts as a modifier (CMD, OPT, CTRL). If you just tap it, it acts as an arrow.
-
-## Mac versus Win/Linux layers:
-
-- Modifiers are ordered differently. Mac version has (from the middle to the outside): CMD, ALT, CTRL, Win/Linux version has CTRL, ALT, CMD. It's meant to make switching between platforms easier.
-- Extend layer is different, so the keys which represent shortcuts ("previous/next word" and "copy", "paste", "cut", "undo") work properly.
-
-## More details - reasons for some choices in this layout
-
-I use Mac for work and Ubuntu at home. So I would like to stay compatible with both systems. The main problem is the modifiers. Firstly, they tend to be ordered differently on Mac keyboards. Secondly, the main modifier on Mac is CMD (equivalent to WIn or SUPER on other keyboards). The same role is played by CTRL on Windows and Linux. Most of IDE’s or editors (Android Studio, VS Code, SublimeText) follow this habit in their OS-specific keymaps.
-
-I am a user of the Colemak layout. But I would like to have the ability to switch to qwerty. That would allow my other people to use my keyboard occasionally.
-
-I am a heavy user of keyboard shortcuts. So I need the layout to support my needs. Some keyboard layout has modifiers only on one side of the keyboard or they hide some of them (CMD) under a key combination. I tend to press the modifiers for a key shortcut with the opposite hand to the one which presses the letter. 
-
-Layout in [keyboard-layout-editor.com](http://www.keyboard-layout-editor.com/#/gists/14d62ee67d36621c37888783fa29b107)
diff --git a/keyboards/rominronin/katana60/rev1/keymaps/rominronin/config.h b/keyboards/rominronin/katana60/rev1/keymaps/rominronin/config.h
deleted file mode 100644
index 08c51f6cb50..00000000000
--- a/keyboards/rominronin/katana60/rev1/keymaps/rominronin/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2017 Baris Tosun
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-// place overrides here
-
-#endif
diff --git a/keyboards/rominronin/katana60/rev1/keymaps/rominronin/keymap.c b/keyboards/rominronin/katana60/rev1/keymaps/rominronin/keymap.c
deleted file mode 100644
index 615de932f89..00000000000
--- a/keyboards/rominronin/katana60/rev1/keymaps/rominronin/keymap.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/* Copyright 2017 Baris Tosun
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-
-// MacOS based definitions.
-#define K_SPCFN LT(SYMB, KC_SPACE) // Tap for space, hold for symbols layer
-#define K_PRVWD LALT(KC_LEFT)      // Previous word
-#define K_NXTWD LALT(KC_RIGHT)     // Next word
-#define K_LSTRT LGUI(KC_LEFT)      // Start of line
-#define K_LEND  LGUI(KC_RIGHT)     // End of line
-#define UNDO    LGUI(KC_Z)         // UNDO
-#define CUT     LGUI(KC_X)         // CUT
-#define COPY    LGUI(KC_C)         // COPY
-#define PASTE   LGUI(KC_V)         // PASTE
-
-
-#define BASE 0 // Default
-#define NUMB 1 // Numbers
-#define SYMB 2 // Symbols
-#define CURS 3 // Text Editing
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[BASE] = LAYOUT( /* Base */
-  KC_ESC,  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    DF(1),   KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,
-  KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_B,    KC_LBRC,          KC_RBRC, KC_J,    KC_L,    KC_U,    KC_Y,    KC_QUOT, KC_BSPC,
-  MO(3),   KC_A,    KC_R,    KC_S,    KC_T,    KC_G,    KC_HOME,          KC_PGUP, KC_M,    KC_N,    KC_E,    KC_I,    KC_O,    KC_ENT,
-  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_D,    KC_V,    KC_END,  KC_DEL,  KC_PGDN, KC_K,    KC_H,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-  MO(2),   KC_LCTL, KC_LALT, KC_LGUI,                   KC_BSPC, KC_ENT,  K_SPCFN,          KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT,MO(2)
-    ),
-[NUMB] = LAYOUT(
-  _______, _______, _______, _______, _______, _______, _______, DF(0),   KC_PSLS, KC_PAST, KC_PMNS, _______, _______, _______, _______,
-  _______, _______, _______, KC_MS_U, _______, _______, _______,          KC_7,    KC_8,    KC_9,    KC_PPLS, _______, _______, _______,
-  _______, KC_BTN2, KC_MS_L, KC_MS_D, KC_MS_R, _______, _______,          KC_4,    KC_5,    KC_6,    KC_PPLS, _______, _______, _______,
-  _______, _______, KC_ACL0, KC_ACL1, KC_ACL2, _______, _______, _______, KC_1,    KC_2,    KC_3,    KC_PENT, _______, _______, _______,
-  _______, _______, _______, _______,                   KC_BTN1, _______, KC_P0,            KC_PDOT, KC_PENT, _______, _______, _______
-    ),
-[SYMB] = LAYOUT(
-  QK_BOOT, _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   _______, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    _______,          _______, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL,
-  _______, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_VOLD,          KC_VOLU, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
-  _______, KC_PLUS, KC_MINS, KC_EQL,  KC_LCBR, KC_RCBR, KC_MPRV, KC_MPLY, KC_MNXT, KC_LBRC, KC_RBRC, KC_SCLN, KC_COLN, KC_BSLS, _______,
-  _______, _______, _______, _______,                   KC_DEL,  _______, _______,          _______, _______, _______, _______, _______
-    ),
-[CURS] = LAYOUT(
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, KC_WH_U, _______, _______, _______, _______,          _______, _______, K_PRVWD, KC_UP,   K_NXTWD, _______, _______,
-  _______, KC_LCTL, KC_WH_D, KC_LSFT, _______, _______, _______,          _______, KC_BSPC, KC_LEFT, KC_DOWN, KC_RIGHT,KC_DEL,  _______,
-  _______, UNDO,    CUT,     COPY,    PASTE,   _______, _______, _______, _______, _______, K_LSTRT, _______, K_LEND,  _______, _______,
-  _______, _______, _______, _______,                   _______, _______, _______,          _______, _______, _______, _______, _______
-    )
-
-};
diff --git a/keyboards/rominronin/katana60/rev1/keymaps/rominronin/readme.md b/keyboards/rominronin/katana60/rev1/keymaps/rominronin/readme.md
deleted file mode 100644
index 9647426f702..00000000000
--- a/keyboards/rominronin/katana60/rev1/keymaps/rominronin/readme.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# RominRonin's keymap for katana60
-
-My own personal daily layout. OS keys are oriented for MacOS and the keys are in COLEMAK Mod-DH layout.
-
-# TODO: references to extend layer and symbol layers
\ No newline at end of file
diff --git a/keyboards/rominronin/katana60/rev2/keymaps/rominronin_7u/keymap.c b/keyboards/rominronin/katana60/rev2/keymaps/rominronin_7u/keymap.c
deleted file mode 100644
index 6919b469907..00000000000
--- a/keyboards/rominronin/katana60/rev2/keymaps/rominronin_7u/keymap.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/* Copyright 2019 rominronin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-
-// MacOS based definitions.
-#define K_SPCFN LT(SYMB, KC_SPACE) // Tap for space, hold for symbols layer
-#define K_PRVWD LALT(KC_LEFT)      // Previous word
-#define K_NXTWD LALT(KC_RIGHT)     // Next word
-#define K_LSTRT LGUI(KC_LEFT)      // Start of line
-#define K_LEND  LGUI(KC_RIGHT)     // End of line
-#define UNDO    LGUI(KC_Z)         // UNDO
-#define CUT     LGUI(KC_X)         // CUT
-#define COPY    LGUI(KC_C)         // COPY
-#define PASTE   LGUI(KC_V)         // PASTE
-
-enum layer_names {
-    BASE,
-    NUMB,
-    SYMB,
-    CURS,
-    BASE2,
-};
-
-// Defines the keycodes used by our macros in process_record_user
-enum custom_keycodes {
-  QMKBEST = SAFE_RANGE,
-  QMKURL
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [BASE] = LAYOUT_7u_a(/* Base */
-    KC_ESC,  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    DF(4),   KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,
-    KC_TAB,      KC_Q,    KC_W,    KC_F,    KC_P,    KC_B,    KC_LBRC, KC_RBRC, KC_J,    KC_L,    KC_U,    KC_Y,    KC_QUOT,      KC_BSPC,
-    MO(3),     KC_A,    KC_R,    KC_S,    KC_T,    KC_G,    KC_HOME,      KC_PGUP, KC_M,    KC_N,    KC_E,    KC_I,    KC_O,      KC_ENT,
-    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_D,    KC_V,    KC_END,  KC_DEL,  KC_PGDN, KC_K,    KC_H,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-    KC_LCTL, KC_LALT, KC_LGUI,                                     K_SPCFN,                            KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT
-  ),
-  [NUMB] = LAYOUT_7u_a(
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PEQL, KC_PSLS, KC_PAST, _______, _______,
-    _______,     _______, _______, KC_MS_U, _______, _______, _______, _______, _______, KC_P7,   KC_P8,   KC_P9,   KC_PMNS,      _______,
-    DF(0),     KC_BTN2, KC_MS_L, KC_MS_D, KC_MS_R, _______, _______,      _______, _______, KC_P4,   KC_P5,   KC_P6,   KC_PPLS,   _______,
-    _______, _______, KC_ACL0, KC_ACL1, KC_ACL2, _______, _______, _______, _______, _______, KC_P1,   KC_P2,   KC_P3,   KC_PENT, _______,
-    _______, _______, _______,                                     KC_P0,                               KC_PDOT, KC_PENT, _______, _______
-  ),
-  [SYMB] = LAYOUT_7u_a(
-    QK_BOOT, _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   _______, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-    KC_GRV,      KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    _______, _______, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,         KC_DEL,
-    _______,   KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_VOLD,      KC_VOLU, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN,   _______,
-    _______, KC_PLUS, KC_MINS, KC_EQL,  KC_LCBR, KC_RCBR, KC_MPRV, KC_MPLY, KC_MNXT, KC_LBRC, KC_RBRC, KC_SCLN, KC_COLN, KC_BSLS, _______,
-    _______, _______, _______,                                     KC_DEL,                             _______, _______, _______, _______
-  ),
-  [CURS] = LAYOUT_7u_a(
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______,     _______, _______, _______, _______, _______, _______, _______, _______, K_PRVWD, KC_UP,   K_NXTWD, _______,      _______,
-    _______,   _______, KC_LCTL, KC_LALT, KC_LSFT, _______, _______,      _______, KC_BSPC, KC_LEFT, KC_DOWN, KC_RIGHT,KC_DEL,    _______,
-    _______, UNDO,    CUT,     COPY,    PASTE,   _______, _______, _______, _______, _______, K_LSTRT, _______, K_LEND,  _______, _______,
-    _______, _______, _______,                                      DF(1),                             _______, _______, _______, _______
-  ),
-  [BASE2] = LAYOUT_7u_a(/* Base */
-    KC_ESC,  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    DF(0),   KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,
-    KC_TAB,      KC_Q,    KC_W,    KC_F,    KC_P,    KC_B,    KC_LBRC, KC_RBRC, KC_J,    KC_L,    KC_U,    KC_Y,    KC_QUOT,      KC_BSPC,
-    KC_CAPS,   KC_A,    KC_R,    KC_S,    KC_T,    KC_G,    KC_HOME,      KC_PGUP, KC_M,    KC_N,    KC_E,    KC_I,    KC_O,      KC_ENT,
-    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_D,    KC_V,    KC_END,  KC_DEL,  KC_PGDN, KC_K,    KC_H,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-    KC_LCTL, KC_LALT, KC_LGUI,                                     KC_SPACE,                           KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT
-  )
-};
diff --git a/keyboards/rominronin/katana60/rev2/keymaps/rominronin_7u/readme.md b/keyboards/rominronin/katana60/rev2/keymaps/rominronin_7u/readme.md
deleted file mode 100644
index 6d0bbe8b2d1..00000000000
--- a/keyboards/rominronin/katana60/rev2/keymaps/rominronin_7u/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The default keymap for katana60_rev2
diff --git a/keyboards/rookiebwoy/late9/readme.md b/keyboards/rookiebwoy/late9/readme.md
index 9815391cbd5..bc6dfab57e2 100644
--- a/keyboards/rookiebwoy/late9/readme.md
+++ b/keyboards/rookiebwoy/late9/readme.md
@@ -5,11 +5,9 @@ The LATE-9 is a multi-tap input keyboard based on mobile phones from the late '9
 
 ![LATE-9](https://i.imgur.com/QXycTC3h.jpg "LATE-9 first proto")
 
-See the project repository for gerbers.
-
 * Keyboard maintainer: [rookiebwoy](https://github.com/rookiebwoy)
 * Hardware supported: ProMicro, _Elite-C (not tested)_
-* Project repository: [LATE-9 on github](https://github.com/rookiebwoy/late-9)
+* Hardware Availability: LATE-9 is open source, check the [project repository](https://github.com/rookiebwoy/late-9) for gerbers.
 
 Make example for this keyboard (after setting up your build environment):
 
@@ -19,9 +17,9 @@ Flashing example for this keyboard:
 
     make rookiebwoy/late9/rev1:default:flash
 
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
 
-When asked by the terminal, short with a metal wire the pins on the backside of the board highlighted as `RST` (one is the `RESET` and the other one is `GROUND`) to enter the bootloader and let the OS detects the device.
-After installing this firmware you can use Bootmagic to enter the bootloader while plugging in your LATE-9. By default it's the button on the upper-left of the keyboard.
-
-See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+## Bootloader
 
+When asked by the terminal, short with a metal wire the pins on the backside of the board highlighted as `RST` (one is the `RESET` and the other one is `GROUND`) to enter the bootloader and let the OS detects the device.\
+After installing this firmware you can use Bootmagic to enter the bootloader while plugging in your LATE-9. By default it's the button on the upper-left of the keyboard.
\ No newline at end of file
diff --git a/keyboards/rookiebwoy/late9/rev1/info.json b/keyboards/rookiebwoy/late9/rev1/info.json
index 05d0934b964..48f3cff840d 100644
--- a/keyboards/rookiebwoy/late9/rev1/info.json
+++ b/keyboards/rookiebwoy/late9/rev1/info.json
@@ -4,8 +4,8 @@
     "url": "https://github.com/rookiebwoy/late-9)",
     "maintainer": "rookiebwoy",
     "usb": {
-        "vid": "0xFEED",
-        "pid": "0x3777",
+        "vid": "0x6961",
+        "pid": "0x3032",
         "device_version": "0.1.0"
     },
     "tapping": {
@@ -19,6 +19,11 @@
         "rows": ["B4", "E6", "D7", "B3", "B2", "B6"]
     },
     "diode_direction": "ROW2COL",
+    "features": {
+      "bootmagic": true,
+      "nkro": true,
+      "oled": true
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
diff --git a/keyboards/rookiebwoy/late9/rev1/keymaps/default/keymap.c b/keyboards/rookiebwoy/late9/rev1/keymaps/default/keymap.c
index bed15eb57e5..f93958fe8f3 100644
--- a/keyboards/rookiebwoy/late9/rev1/keymaps/default/keymap.c
+++ b/keyboards/rookiebwoy/late9/rev1/keymaps/default/keymap.c
@@ -22,23 +22,23 @@ enum layers {
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Keymap _BL: Base Layer
+/* BL: Base Layer
  * ,-----------------------.
  * |MO(OP) | ↑     | BSPC  |
  * |       |       |       |
- * |-------|-------|-------|
+ * |-------+-------+-------|
  * | <-    | ↓     | ->    |
  * |       |       |       |
- * |-------|-------|-------|
+ * |-------+-------+-------|
  * | 1     | 2     | 3     |
  * |       |       |       |
- * |-------|-------|-------|
+ * |-------+-------+-------|
  * | 4     | 5     | 6     |
  * |       |       |       |
- * |-------|-------|-------|
+ * |-------+-------+-------|
  * | 7     | 8     | 9     |
  * |       |       |       |
- * |-------|-------|-------|
+ * |-------+-------+-------|
  * | 0     | .     | =     |
  * |       |       |       |
  * `-----------------------'
@@ -52,23 +52,23 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_P0,         KC_PDOT,       KC_PEQL
   ),
 
-/* Keymap _OP: Operators Layer
+/* OP: Operators Layer
  * ,-----------------------.
  * |MO(OP) | ↑     | BSPC  |
  * |       |       |       |
- * |-------|-------|-------|
+ * |-------+-------+-------|
  * | <-    | ↓     | ->    |
  * |       |       |       |
- * |-------|-------|-------|
+ * |-------+-------+-------|
  * | /     | *     | -     |
  * |       |       |       |
- * |-------|-------|-------|
+ * |-------+-------+-------|
  * | (     | )     | +     |
  * |       |       |       |
- * |-------|-------|-------|
+ * |-------+-------+-------|
  * | &     | %     | ^     |
  * |       |       |       |
- * |-------|-------|-------|
+ * |-------+-------+-------|
  * | |     | .     | =     |
  * |       |       |       |
  * `-----------------------'
diff --git a/keyboards/rookiebwoy/late9/rev1/keymaps/multitap/keymap.c b/keyboards/rookiebwoy/late9/rev1/keymaps/multitap/keymap.c
deleted file mode 100644
index e378fb4921f..00000000000
--- a/keyboards/rookiebwoy/late9/rev1/keymaps/multitap/keymap.c
+++ /dev/null
@@ -1,235 +0,0 @@
-/* Copyright 2021 rookiebwoy
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-
-// Layers declarations
-enum layers {
-    _BL
-};
-
-// Tap Dance declarations
-enum {
-    TD_PNCT,
-    TD_ABC,
-    TD_DEF,
-    TD_GHI,
-    TD_JKL,
-    TD_MNO,
-    TD_PQRS,
-    TD_TUV,
-    TD_WXYZ,
-    TD_SPACE,
-    TD_UPRCS,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Keymap _BL: Base Layer
- * ,-----------------------.
- * |ENTER  | ↑     | BSPC  |
- * |       |       |       |
- * |-------|-------|-------|
- * | <-    | ↓     | ->    |
- * |       |       |       |
- * |-------|-------|-------|
- * | 1 .,' | 2     | 3     |
- * |?!-:;/ | abc   | def   |
- * |-------|-------|-------|
- * | 4     | 5     | 6     |
- * | ghi   | jkl   | mno   |
- * |-------|-------|-------|
- * | 7     | 8     | 9     |
- * | pqrs  | tuv   | wxyz  |
- * |-------|-------|-------|
- * | *     | 0     | CAPS  |
- * |       | space |       |
- * `-----------------------'
- */
-  [_BL] = LAYOUT(
-    KC_ENT,       KC_UP,        KC_BSPC,
-    KC_LEFT,      KC_DOWN,      KC_RIGHT,
-    TD(TD_PNCT),  TD(TD_ABC),   TD(TD_DEF),
-    TD(TD_GHI),   TD(TD_JKL),   TD(TD_MNO),
-    TD(TD_PQRS),  TD(TD_TUV),   TD(TD_WXYZ),
-    KC_PAST,      TD(TD_SPACE), TD(TD_UPRCS)
-  ),
-};
-
-// Tap Dance cycles
-void dance_1 (tap_dance_state_t *state, void *user_data) {
-    if (state->count == 1) {
-        if (state->interrupted || !state->pressed) return tap_code(KC_DOT);
-        else return tap_code(KC_1);
-    } else if (state->count == 2) {
-        tap_code (KC_COMM);
-    } else if (state->count == 3) {
-        tap_code(KC_QUOT);
-    } else if (state->count == 4) {
-        tap_code16(KC_QUES);
-    } else if (state->count == 5) {
-        tap_code16(KC_EXLM);
-    } else if (state->count == 6) {
-        tap_code(KC_MINS);
-    } else if (state->count == 7) {
-        tap_code16(KC_COLN);
-    } else if (state->count == 8) {
-        tap_code(KC_SCLN);
-    } else if (state->count == 9) {
-        tap_code(KC_SLSH);
-    } else {
-        reset_tap_dance (state);
-    }
-}
-
-void dance_2 (tap_dance_state_t *state, void *user_data) {
-    if (state->count == 1) {
-        if (state->interrupted || !state->pressed) return tap_code(KC_A);
-        else return tap_code(KC_2);
-    } else if (state->count == 2) {
-        tap_code (KC_B);
-    } else if (state->count == 3) {
-        tap_code(KC_C);
-    } else {
-        reset_tap_dance (state);
-    }
-}
-
-void dance_3 (tap_dance_state_t *state, void *user_data) {
-    if (state->count == 1) {
-        if (state->interrupted || !state->pressed) return tap_code(KC_D);
-        else return tap_code(KC_3);
-    } else if (state->count == 2) {
-        tap_code (KC_E);
-    } else if (state->count == 3) {
-        tap_code(KC_F);
-    } else {
-        reset_tap_dance (state);
-    }
-}
-
-void dance_4 (tap_dance_state_t *state, void *user_data) {
-    if (state->count == 1) {
-        if (state->interrupted || !state->pressed) return tap_code(KC_G);
-        else return tap_code(KC_4);
-    } else if (state->count == 2) {
-        tap_code (KC_H);
-    } else if (state->count == 3) {
-        tap_code(KC_I);
-    } else {
-        reset_tap_dance (state);
-    }
-}
-
-void dance_5 (tap_dance_state_t *state, void *user_data) {
-    if (state->count == 1) {
-        if (state->interrupted || !state->pressed) return tap_code(KC_J);
-        else return tap_code(KC_5);
-    } else if (state->count == 2) {
-        tap_code (KC_K);
-    } else if (state->count == 3) {
-        tap_code(KC_L);
-    } else {
-        reset_tap_dance (state);
-    }
-}
-
-void dance_6 (tap_dance_state_t *state, void *user_data) {
-    if (state->count == 1) {
-        if (state->interrupted || !state->pressed) return tap_code(KC_M);
-        else return tap_code(KC_6);
-    } else if (state->count == 2) {
-        tap_code (KC_N);
-    } else if (state->count == 3) {
-        tap_code(KC_O);
-    } else {
-        reset_tap_dance (state);
-    }
-}
-
-void dance_7 (tap_dance_state_t *state, void *user_data) {
-    if (state->count == 1) {
-        if (state->interrupted || !state->pressed) return tap_code(KC_P);
-        else return tap_code(KC_7);
-    } else if (state->count == 2) {
-        tap_code (KC_Q);
-    } else if (state->count == 3) {
-        tap_code(KC_R);
-    } else if (state->count == 4) {
-        tap_code(KC_S);
-    } else {
-        reset_tap_dance (state);
-    }
-}
-
-void dance_8 (tap_dance_state_t *state, void *user_data) {
-    if (state->count == 1) {
-        if (state->interrupted || !state->pressed) return tap_code(KC_T);
-        else return tap_code(KC_8);
-    } else if (state->count == 2) {
-        tap_code (KC_U);
-    } else if (state->count == 3) {
-        tap_code(KC_V);
-    } else {
-        reset_tap_dance (state);
-    }
-}
-
-void dance_9 (tap_dance_state_t *state, void *user_data) {
-    if (state->count == 1) {
-        if (state->interrupted || !state->pressed) return tap_code(KC_W);
-        else return tap_code(KC_9);
-    } else if (state->count == 2) {
-        tap_code (KC_X);
-    } else if (state->count == 3) {
-        tap_code(KC_Y);
-    } else if (state->count == 4) {
-        tap_code(KC_Z);
-    } else {
-        reset_tap_dance (state);
-    }
-}
-
-void dance_0 (tap_dance_state_t *state, void *user_data) {
-    if (state->count == 1) {
-        if (state->interrupted || !state->pressed) return tap_code(KC_SPACE);
-        else return tap_code(KC_0);
-    } else {
-        reset_tap_dance (state);
-    }
-}
-
-void dance_maiusc (tap_dance_state_t *state, void *user_data) {
-    if (state->count == 1) {
-        if (state->interrupted || !state->pressed) return set_oneshot_mods(MOD_BIT(KC_LSFT)); 
-        else return tap_code(KC_CAPS);
-    } else {
-        reset_tap_dance (state);
-    }
-}
-
-// Tap Dance actions
-tap_dance_action_t tap_dance_actions[] = {
-    [TD_PNCT] = ACTION_TAP_DANCE_FN (dance_1),
-    [TD_ABC] = ACTION_TAP_DANCE_FN (dance_2),
-    [TD_DEF] = ACTION_TAP_DANCE_FN (dance_3),
-    [TD_GHI] = ACTION_TAP_DANCE_FN (dance_4),
-    [TD_JKL] = ACTION_TAP_DANCE_FN (dance_5),
-    [TD_MNO] = ACTION_TAP_DANCE_FN (dance_6),
-    [TD_PQRS] = ACTION_TAP_DANCE_FN (dance_7),
-    [TD_TUV] = ACTION_TAP_DANCE_FN (dance_8),
-    [TD_WXYZ] = ACTION_TAP_DANCE_FN (dance_9),
-    [TD_SPACE] = ACTION_TAP_DANCE_FN (dance_0),
-    [TD_UPRCS] = ACTION_TAP_DANCE_FN (dance_maiusc),
-};
diff --git a/keyboards/rookiebwoy/late9/rev1/keymaps/multitap/readme.md b/keyboards/rookiebwoy/late9/rev1/keymaps/multitap/readme.md
deleted file mode 100644
index 2b5136c2b8e..00000000000
--- a/keyboards/rookiebwoy/late9/rev1/keymaps/multitap/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# LATE-9 multitap keymap
-
-This is the intended LATE-9 layout with multitap `ON` and old mobile phone look-a-like layout..
diff --git a/keyboards/rookiebwoy/late9/rev1/keymaps/multitap/rules.mk b/keyboards/rookiebwoy/late9/rev1/keymaps/multitap/rules.mk
deleted file mode 100644
index 4141c3e7a42..00000000000
--- a/keyboards/rookiebwoy/late9/rev1/keymaps/multitap/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-# Enable Tap Dance feature
-TAP_DANCE_ENABLE = yes
diff --git a/keyboards/rookiebwoy/late9/rev1/keymaps/via/keymap.c b/keyboards/rookiebwoy/late9/rev1/keymaps/via/keymap.c
new file mode 100644
index 00000000000..f93958fe8f3
--- /dev/null
+++ b/keyboards/rookiebwoy/late9/rev1/keymaps/via/keymap.c
@@ -0,0 +1,84 @@
+/* Copyright 2021 rookiebwoy
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+// Layers declarations
+enum layers {
+    _BL,
+    _OL
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+/* BL: Base Layer
+ * ,-----------------------.
+ * |MO(OP) | ↑     | BSPC  |
+ * |       |       |       |
+ * |-------+-------+-------|
+ * | <-    | ↓     | ->    |
+ * |       |       |       |
+ * |-------+-------+-------|
+ * | 1     | 2     | 3     |
+ * |       |       |       |
+ * |-------+-------+-------|
+ * | 4     | 5     | 6     |
+ * |       |       |       |
+ * |-------+-------+-------|
+ * | 7     | 8     | 9     |
+ * |       |       |       |
+ * |-------+-------+-------|
+ * | 0     | .     | =     |
+ * |       |       |       |
+ * `-----------------------'
+ */
+  [_BL] = LAYOUT(
+    MO(1),         KC_UP,         KC_BSPC,
+    KC_LEFT,       KC_DOWN,       KC_RIGHT,
+    KC_P1,         KC_P2,         KC_P3,
+    KC_P4,         KC_P5,         KC_P6,
+    KC_P7,         KC_P8,         KC_P9,
+    KC_P0,         KC_PDOT,       KC_PEQL
+  ),
+
+/* OP: Operators Layer
+ * ,-----------------------.
+ * |MO(OP) | ↑     | BSPC  |
+ * |       |       |       |
+ * |-------+-------+-------|
+ * | <-    | ↓     | ->    |
+ * |       |       |       |
+ * |-------+-------+-------|
+ * | /     | *     | -     |
+ * |       |       |       |
+ * |-------+-------+-------|
+ * | (     | )     | +     |
+ * |       |       |       |
+ * |-------+-------+-------|
+ * | &     | %     | ^     |
+ * |       |       |       |
+ * |-------+-------+-------|
+ * | |     | .     | =     |
+ * |       |       |       |
+ * `-----------------------'
+ */
+  [_OL] = LAYOUT(
+    MO(1),         KC_UP,         KC_BSPC,
+    KC_LEFT,       KC_DOWN,       KC_RIGHT,
+    KC_PSLS,       KC_PAST,       KC_PMNS,
+    LSFT(KC_9),    LSFT(KC_0),    KC_PPLS,
+    LSFT(KC_7),    LSFT(KC_5),    LSFT(KC_6),
+    LSFT(KC_BSLS), KC_PDOT,       KC_PEQL
+  ),
+};
\ No newline at end of file
diff --git a/keyboards/mechlovin/hex4b/keymaps/nazzer/rules.mk b/keyboards/rookiebwoy/late9/rev1/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/mechlovin/hex4b/keymaps/nazzer/rules.mk
rename to keyboards/rookiebwoy/late9/rev1/keymaps/via/rules.mk
diff --git a/keyboards/rookiebwoy/late9/rev1/rules.mk b/keyboards/rookiebwoy/late9/rev1/rules.mk
index 874033acc90..6e7633bfe01 100644
--- a/keyboards/rookiebwoy/late9/rev1/rules.mk
+++ b/keyboards/rookiebwoy/late9/rev1/rules.mk
@@ -1,14 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = no        # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-OLED_ENABLE = yes
+# This file intentionally left blank
diff --git a/keyboards/sawnsprojects/eclipse/eclipse60/info.json b/keyboards/sawnsprojects/eclipse/eclipse60/info.json
index ad6c9741366..7586ed5a347 100644
--- a/keyboards/sawnsprojects/eclipse/eclipse60/info.json
+++ b/keyboards/sawnsprojects/eclipse/eclipse60/info.json
@@ -22,10 +22,7 @@
         "console": false,
         "command": false,
         "nkro": false,
-        "backlight": false,
-        "rgblight": true,
-        "audio": false,
-        "key_lock": false
+        "rgblight": true
     },
     "rgblight": {
         "led_count": 18,
diff --git a/keyboards/sawnsprojects/eclipse/tinyneko/info.json b/keyboards/sawnsprojects/eclipse/tinyneko/info.json
index 387532d58bf..80ae2558f2d 100644
--- a/keyboards/sawnsprojects/eclipse/tinyneko/info.json
+++ b/keyboards/sawnsprojects/eclipse/tinyneko/info.json
@@ -22,10 +22,7 @@
         "console": false,
         "command": false,
         "nkro": false,
-        "backlight": false,
-        "rgblight": true,
-        "audio": false,
-        "key_lock": false
+        "rgblight": true
     },
     "rgblight": {
         "led_count": 18,
diff --git a/keyboards/sf2040/info.json b/keyboards/sf2040/info.json
new file mode 100644
index 00000000000..21acb322af4
--- /dev/null
+++ b/keyboards/sf2040/info.json
@@ -0,0 +1,105 @@
+{
+    "manufacturer": "Strayfade",
+    "keyboard_name": "sf2040",
+    "maintainer": "Strayfade",
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+    },
+    "matrix_pins": {
+        "cols": ["GP6", "GP7", "GP8", "GP9", "GP10", "GP11", "GP12", "GP13", "GP14", "GP15", "GP16", "GP17", "GP18", "GP19", "GP20"],
+        "rows": ["GP0", "GP1", "GP2", "GP3", "GP4", "GP5"]
+    },
+    "processor": "RP2040",
+    "url": "https://strayfade.com/sf2040",
+    "usb": {
+        "device_version": "1.0.1",
+        "pid": "0x0001",
+        "vid": "0x5346"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1, "w": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [2, 8], "x": 8.5, "y": 2},
+                {"matrix": [2, 9], "x": 9.5, "y": 2},
+                {"matrix": [2, 10], "x": 10.5, "y": 2},
+                {"matrix": [2, 11], "x": 11.5, "y": 2},
+                {"matrix": [2, 12], "x": 12.5, "y": 2},
+                {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [3, 5], "x": 5.75, "y": 3},
+                {"matrix": [3, 6], "x": 6.75, "y": 3},
+                {"matrix": [3, 7], "x": 7.75, "y": 3},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "x": 11.75, "y": 3},
+                {"matrix": [3, 12], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4},
+                {"matrix": [4, 2], "x": 3.25, "y": 4},
+                {"matrix": [4, 3], "x": 4.25, "y": 4},
+                {"matrix": [4, 4], "x": 5.25, "y": 4},
+                {"matrix": [4, 5], "x": 6.25, "y": 4},
+                {"matrix": [4, 6], "x": 7.25, "y": 4},
+                {"matrix": [4, 7], "x": 8.25, "y": 4},
+                {"matrix": [4, 8], "x": 9.25, "y": 4},
+                {"matrix": [4, 9], "x": 10.25, "y": 4},
+                {"matrix": [4, 10], "x": 11.25, "y": 4},
+                {"matrix": [4, 11], "x": 12.25, "y": 4, "w": 2.75},
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.75, "y": 5, "w": 1.25},
+                {"matrix": [5, 3], "x": 4, "y": 5, "w": 6.25},
+                {"matrix": [5, 4], "x": 10.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 5], "x": 11.5, "y": 5},
+                {"matrix": [5, 6], "x": 12.5, "y": 5},
+                {"matrix": [5, 7], "x": 13.5, "y": 5, "w": 1.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/sf2040/keymaps/default/keymap.c b/keyboards/sf2040/keymaps/default/keymap.c
new file mode 100644
index 00000000000..ca5bcce3585
--- /dev/null
+++ b/keyboards/sf2040/keymaps/default/keymap.c
@@ -0,0 +1,25 @@
+// Copyright 2024 Strayfade
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT(
+        KC_ESCAPE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_AUDIO_VOL_UP, KC_AUDIO_VOL_DOWN,
+        KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS, KC_EQUAL, KC_BACKSPACE,
+        KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LEFT_BRACKET, KC_RIGHT_BRACKET, KC_BACKSLASH,
+        KC_CAPS_LOCK, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SEMICOLON, KC_QUOTE, KC_ENTER,
+        KC_LEFT_SHIFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLASH, KC_RIGHT_SHIFT,
+        KC_LEFT_CTRL, KC_LEFT_GUI, KC_LEFT_ALT, KC_SPACE, MO(1), KC_HOME, KC_END, KC_RIGHT_CTRL
+    ),
+    [1] = LAYOUT(
+        KC_TILDE, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DELETE,
+        _______, _______, _______, _______, _______, _______, _______, _______, KC_UP, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, KC_ENTER,
+        KC_LEFT_SHIFT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_RIGHT_SHIFT,
+        KC_LEFT_CTRL, KC_LEFT_GUI, KC_LEFT_ALT, KC_SPACE, _______, KC_HOME, KC_END, KC_RIGHT_CTRL
+    )
+    
+};
\ No newline at end of file
diff --git a/keyboards/sf2040/keymaps/via/keymap.c b/keyboards/sf2040/keymaps/via/keymap.c
new file mode 100644
index 00000000000..ca5bcce3585
--- /dev/null
+++ b/keyboards/sf2040/keymaps/via/keymap.c
@@ -0,0 +1,25 @@
+// Copyright 2024 Strayfade
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT(
+        KC_ESCAPE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_AUDIO_VOL_UP, KC_AUDIO_VOL_DOWN,
+        KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS, KC_EQUAL, KC_BACKSPACE,
+        KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LEFT_BRACKET, KC_RIGHT_BRACKET, KC_BACKSLASH,
+        KC_CAPS_LOCK, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SEMICOLON, KC_QUOTE, KC_ENTER,
+        KC_LEFT_SHIFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLASH, KC_RIGHT_SHIFT,
+        KC_LEFT_CTRL, KC_LEFT_GUI, KC_LEFT_ALT, KC_SPACE, MO(1), KC_HOME, KC_END, KC_RIGHT_CTRL
+    ),
+    [1] = LAYOUT(
+        KC_TILDE, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DELETE,
+        _______, _______, _______, _______, _______, _______, _______, _______, KC_UP, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, KC_ENTER,
+        KC_LEFT_SHIFT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_RIGHT_SHIFT,
+        KC_LEFT_CTRL, KC_LEFT_GUI, KC_LEFT_ALT, KC_SPACE, _______, KC_HOME, KC_END, KC_RIGHT_CTRL
+    )
+    
+};
\ No newline at end of file
diff --git a/keyboards/sf2040/keymaps/via/rules.mk b/keyboards/sf2040/keymaps/via/rules.mk
new file mode 100644
index 00000000000..036bd6d1c3e
--- /dev/null
+++ b/keyboards/sf2040/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/sf2040/readme.md b/keyboards/sf2040/readme.md
new file mode 100644
index 00000000000..fb9ef2efe6e
--- /dev/null
+++ b/keyboards/sf2040/readme.md
@@ -0,0 +1,22 @@
+# sf2040
+
+![sf2040 Image](https://i.imgur.com/DZ9N17ph.png)
+
+The sf2040 is a mechanical 76-key keyboard based on the [RP2040](https://datasheets.raspberrypi.com/rp2040/rp2040-datasheet.pdf) microcontroller from Raspberry Pi.
+
+* Keyboard Maintainer: [strayfade](https://github.com/strayfade)
+* Hardware Availability: https://github.com/strayfade/sf2040
+
+Make example for this keyboard (after setting up your build environment):
+
+    make sf2040:default
+
+Flashing example for this keyboard:
+
+    make sf2040:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+**Bootmagic reset**: To enter the bootloader, hold down the key at (0,0) in the matrix (the top left key or Escape) and plug in the keyboard.
diff --git a/keyboards/sf2040/rules.mk b/keyboards/sf2040/rules.mk
new file mode 100644
index 00000000000..7ff128fa692
--- /dev/null
+++ b/keyboards/sf2040/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/sharkoon/skiller_sgk50_s3/info.json b/keyboards/sharkoon/skiller_sgk50_s3/info.json
index 0b228b034b6..6535ec63b77 100644
--- a/keyboards/sharkoon/skiller_sgk50_s3/info.json
+++ b/keyboards/sharkoon/skiller_sgk50_s3/info.json
@@ -18,8 +18,7 @@
         "extrakey": true,
         "mousekey": true,
         "nkro": true,
-        "rgb_matrix": true,
-        "rgblight": false
+        "rgb_matrix": true
     },
     "matrix_pins": {
         "cols": ["C0", "C1", "C2", "C3", "A6", "B1", "B10", "B11", "B12", "B13", "B14", "B15", "C6", "C7", "C8", "C9"],
diff --git a/keyboards/skyloong/dt40/config.h b/keyboards/skyloong/dt40/config.h
index b0aa9780633..7e101addcb9 100644
--- a/keyboards/skyloong/dt40/config.h
+++ b/keyboards/skyloong/dt40/config.h
@@ -24,5 +24,5 @@
 #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
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM3
+#define WS2812_PWM_DMA_CHANNEL 3
diff --git a/keyboards/skyloong/gk61/pro/pro.c b/keyboards/skyloong/gk61/pro/pro.c
index 55fcf3b41f5..06d9ce721d8 100644
--- a/keyboards/skyloong/gk61/pro/pro.c
+++ b/keyboards/skyloong/gk61/pro/pro.c
@@ -13,74 +13,74 @@ const is31fl3743a_led_t PROGMEM g_is31fl3743a_leds[IS31FL3743A_LED_COUNT] = {
  *   |  |          G location
  *   |  |          |          B location
  *   |  |          |          | */
-    {0, CS1_SW1,   CS2_SW1,   CS3_SW1},
-    {0, CS1_SW2,   CS2_SW2,   CS3_SW2},
-    {0, CS1_SW3,   CS2_SW3,   CS3_SW3},
-    {0, CS1_SW4,   CS2_SW4,   CS3_SW4},
-    {0, CS1_SW5,   CS2_SW5,   CS3_SW5},
-    {0, CS1_SW6,   CS2_SW6,   CS3_SW6},
-    {0, CS1_SW7,   CS2_SW7,   CS3_SW7},
-    {0, CS1_SW8,   CS2_SW8,   CS3_SW8},
-    {0, CS1_SW9,   CS2_SW9,   CS3_SW9},
-    {0, CS1_SW10,  CS2_SW10,  CS3_SW10},
-    {0, CS1_SW11,  CS2_SW11,  CS3_SW11},
-    {0, CS16_SW1,  CS17_SW1,  CS18_SW1},
-    {0, CS16_SW2,  CS17_SW2,  CS18_SW2},
-    {0, CS16_SW3,  CS17_SW3,  CS18_SW3},
+    {0, SW1_CS1,   SW1_CS2,   SW1_CS3},
+    {0, SW2_CS1,   SW2_CS2,   SW2_CS3},
+    {0, SW3_CS1,   SW3_CS2,   SW3_CS3},
+    {0, SW4_CS1,   SW4_CS2,   SW4_CS3},
+    {0, SW5_CS1,   SW5_CS2,   SW5_CS3},
+    {0, SW6_CS1,   SW6_CS2,   SW6_CS3},
+    {0, SW7_CS1,   SW7_CS2,   SW7_CS3},
+    {0, SW8_CS1,   SW8_CS2,   SW8_CS3},
+    {0, SW9_CS1,   SW9_CS2,   SW9_CS3},
+    {0, SW10_CS1,  SW10_CS2,  SW10_CS3},
+    {0, SW11_CS1,  SW11_CS2,  SW11_CS3},
+    {0, SW1_CS16,  SW1_CS17,  SW1_CS18},
+    {0, SW2_CS16,  SW2_CS17,  SW2_CS18},
+    {0, SW3_CS16,  SW3_CS17,  SW3_CS18},
 
-    {0, CS4_SW1,   CS5_SW1,   CS6_SW1},
-    {0, CS4_SW2,   CS5_SW2,   CS6_SW2},
-    {0, CS4_SW3,   CS5_SW3,   CS6_SW3},
-    {0, CS4_SW4,   CS5_SW4,   CS6_SW4},
-    {0, CS4_SW5,   CS5_SW5,   CS6_SW5},
-    {0, CS4_SW6,   CS5_SW6,   CS6_SW6},
-    {0, CS4_SW7,   CS5_SW7,   CS6_SW7},
-    {0, CS4_SW8,   CS5_SW8,   CS6_SW8},
-    {0, CS4_SW9,   CS5_SW9,   CS6_SW9},
-    {0, CS4_SW10,  CS5_SW10,  CS6_SW10},
-    {0, CS4_SW11,  CS5_SW11,  CS6_SW11},
-    {0, CS16_SW4,  CS17_SW4,  CS18_SW4},
-    {0, CS16_SW5,  CS17_SW5,  CS18_SW5},
-    {0, CS16_SW6,  CS17_SW6,  CS18_SW6},
+    {0, SW1_CS4,   SW1_CS5,   SW1_CS6},
+    {0, SW2_CS4,   SW2_CS5,   SW2_CS6},
+    {0, SW3_CS4,   SW3_CS5,   SW3_CS6},
+    {0, SW4_CS4,   SW4_CS5,   SW4_CS6},
+    {0, SW5_CS4,   SW5_CS5,   SW5_CS6},
+    {0, SW6_CS4,   SW6_CS5,   SW6_CS6},
+    {0, SW7_CS4,   SW7_CS5,   SW7_CS6},
+    {0, SW8_CS4,   SW8_CS5,   SW8_CS6},
+    {0, SW9_CS4,   SW9_CS5,   SW9_CS6},
+    {0, SW10_CS4,  SW10_CS5,  SW10_CS6},
+    {0, SW11_CS4,  SW11_CS5,  SW11_CS6},
+    {0, SW4_CS16,  SW4_CS17,  SW4_CS18},
+    {0, SW5_CS16,  SW5_CS17,  SW5_CS18},
+    {0, SW6_CS16,  SW6_CS17,  SW6_CS18},
 
-    {0, CS7_SW1,   CS8_SW1,   CS9_SW1},
-    {0, CS7_SW2,   CS8_SW2,   CS9_SW2},
-    {0, CS7_SW3,   CS8_SW3,   CS9_SW3},
-    {0, CS7_SW4,   CS8_SW4,   CS9_SW4},
-    {0, CS7_SW5,   CS8_SW5,   CS9_SW5},
-    {0, CS7_SW6,   CS8_SW6,   CS9_SW6},
-    {0, CS7_SW7,   CS8_SW7,   CS9_SW7},
-    {0, CS7_SW8,   CS8_SW8,   CS9_SW8},
-    {0, CS7_SW9,   CS8_SW9,   CS9_SW9},
-    {0, CS7_SW10,  CS8_SW10,  CS9_SW10},
-    {0, CS7_SW11,  CS8_SW11,  CS9_SW11},
-    {0, CS16_SW7,  CS17_SW7,  CS18_SW7},
-    {0, CS16_SW8,  CS17_SW8,  CS18_SW8},
+    {0, SW1_CS7,   SW1_CS8,   SW1_CS9},
+    {0, SW2_CS7,   SW2_CS8,   SW2_CS9},
+    {0, SW3_CS7,   SW3_CS8,   SW3_CS9},
+    {0, SW4_CS7,   SW4_CS8,   SW4_CS9},
+    {0, SW5_CS7,   SW5_CS8,   SW5_CS9},
+    {0, SW6_CS7,   SW6_CS8,   SW6_CS9},
+    {0, SW7_CS7,   SW7_CS8,   SW7_CS9},
+    {0, SW8_CS7,   SW8_CS8,   SW8_CS9},
+    {0, SW9_CS7,   SW9_CS8,   SW9_CS9},
+    {0, SW10_CS7,  SW10_CS8,  SW10_CS9},
+    {0, SW11_CS7,  SW11_CS8,  SW11_CS9},
+    {0, SW7_CS16,  SW7_CS17,  SW7_CS18},
+    {0, SW8_CS16,  SW8_CS17,  SW8_CS18},
 
-    {0, CS10_SW1,  CS11_SW1,  CS12_SW1},
-    {0, CS10_SW2,  CS11_SW2,  CS12_SW2},
-    {0, CS10_SW3,  CS11_SW3,  CS12_SW3},
-    {0, CS10_SW4,  CS11_SW4,  CS12_SW4},
-    {0, CS10_SW5,  CS11_SW5,  CS12_SW5},
-    {0, CS10_SW6,  CS11_SW6,  CS12_SW6},
-    {0, CS10_SW7,  CS11_SW7,  CS12_SW7},
-    {0, CS10_SW8,  CS11_SW8,  CS12_SW8},
-    {0, CS10_SW9,  CS11_SW9,  CS12_SW9},
-    {0, CS10_SW10, CS11_SW10, CS12_SW10},
-    {0, CS10_SW11, CS11_SW11, CS12_SW11},
-    {0, CS16_SW9,  CS17_SW9,  CS18_SW9},
+    {0, SW1_CS10,  SW1_CS11,  SW1_CS12},
+    {0, SW2_CS10,  SW2_CS11,  SW2_CS12},
+    {0, SW3_CS10,  SW3_CS11,  SW3_CS12},
+    {0, SW4_CS10,  SW4_CS11,  SW4_CS12},
+    {0, SW5_CS10,  SW5_CS11,  SW5_CS12},
+    {0, SW6_CS10,  SW6_CS11,  SW6_CS12},
+    {0, SW7_CS10,  SW7_CS11,  SW7_CS12},
+    {0, SW8_CS10,  SW8_CS11,  SW8_CS12},
+    {0, SW9_CS10,  SW9_CS11,  SW9_CS12},
+    {0, SW10_CS10, SW10_CS11, SW10_CS12},
+    {0, SW11_CS10, SW11_CS11, SW11_CS12},
+    {0, SW9_CS16,  SW9_CS17,  SW9_CS18},
 
-    {0, CS13_SW1,  CS14_SW1,  CS15_SW1},
-    {0, CS13_SW2,  CS14_SW2,  CS15_SW2},
-    {0, CS13_SW3,  CS14_SW3,  CS15_SW3},
-    {0, CS13_SW4,  CS14_SW4,  CS15_SW4},
-    {0, CS13_SW5,  CS14_SW5,  CS15_SW5},
-    {0, CS13_SW5,  CS14_SW5,  CS15_SW5},
-    {0, CS13_SW6,  CS14_SW6,  CS15_SW6},
-    {0, CS13_SW7,  CS14_SW7,  CS15_SW7},
-    {0, CS13_SW8,  CS14_SW8,  CS15_SW8},
-    {0, CS13_SW9,  CS14_SW9,  CS15_SW9},
-    {0, CS13_SW10, CS14_SW10, CS15_SW10}
+    {0, SW1_CS13,  SW1_CS14,  SW1_CS15},
+    {0, SW2_CS13,  SW2_CS14,  SW2_CS15},
+    {0, SW3_CS13,  SW3_CS14,  SW3_CS15},
+    {0, SW4_CS13,  SW4_CS14,  SW4_CS15},
+    {0, SW5_CS13,  SW5_CS14,  SW5_CS15},
+    {0, SW5_CS13,  SW5_CS14,  SW5_CS15},
+    {0, SW6_CS13,  SW6_CS14,  SW6_CS15},
+    {0, SW7_CS13,  SW7_CS14,  SW7_CS15},
+    {0, SW8_CS13,  SW8_CS14,  SW8_CS15},
+    {0, SW9_CS13,  SW9_CS14,  SW9_CS15},
+    {0, SW10_CS13, SW10_CS14, SW10_CS15}
 };
 
 #if defined(RGB_MATRIX_ENABLE)  /*&& defined(CAPS_LOCK_INDEX)*/
diff --git a/keyboards/skyloong/gk61/pro_48/pro_48.c b/keyboards/skyloong/gk61/pro_48/pro_48.c
index ffa04f2c056..c5758ffcf4c 100644
--- a/keyboards/skyloong/gk61/pro_48/pro_48.c
+++ b/keyboards/skyloong/gk61/pro_48/pro_48.c
@@ -14,74 +14,74 @@ const is31fl3743a_led_t PROGMEM g_is31fl3743a_leds[IS31FL3743A_LED_COUNT] = {
  *   |  |          G location
  *   |  |          |          B location
  *   |  |          |          | */
-    {0, CS1_SW1,   CS2_SW1,   CS3_SW1},
-    {0, CS1_SW2,   CS2_SW2,   CS3_SW2},
-    {0, CS1_SW3,   CS2_SW3,   CS3_SW3},
-    {0, CS1_SW4,   CS2_SW4,   CS3_SW4},
-    {0, CS1_SW5,   CS2_SW5,   CS3_SW5},
-    {0, CS1_SW6,   CS2_SW6,   CS3_SW6},
-    {0, CS1_SW7,   CS2_SW7,   CS3_SW7},
-    {0, CS1_SW8,   CS2_SW8,   CS3_SW8},
-    {0, CS1_SW9,   CS2_SW9,   CS3_SW9},
-    {0, CS1_SW10,  CS2_SW10,  CS3_SW10},
-    {0, CS1_SW11,  CS2_SW11,  CS3_SW11},
-    {0, CS16_SW1,  CS17_SW1,  CS18_SW1},
-    {0, CS16_SW2,  CS17_SW2,  CS18_SW2},
-    {0, CS16_SW3,  CS17_SW3,  CS18_SW3},
+    {0, SW1_CS1,   SW1_CS2,   SW1_CS3},
+    {0, SW2_CS1,   SW2_CS2,   SW2_CS3},
+    {0, SW3_CS1,   SW3_CS2,   SW3_CS3},
+    {0, SW4_CS1,   SW4_CS2,   SW4_CS3},
+    {0, SW5_CS1,   SW5_CS2,   SW5_CS3},
+    {0, SW6_CS1,   SW6_CS2,   SW6_CS3},
+    {0, SW7_CS1,   SW7_CS2,   SW7_CS3},
+    {0, SW8_CS1,   SW8_CS2,   SW8_CS3},
+    {0, SW9_CS1,   SW9_CS2,   SW9_CS3},
+    {0, SW10_CS1,  SW10_CS2,  SW10_CS3},
+    {0, SW11_CS1,  SW11_CS2,  SW11_CS3},
+    {0, SW1_CS16,  SW1_CS17,  SW1_CS18},
+    {0, SW2_CS16,  SW2_CS17,  SW2_CS18},
+    {0, SW3_CS16,  SW3_CS17,  SW3_CS18},
 
-    {0, CS4_SW1,   CS5_SW1,   CS6_SW1},
-    {0, CS4_SW2,   CS5_SW2,   CS6_SW2},
-    {0, CS4_SW3,   CS5_SW3,   CS6_SW3},
-    {0, CS4_SW4,   CS5_SW4,   CS6_SW4},
-    {0, CS4_SW5,   CS5_SW5,   CS6_SW5},
-    {0, CS4_SW6,   CS5_SW6,   CS6_SW6},
-    {0, CS4_SW7,   CS5_SW7,   CS6_SW7},
-    {0, CS4_SW8,   CS5_SW8,   CS6_SW8},
-    {0, CS4_SW9,   CS5_SW9,   CS6_SW9},
-    {0, CS4_SW10,  CS5_SW10,  CS6_SW10},
-    {0, CS4_SW11,  CS5_SW11,  CS6_SW11},
-    {0, CS16_SW4,  CS17_SW4,  CS18_SW4},
-    {0, CS16_SW5,  CS17_SW5,  CS18_SW5},
-    {0, CS16_SW6,  CS17_SW6,  CS18_SW6},
+    {0, SW1_CS4,   SW1_CS5,   SW1_CS6},
+    {0, SW2_CS4,   SW2_CS5,   SW2_CS6},
+    {0, SW3_CS4,   SW3_CS5,   SW3_CS6},
+    {0, SW4_CS4,   SW4_CS5,   SW4_CS6},
+    {0, SW5_CS4,   SW5_CS5,   SW5_CS6},
+    {0, SW6_CS4,   SW6_CS5,   SW6_CS6},
+    {0, SW7_CS4,   SW7_CS5,   SW7_CS6},
+    {0, SW8_CS4,   SW8_CS5,   SW8_CS6},
+    {0, SW9_CS4,   SW9_CS5,   SW9_CS6},
+    {0, SW10_CS4,  SW10_CS5,  SW10_CS6},
+    {0, SW11_CS4,  SW11_CS5,  SW11_CS6},
+    {0, SW4_CS16,  SW4_CS17,  SW4_CS18},
+    {0, SW5_CS16,  SW5_CS17,  SW5_CS18},
+    {0, SW6_CS16,  SW6_CS17,  SW6_CS18},
 
-    {0, CS7_SW1,   CS8_SW1,   CS9_SW1},
-    {0, CS7_SW2,   CS8_SW2,   CS9_SW2},
-    {0, CS7_SW3,   CS8_SW3,   CS9_SW3},
-    {0, CS7_SW4,   CS8_SW4,   CS9_SW4},
-    {0, CS7_SW5,   CS8_SW5,   CS9_SW5},
-    {0, CS7_SW6,   CS8_SW6,   CS9_SW6},
-    {0, CS7_SW7,   CS8_SW7,   CS9_SW7},
-    {0, CS7_SW8,   CS8_SW8,   CS9_SW8},
-    {0, CS7_SW9,   CS8_SW9,   CS9_SW9},
-    {0, CS7_SW10,  CS8_SW10,  CS9_SW10},
-    {0, CS7_SW11,  CS8_SW11,  CS9_SW11},
-    {0, CS16_SW7,  CS17_SW7,  CS18_SW7},
-    {0, CS16_SW8,  CS17_SW8,  CS18_SW8},
+    {0, SW1_CS7,   SW1_CS8,   SW1_CS9},
+    {0, SW2_CS7,   SW2_CS8,   SW2_CS9},
+    {0, SW3_CS7,   SW3_CS8,   SW3_CS9},
+    {0, SW4_CS7,   SW4_CS8,   SW4_CS9},
+    {0, SW5_CS7,   SW5_CS8,   SW5_CS9},
+    {0, SW6_CS7,   SW6_CS8,   SW6_CS9},
+    {0, SW7_CS7,   SW7_CS8,   SW7_CS9},
+    {0, SW8_CS7,   SW8_CS8,   SW8_CS9},
+    {0, SW9_CS7,   SW9_CS8,   SW9_CS9},
+    {0, SW10_CS7,  SW10_CS8,  SW10_CS9},
+    {0, SW11_CS7,  SW11_CS8,  SW11_CS9},
+    {0, SW7_CS16,  SW7_CS17,  SW7_CS18},
+    {0, SW8_CS16,  SW8_CS17,  SW8_CS18},
 
-    {0, CS10_SW1,  CS11_SW1,  CS12_SW1},
-    {0, CS10_SW2,  CS11_SW2,  CS12_SW2},
-    {0, CS10_SW3,  CS11_SW3,  CS12_SW3},
-    {0, CS10_SW4,  CS11_SW4,  CS12_SW4},
-    {0, CS10_SW5,  CS11_SW5,  CS12_SW5},
-    {0, CS10_SW6,  CS11_SW6,  CS12_SW6},
-    {0, CS10_SW7,  CS11_SW7,  CS12_SW7},
-    {0, CS10_SW8,  CS11_SW8,  CS12_SW8},
-    {0, CS10_SW9,  CS11_SW9,  CS12_SW9},
-    {0, CS10_SW10, CS11_SW10, CS12_SW10},
-    {0, CS10_SW11, CS11_SW11, CS12_SW11},
-    {0, CS16_SW9,  CS17_SW9,  CS18_SW9},
+    {0, SW1_CS10,  SW1_CS11,  SW1_CS12},
+    {0, SW2_CS10,  SW2_CS11,  SW2_CS12},
+    {0, SW3_CS10,  SW3_CS11,  SW3_CS12},
+    {0, SW4_CS10,  SW4_CS11,  SW4_CS12},
+    {0, SW5_CS10,  SW5_CS11,  SW5_CS12},
+    {0, SW6_CS10,  SW6_CS11,  SW6_CS12},
+    {0, SW7_CS10,  SW7_CS11,  SW7_CS12},
+    {0, SW8_CS10,  SW8_CS11,  SW8_CS12},
+    {0, SW9_CS10,  SW9_CS11,  SW9_CS12},
+    {0, SW10_CS10, SW10_CS11, SW10_CS12},
+    {0, SW11_CS10, SW11_CS11, SW11_CS12},
+    {0, SW9_CS16,  SW9_CS17,  SW9_CS18},
 
-    {0, CS13_SW1,  CS14_SW1,  CS15_SW1},
-    {0, CS13_SW2,  CS14_SW2,  CS15_SW2},
-    {0, CS13_SW3,  CS14_SW3,  CS15_SW3},
-    {0, CS13_SW4,  CS14_SW4,  CS15_SW4},
-    {0, CS13_SW5,  CS14_SW5,  CS15_SW5},
-    {0, CS13_SW5,  CS14_SW5,  CS15_SW5},
-    {0, CS13_SW6,  CS14_SW6,  CS15_SW6},
-    {0, CS13_SW7,  CS14_SW7,  CS15_SW7},
-    {0, CS13_SW8,  CS14_SW8,  CS15_SW8},
-    {0, CS13_SW9,  CS14_SW9,  CS15_SW9},
-    {0, CS13_SW10, CS14_SW10, CS15_SW10}
+    {0, SW1_CS13,  SW1_CS14,  SW1_CS15},
+    {0, SW2_CS13,  SW2_CS14,  SW2_CS15},
+    {0, SW3_CS13,  SW3_CS14,  SW3_CS15},
+    {0, SW4_CS13,  SW4_CS14,  SW4_CS15},
+    {0, SW5_CS13,  SW5_CS14,  SW5_CS15},
+    {0, SW5_CS13,  SW5_CS14,  SW5_CS15},
+    {0, SW6_CS13,  SW6_CS14,  SW6_CS15},
+    {0, SW7_CS13,  SW7_CS14,  SW7_CS15},
+    {0, SW8_CS13,  SW8_CS14,  SW8_CS15},
+    {0, SW9_CS13,  SW9_CS14,  SW9_CS15},
+    {0, SW10_CS13, SW10_CS14, SW10_CS15}
 };
 
 bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) {
diff --git a/keyboards/skyloong/gk61/v1/v1.c b/keyboards/skyloong/gk61/v1/v1.c
index cb362b53596..01e6b6c6ae6 100644
--- a/keyboards/skyloong/gk61/v1/v1.c
+++ b/keyboards/skyloong/gk61/v1/v1.c
@@ -24,78 +24,78 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, C_1,    B_1,    A_1},
-    {0, C_2,    B_2,    A_2},
-    {0, C_3,    B_3,    A_3},
-    {0, C_4,    B_4,    A_4},
-    {0, C_5,    B_5,    A_5},
-    {0, C_6,    B_6,    A_6},
-    {0, C_7,    B_7,    A_7},
-    {0, C_8,    B_8,    A_8},
-    {0, C_9,    B_9,    A_9},
-    {0, C_10,   B_10,   A_10},
-    {0, C_11,   B_11,   A_11},
-    {0, C_12,   B_12,   A_12},
-    {0, C_13,   B_13,   A_13},
-    {0, C_14,   B_14,   A_14},
+    {0, CB3_CA1,    CB2_CA1,    CB1_CA1},
+    {0, CB3_CA2,    CB2_CA2,    CB1_CA2},
+    {0, CB3_CA3,    CB2_CA3,    CB1_CA3},
+    {0, CB3_CA4,    CB2_CA4,    CB1_CA4},
+    {0, CB3_CA5,    CB2_CA5,    CB1_CA5},
+    {0, CB3_CA6,    CB2_CA6,    CB1_CA6},
+    {0, CB3_CA7,    CB2_CA7,    CB1_CA7},
+    {0, CB3_CA8,    CB2_CA8,    CB1_CA8},
+    {0, CB3_CA9,    CB2_CA9,    CB1_CA9},
+    {0, CB3_CA10,   CB2_CA10,   CB1_CA10},
+    {0, CB3_CA11,   CB2_CA11,   CB1_CA11},
+    {0, CB3_CA12,   CB2_CA12,   CB1_CA12},
+    {0, CB3_CA13,   CB2_CA13,   CB1_CA13},
+    {0, CB3_CA14,   CB2_CA14,   CB1_CA14},
 
 
-    {0, F_1,    E_1,    D_1},
-    {0, F_2,    E_2,    D_2},
-    {0, F_3,    E_3,    D_3},
-    {0, F_4,    E_4,    D_4},
-    {0, F_5,    E_5,    D_5},
-    {0, F_6,    E_6,    D_6},
-    {0, F_7,    E_7,    D_7},
-    {0, F_8,    E_8,    D_8},
-    {0, F_9,    E_9,    D_9},
-    {0, F_10,   E_10,   D_10},
-    {0, F_11,   E_11,   D_11},
-    {0, F_12,   E_12,   D_12},
-    {0, F_13,   E_13,   D_13},
-    {0, F_14,   E_14,   D_14},
+    {0, CB6_CA1,    CB5_CA1,    CB4_CA1},
+    {0, CB6_CA2,    CB5_CA2,    CB4_CA2},
+    {0, CB6_CA3,    CB5_CA3,    CB4_CA3},
+    {0, CB6_CA4,    CB5_CA4,    CB4_CA4},
+    {0, CB6_CA5,    CB5_CA5,    CB4_CA5},
+    {0, CB6_CA6,    CB5_CA6,    CB4_CA6},
+    {0, CB6_CA7,    CB5_CA7,    CB4_CA7},
+    {0, CB6_CA8,    CB5_CA8,    CB4_CA8},
+    {0, CB6_CA9,    CB5_CA9,    CB4_CA9},
+    {0, CB6_CA10,   CB5_CA10,   CB4_CA10},
+    {0, CB6_CA11,   CB5_CA11,   CB4_CA11},
+    {0, CB6_CA12,   CB5_CA12,   CB4_CA12},
+    {0, CB6_CA13,   CB5_CA13,   CB4_CA13},
+    {0, CB6_CA14,   CB5_CA14,   CB4_CA14},
 
 
-    {0, I_1,    H_1,    G_1},
-    {0, I_2,    H_2,    G_2},
-    {0, I_3,    H_3,    G_3},
-    {0, I_4,    H_4,    G_4},
-    {0, I_5,    H_5,    G_5},
-    {0, I_6,    H_6,    G_6},
-    {0, I_7,    H_7,    G_7},
-    {0, I_8,    H_8,    G_8},
-    {0, I_9,    H_9,    G_9},
-    {0, I_10,   H_10,   G_10},
-    {0, I_11,   H_11,   G_11},
-    {0, I_12,   H_12,   G_12},
-    {0, I_13,   H_13,   G_13},
+    {0, CB9_CA1,    CB8_CA1,    CB7_CA1},
+    {0, CB9_CA2,    CB8_CA2,    CB7_CA2},
+    {0, CB9_CA3,    CB8_CA3,    CB7_CA3},
+    {0, CB9_CA4,    CB8_CA4,    CB7_CA4},
+    {0, CB9_CA5,    CB8_CA5,    CB7_CA5},
+    {0, CB9_CA6,    CB8_CA6,    CB7_CA6},
+    {0, CB9_CA7,    CB8_CA7,    CB7_CA7},
+    {0, CB9_CA8,    CB8_CA8,    CB7_CA8},
+    {0, CB9_CA9,    CB8_CA9,    CB7_CA9},
+    {0, CB9_CA10,   CB8_CA10,   CB7_CA10},
+    {0, CB9_CA11,   CB8_CA11,   CB7_CA11},
+    {0, CB9_CA12,   CB8_CA12,   CB7_CA12},
+    {0, CB9_CA13,   CB8_CA13,   CB7_CA13},
 
 
 
-    {0, L_1,    K_1,    J_1},
-    {0, L_2,    K_2,    J_2},
-    {0, L_3,    K_3,    J_3},
-    {0, L_4,    K_4,    J_4},
-    {0, L_5,    K_5,    J_5},
-    {0, L_6,    K_6,    J_6},
-    {0, L_7,    K_7,    J_7},
-    {0, L_8,    K_8,    J_8},
-    {0, L_9,    K_9,    J_9},
-    {0, L_10,   K_10,   J_10},
-    {0, L_11,   K_11,   J_11},
-    {0, L_13,   K_13,   J_13},
+    {0, CB12_CA1,    CB11_CA1,    CB10_CA1},
+    {0, CB12_CA2,    CB11_CA2,    CB10_CA2},
+    {0, CB12_CA3,    CB11_CA3,    CB10_CA3},
+    {0, CB12_CA4,    CB11_CA4,    CB10_CA4},
+    {0, CB12_CA5,    CB11_CA5,    CB10_CA5},
+    {0, CB12_CA6,    CB11_CA6,    CB10_CA6},
+    {0, CB12_CA7,    CB11_CA7,    CB10_CA7},
+    {0, CB12_CA8,    CB11_CA8,    CB10_CA8},
+    {0, CB12_CA9,    CB11_CA9,    CB10_CA9},
+    {0, CB12_CA10,   CB11_CA10,   CB10_CA10},
+    {0, CB12_CA11,   CB11_CA11,   CB10_CA11},
+    {0, CB12_CA13,   CB11_CA13,   CB10_CA13},
 
-    {0, L_15,   K_15,   J_15},
-    {0, L_16,   K_16,   J_16},
-    {0, I_15,   H_15,   G_15},
-    {0, I_16,   H_16,   G_16},
-    {0, F_15,   E_15,   D_15},
-    {0, F_16,   E_16,   D_16},
-    {0, C_15,   B_15,   A_15},
-    {0, C_16,   B_16,   A_16},
-    {0, I_14,   H_14,   G_14},
-    {0, L_12,   K_12,   J_12},
-    {0, L_14,   K_14,   J_14},
+    {0, CB12_CA15,   CB11_CA15,   CB10_CA15},
+    {0, CB12_CA16,   CB11_CA16,   CB10_CA16},
+    {0, CB9_CA15,   CB8_CA15,   CB7_CA15},
+    {0, CB9_CA16,   CB8_CA16,   CB7_CA16},
+    {0, CB6_CA15,   CB5_CA15,   CB4_CA15},
+    {0, CB6_CA16,   CB5_CA16,   CB4_CA16},
+    {0, CB3_CA15,   CB2_CA15,   CB1_CA15},
+    {0, CB3_CA16,   CB2_CA16,   CB1_CA16},
+    {0, CB9_CA14,   CB8_CA14,   CB7_CA14},
+    {0, CB12_CA12,   CB11_CA12,   CB10_CA12},
+    {0, CB12_CA14,   CB11_CA14,   CB10_CA14},
 
 
 };
diff --git a/keyboards/smithrune/iron165r2/f411/config.h b/keyboards/smithrune/iron165r2/f411/config.h
index 8ed73d3ff48..bcd506ade3f 100644
--- a/keyboards/smithrune/iron165r2/f411/config.h
+++ b/keyboards/smithrune/iron165r2/f411/config.h
@@ -24,5 +24,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define WS2812_PWM_DRIVER PWMD1
 #define WS2812_PWM_CHANNEL 3
 #define WS2812_PWM_PAL_MODE 1
-#define WS2812_DMA_STREAM STM32_DMA2_STREAM5
-#define WS2812_DMA_CHANNEL 6
+#define WS2812_PWM_DMA_STREAM STM32_DMA2_STREAM5
+#define WS2812_PWM_DMA_CHANNEL 6
diff --git a/keyboards/smithrune/iron180v2/v2h/info.json b/keyboards/smithrune/iron180v2/v2h/info.json
index 67eaf0501b0..a41c9d7e952 100644
--- a/keyboards/smithrune/iron180v2/v2h/info.json
+++ b/keyboards/smithrune/iron180v2/v2h/info.json
@@ -111,7 +111,7 @@
                 {"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": 13.75, "y": 3.25, "w": 1.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
 
                 {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
                 {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
@@ -218,7 +218,7 @@
                 {"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": 13.75, "y": 3.25, "w": 1.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
 
                 {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
                 {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
@@ -325,7 +325,7 @@
                 {"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": 13.75, "y": 3.25, "w": 1.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
 
                 {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
                 {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
@@ -431,7 +431,7 @@
                 {"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": 13.75, "y": 3.25, "w": 1.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
 
                 {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
                 {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
@@ -537,7 +537,7 @@
                 {"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": 13.75, "y": 3.25, "w": 1.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
 
                 {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
                 {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
@@ -641,7 +641,7 @@
                 {"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": 13.75, "y": 3.25, "w": 1.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
 
                 {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
                 {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
diff --git a/keyboards/smithrune/iron180v2/v2s/info.json b/keyboards/smithrune/iron180v2/v2s/info.json
index aae84fd9566..82744159912 100644
--- a/keyboards/smithrune/iron180v2/v2s/info.json
+++ b/keyboards/smithrune/iron180v2/v2s/info.json
@@ -229,7 +229,7 @@
                 {"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": 13.75, "y": 3.25, "w": 1.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
 
                 {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
                 {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
@@ -336,7 +336,7 @@
                 {"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": 13.75, "y": 3.25, "w": 1.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
 
                 {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
                 {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
@@ -443,7 +443,7 @@
                 {"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": 13.75, "y": 3.25, "w": 1.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
 
                 {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
                 {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
@@ -549,7 +549,7 @@
                 {"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": 13.75, "y": 3.25, "w": 1.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
 
                 {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
                 {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
@@ -655,7 +655,7 @@
                 {"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": 13.75, "y": 3.25, "w": 1.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
 
                 {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
                 {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
@@ -759,7 +759,7 @@
                 {"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": 13.75, "y": 3.25, "w": 1.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
 
                 {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
                 {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
diff --git a/keyboards/smithrune/magnus/m75h/config.h b/keyboards/smithrune/magnus/m75h/config.h
index e72ba069692..18fd960d8fc 100644
--- a/keyboards/smithrune/magnus/m75h/config.h
+++ b/keyboards/smithrune/magnus/m75h/config.h
@@ -25,5 +25,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define WS2812_PWM_DRIVER PWMD1
 #define WS2812_PWM_CHANNEL 3
 #define WS2812_PWM_PAL_MODE 1
-#define WS2812_DMA_STREAM STM32_DMA2_STREAM5
-#define WS2812_DMA_CHANNEL 6
+#define WS2812_PWM_DMA_STREAM STM32_DMA2_STREAM5
+#define WS2812_PWM_DMA_CHANNEL 6
diff --git a/keyboards/smithrune/magnus/m75h/info.json b/keyboards/smithrune/magnus/m75h/info.json
index a4f2ce57682..325db7d1da1 100644
--- a/keyboards/smithrune/magnus/m75h/info.json
+++ b/keyboards/smithrune/magnus/m75h/info.json
@@ -17,12 +17,9 @@
         }
     },
     "features": {
-        "audio": false,
-        "backlight": false,
         "bootmagic": true,
         "command": false,
         "console": false,
-        "encoder": false,
         "extrakey": true,
         "mousekey": true,
         "nkro": true,
diff --git a/keyboards/smithrune/magnus/m75s/config.h b/keyboards/smithrune/magnus/m75s/config.h
index 1e8874caa4e..95fb2a420c6 100644
--- a/keyboards/smithrune/magnus/m75s/config.h
+++ b/keyboards/smithrune/magnus/m75s/config.h
@@ -27,5 +27,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define WS2812_PWM_DRIVER PWMD1
 #define WS2812_PWM_CHANNEL 3
 #define WS2812_PWM_PAL_MODE 1
-#define WS2812_DMA_STREAM STM32_DMA2_STREAM5
-#define WS2812_DMA_CHANNEL 6
+#define WS2812_PWM_DMA_STREAM STM32_DMA2_STREAM5
+#define WS2812_PWM_DMA_CHANNEL 6
diff --git a/keyboards/smithrune/magnus/m75s/info.json b/keyboards/smithrune/magnus/m75s/info.json
index 5b834631f78..352b529bb06 100644
--- a/keyboards/smithrune/magnus/m75s/info.json
+++ b/keyboards/smithrune/magnus/m75s/info.json
@@ -17,12 +17,10 @@
         }
     },
     "features": {
-        "audio": false,
         "backlight": true,
         "bootmagic": true,
         "command": false,
         "console": false,
-        "encoder": false,
         "extrakey": true,
         "mousekey": true,
         "nkro": true,
@@ -36,7 +34,7 @@
     },
     "indicators": {
         "caps_lock": "A10"
-    }
+    },
     "ws2812": {
         "pin": "B15"
     },
diff --git a/keyboards/spaceholdings/nebula68/config.h b/keyboards/spaceholdings/nebula68/config.h
index 1b2441556b0..85d3261dd12 100755
--- a/keyboards/spaceholdings/nebula68/config.h
+++ b/keyboards/spaceholdings/nebula68/config.h
@@ -20,8 +20,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define WS2812_PWM_DRIVER PWMD3  // default: PWMD2
 #define WS2812_PWM_CHANNEL 2  // default: 2
 #define WS2812_PWM_PAL_MODE 2  // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 2
-#define WS2812_DMA_STREAM STM32_DMA1_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 WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM3  // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
+#define WS2812_PWM_DMA_CHANNEL 3  // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
 
 /* Backlight options */
 
diff --git a/keyboards/spaceholdings/nebula68/nebula68.c b/keyboards/spaceholdings/nebula68/nebula68.c
index af51c4805e1..db8a31b8319 100755
--- a/keyboards/spaceholdings/nebula68/nebula68.c
+++ b/keyboards/spaceholdings/nebula68/nebula68.c
@@ -29,134 +29,134 @@ const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
  *   |  |      G location
  *   |  |      |      B location
  *   |  |      |      | */
-    {0, B_1,   A_1,   C_1}, //LA1
-    {0, E_1,   D_1,   F_1}, //LA2
-    {0, H_1,   G_1,   I_1}, //LA3
-    {0, K_1,   J_1,   L_1}, //LA4
-    {0, B_2,   A_2,   C_2}, //LA5
-    {0, E_2,   D_2,   F_2}, //LA6
-    {0, H_2,   G_2,   I_2}, //LA7
-    {0, K_2,   J_2,   L_2}, //LA8
-    {0, B_3,   A_3,   C_3}, //LA9
-    {0, E_3,   D_3,   F_3}, //LA10
-    {0, H_3,   G_3,   I_3}, //LA11
-    {0, K_3,   J_3,   L_3}, //LA12
-    {0, B_4,   A_4,   C_4}, //LA13
-    {0, E_4,   D_4,   F_4}, //LA14
-    {0, H_4,   G_4,   I_4}, //LA15
-    {0, K_4,   J_4,   L_4}, //LA16
-    {0, B_5,   A_5,   C_5}, //LA17
-    {0, E_5,   D_5,   F_5}, //LA18
-    {0, H_5,   G_5,   I_5}, //LA19
-    {0, K_5,   J_5,   L_5}, //LA20
-    {0, B_6,   A_6,   C_6}, //LA21
-    {0, E_6,   D_6,   F_6}, //LA22
-    {0, H_6,   G_6,   I_6}, //LA23
-    {0, K_6,   J_6,   L_6}, //LA24
-    {0, B_7,   A_7,   C_7}, //LA25
-    {0, E_7,   D_7,   F_7}, //LA26
-    {0, H_7,   G_7,   I_7}, //LA27
-    {0, K_7,   J_7,   L_7}, //LA28
-    {0, B_8,   A_8,   C_8}, //LA29
-    {0, E_8,   D_8,   F_8}, //LA30
-    {0, H_8,   G_8,   I_8}, //LA31
-    {0, K_8,   J_8,   L_8}, //LA32
-    {0, B_9,   A_9,   C_9}, //LA33
-    {0, E_9,   D_9,   F_9}, //LA34
-    {0, H_9,   G_9,   I_9}, //LA35
-    {0, K_9,   J_9,   L_9}, //LA36
-    {0, B_10,  A_10,  C_10}, //LA37
-    {0, E_10,  D_10,  F_10}, //LA38
-    {0, H_10,  G_10,  I_10}, //LA39
-    {0, K_10,  J_10,  L_10}, //LA40
-    {0, B_11,  A_11,  C_11}, //LA41
-    {0, E_11,  D_11,  F_11}, //LA42
-    {0, H_11,  G_11,  I_11}, //LA43
-    {0, K_11,  J_11,  L_11}, //LA44
-    {0, B_12,  A_12,  C_12}, //LA45
-    {0, E_12,  D_12,  F_12}, //LA46
-    {0, H_12,  G_12,  I_12}, //LA47
-    {0, K_12,  J_12,  L_12}, //LA48
-    {0, B_13,  A_13,  C_13}, //LA49
-    {0, E_13,  D_13,  F_13}, //LA50
-    {0, H_13,  G_13,  I_13}, //LA51
-    {0, K_13,  J_13,  L_13}, //LA52
-    {0, B_14,  A_14,  C_14}, //LA53
-    {0, E_14,  D_14,  F_14}, //LA54
-    {0, H_14,  G_14,  I_14}, //LA55
-    {0, K_14,  J_14,  L_14}, //LA56
-    {0, B_15,  A_15,  C_15}, //LA57
-    {0, E_15,  D_15,  F_15}, //LA58
-    {0, H_15,  G_15,  I_15}, //LA59
-    {0, K_15,  J_15,  L_15}, //LA60
-    {0, B_16,  A_16,  C_16}, //LA61
-    {0, E_16,  D_16,  F_16}, //LA62
-    {0, H_16,  G_16,  I_16}, //LA63
-    {0, K_16,  J_16,  L_16}, //LA64
+    {0, SW2_CS1,   SW1_CS1,   SW3_CS1}, //LA1
+    {0, SW5_CS1,   SW4_CS1,   SW6_CS1}, //LA2
+    {0, SW8_CS1,   SW7_CS1,   SW9_CS1}, //LA3
+    {0, SW11_CS1,   SW10_CS1,   SW12_CS1}, //LA4
+    {0, SW2_CS2,   SW1_CS2,   SW3_CS2}, //LA5
+    {0, SW5_CS2,   SW4_CS2,   SW6_CS2}, //LA6
+    {0, SW8_CS2,   SW7_CS2,   SW9_CS2}, //LA7
+    {0, SW11_CS2,   SW10_CS2,   SW12_CS2}, //LA8
+    {0, SW2_CS3,   SW1_CS3,   SW3_CS3}, //LA9
+    {0, SW5_CS3,   SW4_CS3,   SW6_CS3}, //LA10
+    {0, SW8_CS3,   SW7_CS3,   SW9_CS3}, //LA11
+    {0, SW11_CS3,   SW10_CS3,   SW12_CS3}, //LA12
+    {0, SW2_CS4,   SW1_CS4,   SW3_CS4}, //LA13
+    {0, SW5_CS4,   SW4_CS4,   SW6_CS4}, //LA14
+    {0, SW8_CS4,   SW7_CS4,   SW9_CS4}, //LA15
+    {0, SW11_CS4,   SW10_CS4,   SW12_CS4}, //LA16
+    {0, SW2_CS5,   SW1_CS5,   SW3_CS5}, //LA17
+    {0, SW5_CS5,   SW4_CS5,   SW6_CS5}, //LA18
+    {0, SW8_CS5,   SW7_CS5,   SW9_CS5}, //LA19
+    {0, SW11_CS5,   SW10_CS5,   SW12_CS5}, //LA20
+    {0, SW2_CS6,   SW1_CS6,   SW3_CS6}, //LA21
+    {0, SW5_CS6,   SW4_CS6,   SW6_CS6}, //LA22
+    {0, SW8_CS6,   SW7_CS6,   SW9_CS6}, //LA23
+    {0, SW11_CS6,   SW10_CS6,   SW12_CS6}, //LA24
+    {0, SW2_CS7,   SW1_CS7,   SW3_CS7}, //LA25
+    {0, SW5_CS7,   SW4_CS7,   SW6_CS7}, //LA26
+    {0, SW8_CS7,   SW7_CS7,   SW9_CS7}, //LA27
+    {0, SW11_CS7,   SW10_CS7,   SW12_CS7}, //LA28
+    {0, SW2_CS8,   SW1_CS8,   SW3_CS8}, //LA29
+    {0, SW5_CS8,   SW4_CS8,   SW6_CS8}, //LA30
+    {0, SW8_CS8,   SW7_CS8,   SW9_CS8}, //LA31
+    {0, SW11_CS8,   SW10_CS8,   SW12_CS8}, //LA32
+    {0, SW2_CS9,   SW1_CS9,   SW3_CS9}, //LA33
+    {0, SW5_CS9,   SW4_CS9,   SW6_CS9}, //LA34
+    {0, SW8_CS9,   SW7_CS9,   SW9_CS9}, //LA35
+    {0, SW11_CS9,   SW10_CS9,   SW12_CS9}, //LA36
+    {0, SW2_CS10,  SW1_CS10,  SW3_CS10}, //LA37
+    {0, SW5_CS10,  SW4_CS10,  SW6_CS10}, //LA38
+    {0, SW8_CS10,  SW7_CS10,  SW9_CS10}, //LA39
+    {0, SW11_CS10,  SW10_CS10,  SW12_CS10}, //LA40
+    {0, SW2_CS11,  SW1_CS11,  SW3_CS11}, //LA41
+    {0, SW5_CS11,  SW4_CS11,  SW6_CS11}, //LA42
+    {0, SW8_CS11,  SW7_CS11,  SW9_CS11}, //LA43
+    {0, SW11_CS11,  SW10_CS11,  SW12_CS11}, //LA44
+    {0, SW2_CS12,  SW1_CS12,  SW3_CS12}, //LA45
+    {0, SW5_CS12,  SW4_CS12,  SW6_CS12}, //LA46
+    {0, SW8_CS12,  SW7_CS12,  SW9_CS12}, //LA47
+    {0, SW11_CS12,  SW10_CS12,  SW12_CS12}, //LA48
+    {0, SW2_CS13,  SW1_CS13,  SW3_CS13}, //LA49
+    {0, SW5_CS13,  SW4_CS13,  SW6_CS13}, //LA50
+    {0, SW8_CS13,  SW7_CS13,  SW9_CS13}, //LA51
+    {0, SW11_CS13,  SW10_CS13,  SW12_CS13}, //LA52
+    {0, SW2_CS14,  SW1_CS14,  SW3_CS14}, //LA53
+    {0, SW5_CS14,  SW4_CS14,  SW6_CS14}, //LA54
+    {0, SW8_CS14,  SW7_CS14,  SW9_CS14}, //LA55
+    {0, SW11_CS14,  SW10_CS14,  SW12_CS14}, //LA56
+    {0, SW2_CS15,  SW1_CS15,  SW3_CS15}, //LA57
+    {0, SW5_CS15,  SW4_CS15,  SW6_CS15}, //LA58
+    {0, SW8_CS15,  SW7_CS15,  SW9_CS15}, //LA59
+    {0, SW11_CS15,  SW10_CS15,  SW12_CS15}, //LA60
+    {0, SW2_CS16,  SW1_CS16,  SW3_CS16}, //LA61
+    {0, SW5_CS16,  SW4_CS16,  SW6_CS16}, //LA62
+    {0, SW8_CS16,  SW7_CS16,  SW9_CS16}, //LA63
+    {0, SW11_CS16,  SW10_CS16,  SW12_CS16}, //LA64
 
-    {1, B_1,   A_1,   C_1}, //LB1
-    {1, E_1,   D_1,   F_1}, //LB2
-    {1, H_1,   G_1,   I_1}, //LB3
-    {1, K_1,   J_1,   L_1}, //LB4
-    {1, B_2,   A_2,   C_2}, //LB5
-    {1, E_2,   D_2,   F_2}, //LB6
-    {1, H_2,   G_2,   I_2}, //LB7
-    {1, K_2,   J_2,   L_2}, //LB8
-    {1, B_3,   A_3,   C_3}, //LB9
-    {1, E_3,   D_3,   F_3}, //LB10
-    {1, H_3,   G_3,   I_3}, //LB11
-    {1, K_3,   J_3,   L_3}, //LB12
-    {1, B_4,   A_4,   C_4}, //LB13
-    {1, E_4,   D_4,   F_4}, //LB14
-    {1, H_4,   G_4,   I_4}, //LB15
-    {1, K_4,   J_4,   L_4}, //LB16
-    {1, B_5,   A_5,   C_5}, //LB17
-    {1, E_5,   D_5,   F_5}, //LB18
-    {1, H_5,   G_5,   I_5}, //LB19
-    {1, K_5,   J_5,   L_5}, //LB20
-    {1, B_6,   A_6,   C_6}, //LB21
-    {1, E_6,   D_6,   F_6}, //LB22
-    {1, H_6,   G_6,   I_6}, //LB23
-    {1, K_6,   J_6,   L_6}, //LB24
-    {1, B_7,   A_7,   C_7}, //LB25
-    {1, E_7,   D_7,   F_7}, //LB26
-    {1, H_7,   G_7,   I_7}, //LB27
-    {1, K_7,   J_7,   L_7}, //LB28
-    {1, B_8,   A_8,   C_8}, //LB29
-    {1, E_8,   D_8,   F_8}, //LB30
-    {1, H_8,   G_8,   I_8}, //LB31
-    {1, K_8,   J_8,   L_8}, //LB32
-    {1, B_9,   A_9,   C_9}, //LB33
-    {1, E_9,   D_9,   F_9}, //LB34
-    {1, H_9,   G_9,   I_9}, //LB35
-    {1, K_9,   J_9,   L_9}, //LB36
-    {1, B_10,  A_10,  C_10}, //LB37
-    {1, E_10,  D_10,  F_10}, //LB38
-    {1, H_10,  G_10,  I_10}, //LB39
-    {1, K_10,  J_10,  L_10}, //LB40
-    {1, B_11,  A_11,  C_11}, //LB41
-    {1, E_11,  D_11,  F_11}, //LB42
-    {1, H_11,  G_11,  I_11}, //LB43
-    {1, K_11,  J_11,  L_11}, //LB44
-    {1, B_12,  A_12,  C_12}, //LB45
-    {1, E_12,  D_12,  F_12}, //LB46
-    {1, H_12,  G_12,  I_12}, //LB47
-    {1, K_12,  J_12,  L_12}, //LB48
-    {1, B_13,  A_13,  C_13}, //LB49
-    {1, E_13,  D_13,  F_13}, //LB50
-    {1, H_13,  G_13,  I_13}, //LB51
-    {1, K_13,  J_13,  L_13}, //LB52
-    {1, B_14,  A_14,  C_14}, //LB53
-    {1, E_14,  D_14,  F_14}, //LB54
-    {1, H_14,  G_14,  I_14}, //LB55
-    {1, K_14,  J_14,  L_14}, //LB56
-    {1, B_15,  A_15,  C_15}, //LB57
-    {1, E_15,  D_15,  F_15}, //LB58
-    {1, H_15,  G_15,  I_15}, //LB59
-    {1, K_15,  J_15,  L_15}, //LB60
-    {1, B_16,  A_16,  C_16}, //LB61
-    {1, E_16,  D_16,  F_16}, //LB62
-    {1, H_16,  G_16,  I_16}, //LB63
-    {1, K_16,  J_16,  L_16}, //LB64
+    {1, SW2_CS1,   SW1_CS1,   SW3_CS1}, //LB1
+    {1, SW5_CS1,   SW4_CS1,   SW6_CS1}, //LB2
+    {1, SW8_CS1,   SW7_CS1,   SW9_CS1}, //LB3
+    {1, SW11_CS1,   SW10_CS1,   SW12_CS1}, //LB4
+    {1, SW2_CS2,   SW1_CS2,   SW3_CS2}, //LB5
+    {1, SW5_CS2,   SW4_CS2,   SW6_CS2}, //LB6
+    {1, SW8_CS2,   SW7_CS2,   SW9_CS2}, //LB7
+    {1, SW11_CS2,   SW10_CS2,   SW12_CS2}, //LB8
+    {1, SW2_CS3,   SW1_CS3,   SW3_CS3}, //LB9
+    {1, SW5_CS3,   SW4_CS3,   SW6_CS3}, //LB10
+    {1, SW8_CS3,   SW7_CS3,   SW9_CS3}, //LB11
+    {1, SW11_CS3,   SW10_CS3,   SW12_CS3}, //LB12
+    {1, SW2_CS4,   SW1_CS4,   SW3_CS4}, //LB13
+    {1, SW5_CS4,   SW4_CS4,   SW6_CS4}, //LB14
+    {1, SW8_CS4,   SW7_CS4,   SW9_CS4}, //LB15
+    {1, SW11_CS4,   SW10_CS4,   SW12_CS4}, //LB16
+    {1, SW2_CS5,   SW1_CS5,   SW3_CS5}, //LB17
+    {1, SW5_CS5,   SW4_CS5,   SW6_CS5}, //LB18
+    {1, SW8_CS5,   SW7_CS5,   SW9_CS5}, //LB19
+    {1, SW11_CS5,   SW10_CS5,   SW12_CS5}, //LB20
+    {1, SW2_CS6,   SW1_CS6,   SW3_CS6}, //LB21
+    {1, SW5_CS6,   SW4_CS6,   SW6_CS6}, //LB22
+    {1, SW8_CS6,   SW7_CS6,   SW9_CS6}, //LB23
+    {1, SW11_CS6,   SW10_CS6,   SW12_CS6}, //LB24
+    {1, SW2_CS7,   SW1_CS7,   SW3_CS7}, //LB25
+    {1, SW5_CS7,   SW4_CS7,   SW6_CS7}, //LB26
+    {1, SW8_CS7,   SW7_CS7,   SW9_CS7}, //LB27
+    {1, SW11_CS7,   SW10_CS7,   SW12_CS7}, //LB28
+    {1, SW2_CS8,   SW1_CS8,   SW3_CS8}, //LB29
+    {1, SW5_CS8,   SW4_CS8,   SW6_CS8}, //LB30
+    {1, SW8_CS8,   SW7_CS8,   SW9_CS8}, //LB31
+    {1, SW11_CS8,   SW10_CS8,   SW12_CS8}, //LB32
+    {1, SW2_CS9,   SW1_CS9,   SW3_CS9}, //LB33
+    {1, SW5_CS9,   SW4_CS9,   SW6_CS9}, //LB34
+    {1, SW8_CS9,   SW7_CS9,   SW9_CS9}, //LB35
+    {1, SW11_CS9,   SW10_CS9,   SW12_CS9}, //LB36
+    {1, SW2_CS10,  SW1_CS10,  SW3_CS10}, //LB37
+    {1, SW5_CS10,  SW4_CS10,  SW6_CS10}, //LB38
+    {1, SW8_CS10,  SW7_CS10,  SW9_CS10}, //LB39
+    {1, SW11_CS10,  SW10_CS10,  SW12_CS10}, //LB40
+    {1, SW2_CS11,  SW1_CS11,  SW3_CS11}, //LB41
+    {1, SW5_CS11,  SW4_CS11,  SW6_CS11}, //LB42
+    {1, SW8_CS11,  SW7_CS11,  SW9_CS11}, //LB43
+    {1, SW11_CS11,  SW10_CS11,  SW12_CS11}, //LB44
+    {1, SW2_CS12,  SW1_CS12,  SW3_CS12}, //LB45
+    {1, SW5_CS12,  SW4_CS12,  SW6_CS12}, //LB46
+    {1, SW8_CS12,  SW7_CS12,  SW9_CS12}, //LB47
+    {1, SW11_CS12,  SW10_CS12,  SW12_CS12}, //LB48
+    {1, SW2_CS13,  SW1_CS13,  SW3_CS13}, //LB49
+    {1, SW5_CS13,  SW4_CS13,  SW6_CS13}, //LB50
+    {1, SW8_CS13,  SW7_CS13,  SW9_CS13}, //LB51
+    {1, SW11_CS13,  SW10_CS13,  SW12_CS13}, //LB52
+    {1, SW2_CS14,  SW1_CS14,  SW3_CS14}, //LB53
+    {1, SW5_CS14,  SW4_CS14,  SW6_CS14}, //LB54
+    {1, SW8_CS14,  SW7_CS14,  SW9_CS14}, //LB55
+    {1, SW11_CS14,  SW10_CS14,  SW12_CS14}, //LB56
+    {1, SW2_CS15,  SW1_CS15,  SW3_CS15}, //LB57
+    {1, SW5_CS15,  SW4_CS15,  SW6_CS15}, //LB58
+    {1, SW8_CS15,  SW7_CS15,  SW9_CS15}, //LB59
+    {1, SW11_CS15,  SW10_CS15,  SW12_CS15}, //LB60
+    {1, SW2_CS16,  SW1_CS16,  SW3_CS16}, //LB61
+    {1, SW5_CS16,  SW4_CS16,  SW6_CS16}, //LB62
+    {1, SW8_CS16,  SW7_CS16,  SW9_CS16}, //LB63
+    {1, SW11_CS16,  SW10_CS16,  SW12_CS16}, //LB64
 };
 #endif
diff --git a/keyboards/splitkb/kyria/rev1/config.h b/keyboards/splitkb/kyria/rev1/config.h
index d6660991355..4f130293e22 100644
--- a/keyboards/splitkb/kyria/rev1/config.h
+++ b/keyboards/splitkb/kyria/rev1/config.h
@@ -33,9 +33,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define WS2812_PWM_DRIVER        PWMD2                  // default: PWMD2
 #    define WS2812_PWM_CHANNEL       4                      // default: 2
 #    define WS2812_PWM_PAL_MODE      1                      // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 2
-#    define WS2812_DMA_STREAM        STM32_DMA1_STREAM2     // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
-#    define WS2812_DMA_CHANNEL       2                      // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
-#    define WS2812_DMAMUX_ID         STM32_DMAMUX1_TIM2_UP  // DMAMUX configuration for TIMx_UP -- only required if your MCU has a DMAMUX peripheral, see the respective reference manual for the appropriate values for your MCU.
+#    define WS2812_PWM_DMA_STREAM        STM32_DMA1_STREAM2     // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
+#    define WS2812_PWM_DMA_CHANNEL       2                      // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
+#    define WS2812_PWM_DMAMUX_ID         STM32_DMAMUX1_TIM2_UP  // DMAMUX configuration for TIMx_UP -- only required if your MCU has a DMAMUX peripheral, see the respective reference manual for the appropriate values for your MCU.
 #else
 #    define WS2812_DI_PIN D3
 #    define SOFT_SERIAL_PIN D2
diff --git a/keyboards/splitkb/kyria/rev2/config.h b/keyboards/splitkb/kyria/rev2/config.h
index 452e011f0ab..54d8f0985ae 100644
--- a/keyboards/splitkb/kyria/rev2/config.h
+++ b/keyboards/splitkb/kyria/rev2/config.h
@@ -38,9 +38,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define WS2812_PWM_DRIVER        PWMD2                  // default: PWMD2
 #    define WS2812_PWM_CHANNEL       4                      // default: 2
 #    define WS2812_PWM_PAL_MODE      1                      // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 2
-#    define WS2812_DMA_STREAM        STM32_DMA1_STREAM2     // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
-#    define WS2812_DMA_CHANNEL       2                      // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
-#    define WS2812_DMAMUX_ID         STM32_DMAMUX1_TIM2_UP  // DMAMUX configuration for TIMx_UP -- only required if your MCU has a DMAMUX peripheral, see the respective reference manual for the appropriate values for your MCU.
+#    define WS2812_PWM_DMA_STREAM        STM32_DMA1_STREAM2     // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
+#    define WS2812_PWM_DMA_CHANNEL       2                      // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
+#    define WS2812_PWM_DMAMUX_ID         STM32_DMAMUX1_TIM2_UP  // DMAMUX configuration for TIMx_UP -- only required if your MCU has a DMAMUX peripheral, see the respective reference manual for the appropriate values for your MCU.
 #else
 #    define WS2812_DI_PIN D3
 #    define SOFT_SERIAL_PIN D2
diff --git a/keyboards/splitography/info.json b/keyboards/splitography/info.json
index 45ee7beed8d..3805f1ca2b0 100644
--- a/keyboards/splitography/info.json
+++ b/keyboards/splitography/info.json
@@ -11,9 +11,7 @@
         "mousekey": false,
         "extrakey": true,
         "console": false,
-        "audio": false,
-        "command": false,
-        "backlight": false
+        "command": false
     },
     "matrix_pins": {
         "rows": ["D0", "D1", "D2", "D3"],
diff --git a/keyboards/stront/info.json b/keyboards/stront/info.json
index 88ccb2c6d03..d2726c85f0e 100644
--- a/keyboards/stront/info.json
+++ b/keyboards/stront/info.json
@@ -85,7 +85,6 @@
         "encoder": true,
         "backlight": true,
         "extrakey": true,
-        "rgblight": false,
         "rgb_matrix": true,
         "nkro": false
     },
diff --git a/keyboards/synthlabs/060/info.json b/keyboards/synthlabs/060/info.json
index 0c5870b46aa..2fe90c96fda 100644
--- a/keyboards/synthlabs/060/info.json
+++ b/keyboards/synthlabs/060/info.json
@@ -13,7 +13,6 @@
     "extrakey": true,
     "mousekey": true,
     "nkro": true,
-    "rgblight": false,
     "rgb_matrix": true
   },
   "ws2812": {
diff --git a/keyboards/tada68/keymaps/rgb/config.h b/keyboards/tada68/keymaps/rgb/config.h
index f902184d82a..21ddfa1850e 100755
--- a/keyboards/tada68/keymaps/rgb/config.h
+++ b/keyboards/tada68/keymaps/rgb/config.h
@@ -12,7 +12,7 @@
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 16         // Number of LEDs. Change this to match your use case.
+#define RGBLIGHT_LED_COUNT 16         // Number of LEDs. Change this to match your use case.
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/takashicompany/ejectix/info.json b/keyboards/takashicompany/ejectix/info.json
new file mode 100644
index 00000000000..560c2533263
--- /dev/null
+++ b/keyboards/takashicompany/ejectix/info.json
@@ -0,0 +1,90 @@
+{
+    "manufacturer": "takashicompany",
+    "keyboard_name": "Ejectix",
+    "maintainer": "takashicompany",
+    "development_board": "promicro",
+    "diode_direction": "COL2ROW",
+    "dynamic_keymap": {
+        "layer_count": 11
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": true
+    },
+    "matrix_pins": {
+        "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
+        "rows": ["F4", "F5", "F6", "F7", "B1", "B3"]
+    },
+    "rgblight": {
+        "animations": {
+            "alternating": true,
+            "breathing": true,
+            "christmas": true,
+            "knight": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "rgb_test": true,
+            "snake": true,
+            "static_gradient": true,
+            "twinkle": true
+        },
+        "led_count": 11,
+        "sleep": true
+    },
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0049",
+        "vid": "0x7463"
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 3], "x": 1, "y": 0},
+                {"matrix": [1, 0], "x": 2, "y": 0},
+                {"matrix": [1, 3], "x": 3, "y": 0},
+                {"matrix": [2, 0], "x": 4, "y": 0},
+                {"matrix": [2, 3], "x": 5, "y": 0},
+                {"matrix": [3, 0], "x": 6, "y": 0},
+                {"matrix": [3, 3], "x": 7, "y": 0},
+                {"matrix": [4, 0], "x": 8, "y": 0},
+                {"matrix": [4, 3], "x": 9, "y": 0},
+                {"matrix": [4, 5], "x": 10, "y": 0},
+                {"matrix": [0, 1], "x": 0.5, "y": 1},
+                {"matrix": [0, 4], "x": 1.5, "y": 1},
+                {"matrix": [1, 1], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [2, 1], "x": 4.5, "y": 1},
+                {"matrix": [2, 4], "x": 5.5, "y": 1},
+                {"matrix": [3, 1], "x": 6.5, "y": 1},
+                {"matrix": [3, 4], "x": 7.5, "y": 1},
+                {"matrix": [4, 1], "x": 8.5, "y": 1},
+                {"matrix": [4, 4], "x": 9.5, "y": 1},
+                {"matrix": [0, 2], "x": 1, "y": 2},
+                {"matrix": [0, 5], "x": 2, "y": 2},
+                {"matrix": [1, 2], "x": 3, "y": 2},
+                {"matrix": [1, 5], "x": 4, "y": 2},
+                {"matrix": [2, 2], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [3, 2], "x": 7, "y": 2},
+                {"matrix": [3, 5], "x": 8, "y": 2},
+                {"matrix": [4, 2], "x": 9, "y": 2},
+                {"matrix": [5, 0], "x": 1.75, "y": 3},
+                {"matrix": [5, 1], "x": 3, "y": 3},
+                {"matrix": [5, 2], "x": 4.25, "y": 3},
+                {"matrix": [5, 3], "x": 5.5, "y": 3},
+                {"matrix": [5, 4], "x": 6.75, "y": 3},
+                {"matrix": [5, 5], "x": 8, "y": 3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/takashicompany/ejectix/keymaps/default/keymap.c b/keyboards/takashicompany/ejectix/keymaps/default/keymap.c
new file mode 100644
index 00000000000..b2c94317642
--- /dev/null
+++ b/keyboards/takashicompany/ejectix/keymaps/default/keymap.c
@@ -0,0 +1,69 @@
+// Copyright 2024 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+        LT(7, KC_Q), KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
+        KC_A, KC_S, LT(6, KC_D), KC_F, KC_G, KC_H, KC_J, LT(6, KC_K), KC_L, KC_ENT,
+        LSFT_T(KC_Z), LGUI_T(KC_X), KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, LCTL_T(KC_DOT),
+        KC_LGUI, LALT_T(KC_LNG2), LSFT_T(KC_TAB), LT(2, KC_SPC), LT(1, KC_LNG1), KC_BSPC
+    ),
+    
+    [1] = LAYOUT(
+        KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS,
+        LCTL_T(KC_EQL), KC_LBRC, KC_SLSH, KC_MINS, KC_INT1, KC_SCLN, KC_QUOT, KC_RBRC, KC_NUHS, KC_INT3,
+        LSFT_T(KC_PLUS), KC_LCBR, KC_QUES, KC_UNDS, LSFT(KC_INT1), KC_COLN, KC_DQUO, KC_RCBR, LSFT(KC_NUHS),
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    
+    [2] = LAYOUT(
+        KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, LGUI(KC_INT3), KC_TRNS,
+        KC_PLUS, KC_LCBR, KC_QUES, KC_UNDS, LSFT(KC_INT1), KC_COLN, KC_DQUO, KC_RCBR, LSFT(KC_NUHS), LSFT(KC_INT3),
+        KC_LSFT, KC_LGUI, KC_LALT, KC_LNG2, KC_LSFT, KC_SPC, KC_LNG1, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    
+    [3] = LAYOUT(
+        LT(7, KC_Q), KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_TRNS,
+        KC_A, KC_S, LT(6, KC_D), KC_F, KC_G, KC_H, KC_J, LT(6, KC_K), KC_L, KC_ENT,
+        LSFT_T(KC_Z), LGUI_T(KC_X), KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, LCTL_T(KC_DOT),
+        KC_LGUI, LALT_T(KC_LNG2), LSFT_T(KC_TAB), LT(4, KC_SPC), LT(4, KC_LNG1), KC_BSPC
+    ),
+        
+    [4] = LAYOUT(
+        KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS,
+        KC_CIRC, KC_AT, KC_SLSH, KC_MINS, KC_UNDS, KC_SCLN, KC_COLN, KC_LBRC, KC_RBRC, KC_INT3,
+        LT(5, KC_TILD), KC_GRV, KC_QUES, KC_EQL, KC_UNDS, KC_PLUS, KC_ASTR, KC_LCBR, KC_RCBR,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    
+    [5] = LAYOUT(
+        KC_EXLM, KC_DQUO, KC_HASH, KC_DLR, KC_PERC, KC_AMPR, KC_QUOT, KC_LPRN, KC_RPRN, KC_BSLS, KC_TRNS,
+        KC_TILD, KC_GRV, KC_QUES, KC_EQL, KC_UNDS, KC_PLUS, KC_ASTR, KC_LCBR, KC_RCBR, KC_PIPE,
+        KC_LSFT, KC_LGUI, KC_LALT, KC_LNG2, KC_LSFT, KC_SPC, KC_LNG1, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    
+    [6] = LAYOUT(
+        KC_ESC, KC_TAB, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_UP, KC_NO, KC_NO, KC_TRNS,
+        KC_LCTL, KC_TRNS, KC_QUES, KC_EXLM, KC_NO, KC_NO, KC_LEFT, KC_DOWN, KC_RGHT, KC_NO,
+        KC_LSFT, KC_LGUI, KC_LALT, KC_LNG2, KC_TRNS, KC_NO, KC_LNG1, KC_NO, KC_NO,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ), 
+    
+    [7] = LAYOUT(
+        KC_NO, KC_TAB, KC_NO, KC_NO, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_TRNS,
+        KC_NO, KC_NO, KC_NO, KC_NO, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,
+        KC_LSFT, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, MO(8),
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    
+    [8] = LAYOUT(
+        RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, KC_NO, KC_NO, KC_NO, DF(0), DF(3), KC_TRNS,
+        RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+        RGB_M_K, RGB_M_X, RGB_M_G, KC_NO, KC_NO, QK_BOOT, KC_NO, KC_NO, KC_NO,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    )
+};
diff --git a/keyboards/takashicompany/ejectix/keymaps/via/keymap.c b/keyboards/takashicompany/ejectix/keymaps/via/keymap.c
new file mode 100644
index 00000000000..b2c94317642
--- /dev/null
+++ b/keyboards/takashicompany/ejectix/keymaps/via/keymap.c
@@ -0,0 +1,69 @@
+// Copyright 2024 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+        LT(7, KC_Q), KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
+        KC_A, KC_S, LT(6, KC_D), KC_F, KC_G, KC_H, KC_J, LT(6, KC_K), KC_L, KC_ENT,
+        LSFT_T(KC_Z), LGUI_T(KC_X), KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, LCTL_T(KC_DOT),
+        KC_LGUI, LALT_T(KC_LNG2), LSFT_T(KC_TAB), LT(2, KC_SPC), LT(1, KC_LNG1), KC_BSPC
+    ),
+    
+    [1] = LAYOUT(
+        KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS,
+        LCTL_T(KC_EQL), KC_LBRC, KC_SLSH, KC_MINS, KC_INT1, KC_SCLN, KC_QUOT, KC_RBRC, KC_NUHS, KC_INT3,
+        LSFT_T(KC_PLUS), KC_LCBR, KC_QUES, KC_UNDS, LSFT(KC_INT1), KC_COLN, KC_DQUO, KC_RCBR, LSFT(KC_NUHS),
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    
+    [2] = LAYOUT(
+        KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, LGUI(KC_INT3), KC_TRNS,
+        KC_PLUS, KC_LCBR, KC_QUES, KC_UNDS, LSFT(KC_INT1), KC_COLN, KC_DQUO, KC_RCBR, LSFT(KC_NUHS), LSFT(KC_INT3),
+        KC_LSFT, KC_LGUI, KC_LALT, KC_LNG2, KC_LSFT, KC_SPC, KC_LNG1, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    
+    [3] = LAYOUT(
+        LT(7, KC_Q), KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_TRNS,
+        KC_A, KC_S, LT(6, KC_D), KC_F, KC_G, KC_H, KC_J, LT(6, KC_K), KC_L, KC_ENT,
+        LSFT_T(KC_Z), LGUI_T(KC_X), KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, LCTL_T(KC_DOT),
+        KC_LGUI, LALT_T(KC_LNG2), LSFT_T(KC_TAB), LT(4, KC_SPC), LT(4, KC_LNG1), KC_BSPC
+    ),
+        
+    [4] = LAYOUT(
+        KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS,
+        KC_CIRC, KC_AT, KC_SLSH, KC_MINS, KC_UNDS, KC_SCLN, KC_COLN, KC_LBRC, KC_RBRC, KC_INT3,
+        LT(5, KC_TILD), KC_GRV, KC_QUES, KC_EQL, KC_UNDS, KC_PLUS, KC_ASTR, KC_LCBR, KC_RCBR,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    
+    [5] = LAYOUT(
+        KC_EXLM, KC_DQUO, KC_HASH, KC_DLR, KC_PERC, KC_AMPR, KC_QUOT, KC_LPRN, KC_RPRN, KC_BSLS, KC_TRNS,
+        KC_TILD, KC_GRV, KC_QUES, KC_EQL, KC_UNDS, KC_PLUS, KC_ASTR, KC_LCBR, KC_RCBR, KC_PIPE,
+        KC_LSFT, KC_LGUI, KC_LALT, KC_LNG2, KC_LSFT, KC_SPC, KC_LNG1, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    
+    [6] = LAYOUT(
+        KC_ESC, KC_TAB, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_UP, KC_NO, KC_NO, KC_TRNS,
+        KC_LCTL, KC_TRNS, KC_QUES, KC_EXLM, KC_NO, KC_NO, KC_LEFT, KC_DOWN, KC_RGHT, KC_NO,
+        KC_LSFT, KC_LGUI, KC_LALT, KC_LNG2, KC_TRNS, KC_NO, KC_LNG1, KC_NO, KC_NO,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ), 
+    
+    [7] = LAYOUT(
+        KC_NO, KC_TAB, KC_NO, KC_NO, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_TRNS,
+        KC_NO, KC_NO, KC_NO, KC_NO, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,
+        KC_LSFT, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, MO(8),
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    
+    [8] = LAYOUT(
+        RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, KC_NO, KC_NO, KC_NO, DF(0), DF(3), KC_TRNS,
+        RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+        RGB_M_K, RGB_M_X, RGB_M_G, KC_NO, KC_NO, QK_BOOT, KC_NO, KC_NO, KC_NO,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    )
+};
diff --git a/keyboards/takashicompany/ejectix/keymaps/via/rules.mk b/keyboards/takashicompany/ejectix/keymaps/via/rules.mk
new file mode 100644
index 00000000000..1e5b99807cb
--- /dev/null
+++ b/keyboards/takashicompany/ejectix/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/takashicompany/ejectix/readme.md b/keyboards/takashicompany/ejectix/readme.md
new file mode 100644
index 00000000000..3a731808d60
--- /dev/null
+++ b/keyboards/takashicompany/ejectix/readme.md
@@ -0,0 +1,33 @@
+# Ejectix
+
+![takashicompany/ejectix](https://i.imgur.com/gGk5UVdh.jpg)
+
+Ejectix is a 36-key, low-staggered keyboard.  
+Its layout is similar to that of a conventional keyboard, making it suitable for an introductory keyboard of 30% size.  
+Its relatively simple structure makes it easy to assemble, and it is recommended for those who are just starting to build their own keyboards.  
+Since the firmware is VIA-compatible, it is possible to write the firmware and change the keymap from a web browser by using Remap.  
+The MX socket is also supported, making it easy to replace the keyswitch for long-lasting use.  
+Underglow LEDs can also be used to decorate your desk.
+
+* Keyboard Maintainer: [takashicompany](https://github.com/takashicompany)
+* Hardware Supported: Ejectix PCB, Pro Micro
+* Hardware Availability: https://github.com/takashicompany/ejectix
+
+Make example for this keyboard (after setting up your build environment):
+
+    make takashicompany/ejectix:default
+    
+
+Flashing example for this keyboard:
+
+    make takashicompany/ejectix:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/takashicompany/ejectix/rules.mk b/keyboards/takashicompany/ejectix/rules.mk
new file mode 100644
index 00000000000..6e7633bfe01
--- /dev/null
+++ b/keyboards/takashicompany/ejectix/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/teleport/native/native.c b/keyboards/teleport/native/native.c
index 5d8ccc64752..b53979e27cc 100644
--- a/keyboards/teleport/native/native.c
+++ b/keyboards/teleport/native/native.c
@@ -24,95 +24,95 @@ const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
  *   |  |     G location
  *   |  |     |     B location
  *   |  |     |     | */
-    {0, L_1,  K_1,  J_1},               // Row 1
-    {0, L_2,  K_2,  J_2},
-    {0, L_3,  K_3,  J_3},
-    {0, L_4,  K_4,  J_4},
-    {0, L_5,  K_5,  J_5},
-    {0, L_6,  K_6,  J_6},
-    {0, L_7,  K_7,  J_7},
-    {0, L_8,  K_8,  J_8},
-    {0, L_9,  K_9,  J_9},
-    {0, L_10, K_10, J_10},
-    {0, L_11, K_11, J_11},
-    {0, L_12, K_12, J_12},
-    {0, L_13, K_13, J_13},
-    {0, L_14, K_14, J_14},
-    {0, L_15, K_15, J_15},
-    {0, L_16, K_16, J_16},
+    {0, SW12_CS1,  SW11_CS1,  SW10_CS1},               // Row 1
+    {0, SW12_CS2,  SW11_CS2,  SW10_CS2},
+    {0, SW12_CS3,  SW11_CS3,  SW10_CS3},
+    {0, SW12_CS4,  SW11_CS4,  SW10_CS4},
+    {0, SW12_CS5,  SW11_CS5,  SW10_CS5},
+    {0, SW12_CS6,  SW11_CS6,  SW10_CS6},
+    {0, SW12_CS7,  SW11_CS7,  SW10_CS7},
+    {0, SW12_CS8,  SW11_CS8,  SW10_CS8},
+    {0, SW12_CS9,  SW11_CS9,  SW10_CS9},
+    {0, SW12_CS10, SW11_CS10, SW10_CS10},
+    {0, SW12_CS11, SW11_CS11, SW10_CS11},
+    {0, SW12_CS12, SW11_CS12, SW10_CS12},
+    {0, SW12_CS13, SW11_CS13, SW10_CS13},
+    {0, SW12_CS14, SW11_CS14, SW10_CS14},
+    {0, SW12_CS15, SW11_CS15, SW10_CS15},
+    {0, SW12_CS16, SW11_CS16, SW10_CS16},
 
-    {0, I_1,  H_1,  G_1},               // Row 2
-    {0, I_2,  H_2,  G_2},
-    {0, I_3,  H_3,  G_3},
-    {0, I_4,  H_4,  G_4},
-    {0, I_5,  H_5,  G_5},
-    {0, I_6,  H_6,  G_6},
-    {0, I_7,  H_7,  G_7},
-    {0, I_8,  H_8,  G_8},
-    {0, I_9,  H_9,  G_9},
-    {0, I_10, H_10, G_10},
-    {0, I_11, H_11, G_11},
-    {0, I_12, H_12, G_12},
-    {0, I_13, H_13, G_13},
-    {0, I_15, H_15, G_15},
-    {0, I_16, H_16, G_16},
+    {0, SW9_CS1,  SW8_CS1,  SW7_CS1},               // Row 2
+    {0, SW9_CS2,  SW8_CS2,  SW7_CS2},
+    {0, SW9_CS3,  SW8_CS3,  SW7_CS3},
+    {0, SW9_CS4,  SW8_CS4,  SW7_CS4},
+    {0, SW9_CS5,  SW8_CS5,  SW7_CS5},
+    {0, SW9_CS6,  SW8_CS6,  SW7_CS6},
+    {0, SW9_CS7,  SW8_CS7,  SW7_CS7},
+    {0, SW9_CS8,  SW8_CS8,  SW7_CS8},
+    {0, SW9_CS9,  SW8_CS9,  SW7_CS9},
+    {0, SW9_CS10, SW8_CS10, SW7_CS10},
+    {0, SW9_CS11, SW8_CS11, SW7_CS11},
+    {0, SW9_CS12, SW8_CS12, SW7_CS12},
+    {0, SW9_CS13, SW8_CS13, SW7_CS13},
+    {0, SW9_CS15, SW8_CS15, SW7_CS15},
+    {0, SW9_CS16, SW8_CS16, SW7_CS16},
 
-    {0, F_1,  E_1,  D_1},               // Row 3
-    {0, F_3,  E_3,  D_3},
-    {0, F_4,  E_4,  D_4},
-    {0, F_5,  E_5,  D_5},
-    {0, F_6,  E_6,  D_6},
-    {0, F_7,  E_7,  D_7},
-    {0, F_8,  E_8,  D_8},
-    {0, F_9,  E_9,  D_9},
-    {0, F_10, E_10, D_10},
-    {0, F_11, E_11, D_11},
-    {0, F_12, E_12, D_12},
-    {0, F_13, E_13, D_13},
-    {0, F_14, E_14, D_14},
-    {0, F_15, E_15, D_15},
-    {0, F_16, E_16, D_16},
+    {0, SW6_CS1,  SW5_CS1,  SW4_CS1},               // Row 3
+    {0, SW6_CS3,  SW5_CS3,  SW4_CS3},
+    {0, SW6_CS4,  SW5_CS4,  SW4_CS4},
+    {0, SW6_CS5,  SW5_CS5,  SW4_CS5},
+    {0, SW6_CS6,  SW5_CS6,  SW4_CS6},
+    {0, SW6_CS7,  SW5_CS7,  SW4_CS7},
+    {0, SW6_CS8,  SW5_CS8,  SW4_CS8},
+    {0, SW6_CS9,  SW5_CS9,  SW4_CS9},
+    {0, SW6_CS10, SW5_CS10, SW4_CS10},
+    {0, SW6_CS11, SW5_CS11, SW4_CS11},
+    {0, SW6_CS12, SW5_CS12, SW4_CS12},
+    {0, SW6_CS13, SW5_CS13, SW4_CS13},
+    {0, SW6_CS14, SW5_CS14, SW4_CS14},
+    {0, SW6_CS15, SW5_CS15, SW4_CS15},
+    {0, SW6_CS16, SW5_CS16, SW4_CS16},
 
-    {1, L_1,  K_1,  J_1},               // Row 4
-    {1, L_3,  K_3,  J_3},
-    {1, L_4,  K_4,  J_4},
-    {1, L_5,  K_5,  J_5},
-    {1, L_6,  K_6,  J_6},
-    {1, L_7,  K_7,  J_7},
-    {1, L_8,  K_8,  J_8},
-    {1, L_9,  K_9,  J_9},
-    {1, L_10, K_10, J_10},
-    {1, L_11, K_11, J_11},
-    {1, L_12, K_12, J_12},
-    {1, L_13, K_13, J_13},
-    {1, L_14, K_14, J_14},
-    {1, L_16, K_16, J_16},
+    {1, SW12_CS1,  SW11_CS1,  SW10_CS1},               // Row 4
+    {1, SW12_CS3,  SW11_CS3,  SW10_CS3},
+    {1, SW12_CS4,  SW11_CS4,  SW10_CS4},
+    {1, SW12_CS5,  SW11_CS5,  SW10_CS5},
+    {1, SW12_CS6,  SW11_CS6,  SW10_CS6},
+    {1, SW12_CS7,  SW11_CS7,  SW10_CS7},
+    {1, SW12_CS8,  SW11_CS8,  SW10_CS8},
+    {1, SW12_CS9,  SW11_CS9,  SW10_CS9},
+    {1, SW12_CS10, SW11_CS10, SW10_CS10},
+    {1, SW12_CS11, SW11_CS11, SW10_CS11},
+    {1, SW12_CS12, SW11_CS12, SW10_CS12},
+    {1, SW12_CS13, SW11_CS13, SW10_CS13},
+    {1, SW12_CS14, SW11_CS14, SW10_CS14},
+    {1, SW12_CS16, SW11_CS16, SW10_CS16},
 
-    {1, I_1,  H_1,  G_1},               // Row 5
-    {1, I_2,  H_2,  G_2},
-    {1, I_3,  H_3,  G_3},
-    {1, I_4,  H_4,  G_4},
-    {1, I_5,  H_5,  G_5},
-    {1, I_6,  H_6,  G_6},
-    {1, I_7,  H_7,  G_7},
-    {1, I_8,  H_8,  G_8},
-    {1, I_9,  H_9,  G_9},
-    {1, I_10, H_10, G_10},
-    {1, I_11, H_11, G_11},
-    {1, I_12, H_12, G_12},
-    {1, I_14, H_14, G_14},
-    {1, I_15, H_15, G_15},
-    {1, I_16, H_16, G_16},
+    {1, SW9_CS1,  SW8_CS1,  SW7_CS1},               // Row 5
+    {1, SW9_CS2,  SW8_CS2,  SW7_CS2},
+    {1, SW9_CS3,  SW8_CS3,  SW7_CS3},
+    {1, SW9_CS4,  SW8_CS4,  SW7_CS4},
+    {1, SW9_CS5,  SW8_CS5,  SW7_CS5},
+    {1, SW9_CS6,  SW8_CS6,  SW7_CS6},
+    {1, SW9_CS7,  SW8_CS7,  SW7_CS7},
+    {1, SW9_CS8,  SW8_CS8,  SW7_CS8},
+    {1, SW9_CS9,  SW8_CS9,  SW7_CS9},
+    {1, SW9_CS10, SW8_CS10, SW7_CS10},
+    {1, SW9_CS11, SW8_CS11, SW7_CS11},
+    {1, SW9_CS12, SW8_CS12, SW7_CS12},
+    {1, SW9_CS14, SW8_CS14, SW7_CS14},
+    {1, SW9_CS15, SW8_CS15, SW7_CS15},
+    {1, SW9_CS16, SW8_CS16, SW7_CS16},
 
-    {1, F_1,  E_1,  D_1},               // Row 6
-    {1, F_2,  E_2,  D_2},
-    {1, F_3,  E_3,  D_3},
-    {1, F_7,  E_7,  D_7},
-    {1, F_11, E_11, D_11},
-    {1, F_12, E_12, D_12},
-    {1, F_13, E_13, D_13},
-    {1, F_14, E_14, D_14},
-    {1, F_15, E_15, D_15},
-    {1, F_16, E_16, D_16}
+    {1, SW6_CS1,  SW5_CS1,  SW4_CS1},               // Row 6
+    {1, SW6_CS2,  SW5_CS2,  SW4_CS2},
+    {1, SW6_CS3,  SW5_CS3,  SW4_CS3},
+    {1, SW6_CS7,  SW5_CS7,  SW4_CS7},
+    {1, SW6_CS11, SW5_CS11, SW4_CS11},
+    {1, SW6_CS12, SW5_CS12, SW4_CS12},
+    {1, SW6_CS13, SW5_CS13, SW4_CS13},
+    {1, SW6_CS14, SW5_CS14, SW4_CS14},
+    {1, SW6_CS15, SW5_CS15, SW4_CS15},
+    {1, SW6_CS16, SW5_CS16, SW4_CS16}
 };
 #endif
\ No newline at end of file
diff --git a/keyboards/tg67/config.h b/keyboards/tg67/config.h
index 7ede76f5513..0d54e925ae5 100644
--- a/keyboards/tg67/config.h
+++ b/keyboards/tg67/config.h
@@ -19,5 +19,5 @@
 #define WS2812_PWM_DRIVER PWMD1
 #define WS2812_PWM_CHANNEL 3
 #define WS2812_PWM_COMPLEMENTARY_OUTPUT
-#define WS2812_DMA_STREAM STM32_DMA1_STREAM5
-#define WS2812_DMA_CHANNEL 5
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM5
+#define WS2812_PWM_DMA_CHANNEL 5
diff --git a/keyboards/thevankeyboards/bananasplit/keymaps/jockyxu1122_ansi/keymap.c b/keyboards/thevankeyboards/bananasplit/keymaps/jockyxu1122_ansi/keymap.c
deleted file mode 100644
index df9983015f1..00000000000
--- a/keyboards/thevankeyboards/bananasplit/keymaps/jockyxu1122_ansi/keymap.c
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
-  Author: jockyxu1122
-
-  Hightlight: split backspace, split space, arrows on bottom right,
-    and backlighting support (capslock's backlighting cannot be controlled separately).
-
-  Note that "Previous track" and "next track" might only work with Windows.
-*/
-
-#include QMK_KEYBOARD_H
-
-#define DEFAULT_LAYER 0
-#define LAYER_1 1
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /*
-  -------------------------------------------------------------
-  |Esc| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | ` |Del|
-  -------------------------------------------------------------
-  | Tab | Q | W | E | R | T | Y | U | I | O | P | [ | ] |  \  |
-  -------------------------------------------------------------
-  | Caps | A | S | D | F | G | H | J | K | L | ; | ' |  Enter |
-  -------------------------------------------------------------
-  | Shift  | Z | X | C | V | B | N | M | , | . | / | Shift| Up|
-  -------------------------------------------------------------
-  |Ctrl| GUI| Alt|  Space   |MoL1| Backspc| Hm|End| <-|Dwn| ->|
-  -------------------------------------------------------------
-  Hm: Home
-  MoL1: Mo(L1)
-  */
-  [DEFAULT_LAYER] = LAYOUT_hhkb_arrow(
-    // row 1
-    KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_GRV,
-      KC_DEL,
-    // row 2
-    KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
-    // row 3
-    KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
-    // row 4
-    KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
-    // row 5
-    KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(LAYER_1), KC_BSPC, KC_HOME, KC_END, KC_LEFT, KC_DOWN,
-      KC_RIGHT
-  ),
-
-  /*
-  -------------------------------------------------------------
-  |LED| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|   |Ins|
-  -------------------------------------------------------------
-  |     |   |   | @ |   |   |   |   |   |   |   |BDn|BUp|     |
-  -------------------------------------------------------------
-  |      |   |   |   |   |   |   |   |   |   |   |   |        |
-  -------------------------------------------------------------
-  |        |   |   |Cal|   |www|   |Mut|   |   |   |      |VUp|
-  -------------------------------------------------------------
-  |    |    |    |  Pause   |    |        |PUp|PDn|PTk|VDn|NTk|
-  -------------------------------------------------------------
-  @: Email
-  BDn: LED brightness down
-  BUp: LED brightness up
-  Cal: Calculator
-  Ins: Insert
-  Mut: Mute
-  NTk: Next track
-  PDn: Page down
-  PTk: Previous track
-  PUp: Page up
-  VDn: Volume down
-  VUp: Volume up
-  www: Browser home page
-  */
-  [LAYER_1] = LAYOUT_hhkb_arrow(
-    // row 1
-    BL_TOGG, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
-      KC_F12, KC_TRNS, KC_INS,
-    // row 2
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_MAIL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, BL_DOWN,BL_UP,  KC_TRNS,
-    // row 3
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, KC_TRNS, KC_TRNS,
-    // row 4
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_CALC, KC_TRNS, KC_WHOM, KC_TRNS, KC_MUTE, KC_TRNS, KC_TRNS,
-      KC_TRNS, KC_TRNS, KC_VOLU,
-    // row 5
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_TRNS, KC_TRNS, KC_PGUP, KC_PGDN, KC_MPRV, KC_VOLD,
-      KC_MNXT
-  )
-};
diff --git a/keyboards/thevankeyboards/bananasplit/keymaps/jockyxu1122_ansi/readme.md b/keyboards/thevankeyboards/bananasplit/keymaps/jockyxu1122_ansi/readme.md
deleted file mode 100644
index 664a0a0483c..00000000000
--- a/keyboards/thevankeyboards/bananasplit/keymaps/jockyxu1122_ansi/readme.md
+++ /dev/null
@@ -1,66 +0,0 @@
-Yida's keymap for BananaSplit
-===
-
-Hightlight: split backspace, split space, arrows on bottom right, and
-backlighting support (capslock's backlighting cannot be controlled separately).
-
-Note that "Previous track" and "next track" might only work with Windows.
-
-Default layer:
-
-```
-  -------------------------------------------------------------
-  |Esc| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | ` |Del|
-  -------------------------------------------------------------
-  | Tab | Q | W | E | R | T | Y | U | I | O | P | [ | ] |  \  |
-  -------------------------------------------------------------
-  | Caps | A | S | D | F | G | H | J | K | L | ; | ' |  Enter |
-  -------------------------------------------------------------
-  | Shift  | Z | X | C | V | B | N | M | , | . | / | Shift| Up|
-  -------------------------------------------------------------
-  |Ctrl| GUI| Alt|  Space   |MoL1| Backspc| Hm|End| <-|Dwn| ->|
-  -------------------------------------------------------------
-  Hm: Home
-  MoL1: Mo(L1)
-```
-
-Layer_1:
-
-```
-  -------------------------------------------------------------
-  |LED| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|   |Ins|
-  -------------------------------------------------------------
-  |     |   |   | @ |   |   |   |   |   |   |   |BDn|BUp|     |
-  -------------------------------------------------------------
-  |      |   |   |   |   |   |   |   |   |   |   |   |        |
-  -------------------------------------------------------------
-  |        |   |   |Cal|   |www|   |Mut|   |   |   |      |VUp|
-  -------------------------------------------------------------
-  |    |    |    |  Pause   |    |        |PUp|PDn|PTk|VDn|NTk|
-  -------------------------------------------------------------
-  @: Email
-  BDn: LED brightness down
-  BUp: LED brightness up
-  Cal: Calculator
-  Ins: Insert
-  Mut: Mute
-  NTk: Next track
-  PDn: Page down
-  PTk: Previous track
-  PUp: Page up
-  VDn: Volume down
-  VUp: Volume up
-  www: Browser home page
-```
-
-Compile and flash:
-
-`cd` to `/qmk_firmware` folder, then
-```
-make bananasplit:jockyxu1122_ansi
-```
-
-A .hex file will be generated under `/qmk_firmware` folder.
-
-
-To flash, use QMK Toolbox.
diff --git a/keyboards/thevankeyboards/bananasplit/keymaps/jockyxu1122_iso/keymap.c b/keyboards/thevankeyboards/bananasplit/keymaps/jockyxu1122_iso/keymap.c
deleted file mode 100644
index 5146c8f4f33..00000000000
--- a/keyboards/thevankeyboards/bananasplit/keymaps/jockyxu1122_iso/keymap.c
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
-  Author: jockyxu1122
-
-  Hightlight: split backspace, ISO Enter, split space, arrows on bottom right,
-    and toggable capslock backlight.
-
-  Note that "Previous track" and "next track" might only work with Windows.
-*/
-
-#include QMK_KEYBOARD_H
-
-#define DEFAULT_LAYER 0
-#define LAYER_1 1
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /*
-  -------------------------------------------------------------
-  |Esc| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | ` |Del|
-  -------------------------------------------------------------
-  | Tab | Q | W | E | R | T | Y | U | I | O | P | [ | ] | Ent |
-  --------------------------------------------------------    -
-  | Caps | A | S | D | F | G | H | J | K | L | ; | ' | \ |    |
-  -------------------------------------------------------------
-  | Shift  | Z | X | C | V | B | N | M | , | . | Shift| Up| / |
-  -------------------------------------------------------------
-  |Ctrl| GUI| Alt|  Space   |MoL1| Backspc| Hm|End| <-|Dwn| ->|
-  -------------------------------------------------------------
-  Hm: Home
-  MoL1: Mo(L1)
-  */
-  [DEFAULT_LAYER] = LAYOUT_hhkb_arrow(
-    // row 1
-    KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_GRV,
-      KC_DEL,
-    // row 2
-    KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENT,
-    // row 3
-    KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS,
-    // row 4
-    KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_RSFT, KC_UP, KC_SLSH,
-    // row 5
-    KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(LAYER_1), KC_BSPC, KC_HOME, KC_END, KC_LEFT, KC_DOWN,
-      KC_RIGHT
-  ),
-
-  /*
-  -------------------------------------------------------------
-  |   | F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|   |Ins|
-  -------------------------------------------------------------
-  |     |   |   | @ |   |   |   |   |   |   |   |   |   |     |
-  --------------------------------------------------------    -
-  |      |   |   |   |   |   |   |   |   |   |   |   |   |    |
-  -------------------------------------------------------------
-  |        |   |   |Cal|   |www|   |Mut|   |   |      |VUp|   |
-  -------------------------------------------------------------
-  |    |    |    |  Pause   |    |        |PUp|PDn|PTk|VDn|NTk|
-  -------------------------------------------------------------
-  @: Email
-  Cal: Calculator
-  Ins: Insert
-  Mut: Mute
-  NTk: Next track
-  PDn: Page down
-  PTk: Previous track
-  PUp: Page up
-  VDn: Volume down
-  VUp: Volume up
-  www: Browser home page
-  */
-  [LAYER_1] = LAYOUT_hhkb_arrow(
-    // row 1
-    KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
-      KC_F12, KC_TRNS, KC_INS,
-    // row 2
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_MAIL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    // row 3
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, KC_TRNS, KC_TRNS,
-    // row 4
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_CALC, KC_TRNS, KC_WHOM, KC_TRNS, KC_MUTE, KC_TRNS, KC_TRNS,
-      KC_TRNS, KC_VOLU, KC_TRNS,
-    // row 5
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_TRNS, KC_TRNS, KC_PGUP, KC_PGDN, KC_MPRV, KC_VOLD,
-      KC_MNXT
-  )
-};
-
-/*
-Capslock's led cannot be controlled separately on bananasplit and you can only turn on/off all
-  leds at once. If you only install led for capslock, it will look like capslock has toggable
-  backlight.
-*/
-bool led_update_user(led_t led_state) {
-  if (led_state.caps_lock) {
-    DDRB |= (1 << 7);
-    PORTB |= (1 << 7);
-  } else {
-    DDRB &= ~(1 << 7);
-    PORTB &= ~(1 << 7);
-  }
-  return false;
-}
diff --git a/keyboards/thevankeyboards/bananasplit/keymaps/jockyxu1122_iso/readme.md b/keyboards/thevankeyboards/bananasplit/keymaps/jockyxu1122_iso/readme.md
deleted file mode 100644
index e135f73e3a7..00000000000
--- a/keyboards/thevankeyboards/bananasplit/keymaps/jockyxu1122_iso/readme.md
+++ /dev/null
@@ -1,61 +0,0 @@
-Yida's keymap for BananaSplit
-===
-
-Hightlight: split backspace, ISO Enter, split space, arrows on bottom right, and toggable capslock backlight.
-
-Note that "Previous track" and "next track" might only work with Windows.
-
-Default layer:
-```
-  -------------------------------------------------------------
-  |Esc| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | ` |Del|
-  -------------------------------------------------------------
-  | Tab | Q | W | E | R | T | Y | U | I | O | P | [ | ] | Ent |
-  --------------------------------------------------------    -
-  | Caps | A | S | D | F | G | H | J | K | L | ; | ' | \ |    |
-  -------------------------------------------------------------
-  | Shift  | Z | X | C | V | B | N | M | , | . | Shift| Up| / |
-  -------------------------------------------------------------
-  |Ctrl| GUI| Alt|  Space   |MoL1| Backspc| Hm|End| <-|Dwn| ->|
-  -------------------------------------------------------------
-  Hm: Home
-  MoL1: Mo(L1)
-```
-
-Layer_1:
-```
-  -------------------------------------------------------------
-  |   | F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|   |Ins|
-  -------------------------------------------------------------
-  |     |   |   | @ |   |   |   |   |   |   |   |   |   |     |
-  --------------------------------------------------------    -
-  |      |   |   |   |   |   |   |   |   |   |   |   |   |    |
-  -------------------------------------------------------------
-  |        |   |   |Cal|   |www|   |Mut|   |   |      |VUp|   |
-  -------------------------------------------------------------
-  |    |    |    |  Pause   |    |        |PUp|PDn|PTk|VDn|NTk|
-  -------------------------------------------------------------
-  @: Email
-  Cal: Calculator
-  Ins: Insert
-  Mut: Mute
-  NTk: Next track
-  PDn: Page down
-  PTk: Previous track
-  PUp: Page up
-  VDn: Volume down
-  VUp: Volume up
-  www: Browser home page
-```
-
-Compile and flash:
-
-`cd` to `/qmk_firmware` folder, then
-```
-make bananasplit:jockyxu1122_iso
-```
-
-A .hex file will be generated under `/qmk_firmware` folder.
-
-
-To flash, use QMK Toolbox.
diff --git a/keyboards/thevankeyboards/minivan/keymaps/like_jis/config.h b/keyboards/thevankeyboards/minivan/keymaps/like_jis/config.h
index 49d7d463aaf..07915657c10 100644
--- a/keyboards/thevankeyboards/minivan/keymaps/like_jis/config.h
+++ b/keyboards/thevankeyboards/minivan/keymaps/like_jis/config.h
@@ -38,5 +38,5 @@
 #ifdef RGBLIGHT_ENABLE
   #define WS2812_DI_PIN D0
   #define RGBLIGHT_TIMER
-  #define RGBLED_NUM 3
+  #define RGBLIGHT_LED_COUNT 3
 #endif
diff --git a/keyboards/tkc/portico68v2/portico68v2.c b/keyboards/tkc/portico68v2/portico68v2.c
index 5c5f65f10d0..0f3c557b2ca 100644
--- a/keyboards/tkc/portico68v2/portico68v2.c
+++ b/keyboards/tkc/portico68v2/portico68v2.c
@@ -19,89 +19,89 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifdef RGB_MATRIX_ENABLE
 const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
-    {0, CS18_SW1, CS17_SW1, CS16_SW1}, /* RGB1 */
-    {0, CS18_SW2, CS17_SW2, CS16_SW2}, /* RGB2 */
-    {0, CS18_SW3, CS17_SW3, CS16_SW3}, /* RGB3 */
-    {0, CS18_SW4, CS17_SW4, CS16_SW4}, /* RGB4 */
-    {0, CS18_SW5, CS17_SW5, CS16_SW5}, /* RGB5 */
-    {0, CS18_SW6, CS17_SW6, CS16_SW6}, /* RGB6 */
-    {0, CS18_SW7, CS17_SW7, CS16_SW7}, /* RGB7 */
-    {0, CS18_SW8, CS17_SW8, CS16_SW8}, /* RGB8 */
-    {0, CS18_SW9, CS17_SW9, CS16_SW9}, /* RGB9 */
-    {0, CS21_SW1, CS20_SW1, CS19_SW1}, /* RGB10 */
-    {0, CS21_SW2, CS20_SW2, CS19_SW2}, /* RGB11 */
-    {0, CS21_SW3, CS20_SW3, CS19_SW3}, /* RGB12 */
-    {0, CS21_SW4, CS20_SW4, CS19_SW4}, /* RGB13 */
-    {0, CS21_SW5, CS20_SW5, CS19_SW5}, /* RGB14 */
-    {0, CS21_SW6, CS20_SW6, CS19_SW6}, /* RGB15 */
-    {0, CS15_SW1, CS14_SW1, CS13_SW1}, /* RGB16 */
-    {0, CS15_SW2, CS14_SW2, CS13_SW2}, /* RGB17 */
-    {0, CS15_SW3, CS14_SW3, CS13_SW3}, /* RGB18 */
-    {0, CS15_SW4, CS14_SW4, CS13_SW4}, /* RGB19 */
-    {0, CS15_SW5, CS14_SW5, CS13_SW5}, /* RGB20 */
-    {0, CS15_SW6, CS14_SW6, CS13_SW6}, /* RGB21 */
-    {0, CS15_SW7, CS14_SW7, CS13_SW7}, /* RGB22 */
-    {0, CS15_SW8, CS14_SW8, CS13_SW8}, /* RGB23 */
-    {0, CS15_SW9, CS14_SW9, CS13_SW9}, /* RGB24 */
-    {0, CS24_SW1, CS23_SW1, CS22_SW1}, /* RGB25 */
-    {0, CS24_SW2, CS23_SW2, CS22_SW2}, /* RGB26 */
-    {0, CS24_SW3, CS23_SW3, CS22_SW3}, /* RGB27 */
-    {0, CS24_SW4, CS23_SW4, CS22_SW4}, /* RGB28 */
-    {0, CS24_SW5, CS23_SW5, CS22_SW5}, /* RGB29 */
-    {0, CS24_SW6, CS23_SW6, CS22_SW6}, /* RGB30 */
-    {0, CS12_SW1, CS11_SW1, CS10_SW1}, /* RGB31 */
-    {0, CS12_SW2, CS11_SW2, CS10_SW2}, /* RGB32 */
-    {0, CS12_SW3, CS11_SW3, CS10_SW3}, /* RGB33 */
-    {0, CS12_SW4, CS11_SW4, CS10_SW4}, /* RGB34 */
-    {0, CS12_SW5, CS11_SW5, CS10_SW5}, /* RGB35 */
-    {0, CS12_SW6, CS11_SW6, CS10_SW6}, /* RGB36 */
-    {0, CS12_SW7, CS11_SW7, CS10_SW7}, /* RGB37 */
-    {0, CS12_SW8, CS11_SW8, CS10_SW8}, /* RGB38 */
-    {0, CS12_SW9, CS11_SW9, CS10_SW9}, /* RGB39 */
-    {0, CS27_SW1, CS26_SW1, CS25_SW1}, /* RGB40 */
-    {0, CS27_SW2, CS26_SW2, CS25_SW2}, /* RGB41 */
-    {0, CS27_SW3, CS26_SW3, CS25_SW3}, /* RGB42 */
-    {0, CS27_SW4, CS26_SW4, CS25_SW4}, /* RGB43 */
-    {0, CS27_SW6, CS26_SW6, CS25_SW6}, /* RGB44 */
-    {0, CS9_SW1, CS8_SW1, CS7_SW1}, /* RGB45 */
-    {0, CS9_SW3, CS8_SW3, CS7_SW3}, /* RGB46 */
-    {0, CS9_SW4, CS8_SW4, CS7_SW4}, /* RGB47 */
-    {0, CS9_SW5, CS8_SW5, CS7_SW5}, /* RGB48 */
-    {0, CS9_SW6, CS8_SW6, CS7_SW6}, /* RGB49 */
-    {0, CS9_SW7, CS8_SW7, CS7_SW7}, /* RGB50 */
-    {0, CS9_SW8, CS8_SW8, CS7_SW8}, /* RGB51 */
-    {0, CS9_SW9, CS8_SW9, CS7_SW9}, /* RGB52 */
-    {0, CS30_SW1, CS29_SW1, CS28_SW1}, /* RGB53 */
-    {0, CS30_SW2, CS29_SW2, CS28_SW2}, /* RGB54 */
-    {0, CS30_SW3, CS29_SW3, CS28_SW3}, /* RGB55 */
-    {0, CS30_SW4, CS29_SW4, CS28_SW4}, /* RGB56 */
-    {0, CS30_SW5, CS29_SW5, CS28_SW5}, /* RGB57 */
-    {0, CS30_SW6, CS29_SW6, CS28_SW6}, /* RGB58 */
-    {0, CS6_SW1, CS5_SW1, CS4_SW1}, /* RGB59 */
-    {0, CS6_SW2, CS5_SW2, CS4_SW2}, /* RGB60 */
-    {0, CS6_SW3, CS5_SW3, CS4_SW3}, /* RGB61 */
-    {0, CS6_SW7, CS5_SW7, CS4_SW7}, /* RGB62 */
-    {0, CS33_SW2, CS32_SW2, CS31_SW2}, /* RGB63 */
-    {0, CS33_SW3, CS32_SW3, CS31_SW3}, /* RGB64 */
-    {0, CS33_SW4, CS32_SW4, CS31_SW4}, /* RGB65 */
-    {0, CS33_SW5, CS32_SW5, CS31_SW5}, /* RGB66 */
-    {0, CS33_SW6, CS32_SW6, CS31_SW6}, /* RGB67 */
+    {0, SW1_CS18, SW1_CS17, SW1_CS16}, /* RGB1 */
+    {0, SW2_CS18, SW2_CS17, SW2_CS16}, /* RGB2 */
+    {0, SW3_CS18, SW3_CS17, SW3_CS16}, /* RGB3 */
+    {0, SW4_CS18, SW4_CS17, SW4_CS16}, /* RGB4 */
+    {0, SW5_CS18, SW5_CS17, SW5_CS16}, /* RGB5 */
+    {0, SW6_CS18, SW6_CS17, SW6_CS16}, /* RGB6 */
+    {0, SW7_CS18, SW7_CS17, SW7_CS16}, /* RGB7 */
+    {0, SW8_CS18, SW8_CS17, SW8_CS16}, /* RGB8 */
+    {0, SW9_CS18, SW9_CS17, SW9_CS16}, /* RGB9 */
+    {0, SW1_CS21, SW1_CS20, SW1_CS19}, /* RGB10 */
+    {0, SW2_CS21, SW2_CS20, SW2_CS19}, /* RGB11 */
+    {0, SW3_CS21, SW3_CS20, SW3_CS19}, /* RGB12 */
+    {0, SW4_CS21, SW4_CS20, SW4_CS19}, /* RGB13 */
+    {0, SW5_CS21, SW5_CS20, SW5_CS19}, /* RGB14 */
+    {0, SW6_CS21, SW6_CS20, SW6_CS19}, /* RGB15 */
+    {0, SW1_CS15, SW1_CS14, SW1_CS13}, /* RGB16 */
+    {0, SW2_CS15, SW2_CS14, SW2_CS13}, /* RGB17 */
+    {0, SW3_CS15, SW3_CS14, SW3_CS13}, /* RGB18 */
+    {0, SW4_CS15, SW4_CS14, SW4_CS13}, /* RGB19 */
+    {0, SW5_CS15, SW5_CS14, SW5_CS13}, /* RGB20 */
+    {0, SW6_CS15, SW6_CS14, SW6_CS13}, /* RGB21 */
+    {0, SW7_CS15, SW7_CS14, SW7_CS13}, /* RGB22 */
+    {0, SW8_CS15, SW8_CS14, SW8_CS13}, /* RGB23 */
+    {0, SW9_CS15, SW9_CS14, SW9_CS13}, /* RGB24 */
+    {0, SW1_CS24, SW1_CS23, SW1_CS22}, /* RGB25 */
+    {0, SW2_CS24, SW2_CS23, SW2_CS22}, /* RGB26 */
+    {0, SW3_CS24, SW3_CS23, SW3_CS22}, /* RGB27 */
+    {0, SW4_CS24, SW4_CS23, SW4_CS22}, /* RGB28 */
+    {0, SW5_CS24, SW5_CS23, SW5_CS22}, /* RGB29 */
+    {0, SW6_CS24, SW6_CS23, SW6_CS22}, /* RGB30 */
+    {0, SW1_CS12, SW1_CS11, SW1_CS10}, /* RGB31 */
+    {0, SW2_CS12, SW2_CS11, SW2_CS10}, /* RGB32 */
+    {0, SW3_CS12, SW3_CS11, SW3_CS10}, /* RGB33 */
+    {0, SW4_CS12, SW4_CS11, SW4_CS10}, /* RGB34 */
+    {0, SW5_CS12, SW5_CS11, SW5_CS10}, /* RGB35 */
+    {0, SW6_CS12, SW6_CS11, SW6_CS10}, /* RGB36 */
+    {0, SW7_CS12, SW7_CS11, SW7_CS10}, /* RGB37 */
+    {0, SW8_CS12, SW8_CS11, SW8_CS10}, /* RGB38 */
+    {0, SW9_CS12, SW9_CS11, SW9_CS10}, /* RGB39 */
+    {0, SW1_CS27, SW1_CS26, SW1_CS25}, /* RGB40 */
+    {0, SW2_CS27, SW2_CS26, SW2_CS25}, /* RGB41 */
+    {0, SW3_CS27, SW3_CS26, SW3_CS25}, /* RGB42 */
+    {0, SW4_CS27, SW4_CS26, SW4_CS25}, /* RGB43 */
+    {0, SW6_CS27, SW6_CS26, SW6_CS25}, /* RGB44 */
+    {0, SW1_CS9, SW1_CS8, SW1_CS7}, /* RGB45 */
+    {0, SW3_CS9, SW3_CS8, SW3_CS7}, /* RGB46 */
+    {0, SW4_CS9, SW4_CS8, SW4_CS7}, /* RGB47 */
+    {0, SW5_CS9, SW5_CS8, SW5_CS7}, /* RGB48 */
+    {0, SW6_CS9, SW6_CS8, SW6_CS7}, /* RGB49 */
+    {0, SW7_CS9, SW7_CS8, SW7_CS7}, /* RGB50 */
+    {0, SW8_CS9, SW8_CS8, SW8_CS7}, /* RGB51 */
+    {0, SW9_CS9, SW9_CS8, SW9_CS7}, /* RGB52 */
+    {0, SW1_CS30, SW1_CS29, SW1_CS28}, /* RGB53 */
+    {0, SW2_CS30, SW2_CS29, SW2_CS28}, /* RGB54 */
+    {0, SW3_CS30, SW3_CS29, SW3_CS28}, /* RGB55 */
+    {0, SW4_CS30, SW4_CS29, SW4_CS28}, /* RGB56 */
+    {0, SW5_CS30, SW5_CS29, SW5_CS28}, /* RGB57 */
+    {0, SW6_CS30, SW6_CS29, SW6_CS28}, /* RGB58 */
+    {0, SW1_CS6, SW1_CS5, SW1_CS4}, /* RGB59 */
+    {0, SW2_CS6, SW2_CS5, SW2_CS4}, /* RGB60 */
+    {0, SW3_CS6, SW3_CS5, SW3_CS4}, /* RGB61 */
+    {0, SW7_CS6, SW7_CS5, SW7_CS4}, /* RGB62 */
+    {0, SW2_CS33, SW2_CS32, SW2_CS31}, /* RGB63 */
+    {0, SW3_CS33, SW3_CS32, SW3_CS31}, /* RGB64 */
+    {0, SW4_CS33, SW4_CS32, SW4_CS31}, /* RGB65 */
+    {0, SW5_CS33, SW5_CS32, SW5_CS31}, /* RGB66 */
+    {0, SW6_CS33, SW6_CS32, SW6_CS31}, /* RGB67 */
 
-    {0,CS36_SW1,CS35_SW1,CS34_SW1}, /* RGB68 */
-    {0,CS36_SW2,CS35_SW2,CS34_SW2}, /* RGB69 */
-    {0,CS36_SW3,CS35_SW3,CS34_SW3}, /* RGB70 */
-    {0,CS36_SW4,CS35_SW4,CS34_SW4}, /* RGB71 */
-    {0,CS36_SW5,CS35_SW5,CS34_SW5}, /* RGB72 */
-    {0,CS36_SW6,CS35_SW6,CS34_SW6}, /* RGB73 */
-    {0,CS36_SW7,CS35_SW7,CS34_SW7}, /* RGB74 */
-    {0,CS36_SW8,CS35_SW8,CS34_SW8}, /* RGB75 */
-    {0,CS36_SW9,CS35_SW9,CS34_SW9}, /* RGB76 */
-    {0,CS39_SW1,CS38_SW1,CS37_SW1}, /* RGB77 */
-    {0,CS39_SW2,CS38_SW2,CS37_SW2}, /* RGB78 */
-    {0,CS39_SW3,CS38_SW3,CS37_SW3}, /* RGB79 */
-    {0,CS39_SW4,CS38_SW4,CS37_SW4}, /* RGB80 */
-    {0,CS39_SW5,CS38_SW5,CS37_SW5}, /* RGB81 */
-    {0,CS39_SW6,CS38_SW6,CS37_SW6}, /* RGB82 */
+    {0,SW1_CS36,SW1_CS35,SW1_CS34}, /* RGB68 */
+    {0,SW2_CS36,SW2_CS35,SW2_CS34}, /* RGB69 */
+    {0,SW3_CS36,SW3_CS35,SW3_CS34}, /* RGB70 */
+    {0,SW4_CS36,SW4_CS35,SW4_CS34}, /* RGB71 */
+    {0,SW5_CS36,SW5_CS35,SW5_CS34}, /* RGB72 */
+    {0,SW6_CS36,SW6_CS35,SW6_CS34}, /* RGB73 */
+    {0,SW7_CS36,SW7_CS35,SW7_CS34}, /* RGB74 */
+    {0,SW8_CS36,SW8_CS35,SW8_CS34}, /* RGB75 */
+    {0,SW9_CS36,SW9_CS35,SW9_CS34}, /* RGB76 */
+    {0,SW1_CS39,SW1_CS38,SW1_CS37}, /* RGB77 */
+    {0,SW2_CS39,SW2_CS38,SW2_CS37}, /* RGB78 */
+    {0,SW3_CS39,SW3_CS38,SW3_CS37}, /* RGB79 */
+    {0,SW4_CS39,SW4_CS38,SW4_CS37}, /* RGB80 */
+    {0,SW5_CS39,SW5_CS38,SW5_CS37}, /* RGB81 */
+    {0,SW6_CS39,SW6_CS38,SW6_CS37}, /* RGB82 */
 };
 
 led_config_t g_led_config = {
diff --git a/keyboards/tkc/portico75/portico75.c b/keyboards/tkc/portico75/portico75.c
index 0a22a37d4e3..cd6dafe31aa 100644
--- a/keyboards/tkc/portico75/portico75.c
+++ b/keyboards/tkc/portico75/portico75.c
@@ -25,119 +25,119 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #if defined(RGB_MATRIX_ENABLE) || defined(RGB_BACKLIGHT_PORTICO75)
 
 const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
-    {0, CS18_SW1, CS17_SW1, CS16_SW1},
-    {0, CS18_SW2, CS17_SW2, CS16_SW2},
-    {0, CS18_SW3, CS17_SW3, CS16_SW3},
-    {0, CS18_SW4, CS17_SW4, CS16_SW4},
-    {0, CS18_SW5, CS17_SW5, CS16_SW5},
-    {0, CS18_SW6, CS17_SW6, CS16_SW6},
-    {0, CS18_SW7, CS17_SW7, CS16_SW7},
-    {0, CS18_SW8, CS17_SW8, CS16_SW8},
-    {0, CS18_SW9, CS17_SW9, CS16_SW9},
+    {0, SW1_CS18, SW1_CS17, SW1_CS16},
+    {0, SW2_CS18, SW2_CS17, SW2_CS16},
+    {0, SW3_CS18, SW3_CS17, SW3_CS16},
+    {0, SW4_CS18, SW4_CS17, SW4_CS16},
+    {0, SW5_CS18, SW5_CS17, SW5_CS16},
+    {0, SW6_CS18, SW6_CS17, SW6_CS16},
+    {0, SW7_CS18, SW7_CS17, SW7_CS16},
+    {0, SW8_CS18, SW8_CS17, SW8_CS16},
+    {0, SW9_CS18, SW9_CS17, SW9_CS16},
 
-    {0, CS21_SW1, CS20_SW1, CS19_SW1},
-    {0, CS21_SW2, CS20_SW2, CS19_SW2},
-    {0, CS21_SW3, CS20_SW3, CS19_SW3},
-    {0, CS21_SW4, CS20_SW4, CS19_SW4},
-    {0, CS21_SW5, CS20_SW5, CS19_SW5},
-    {0, CS21_SW6, CS20_SW6, CS19_SW6}, //Encoder, NO_LED
+    {0, SW1_CS21, SW1_CS20, SW1_CS19},
+    {0, SW2_CS21, SW2_CS20, SW2_CS19},
+    {0, SW3_CS21, SW3_CS20, SW3_CS19},
+    {0, SW4_CS21, SW4_CS20, SW4_CS19},
+    {0, SW5_CS21, SW5_CS20, SW5_CS19},
+    {0, SW6_CS21, SW6_CS20, SW6_CS19}, //Encoder, NO_LED
 
-    {0, CS15_SW1, CS14_SW1, CS13_SW1},
-    {0, CS15_SW2, CS14_SW2, CS13_SW2},
-    {0, CS15_SW3, CS14_SW3, CS13_SW3},
-    {0, CS15_SW4, CS14_SW4, CS13_SW4},
-    {0, CS15_SW5, CS14_SW5, CS13_SW5},
-    {0, CS15_SW6, CS14_SW6, CS13_SW6},
-    {0, CS15_SW7, CS14_SW7, CS13_SW7},
-    {0, CS15_SW8, CS14_SW8, CS13_SW8},
-    {0, CS15_SW9, CS14_SW9, CS13_SW9},
+    {0, SW1_CS15, SW1_CS14, SW1_CS13},
+    {0, SW2_CS15, SW2_CS14, SW2_CS13},
+    {0, SW3_CS15, SW3_CS14, SW3_CS13},
+    {0, SW4_CS15, SW4_CS14, SW4_CS13},
+    {0, SW5_CS15, SW5_CS14, SW5_CS13},
+    {0, SW6_CS15, SW6_CS14, SW6_CS13},
+    {0, SW7_CS15, SW7_CS14, SW7_CS13},
+    {0, SW8_CS15, SW8_CS14, SW8_CS13},
+    {0, SW9_CS15, SW9_CS14, SW9_CS13},
 
-    {0, CS24_SW1, CS23_SW1, CS22_SW1},
-    {0, CS24_SW2, CS23_SW2, CS22_SW2},
-    {0, CS24_SW3, CS23_SW3, CS22_SW3},
-    {0, CS24_SW4, CS23_SW4, CS22_SW4},
-    {0, CS24_SW5, CS23_SW5, CS22_SW5},
-    {0, CS24_SW6, CS23_SW6, CS22_SW6},
+    {0, SW1_CS24, SW1_CS23, SW1_CS22},
+    {0, SW2_CS24, SW2_CS23, SW2_CS22},
+    {0, SW3_CS24, SW3_CS23, SW3_CS22},
+    {0, SW4_CS24, SW4_CS23, SW4_CS22},
+    {0, SW5_CS24, SW5_CS23, SW5_CS22},
+    {0, SW6_CS24, SW6_CS23, SW6_CS22},
 
-    {0, CS12_SW1, CS11_SW1, CS10_SW1},
-    {0, CS12_SW2, CS11_SW2, CS10_SW2},
-    {0, CS12_SW3, CS11_SW3, CS10_SW3},
-    {0, CS12_SW4, CS11_SW4, CS10_SW4},
-    {0, CS12_SW5, CS11_SW5, CS10_SW5},
-    {0, CS12_SW6, CS11_SW6, CS10_SW6},
-    {0, CS12_SW7, CS11_SW7, CS10_SW7},
-    {0, CS12_SW8, CS11_SW8, CS10_SW8},
-    {0, CS12_SW9, CS11_SW9, CS10_SW9},
+    {0, SW1_CS12, SW1_CS11, SW1_CS10},
+    {0, SW2_CS12, SW2_CS11, SW2_CS10},
+    {0, SW3_CS12, SW3_CS11, SW3_CS10},
+    {0, SW4_CS12, SW4_CS11, SW4_CS10},
+    {0, SW5_CS12, SW5_CS11, SW5_CS10},
+    {0, SW6_CS12, SW6_CS11, SW6_CS10},
+    {0, SW7_CS12, SW7_CS11, SW7_CS10},
+    {0, SW8_CS12, SW8_CS11, SW8_CS10},
+    {0, SW9_CS12, SW9_CS11, SW9_CS10},
 
-    {0, CS27_SW1, CS26_SW1, CS25_SW1},
-    {0, CS27_SW2, CS26_SW2, CS25_SW2},
-    {0, CS27_SW3, CS26_SW3, CS25_SW3},
-    {0, CS27_SW4, CS26_SW4, CS25_SW4},
-    {0, CS27_SW5, CS26_SW5, CS25_SW5},
-    {0, CS27_SW6, CS26_SW6, CS25_SW6},
+    {0, SW1_CS27, SW1_CS26, SW1_CS25},
+    {0, SW2_CS27, SW2_CS26, SW2_CS25},
+    {0, SW3_CS27, SW3_CS26, SW3_CS25},
+    {0, SW4_CS27, SW4_CS26, SW4_CS25},
+    {0, SW5_CS27, SW5_CS26, SW5_CS25},
+    {0, SW6_CS27, SW6_CS26, SW6_CS25},
 
-    {0, CS9_SW1, CS8_SW1, CS7_SW1},
-    {0, CS9_SW2, CS8_SW2, CS7_SW2},
-    {0, CS9_SW3, CS8_SW3, CS7_SW3},
-    {0, CS9_SW4, CS8_SW4, CS7_SW4},
-    {0, CS9_SW5, CS8_SW5, CS7_SW5},
-    {0, CS9_SW6, CS8_SW6, CS7_SW6},
-    {0, CS9_SW7, CS8_SW7, CS7_SW7},
-    {0, CS9_SW8, CS8_SW8, CS7_SW8},
-    {0, CS9_SW9, CS8_SW9, CS7_SW9},
+    {0, SW1_CS9, SW1_CS8, SW1_CS7},
+    {0, SW2_CS9, SW2_CS8, SW2_CS7},
+    {0, SW3_CS9, SW3_CS8, SW3_CS7},
+    {0, SW4_CS9, SW4_CS8, SW4_CS7},
+    {0, SW5_CS9, SW5_CS8, SW5_CS7},
+    {0, SW6_CS9, SW6_CS8, SW6_CS7},
+    {0, SW7_CS9, SW7_CS8, SW7_CS7},
+    {0, SW8_CS9, SW8_CS8, SW8_CS7},
+    {0, SW9_CS9, SW9_CS8, SW9_CS7},
 
-    {0, CS30_SW1, CS29_SW1, CS28_SW1},
-    {0, CS30_SW2, CS29_SW2, CS28_SW2},
-    {0, CS30_SW3, CS29_SW3, CS28_SW3},
-    {0, CS30_SW4, CS29_SW4, CS28_SW4},
+    {0, SW1_CS30, SW1_CS29, SW1_CS28},
+    {0, SW2_CS30, SW2_CS29, SW2_CS28},
+    {0, SW3_CS30, SW3_CS29, SW3_CS28},
+    {0, SW4_CS30, SW4_CS29, SW4_CS28},
 
-    {0, CS6_SW1, CS5_SW1, CS4_SW1},
-    {0, CS6_SW2, CS5_SW2, CS4_SW2},
-    {0, CS6_SW3, CS5_SW3, CS4_SW3},
-    {0, CS6_SW4, CS5_SW4, CS4_SW4},
-    {0, CS6_SW5, CS5_SW5, CS4_SW5},
-    {0, CS6_SW6, CS5_SW6, CS4_SW6},
-    {0, CS6_SW7, CS5_SW7, CS4_SW7},
-    {0, CS6_SW8, CS5_SW8, CS4_SW8},
-    {0, CS6_SW9, CS5_SW9, CS4_SW9},
+    {0, SW1_CS6, SW1_CS5, SW1_CS4},
+    {0, SW2_CS6, SW2_CS5, SW2_CS4},
+    {0, SW3_CS6, SW3_CS5, SW3_CS4},
+    {0, SW4_CS6, SW4_CS5, SW4_CS4},
+    {0, SW5_CS6, SW5_CS5, SW5_CS4},
+    {0, SW6_CS6, SW6_CS5, SW6_CS4},
+    {0, SW7_CS6, SW7_CS5, SW7_CS4},
+    {0, SW8_CS6, SW8_CS5, SW8_CS4},
+    {0, SW9_CS6, SW9_CS5, SW9_CS4},
 
-    {0, CS33_SW1, CS32_SW1, CS31_SW1},
-    {0, CS33_SW2, CS32_SW2, CS31_SW2},
-    {0, CS33_SW3, CS32_SW3, CS31_SW3},
-    {0, CS33_SW4, CS32_SW4, CS31_SW4},
+    {0, SW1_CS33, SW1_CS32, SW1_CS31},
+    {0, SW2_CS33, SW2_CS32, SW2_CS31},
+    {0, SW3_CS33, SW3_CS32, SW3_CS31},
+    {0, SW4_CS33, SW4_CS32, SW4_CS31},
 
-    {0, CS3_SW1, CS2_SW1, CS1_SW1},
-    {0, CS3_SW2, CS2_SW2, CS1_SW2},
-    {0, CS3_SW3, CS2_SW3, CS1_SW3},
-    {0, CS3_SW6, CS2_SW6, CS1_SW6},
-    {0, CS3_SW8, CS2_SW8, CS1_SW8},
-    {0, CS3_SW9, CS2_SW9, CS1_SW9},
+    {0, SW1_CS3, SW1_CS2, SW1_CS1},
+    {0, SW2_CS3, SW2_CS2, SW2_CS1},
+    {0, SW3_CS3, SW3_CS2, SW3_CS1},
+    {0, SW6_CS3, SW6_CS2, SW6_CS1},
+    {0, SW8_CS3, SW8_CS2, SW8_CS1},
+    {0, SW9_CS3, SW9_CS2, SW9_CS1},
 
-    {0, CS36_SW1, CS35_SW1, CS34_SW1},
-    {0, CS36_SW2, CS35_SW2, CS34_SW2},
-    {0, CS36_SW3, CS35_SW3, CS34_SW3},
+    {0, SW1_CS36, SW1_CS35, SW1_CS34},
+    {0, SW2_CS36, SW2_CS35, SW2_CS34},
+    {0, SW3_CS36, SW3_CS35, SW3_CS34},
 
 /*UNDERGLOW*/
-    {0, CS39_SW1, CS38_SW1, CS37_SW1},
-    {0, CS39_SW2, CS38_SW2, CS37_SW2},
-    {0, CS39_SW3, CS38_SW3, CS37_SW3},
-    {0, CS39_SW4, CS38_SW4, CS37_SW4},
-    {0, CS39_SW5, CS38_SW5, CS37_SW5},
-    {0, CS39_SW6, CS38_SW6, CS37_SW6},
-    {0, CS39_SW7, CS38_SW7, CS37_SW7},
-    {0, CS39_SW8, CS38_SW8, CS37_SW8},
-    {0, CS39_SW9, CS38_SW9, CS37_SW9},
+    {0, SW1_CS39, SW1_CS38, SW1_CS37},
+    {0, SW2_CS39, SW2_CS38, SW2_CS37},
+    {0, SW3_CS39, SW3_CS38, SW3_CS37},
+    {0, SW4_CS39, SW4_CS38, SW4_CS37},
+    {0, SW5_CS39, SW5_CS38, SW5_CS37},
+    {0, SW6_CS39, SW6_CS38, SW6_CS37},
+    {0, SW7_CS39, SW7_CS38, SW7_CS37},
+    {0, SW8_CS39, SW8_CS38, SW8_CS37},
+    {0, SW9_CS39, SW9_CS38, SW9_CS37},
 
-    {0, CS36_SW4, CS35_SW4, CS34_SW4},
-    {0, CS36_SW5, CS35_SW5, CS34_SW5},
-    {0, CS36_SW6, CS35_SW6, CS34_SW6},
-    {0, CS36_SW7, CS35_SW7, CS34_SW7},
-    {0, CS36_SW8, CS35_SW8, CS34_SW8},
-    {0, CS36_SW9, CS35_SW9, CS34_SW9},
+    {0, SW4_CS36, SW4_CS35, SW4_CS34},
+    {0, SW5_CS36, SW5_CS35, SW5_CS34},
+    {0, SW6_CS36, SW6_CS35, SW6_CS34},
+    {0, SW7_CS36, SW7_CS35, SW7_CS34},
+    {0, SW8_CS36, SW8_CS35, SW8_CS34},
+    {0, SW9_CS36, SW9_CS35, SW9_CS34},
 
-    {0, CS33_SW5, CS32_SW5, CS31_SW5},
-    {0, CS33_SW6, CS32_SW6, CS31_SW6},
-    {0, CS33_SW7, CS32_SW7, CS31_SW7},
+    {0, SW5_CS33, SW5_CS32, SW5_CS31},
+    {0, SW6_CS33, SW6_CS32, SW6_CS31},
+    {0, SW7_CS33, SW7_CS32, SW7_CS31},
 };
 #endif
 
diff --git a/keyboards/tkw/grandiceps/config.h b/keyboards/tkw/grandiceps/config.h
index a963fbfb510..a02e14f91f0 100644
--- a/keyboards/tkw/grandiceps/config.h
+++ b/keyboards/tkw/grandiceps/config.h
@@ -20,5 +20,5 @@
 #define WS2812_PWM_DRIVER PWMD3
 #define WS2812_PWM_CHANNEL 4
 #define WS2812_PWM_PAL_MODE 2
-#define WS2812_DMA_STREAM STM32_DMA1_STREAM2
-#define WS2812_DMA_CHANNEL 5
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM2
+#define WS2812_PWM_DMA_CHANNEL 5
diff --git a/keyboards/tkw/stoutgat/v2/config.h b/keyboards/tkw/stoutgat/v2/config.h
index bf68edcfae9..79f47b9bb38 100644
--- a/keyboards/tkw/stoutgat/v2/config.h
+++ b/keyboards/tkw/stoutgat/v2/config.h
@@ -18,8 +18,8 @@
 #define WS2812_PWM_DRIVER PWMD3
 #define WS2812_PWM_CHANNEL 4
 #define WS2812_PWM_PAL_MODE 2
-#define WS2812_DMA_STREAM STM32_DMA1_STREAM2
-#define WS2812_DMA_CHANNEL 5
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM2
+#define WS2812_PWM_DMA_CHANNEL 5
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/tunks/ergo33/keymaps/rgb/config.h b/keyboards/tunks/ergo33/keymaps/rgb/config.h
index 60cee638d25..036bcf81b8f 100644
--- a/keyboards/tunks/ergo33/keymaps/rgb/config.h
+++ b/keyboards/tunks/ergo33/keymaps/rgb/config.h
@@ -20,9 +20,9 @@
  * No external LED PCB: 10
  * External LED PCB: 14
  */
-#if defined(RGBLED_NUM)
-#    undef RGBLED_NUM
-#    define RGBLED_NUM 10
+#if defined(RGBLIGHT_LED_COUNT)
+#    undef RGBLIGHT_LED_COUNT
+#    define RGBLIGHT_LED_COUNT 10
 #endif
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/tweetydabird/lotus58/elite_c/info.json b/keyboards/tweetydabird/lotus58/elite_c/info.json
index 606784570c7..af1a9f913c5 100644
--- a/keyboards/tweetydabird/lotus58/elite_c/info.json
+++ b/keyboards/tweetydabird/lotus58/elite_c/info.json
@@ -1,3 +1,32 @@
 {
-    "bootloader": "atmel-dfu"
+	"build": {
+        "lto": true
+    },
+    "development_board": "elite_c",
+    "pin_compatible": "elite_c",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "F5", "pin_b": "F4", "resolution": 2}
+        ]
+    },
+    "matrix_pins": {
+        "cols": ["B1", "B2", "B3", "B6", "F7", "F6"],
+        "rows": ["D4", "C6", "D7", "E6", "B4"]
+    },
+    "split": {
+        "encoder": {
+            "right": {
+                "rotary": [
+                    {"pin_a": "F4", "pin_b": "F5", "resolution": 2}
+                ]
+            }
+        },
+        "handedness": {
+            "pin": "B5"
+        },
+        "soft_serial_pin": "D2",
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
 }
diff --git a/keyboards/tweetydabird/lotus58/info.json b/keyboards/tweetydabird/lotus58/info.json
index 646843e7652..f4660c3ad9f 100644
--- a/keyboards/tweetydabird/lotus58/info.json
+++ b/keyboards/tweetydabird/lotus58/info.json
@@ -1,17 +1,9 @@
 {
     "manufacturer": "Tweetys Wild Thinking",
-    "keyboard_name": "Lotus 58 Glow (QMK)",
+    "keyboard_name": "Lotus 58 Glow",
     "maintainer": "TweetyDaBird",
     "bootloader_instructions": "Short marked pads on PCB, or hold top-outer key when plugging in each hand.",
-    "build": {
-        "lto": true
-    },
     "diode_direction": "COL2ROW",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "F5", "pin_b": "F4", "resolution": 2}
-        ]
-    },
     "features": {
         "bootmagic": true,
         "command": false,
@@ -25,12 +17,6 @@
         "split": true,
         "tri_layer": true
     },
-    "matrix_pins": {
-        "cols": ["B1", "B2", "B3", "B6", "F7", "F6"],
-        "rows": ["D4", "C6", "D7", "E6", "B4"]
-    },
-    "pin_compatible": "promicro",
-    "processor": "atmega32u4",
     "rgblight": {
         "default": {
             "val": 87
@@ -46,19 +32,7 @@
             "matrix": [5, 0]
         },
         "enabled": true,
-        "encoder": {
-            "right": {
-                "rotary": [
-                    {"pin_a": "F4", "pin_b": "F5", "resolution": 2}
-                ]
-            }
-        },
-        "handedness": {
-            "pin": "B5"
-        },
-        "soft_serial_pin": "D2",
         "transport": {
-            "protocol": "serial",
             "sync": {
                 "indicators": true,
                 "layer_state": true,
@@ -78,9 +52,6 @@
         "pid": "0x23B0",
         "vid": "0xFEED"
     },
-    "ws2812": {
-        "pin": "D3"
-    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/tweetydabird/lotus58/nanoboot/info.json b/keyboards/tweetydabird/lotus58/nanoboot/info.json
new file mode 100644
index 00000000000..e7586e6f2f2
--- /dev/null
+++ b/keyboards/tweetydabird/lotus58/nanoboot/info.json
@@ -0,0 +1,32 @@
+{
+    "build": {
+        "lto": true
+    },
+	"pin_compatible": "promicro",
+    "processor": "atmega32u4",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "F5", "pin_b": "F4", "resolution": 2}
+        ]
+    },
+    "matrix_pins": {
+        "cols": ["B1", "B2", "B3", "B6", "F7", "F6"],
+        "rows": ["D4", "C6", "D7", "E6", "B4"]
+    },
+    "split": {
+        "encoder": {
+            "right": {
+                "rotary": [
+                    {"pin_a": "F4", "pin_b": "F5", "resolution": 2}
+                ]
+            }
+        },
+        "handedness": {
+            "pin": "B5"
+        },
+        "soft_serial_pin": "D2",
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
+}
diff --git a/keyboards/tweetydabird/lotus58/promicro/info.json b/keyboards/tweetydabird/lotus58/promicro/info.json
index 56062f7ad37..62ee0355ef8 100644
--- a/keyboards/tweetydabird/lotus58/promicro/info.json
+++ b/keyboards/tweetydabird/lotus58/promicro/info.json
@@ -1,3 +1,31 @@
 {
-    "bootloader": "caterina"
+    "build": {
+        "lto": true
+    },
+	"development_board": "promicro",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "F5", "pin_b": "F4", "resolution": 2}
+        ]
+    },
+    "matrix_pins": {
+        "cols": ["B1", "B2", "B3", "B6", "F7", "F6"],
+        "rows": ["D4", "C6", "D7", "E6", "B4"]
+    },
+    "split": {
+        "encoder": {
+            "right": {
+                "rotary": [
+                    {"pin_a": "F4", "pin_b": "F5", "resolution": 2}
+                ]
+            }
+        },
+        "handedness": {
+            "pin": "B5"
+        },
+        "soft_serial_pin": "D2",
+    },
+    "ws2812": {
+        "pin": "D3"
+    },
 }
diff --git a/keyboards/tweetydabird/lotus58/rp2040_ce/config.h b/keyboards/tweetydabird/lotus58/rp2040_ce/config.h
new file mode 100644
index 00000000000..e4a23b7d7f0
--- /dev/null
+++ b/keyboards/tweetydabird/lotus58/rp2040_ce/config.h
@@ -0,0 +1,9 @@
+// Copyright 2024 Markus Knutsson (@TweetyDaBird)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#define SERIAL_PIO_USE_PIO1 // Force the usage of PIO1 peripheral, by default the Serial implementation uses the PIO0 peripheral
+
+#define I2C_DRIVER I2CD1
+#define I2C1_SDA_PIN GP2
+#define I2C1_SCL_PIN GP3
diff --git a/keyboards/gray_studio/think65/solder/keymaps/yt/config.h b/keyboards/tweetydabird/lotus58/rp2040_ce/halconf.h
similarity index 90%
rename from keyboards/gray_studio/think65/solder/keymaps/yt/config.h
rename to keyboards/tweetydabird/lotus58/rp2040_ce/halconf.h
index 6bdff5008e4..2e098f5113d 100644
--- a/keyboards/gray_studio/think65/solder/keymaps/yt/config.h
+++ b/keyboards/tweetydabird/lotus58/rp2040_ce/halconf.h
@@ -1,4 +1,4 @@
-/* Copyright 2022 Yt Liu
+/* Copyright 2022 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
@@ -16,4 +16,6 @@
 
 #pragma once
 
-#define RGBLIGHT_LAYERS
+#define HAL_USE_I2C TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/tweetydabird/lotus58/rp2040_ce/info.json b/keyboards/tweetydabird/lotus58/rp2040_ce/info.json
new file mode 100644
index 00000000000..c8bf7117477
--- /dev/null
+++ b/keyboards/tweetydabird/lotus58/rp2040_ce/info.json
@@ -0,0 +1,29 @@
+{
+    "development_board": "promicro_rp2040",
+	"encoder": {
+        "rotary": [
+            {"pin_a": "GP28", "pin_b": "GP29", "resolution": 2}
+        ]
+    },
+    "matrix_pins": {
+        "cols": ["GP22", "GP23", "GP20", "GP21", "GP26", "GP27"],
+        "rows": ["GP4", "GP5", "GP6", "GP7", "GP8"]
+    },
+    "split": {
+        "encoder": {
+            "right": {
+                "rotary": [
+                    {"pin_a": "GP29", "pin_b": "GP28", "resolution": 2}
+                ]
+            }
+        },
+        "soft_serial_pin": "GP1",
+        "handedness": {
+            "pin": "GP9"
+        }
+	},
+	"ws2812": {
+		"driver": "vendor",
+		"pin": "GP0"
+	}
+}
diff --git a/keyboards/ibm/model_m_ssk/teensypp_ssk/keymaps/tiltowait/config.h b/keyboards/tweetydabird/lotus58/rp2040_ce/mcuconf.h
similarity index 86%
rename from keyboards/ibm/model_m_ssk/teensypp_ssk/keymaps/tiltowait/config.h
rename to keyboards/tweetydabird/lotus58/rp2040_ce/mcuconf.h
index 151118fdf67..2ae39bf675d 100644
--- a/keyboards/ibm/model_m_ssk/teensypp_ssk/keymaps/tiltowait/config.h
+++ b/keyboards/tweetydabird/lotus58/rp2040_ce/mcuconf.h
@@ -1,4 +1,4 @@
-/* Copyright 2021 tiltowait
+/* Copyright 2022 QMK
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -13,9 +13,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
+ 
 #pragma once
 
-// place overrides here
+#include_next <mcuconf.h>
 
-#define PERMISSIVE_HOLD
+#undef RP_I2C_USE_I2C1
+#define RP_I2C_USE_I2C1 TRUE
diff --git a/keyboards/tweetydabird/lotus58/rp2040_ce/rules.mk b/keyboards/tweetydabird/lotus58/rp2040_ce/rules.mk
new file mode 100644
index 00000000000..161ec22b16e
--- /dev/null
+++ b/keyboards/tweetydabird/lotus58/rp2040_ce/rules.mk
@@ -0,0 +1 @@
+SERIAL_DRIVER = vendor
diff --git a/keyboards/tzarc/djinn/config.h b/keyboards/tzarc/djinn/config.h
index 74bb00edc21..24357b6a35e 100644
--- a/keyboards/tzarc/djinn/config.h
+++ b/keyboards/tzarc/djinn/config.h
@@ -39,9 +39,9 @@
 #define WS2812_PWM_DRIVER PWMD20
 #define WS2812_PWM_CHANNEL 1
 #define WS2812_PWM_PAL_MODE 3
-#define WS2812_DMA_STREAM STM32_DMA1_STREAM1
-#define WS2812_DMA_CHANNEL 1
-#define WS2812_DMAMUX_ID STM32_DMAMUX1_TIM20_UP
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM1
+#define WS2812_PWM_DMA_CHANNEL 1
+#define WS2812_PWM_DMAMUX_ID STM32_DMAMUX1_TIM20_UP
 
 // Audio configuration
 #define AUDIO_PIN A5
diff --git a/keyboards/tzarc/djinn/djinn_portscan_matrix.c b/keyboards/tzarc/djinn/djinn_portscan_matrix.c
index cb73c47def7..ac81ad18c1b 100644
--- a/keyboards/tzarc/djinn/djinn_portscan_matrix.c
+++ b/keyboards/tzarc/djinn/djinn_portscan_matrix.c
@@ -1,7 +1,8 @@
 // Copyright 2018-2022 Nick Brassel (@tzarc)
 // SPDX-License-Identifier: GPL-2.0-or-later
+#include <ch.h>
+#include <hal.h>
 #include "quantum.h"
-#include <hal_pal.h>
 #include "djinn.h"
 
 #define GPIOB_BITMASK (1 << 13 | 1 << 14 | 1 << 15) // B13, B14, B15
@@ -34,6 +35,8 @@ void matrix_wait_for_port(stm32_gpio_t *port, uint32_t target_bitmask) {
     }
 }
 
+static void dummy_vt_callback(virtual_timer_t *vtp, void *p) {}
+
 void matrix_init_custom(void) {
     for (int i = 0; i < MATRIX_ROWS; ++i) {
         setPinInputHigh(row_pins[i]);
@@ -41,6 +44,11 @@ void matrix_init_custom(void) {
     for (int i = 0; i < MATRIX_COLS; ++i) {
         setPinInputHigh(col_pins[i]);
     }
+
+    // Start a virtual timer so we'll still get periodic wakeups, now that USB SOF doesn't wake up the main loop
+    static virtual_timer_t vt;
+    chVTObjectInit(&vt);
+    chVTSetContinuous(&vt, TIME_MS2I(10), dummy_vt_callback, NULL);
 }
 
 bool matrix_scan_custom(matrix_row_t current_matrix[]) {
diff --git a/keyboards/tzarc/djinn/info.json b/keyboards/tzarc/djinn/info.json
index 64ed1da6904..fddee1c21fd 100644
--- a/keyboards/tzarc/djinn/info.json
+++ b/keyboards/tzarc/djinn/info.json
@@ -23,7 +23,6 @@
     "nkro": true,
     "quantum_painter": true,
     "rgb_matrix": true,
-    "unicode": false,
     "usbpd": true,
     "wpm": true
   },
diff --git a/keyboards/tzarc/ghoul/rev1/stm32/config.h b/keyboards/tzarc/ghoul/rev1/stm32/config.h
index 1dbc1640397..a835b341db4 100644
--- a/keyboards/tzarc/ghoul/rev1/stm32/config.h
+++ b/keyboards/tzarc/ghoul/rev1/stm32/config.h
@@ -28,8 +28,8 @@
 #define WS2812_PWM_DRIVER PWMD3
 #define WS2812_PWM_CHANNEL 1
 #define WS2812_PWM_PAL_MODE 2
-#define WS2812_DMA_STREAM STM32_DMA1_STREAM2
-#define WS2812_DMA_CHANNEL 5
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM2
+#define WS2812_PWM_DMA_CHANNEL 5
 #define RGB_ENABLE_PIN C0
 
 // ADC Configuration
diff --git a/keyboards/ungodly/launch_pad/keymaps/warzone/keymap.c b/keyboards/ungodly/launch_pad/keymaps/warzone/keymap.c
deleted file mode 100644
index e3292dd30c8..00000000000
--- a/keyboards/ungodly/launch_pad/keymaps/warzone/keymap.c
+++ /dev/null
@@ -1,270 +0,0 @@
-/* Copyright 2020 Ungodly Design <hello@ungodly.design>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-#include "analog.h"
-#include "qmk_midi.h"
-
-/* Force Numlock on */
-void matrix_init_user (void) {
-  if (!host_keyboard_led_state().num_lock) {
-      tap_code(KC_NUM_LOCK);
-  }
-}
-
-// Tap Dance declarations
-enum {
-    TD_ESC_TAB,
-    TD_NUMLOCK_L1,
-    TD_3_L0
-};
-
-// Tap Dance definitions
-tap_dance_action_t tap_dance_actions[] = {
-    // Tap once for Escape, twice for Number 4 (armor plates in warzone)
-    [TD_ESC_TAB] = ACTION_TAP_DANCE_DOUBLE(KC_ESC, KC_TAB),
-    [TD_3_L0] = ACTION_TAP_DANCE_LAYER_TOGGLE(KC_3, 1),
-    [TD_NUMLOCK_L1] = ACTION_TAP_DANCE_LAYER_TOGGLE(KC_NUM_LOCK, 1),
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap _BL: (Base Layer) Default Numpad Layer
-  * ,-------------------.
-  * | NV | /  | *  |BK/FN|
-  * |----|----|----|-----|
-  * | 7  | 8  | 9  |  -  |
-  * |----|----|----|-----|
-  * | 4  | 5  | 6  |  +  |
-  * |----|----|----|-----|
-  * | 1  | 2  | 3  | En  |
-  * |----|----|----|-----|
-  * | 0  | 0  | .  | En  |
-  * `--------------------'
-  */
-  [0] = LAYOUT_ortho_5x4(
-   TD(TD_NUMLOCK_L1),  KC_PSLS,  KC_PAST, LT(2, KC_BSPC),
-   KC_P7,    KC_P8,    KC_P9,        KC_PMNS,
-   KC_P4,    KC_P5,    KC_P6,        KC_PPLS,
-   KC_P1,    KC_P2,    KC_P3,        KC_PENT,
-   KC_P0,    KC_P0,  KC_PDOT,        KC_PENT
-  ),
-  /* Keymap _WAR: (Warzone Layer) Default Numpad Layer for COD Warzone N00BS
-  * ,-------------------.
-  * | R  | F  | V  | Spc |
-  * |----|----|----|-----|
-  * | E  | D  | C  | Alt |
-  * |----|----|----|-----|
-  * | W  | S  | X  |  4  |
-  * |----|----|----|-----|
-  * | Q  | A  | Z  |  3  |
-  * |----|----|----|-----|
-  * | Esc|Ctrl|Shift| M |
-  * `--------------------'
-  */
-  [1] = LAYOUT_ortho_5x4(
-    KC_R,    KC_F,    KC_V,     KC_SPACE,
-    KC_E,    KC_D,    KC_C,     KC_LALT,
-    KC_W,    KC_S,    KC_X,     KC_4,
-    KC_Q,    KC_A,    KC_Z,     TD(TD_3_L0),
-    TD(TD_ESC_TAB),    KC_LCTL,  KC_LSFT,   KC_M
-  ),
-  /* Keymap _FN: RGB Function Layer
-   * ,-------------------.
-   * |LAYR|    |    |RTOG|
-   * |----|----|----|----|
-   * |HUD |HUI |    |RGBP|
-   * |----|----|----|----|
-   * |SAD |SAI |    |RMOD|
-   * |----|----|----|----|
-   * |VAD |VAS |    |    |
-   * |----|----|----|----|
-   * |RST |RST |    |    |
-   * `-------------------'
-   */
-    [2] = LAYOUT_ortho_5x4(
-      KC_LUP,  XXXXXXX,  XXXXXXX,   RGB_TOG,
-      RGB_HUD,  RGB_HUI,  XXXXXXX,   RGB_M_P,
-      RGB_SAD,  RGB_SAI,  XXXXXXX,   RGB_MOD,
-      RGB_VAD,  RGB_VAI,  XXXXXXX,   XXXXXXX,
-        QK_BOOT,  QK_BOOT,  XXXXXXX,   XXXXXXX
-  ),
-};
-
-// (Optional) Rotary Encoder, Volume Control
-bool encoder_update_user(uint8_t index, bool clockwise) {
-  if (clockwise) {
-      tap_code(KC_VOLU);
-  } else {
-      tap_code(KC_VOLD);
-  }
-  return true;
-}
-
-// Potentiometer Slider, MIDI Control
-uint8_t divisor = 0;
-void slider(void){
-  if (divisor++) { // only run the slider function 1/256 times it's called
-      return;
-  }
-  midi_send_cc(&midi_device, 2, 0x3E, 0x7F - (analogReadPin(SLIDER_PIN) >> 3));
-}
-
-void matrix_scan_user(void) {
-  slider();
-}
-
-// 0.91" OLED, 128x32 resolution
-#ifdef OLED_ENABLE
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-	return OLED_ROTATION_180;
-}
-
-static void render_rocket_logo(void) {
-  static const char PROGMEM rocket_logo[]={
-    // Rocket Screen
-    // 'home', 128x32px
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
-    0x80, 0x80, 0xc0, 0x40, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x20, 0x50, 0x50, 0x90,
-    0x10, 0x10, 0x20, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80,
-    0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x10, 0x10, 0xf0, 0x10, 0x10, 0x08, 0x08, 0x08, 0x04, 0x04,
-    0x04, 0xfc, 0xfc, 0xfc, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0xfc, 0x7c, 0x7e, 0x7e, 0x7f,
-    0x81, 0x81, 0x81, 0x81, 0xff, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0xff,
-    0xff, 0xe7, 0xe7, 0xe7, 0xe7, 0xe7, 0xe7, 0xe7, 0xe7, 0x01, 0x01, 0x01, 0xf9, 0x01, 0xf9, 0x01,
-    0xf9, 0x01, 0xf9, 0x01, 0x01, 0x01, 0xe7, 0xe7, 0xe7, 0xe7, 0xe7, 0xe7, 0xe7, 0xe7, 0xe7, 0xe6,
-    0xe6, 0xe6, 0xe6, 0xe6, 0xff, 0x8c, 0x52, 0x52, 0x52, 0xde, 0x84, 0x08, 0x84, 0x08, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x04, 0x04,
-    0x05, 0x05, 0x02, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x01, 0x01, 0x01, 0x01, 0x02, 0x04, 0x04, 0x07, 0x04, 0x04, 0x08, 0x08, 0x08, 0x10, 0x10,
-    0x10, 0x1f, 0x1f, 0x1f, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x1f, 0x10, 0x20, 0x20, 0x40,
-    0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x7f,
-    0x7f, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x40, 0x40, 0x40, 0x4a, 0x44, 0x4a, 0x40,
-    0x4f, 0x40, 0x4f, 0x40, 0x40, 0x40, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x9c,
-    0x9c, 0x9c, 0x9c, 0x1c, 0xff, 0x31, 0x4a, 0x4a, 0x4a, 0x7b, 0x10, 0x21, 0x10, 0x21, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-  };
-  oled_write_raw_P(rocket_logo, sizeof(rocket_logo));
-}
-static void render_warzone_logo(void) {
-  static const char PROGMEM warzone_logo[]={
-    // Home Screen
-    // 'warzone_bit', 128x32px
-    0x00, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xe0, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0x00, 0xe0, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xfe,
-    0xfc, 0xf0, 0x00, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0x7f, 0x00, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0x80, 0x00, 0x00, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc0, 0xc0, 0xc0, 0xc0,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0xc0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xf8, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0xe0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xf8, 0xfe, 0xff, 0xff, 0xff, 0x7f, 0x1f,
-    0x07, 0x01, 0x00, 0x00, 0x00, 0x03, 0x8f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xf0, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1f, 0x1f, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0x07, 0xe0, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff,
-    0xff, 0x00, 0xfc, 0xff, 0xff, 0xff, 0xff, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x03, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0x00, 0x80, 0xe0, 0xf8, 0xfe, 0xff, 0xff, 0xff, 0xff, 0x1f, 0x07, 0x01, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x03, 0x03, 0x03, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x01, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xfe, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0x03, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0x07, 0x00, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00,
-    0x00, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x00,
-    0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x00, 0x00, 0x01, 0x0f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
-    0x00, 0x03, 0x1f, 0x3f, 0x3f, 0x7f, 0x7f, 0x7f, 0x7e, 0x7e, 0x7e, 0x7f, 0x7f, 0x7f, 0x3f, 0x3f,
-    0x1f, 0x07, 0x00, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
-    0x7f, 0x7f, 0x7f, 0x00, 0x00, 0x1f, 0x3f, 0x3f, 0x7f, 0x7f, 0x7f, 0x7e, 0x7e, 0x7e, 0x7f, 0x7f,
-    0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x01, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
-    0x7f, 0x7f, 0x7f, 0x00, 0x00, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x00, 0x00, 0x07, 0x7f, 0x7f,
-    0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x00, 0x00, 0x0f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7e, 0x00
-  };
-  oled_write_raw_P(warzone_logo, sizeof(warzone_logo));
-}
-static void render_light_logo(void) {
-  static const char PROGMEM light_logo[]={
-    // RGB Screen
-    // 'rgb', 128x32px
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x9c, 0x80, 0x80,
-    0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80,
-    0x80, 0x40, 0x40, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x20, 0x50, 0x50, 0x90,
-    0x10, 0x10, 0x20, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x80, 0x80, 0x80, 0x00, 0x00, 0xe0, 0x19, 0x04, 0x62, 0x11, 0x09, 0x04, 0x04, 0x00, 0x00, 0x00,
-    0x00, 0x01, 0x01, 0x02, 0x04, 0x19, 0x10, 0x10, 0xf0, 0x00, 0x00, 0xf0, 0x00, 0xf0, 0xe0, 0xc0,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc7, 0x24, 0x04,
-    0x07, 0xe4, 0x24, 0x24, 0xc7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x04, 0x04,
-    0x05, 0x05, 0x02, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x88, 0x30, 0x40, 0x40, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00,
-    0x80, 0x80, 0x40, 0x60, 0x30, 0x98, 0x08, 0x08, 0x0f, 0x00, 0x00, 0x0f, 0x00, 0x0f, 0x07, 0x03,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc1, 0x22, 0x24,
-    0x24, 0xc4, 0x44, 0x22, 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x1d, 0x01, 0x01,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x02, 0x02,
-    0x02, 0x03, 0x02, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-  };
-  oled_write_raw_P(light_logo, sizeof(light_logo));
-}
-
-bool oled_task_user(void) {
-  switch (get_highest_layer(layer_state)) {
-    case 0:
-      render_rocket_logo();
-      break;
-    case 1:
-      render_warzone_logo();
-      break;
-    case 2:
-      render_light_logo();
-      break;
-    default:
-      // Or use the write_ln shortcut over adding '\n' to the end of your string
-      oled_write_ln_P(PSTR(" UND"), false);
-      break;
-    }
-    return false;
-}
-#endif
diff --git a/keyboards/ungodly/launch_pad/keymaps/warzone/rules.mk b/keyboards/ungodly/launch_pad/keymaps/warzone/rules.mk
deleted file mode 100644
index 791d5ab5021..00000000000
--- a/keyboards/ungodly/launch_pad/keymaps/warzone/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-VIA_ENABLE = yes
-TAP_DANCE_ENABLE = yes
diff --git a/keyboards/viendi8l/config.h b/keyboards/viendi8l/config.h
index 050a0cca223..a449301c2b2 100644
--- a/keyboards/viendi8l/config.h
+++ b/keyboards/viendi8l/config.h
@@ -37,5 +37,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define WS2812_PWM_DRIVER PWMD1
 #define WS2812_PWM_CHANNEL 3
 #define WS2812_PWM_PAL_MODE 1
-#define WS2812_DMA_STREAM STM32_DMA2_STREAM5
-#define WS2812_DMA_CHANNEL 6
+#define WS2812_PWM_DMA_STREAM STM32_DMA2_STREAM5
+#define WS2812_PWM_DMA_CHANNEL 6
diff --git a/keyboards/viktus/osav2/keymaps/default/keymap.c b/keyboards/viktus/osav2/keymaps/default/keymap.c
index 41533f136ca..9efc093864a 100644
--- a/keyboards/viktus/osav2/keymaps/default/keymap.c
+++ b/keyboards/viktus/osav2/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_split_normal_split(
-        KC_DEL,  KC_ESC,  KC_1, KC_2,    KC_3, KC_4,   KC_5, KC_6,       KC_7,   KC_8, KC_9, KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_TILD,
+        KC_DEL,  KC_ESC,  KC_1, KC_2,    KC_3, KC_4,   KC_5, KC_6,       KC_7,   KC_8, KC_9, KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_GRV,
         KC_PGUP, KC_TAB,  KC_Q, KC_W,    KC_E, KC_R,   KC_T,    	 KC_Y, KC_U,   KC_I, KC_O, KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,
         KC_PGDN, KC_LCTL, KC_A, KC_S,    KC_D, KC_F,   KC_G,    	 KC_H, KC_J,   KC_K, KC_L, KC_SCLN, KC_QUOT,          KC_ENT,
                  KC_LSFT, KC_Z, KC_X,    KC_C, KC_V,   KC_B,	           KC_B,   KC_N, KC_M, KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
diff --git a/keyboards/viktus/osav2/keymaps/via/keymap.c b/keyboards/viktus/osav2/keymaps/via/keymap.c
index 41533f136ca..9efc093864a 100644
--- a/keyboards/viktus/osav2/keymaps/via/keymap.c
+++ b/keyboards/viktus/osav2/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_split_normal_split(
-        KC_DEL,  KC_ESC,  KC_1, KC_2,    KC_3, KC_4,   KC_5, KC_6,       KC_7,   KC_8, KC_9, KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_TILD,
+        KC_DEL,  KC_ESC,  KC_1, KC_2,    KC_3, KC_4,   KC_5, KC_6,       KC_7,   KC_8, KC_9, KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_GRV,
         KC_PGUP, KC_TAB,  KC_Q, KC_W,    KC_E, KC_R,   KC_T,    	 KC_Y, KC_U,   KC_I, KC_O, KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,
         KC_PGDN, KC_LCTL, KC_A, KC_S,    KC_D, KC_F,   KC_G,    	 KC_H, KC_J,   KC_K, KC_L, KC_SCLN, KC_QUOT,          KC_ENT,
                  KC_LSFT, KC_Z, KC_X,    KC_C, KC_V,   KC_B,	           KC_B,   KC_N, KC_M, KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
diff --git a/keyboards/viktus/osav2_topre/ec.c b/keyboards/viktus/osav2_topre/ec.c
index fd2e8fa0ec5..076ffc0ba86 100644
--- a/keyboards/viktus/osav2_topre/ec.c
+++ b/keyboards/viktus/osav2_topre/ec.c
@@ -151,16 +151,16 @@ bool ec_matrix_scan(matrix_row_t current_matrix[]) {
             switch(row) {
                 case 0:
                     switch(col) {
-                        case 14: // lower threshold for split backspace: left 1U( rest,  btm)
-                        case 15: // lower threshold for 2U backspace: 2U(38 rest, 60 btm)
-                            reset_pt = 44;
-                            actuation_pt = 48;
+                        case 14: // lower threshold for split backspace: left 1U
+                        case 15: // lower threshold for 2U backspace: 2U
+                            reset_pt = 48;
+                            actuation_pt = 53;
                             break;
                     }
                     break;
                 case 3:
                     switch(col) {
-                        case 14: // Lower threshold for right shift: 1.75U(40 rest, 70 btm)
+                        case 14: // Lower threshold for right shift: 1.75U
                             reset_pt = 48;
                             actuation_pt = 53;
                             break;
@@ -168,17 +168,17 @@ bool ec_matrix_scan(matrix_row_t current_matrix[]) {
                     break;
                 case 4:
                     switch(col) {
-                        case 3: // Lower threshold for left space: col3( rest,  btm)
-                        case 4: // Lower threshold for left space: col4(38 rest, 88 btm)
+                        case 3: // Lower threshold for left space: col3
+                        case 4: // Lower threshold for left space: col4
                             reset_pt = 50;
                             actuation_pt = 60;
                             break;
-                        case 5: // Lower threshold for left space: col5( rest,  btm)
-                        case 6: // Lower threshold for left space: col6(40 rest, 80 btm)
+                        case 5: // Lower threshold for left space: col5
+                        case 6: // Lower threshold for left space: col6
                             reset_pt = 48;
                             actuation_pt = 58;
                             break;
-                        case 14: // Lower threshold for right shift: 2.75U( rest,  btm)
+                        case 14: // Lower threshold for right shift: 2.75U
                             reset_pt = 48;
                             actuation_pt = 53;
                             break;
diff --git a/keyboards/viktus/osav2_topre/keymaps/default/keymap.c b/keyboards/viktus/osav2_topre/keymaps/default/keymap.c
index b9561c9b325..bb7bc014744 100644
--- a/keyboards/viktus/osav2_topre/keymaps/default/keymap.c
+++ b/keyboards/viktus/osav2_topre/keymaps/default/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_split_back_175u_shift(
-        KC_DEL,  KC_ESC,  KC_1, KC_2,    KC_3, KC_4,   KC_5, KC_6, KC_7, KC_8,   KC_9, KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_TILDE,
+        KC_DEL,  KC_ESC,  KC_1, KC_2,    KC_3, KC_4,   KC_5, KC_6, KC_7, KC_8,   KC_9, KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_GRV,
         KC_PGUP, KC_TAB,  KC_Q, KC_W,    KC_E, KC_R,   KC_T,       KC_Y, KC_U,   KC_I, KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,
         KC_PGDN, KC_CAPS, KC_A, KC_S,    KC_D, KC_F,   KC_G,       KC_H, KC_J,   KC_K, KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
                  KC_LSFT, KC_Z, KC_X,    KC_C, KC_V,   KC_B,       KC_B, KC_N,   KC_M, KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
diff --git a/keyboards/viktus/osav2_topre/keymaps/via/keymap.c b/keyboards/viktus/osav2_topre/keymaps/via/keymap.c
index b9561c9b325..bb7bc014744 100644
--- a/keyboards/viktus/osav2_topre/keymaps/via/keymap.c
+++ b/keyboards/viktus/osav2_topre/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_split_back_175u_shift(
-        KC_DEL,  KC_ESC,  KC_1, KC_2,    KC_3, KC_4,   KC_5, KC_6, KC_7, KC_8,   KC_9, KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_TILDE,
+        KC_DEL,  KC_ESC,  KC_1, KC_2,    KC_3, KC_4,   KC_5, KC_6, KC_7, KC_8,   KC_9, KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_GRV,
         KC_PGUP, KC_TAB,  KC_Q, KC_W,    KC_E, KC_R,   KC_T,       KC_Y, KC_U,   KC_I, KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,
         KC_PGDN, KC_CAPS, KC_A, KC_S,    KC_D, KC_F,   KC_G,       KC_H, KC_J,   KC_K, KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
                  KC_LSFT, KC_Z, KC_X,    KC_C, KC_V,   KC_B,       KC_B, KC_N,   KC_M, KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
diff --git a/keyboards/vinhcatba/uncertainty/config.h b/keyboards/vinhcatba/uncertainty/config.h
index 5c02b78efe6..82671dfdc00 100644
--- a/keyboards/vinhcatba/uncertainty/config.h
+++ b/keyboards/vinhcatba/uncertainty/config.h
@@ -11,8 +11,8 @@
 #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 WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM2        // DMA1 Stream 2 for TIM3_UP (table 28 in reference manual)
+#define WS2812_PWM_DMA_CHANNEL 5                        // DMA Channel 5 for TIM3_UP  (table 28 in reference manual)
 
 
 #define I2C1_CLOCK_SPEED 400000
diff --git a/keyboards/waterfowl/keymaps/cyanduck/keymap.c b/keyboards/waterfowl/keymaps/cyanduck/keymap.c
deleted file mode 100644
index ac52c7454df..00000000000
--- a/keyboards/waterfowl/keymaps/cyanduck/keymap.c
+++ /dev/null
@@ -1,129 +0,0 @@
-/* Copyright 2022  CyanDuck
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include QMK_KEYBOARD_H
-
-// Defines names for use in layer keycodes and the keymap
-enum layer_names {
-    _COLEMAKDH,
-    _NAVNUM,
-    _SYM,
-    _FUNC,
-    _GAME
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Colemak-DH
- *
- * ,----------------------------------.                      ,----------------------------------.
- * |   Q  |   W  |   F  |   P  |   B  |                      |   J  |   L  |   U  |   Y  |   ;  |
- * |------+------+------+------+------|                      |------+------+------+------+------|
- * |   A  |   R  |   S  |   T  |   G  |                      |   M  |   N  |   E  |   I  |   O  |
- * |------+------+------+------+------|  ,-----.    ,-----.  |------+------+------+------+------|
- * |   Z  |   X  |   C  |   D  |   V  |  |  2  |    |  3  |  |   K  |   H  |   ,  |   .  |   /  |
- * `----------------------------------'  `-----'    `-----'  `----------------------------------'
- *          ,-----.   ,--------------------.            ,--------------------.   ,-----. 
- *          |  1  |   | DEL | SPACE | TAB  |            | TO(0) | BS | ENTER |   |  4  |
- *          `-----'   `--------------------'            `--------------------'   `-----'
- */
-[_COLEMAKDH] = LAYOUT(
-  KC_Q,    KC_W,    KC_F,    KC_P,    KC_B,         KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN,
-  KC_A,    MT(MOD_LALT, KC_R),    MT(MOD_LCTL, KC_S),    MT(MOD_LSFT, KC_T),    KC_G,         KC_M,    MT(MOD_LSFT, KC_N),    MT(MOD_LCTL, KC_E),    MT(MOD_LALT, KC_I),    KC_O,
-  KC_Z,    KC_X,    KC_C,    MT(MOD_LGUI, KC_D),    KC_V,         KC_K,    MT(MOD_LGUI, KC_H),    KC_COMM, KC_DOT,  KC_SLSH,
-  KC_1, LT(3,KC_DEL), LT(1,KC_SPC), KC_TAB, KC_2,         KC_3, TO(0), KC_BSPC, LT(2,KC_ENT), KC_4
-),
-
-/* NAVNUM
- *
- * ,----------------------------------.                      ,----------------------------------.
- * |  ESC | PgUp |  UP  | PgDn | TO(4)|                      |   /  |   7  |   8  |   9  |   -  |
- * |------+------+------+------+------|                      |------+------+------+------+------|
- * | Home | Left | Down | Right| End  |                      |   =  |   4  |   5  |   6  |   +  |
- * |------+------+------+------+------|  ,-----.    ,-----.  |------+------+------+------+------|
- * |      |      |  INS | TO(2)|      |  |  2  |    |  3  |  |   0  |   1  |   2  |   3  |   *  |
- * `----------------------------------'  `-----'    `-----'  `----------------------------------'
- *          ,-----.   ,--------------------.            ,--------------------.   ,-----. 
- *          |  1  |   | DEL | SPACE | MO(3)|            | TO(0) | BS | ENTER |   |  4  |
- *          `-----'   `--------------------'            `--------------------'   `-----'
- */
-[_NAVNUM] = LAYOUT(
-  KC_ESC,    KC_PGUP,    KC_UP,    KC_PGDN,   TO(4),    KC_SLSH,    KC_7,    KC_8,    KC_9,    KC_MINS,
-  KC_HOME,   KC_LEFT,    KC_DOWN,  KC_RGHT,   KC_END,  KC_EQL,     KC_4,    KC_5,    KC_6,    KC_PLUS,
-  KC_NO,    KC_NO,      KC_INS,   TO(2),     KC_NO,    KC_0,       KC_1,    KC_2,    KC_3,    KC_ASTR,
-  KC_1, LT(3,KC_DEL), LT(1,KC_SPC), KC_ESC, KC_2,         KC_3, TO(0), KC_BSPC, LT(2,KC_ENT), KC_4
-),
-
-/* SYM
- *
- * ,----------------------------------.                      ,----------------------------------.
- * |   %  |   @  |   [  |   ]  |   \  |                      |   ¦  |   ¬  |   ^  |      |      |
- * |------+------+------+------+------|                      |------+------+------+------+------|
- * |   #  |   !  |   (  |   )  |   |  |                      |   _  |   '  |   "  |   ~  |   `  |
- * |------+------+------+------+------|  ,-----.    ,-----.  |------+------+------+------+------|
- * |   $  |   £  |   {  |   }  |   &  |  |  2  |    |  3  |  | TO(1)|      |      |      |      |
- * `----------------------------------'  `-----'    `-----'  `----------------------------------'
- *          ,-----.   ,--------------------.            ,--------------------.   ,-----. 
- *          |  1  |   | DEL | SPACE | TAB  |            | TO(0) | BS | ENTER |   |  4  |
- *          `-----'   `--------------------'            `--------------------'   `-----'
- */
-[_SYM] = LAYOUT(
-  KC_PERC, S(KC_QUOT),   KC_LBRC, KC_RBRC,  KC_NUBS,     RALT(KC_GRV), S(KC_GRV), KC_CIRC, KC_NO,   KC_NO,
-  KC_NONUS_HASH, KC_EXLM, KC_LPRN, KC_RPRN, S(KC_NUBS),      KC_UNDS, KC_QUOT, S(KC_2), S(KC_NUHS), KC_GRV,
-  KC_DLR, S(KC_3),  KC_LCBR, KC_RCBR, KC_AMPR,      TO(1), KC_NO,   KC_NO,   KC_NO,   KC_NO,
-  KC_1, LT(3,KC_DEL), LT(1,KC_SPC), KC_TAB, KC_2,         KC_3, TO(0), KC_BSPC, LT(2,KC_ENT), KC_4
-),
-
-/* FUNC
- *
- * ,----------------------------------.                      ,----------------------------------.
- * |      |      |      |      |      |                      |      |  F7  |  F8  |  F9  |  F11 |
- * |------+------+------+------+------|                      |------+------+------+------+------|
- * |      |      |      |      |      |                      |      |  F4  |  F5  |  F6  |  F12 |
- * |------+------+------+------+------|  ,-----.    ,-----.  |------+------+------+------+------|
- * | Reset|      |      |      |      |  |  2  |    |  3  |  |  F10 |  F1  |  F2  |  F3  |  F13 |
- * `----------------------------------'  `-----'    `-----'  `----------------------------------'
- *          ,-----.   ,--------------------.            ,--------------------.   ,-----. 
- *          |  1  |   | DEL | SPACE | TAB  |            | TO(0) | BS | ENTER |   |  4  |
- *          `-----'   `--------------------'            `--------------------'   `-----'
- */
-[_FUNC] =  LAYOUT(
-  KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,        KC_NO,   KC_F7,   KC_F8,   KC_F9,   KC_F11,
-  KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,        KC_NO,   KC_F4,   KC_F5,   KC_F6,   KC_F12,
-  QK_BOOT, KC_NO,   KC_NO,   KC_NO,   KC_NO,        KC_F10,  KC_F1,   KC_F2,   KC_F3,   KC_F13,
-  KC_1, LT(3,KC_DEL), LT(1,KC_SPC), KC_TAB, KC_2,         KC_3, TO(0), KC_BSPC, LT(2,KC_ENT), KC_4
-),
-
-/* GAME
- *
- * ,----------------------------------.                      ,----------------------------------.
- * |  ESC |   Q  |   W  |   E  |   R  |                      |      |      |      |      |      |
- * |------+------+------+------+------|                      |------+------+------+------+------|
- * |Shift |   A  |   S  |   D  |   F  |                      |      |      |      |      |      |
- * |------+------+------+------+------|  ,-----.    ,-----.  |------+------+------+------+------|
- * | Ctrl |   Z  |   X  |   C  |   V  |  |  2  |    |  3  |  |      |      |      |      |      |
- * `----------------------------------'  `-----'    `-----'  `----------------------------------'
- *          ,-----.   ,--------------------.            ,--------------------.   ,-----. 
- *          |  1  |   |  T  | SPACE | TAB  |            | TO(0) | BS | ENTER |   |  4  |
- *          `-----'   `--------------------'            `--------------------'   `-----'
- */
-[_GAME] = LAYOUT(
-  KC_ESC,    KC_Q,    KC_W,    KC_E,    KC_R,         KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,
-  KC_LSFT,    KC_A,    KC_S,    KC_D,    KC_F,         KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,
-  KC_LCTL,    KC_Z,    KC_X,    KC_C,    KC_V,         KC_NO,    KC_NO,    KC_NO, KC_NO,  KC_NO,
-  KC_1, KC_T, KC_SPC, KC_TAB, KC_2,         KC_3, TO(0), KC_BSPC, LT(2,KC_ENT), KC_4
-),
-};
diff --git a/keyboards/wilba_tech/wt60_a/wt60_a.c b/keyboards/wilba_tech/wt60_a/wt60_a.c
index fe566ce3fc4..04657835c9d 100644
--- a/keyboards/wilba_tech/wt60_a/wt60_a.c
+++ b/keyboards/wilba_tech/wt60_a/wt60_a.c
@@ -9,112 +9,112 @@
 
 #if defined(LED_MATRIX_ENABLE) || defined(MONO_BACKLIGHT_WT60_A)
 const is31fl3736_led_t PROGMEM g_is31fl3736_leds[IS31FL3736_LED_COUNT] = {
-    {0, A_1},
-    {0, A_2},
-    {0, A_3},
-    {0, A_4},
-    {0, A_5},
-    {0, A_6},
-    {0, A_7},
-    {0, A_8},
+    {0, SW1_CS1},
+    {0, SW1_CS2},
+    {0, SW1_CS3},
+    {0, SW1_CS4},
+    {0, SW1_CS5},
+    {0, SW1_CS6},
+    {0, SW1_CS7},
+    {0, SW1_CS8},
 
-    {0, B_1},
-    {0, B_2},
-    {0, B_3},
-    {0, B_4},
-    {0, B_5},
-    {0, B_6},
-    {0, B_7},
-    {0, B_8},
+    {0, SW2_CS1},
+    {0, SW2_CS2},
+    {0, SW2_CS3},
+    {0, SW2_CS4},
+    {0, SW2_CS5},
+    {0, SW2_CS6},
+    {0, SW2_CS7},
+    {0, SW2_CS8},
 
-    {0, C_1},
-    {0, C_2},
-    {0, C_3},
-    {0, C_4},
-    {0, C_5},
-    {0, C_6},
-    {0, C_7},
-    {0, C_8},
+    {0, SW3_CS1},
+    {0, SW3_CS2},
+    {0, SW3_CS3},
+    {0, SW3_CS4},
+    {0, SW3_CS5},
+    {0, SW3_CS6},
+    {0, SW3_CS7},
+    {0, SW3_CS8},
 
-    {0, D_1},
-    {0, D_2},
-    {0, D_3},
-    {0, D_4},
-    {0, D_5},
-    {0, D_6},
-    {0, D_7},
-    {0, D_8},
+    {0, SW4_CS1},
+    {0, SW4_CS2},
+    {0, SW4_CS3},
+    {0, SW4_CS4},
+    {0, SW4_CS5},
+    {0, SW4_CS6},
+    {0, SW4_CS7},
+    {0, SW4_CS8},
 
-    {0, E_1},
-    {0, E_2},
-    {0, E_3},
-    {0, E_4},
-    {0, E_5},
-    {0, E_6},
-    {0, E_7},
-    {0, E_8},
+    {0, SW5_CS1},
+    {0, SW5_CS2},
+    {0, SW5_CS3},
+    {0, SW5_CS4},
+    {0, SW5_CS5},
+    {0, SW5_CS6},
+    {0, SW5_CS7},
+    {0, SW5_CS8},
 
-    {0, F_1},
-    {0, F_2},
-    {0, F_3},
-    {0, F_4},
-    {0, F_5},
-    {0, F_6},
-    {0, F_7},
-    {0, F_8},
+    {0, SW6_CS1},
+    {0, SW6_CS2},
+    {0, SW6_CS3},
+    {0, SW6_CS4},
+    {0, SW6_CS5},
+    {0, SW6_CS6},
+    {0, SW6_CS7},
+    {0, SW6_CS8},
 
-    {0, G_1},
-    {0, G_2},
-    {0, G_3},
-    {0, G_4},
-    {0, G_5},
-    {0, G_6},
-    {0, G_7},
-    {0, G_8},
+    {0, SW7_CS1},
+    {0, SW7_CS2},
+    {0, SW7_CS3},
+    {0, SW7_CS4},
+    {0, SW7_CS5},
+    {0, SW7_CS6},
+    {0, SW7_CS7},
+    {0, SW7_CS8},
 
-    {0, H_1},
-    {0, H_2},
-    {0, H_3},
-    {0, H_4},
-    {0, H_5},
-    {0, H_6},
-    {0, H_7},
-    {0, H_8},
+    {0, SW8_CS1},
+    {0, SW8_CS2},
+    {0, SW8_CS3},
+    {0, SW8_CS4},
+    {0, SW8_CS5},
+    {0, SW8_CS6},
+    {0, SW8_CS7},
+    {0, SW8_CS8},
 
-    {0, I_1},
-    {0, I_2},
-    {0, I_3},
-    {0, I_4},
-    {0, I_5},
-    {0, I_6},
-    {0, I_7},
-    {0, I_8},
+    {0, SW9_CS1},
+    {0, SW9_CS2},
+    {0, SW9_CS3},
+    {0, SW9_CS4},
+    {0, SW9_CS5},
+    {0, SW9_CS6},
+    {0, SW9_CS7},
+    {0, SW9_CS8},
 
-    {0, J_1},
-    {0, J_2},
-    {0, J_3},
-    {0, J_4},
-    {0, J_5},
-    {0, J_6},
-    {0, J_7},
-    {0, J_8},
+    {0, SW10_CS1},
+    {0, SW10_CS2},
+    {0, SW10_CS3},
+    {0, SW10_CS4},
+    {0, SW10_CS5},
+    {0, SW10_CS6},
+    {0, SW10_CS7},
+    {0, SW10_CS8},
 
-    {0, K_1},
-    {0, K_2},
-    {0, K_3},
-    {0, K_4},
-    {0, K_5},
-    {0, K_6},
-    {0, K_7},
-    {0, K_8},
+    {0, SW11_CS1},
+    {0, SW11_CS2},
+    {0, SW11_CS3},
+    {0, SW11_CS4},
+    {0, SW11_CS5},
+    {0, SW11_CS6},
+    {0, SW11_CS7},
+    {0, SW11_CS8},
 
-    {0, L_1},
-    {0, L_2},
-    {0, L_3},
-    {0, L_4},
-    {0, L_5},
-    {0, L_6},
-    {0, L_7},
-    {0, L_8}
+    {0, SW12_CS1},
+    {0, SW12_CS2},
+    {0, SW12_CS3},
+    {0, SW12_CS4},
+    {0, SW12_CS5},
+    {0, SW12_CS6},
+    {0, SW12_CS7},
+    {0, SW12_CS8}
 };
 #endif
diff --git a/keyboards/wilba_tech/wt65_a/wt65_a.c b/keyboards/wilba_tech/wt65_a/wt65_a.c
index 4ac6e622dbd..398525c2391 100644
--- a/keyboards/wilba_tech/wt65_a/wt65_a.c
+++ b/keyboards/wilba_tech/wt65_a/wt65_a.c
@@ -9,112 +9,112 @@
 
 #if defined(LED_MATRIX_ENABLE) || defined(MONO_BACKLIGHT_WT65_A)
 const is31fl3736_led_t PROGMEM g_is31fl3736_leds[IS31FL3736_LED_COUNT] = {
-    {0, A_1},
-    {0, A_2},
-    {0, A_3},
-    {0, A_4},
-    {0, A_5},
-    {0, A_6},
-    {0, A_7},
-    {0, A_8},
+    {0, SW1_CS1},
+    {0, SW1_CS2},
+    {0, SW1_CS3},
+    {0, SW1_CS4},
+    {0, SW1_CS5},
+    {0, SW1_CS6},
+    {0, SW1_CS7},
+    {0, SW1_CS8},
 
-    {0, B_1},
-    {0, B_2},
-    {0, B_3},
-    {0, B_4},
-    {0, B_5},
-    {0, B_6},
-    {0, B_7},
-    {0, B_8},
+    {0, SW2_CS1},
+    {0, SW2_CS2},
+    {0, SW2_CS3},
+    {0, SW2_CS4},
+    {0, SW2_CS5},
+    {0, SW2_CS6},
+    {0, SW2_CS7},
+    {0, SW2_CS8},
 
-    {0, C_1},
-    {0, C_2},
-    {0, C_3},
-    {0, C_4},
-    {0, C_5},
-    {0, C_6},
-    {0, C_7},
-    {0, C_8},
+    {0, SW3_CS1},
+    {0, SW3_CS2},
+    {0, SW3_CS3},
+    {0, SW3_CS4},
+    {0, SW3_CS5},
+    {0, SW3_CS6},
+    {0, SW3_CS7},
+    {0, SW3_CS8},
 
-    {0, D_1},
-    {0, D_2},
-    {0, D_3},
-    {0, D_4},
-    {0, D_5},
-    {0, D_6},
-    {0, D_7},
-    {0, D_8},
+    {0, SW4_CS1},
+    {0, SW4_CS2},
+    {0, SW4_CS3},
+    {0, SW4_CS4},
+    {0, SW4_CS5},
+    {0, SW4_CS6},
+    {0, SW4_CS7},
+    {0, SW4_CS8},
 
-    {0, E_1},
-    {0, E_2},
-    {0, E_3},
-    {0, E_4},
-    {0, E_5},
-    {0, E_6},
-    {0, E_7},
-    {0, E_8},
+    {0, SW5_CS1},
+    {0, SW5_CS2},
+    {0, SW5_CS3},
+    {0, SW5_CS4},
+    {0, SW5_CS5},
+    {0, SW5_CS6},
+    {0, SW5_CS7},
+    {0, SW5_CS8},
 
-    {0, F_1},
-    {0, F_2},
-    {0, F_3},
-    {0, F_4},
-    {0, F_5},
-    {0, F_6},
-    {0, F_7},
-    {0, F_8},
+    {0, SW6_CS1},
+    {0, SW6_CS2},
+    {0, SW6_CS3},
+    {0, SW6_CS4},
+    {0, SW6_CS5},
+    {0, SW6_CS6},
+    {0, SW6_CS7},
+    {0, SW6_CS8},
 
-    {0, G_1},
-    {0, G_2},
-    {0, G_3},
-    {0, G_4},
-    {0, G_5},
-    {0, G_6},
-    {0, G_7},
-    {0, G_8},
+    {0, SW7_CS1},
+    {0, SW7_CS2},
+    {0, SW7_CS3},
+    {0, SW7_CS4},
+    {0, SW7_CS5},
+    {0, SW7_CS6},
+    {0, SW7_CS7},
+    {0, SW7_CS8},
 
-    {0, H_1},
-    {0, H_2},
-    {0, H_3},
-    {0, H_4},
-    {0, H_5},
-    {0, H_6},
-    {0, H_7},
-    {0, H_8},
+    {0, SW8_CS1},
+    {0, SW8_CS2},
+    {0, SW8_CS3},
+    {0, SW8_CS4},
+    {0, SW8_CS5},
+    {0, SW8_CS6},
+    {0, SW8_CS7},
+    {0, SW8_CS8},
 
-    {0, I_1},
-    {0, I_2},
-    {0, I_3},
-    {0, I_4},
-    {0, I_5},
-    {0, I_6},
-    {0, I_7},
-    {0, I_8},
+    {0, SW9_CS1},
+    {0, SW9_CS2},
+    {0, SW9_CS3},
+    {0, SW9_CS4},
+    {0, SW9_CS5},
+    {0, SW9_CS6},
+    {0, SW9_CS7},
+    {0, SW9_CS8},
 
-    {0, J_1},
-    {0, J_2},
-    {0, J_3},
-    {0, J_4},
-    {0, J_5},
-    {0, J_6},
-    {0, J_7},
-    {0, J_8},
+    {0, SW10_CS1},
+    {0, SW10_CS2},
+    {0, SW10_CS3},
+    {0, SW10_CS4},
+    {0, SW10_CS5},
+    {0, SW10_CS6},
+    {0, SW10_CS7},
+    {0, SW10_CS8},
 
-    {0, K_1},
-    {0, K_2},
-    {0, K_3},
-    {0, K_4},
-    {0, K_5},
-    {0, K_6},
-    {0, K_7},
-    {0, K_8},
+    {0, SW11_CS1},
+    {0, SW11_CS2},
+    {0, SW11_CS3},
+    {0, SW11_CS4},
+    {0, SW11_CS5},
+    {0, SW11_CS6},
+    {0, SW11_CS7},
+    {0, SW11_CS8},
 
-    {0, L_1},
-    {0, L_2},
-    {0, L_3},
-    {0, L_4},
-    {0, L_5},
-    {0, L_6},
-    {0, L_7},
-    {0, L_8}
+    {0, SW12_CS1},
+    {0, SW12_CS2},
+    {0, SW12_CS3},
+    {0, SW12_CS4},
+    {0, SW12_CS5},
+    {0, SW12_CS6},
+    {0, SW12_CS7},
+    {0, SW12_CS8}
 };
 #endif
diff --git a/keyboards/wilba_tech/wt65_b/wt65_b.c b/keyboards/wilba_tech/wt65_b/wt65_b.c
index 139ddca921b..2e2385ace29 100644
--- a/keyboards/wilba_tech/wt65_b/wt65_b.c
+++ b/keyboards/wilba_tech/wt65_b/wt65_b.c
@@ -9,112 +9,112 @@
 
 #if defined(LED_MATRIX_ENABLE) || defined(MONO_BACKLIGHT_WT65_B)
 const is31fl3736_led_t PROGMEM g_is31fl3736_leds[IS31FL3736_LED_COUNT] = {
-    {0, A_1},
-    {0, A_2},
-    {0, A_3},
-    {0, A_4},
-    {0, A_5},
-    {0, A_6},
-    {0, A_7},
-    {0, A_8},
+    {0, SW1_CS1},
+    {0, SW1_CS2},
+    {0, SW1_CS3},
+    {0, SW1_CS4},
+    {0, SW1_CS5},
+    {0, SW1_CS6},
+    {0, SW1_CS7},
+    {0, SW1_CS8},
 
-    {0, B_1},
-    {0, B_2},
-    {0, B_3},
-    {0, B_4},
-    {0, B_5},
-    {0, B_6},
-    {0, B_7},
-    {0, B_8},
+    {0, SW2_CS1},
+    {0, SW2_CS2},
+    {0, SW2_CS3},
+    {0, SW2_CS4},
+    {0, SW2_CS5},
+    {0, SW2_CS6},
+    {0, SW2_CS7},
+    {0, SW2_CS8},
 
-    {0, C_1},
-    {0, C_2},
-    {0, C_3},
-    {0, C_4},
-    {0, C_5},
-    {0, C_6},
-    {0, C_7},
-    {0, C_8},
+    {0, SW3_CS1},
+    {0, SW3_CS2},
+    {0, SW3_CS3},
+    {0, SW3_CS4},
+    {0, SW3_CS5},
+    {0, SW3_CS6},
+    {0, SW3_CS7},
+    {0, SW3_CS8},
 
-    {0, D_1},
-    {0, D_2},
-    {0, D_3},
-    {0, D_4},
-    {0, D_5},
-    {0, D_6},
-    {0, D_7},
-    {0, D_8},
+    {0, SW4_CS1},
+    {0, SW4_CS2},
+    {0, SW4_CS3},
+    {0, SW4_CS4},
+    {0, SW4_CS5},
+    {0, SW4_CS6},
+    {0, SW4_CS7},
+    {0, SW4_CS8},
 
-    {0, E_1},
-    {0, E_2},
-    {0, E_3},
-    {0, E_4},
-    {0, E_5},
-    {0, E_6},
-    {0, E_7},
-    {0, E_8},
+    {0, SW5_CS1},
+    {0, SW5_CS2},
+    {0, SW5_CS3},
+    {0, SW5_CS4},
+    {0, SW5_CS5},
+    {0, SW5_CS6},
+    {0, SW5_CS7},
+    {0, SW5_CS8},
 
-    {0, F_1},
-    {0, F_2},
-    {0, F_3},
-    {0, F_4},
-    {0, F_5},
-    {0, F_6},
-    {0, F_7},
-    {0, F_8},
+    {0, SW6_CS1},
+    {0, SW6_CS2},
+    {0, SW6_CS3},
+    {0, SW6_CS4},
+    {0, SW6_CS5},
+    {0, SW6_CS6},
+    {0, SW6_CS7},
+    {0, SW6_CS8},
 
-    {0, G_1},
-    {0, G_2},
-    {0, G_3},
-    {0, G_4},
-    {0, G_5},
-    {0, G_6},
-    {0, G_7},
-    {0, G_8},
+    {0, SW7_CS1},
+    {0, SW7_CS2},
+    {0, SW7_CS3},
+    {0, SW7_CS4},
+    {0, SW7_CS5},
+    {0, SW7_CS6},
+    {0, SW7_CS7},
+    {0, SW7_CS8},
 
-    {0, H_1},
-    {0, H_2},
-    {0, H_3},
-    {0, H_4},
-    {0, H_5},
-    {0, H_6},
-    {0, H_7},
-    {0, H_8},
+    {0, SW8_CS1},
+    {0, SW8_CS2},
+    {0, SW8_CS3},
+    {0, SW8_CS4},
+    {0, SW8_CS5},
+    {0, SW8_CS6},
+    {0, SW8_CS7},
+    {0, SW8_CS8},
 
-    {0, I_1},
-    {0, I_2},
-    {0, I_3},
-    {0, I_4},
-    {0, I_5},
-    {0, I_6},
-    {0, I_7},
-    {0, I_8},
+    {0, SW9_CS1},
+    {0, SW9_CS2},
+    {0, SW9_CS3},
+    {0, SW9_CS4},
+    {0, SW9_CS5},
+    {0, SW9_CS6},
+    {0, SW9_CS7},
+    {0, SW9_CS8},
 
-    {0, J_1},
-    {0, J_2},
-    {0, J_3},
-    {0, J_4},
-    {0, J_5},
-    {0, J_6},
-    {0, J_7},
-    {0, J_8},
+    {0, SW10_CS1},
+    {0, SW10_CS2},
+    {0, SW10_CS3},
+    {0, SW10_CS4},
+    {0, SW10_CS5},
+    {0, SW10_CS6},
+    {0, SW10_CS7},
+    {0, SW10_CS8},
 
-    {0, K_1},
-    {0, K_2},
-    {0, K_3},
-    {0, K_4},
-    {0, K_5},
-    {0, K_6},
-    {0, K_7},
-    {0, K_8},
+    {0, SW11_CS1},
+    {0, SW11_CS2},
+    {0, SW11_CS3},
+    {0, SW11_CS4},
+    {0, SW11_CS5},
+    {0, SW11_CS6},
+    {0, SW11_CS7},
+    {0, SW11_CS8},
 
-    {0, L_1},
-    {0, L_2},
-    {0, L_3},
-    {0, L_4},
-    {0, L_5},
-    {0, L_6},
-    {0, L_7},
-    {0, L_8}
+    {0, SW12_CS1},
+    {0, SW12_CS2},
+    {0, SW12_CS3},
+    {0, SW12_CS4},
+    {0, SW12_CS5},
+    {0, SW12_CS6},
+    {0, SW12_CS7},
+    {0, SW12_CS8}
 };
 #endif
diff --git a/keyboards/wilba_tech/wt75_a/wt75_a.c b/keyboards/wilba_tech/wt75_a/wt75_a.c
index 8b64397b958..111e6c3a2c1 100644
--- a/keyboards/wilba_tech/wt75_a/wt75_a.c
+++ b/keyboards/wilba_tech/wt75_a/wt75_a.c
@@ -9,112 +9,112 @@
 
 #if defined(LED_MATRIX_ENABLE) || defined(MONO_BACKLIGHT_WT75_A)
 const is31fl3736_led_t PROGMEM g_is31fl3736_leds[IS31FL3736_LED_COUNT] = {
-    {0, A_1},
-    {0, A_2},
-    {0, A_3},
-    {0, A_4},
-    {0, A_5},
-    {0, A_6},
-    {0, A_7},
-    {0, A_8},
+    {0, SW1_CS1},
+    {0, SW1_CS2},
+    {0, SW1_CS3},
+    {0, SW1_CS4},
+    {0, SW1_CS5},
+    {0, SW1_CS6},
+    {0, SW1_CS7},
+    {0, SW1_CS8},
 
-    {0, B_1},
-    {0, B_2},
-    {0, B_3},
-    {0, B_4},
-    {0, B_5},
-    {0, B_6},
-    {0, B_7},
-    {0, B_8},
+    {0, SW2_CS1},
+    {0, SW2_CS2},
+    {0, SW2_CS3},
+    {0, SW2_CS4},
+    {0, SW2_CS5},
+    {0, SW2_CS6},
+    {0, SW2_CS7},
+    {0, SW2_CS8},
 
-    {0, C_1},
-    {0, C_2},
-    {0, C_3},
-    {0, C_4},
-    {0, C_5},
-    {0, C_6},
-    {0, C_7},
-    {0, C_8},
+    {0, SW3_CS1},
+    {0, SW3_CS2},
+    {0, SW3_CS3},
+    {0, SW3_CS4},
+    {0, SW3_CS5},
+    {0, SW3_CS6},
+    {0, SW3_CS7},
+    {0, SW3_CS8},
 
-    {0, D_1},
-    {0, D_2},
-    {0, D_3},
-    {0, D_4},
-    {0, D_5},
-    {0, D_6},
-    {0, D_7},
-    {0, D_8},
+    {0, SW4_CS1},
+    {0, SW4_CS2},
+    {0, SW4_CS3},
+    {0, SW4_CS4},
+    {0, SW4_CS5},
+    {0, SW4_CS6},
+    {0, SW4_CS7},
+    {0, SW4_CS8},
 
-    {0, E_1},
-    {0, E_2},
-    {0, E_3},
-    {0, E_4},
-    {0, E_5},
-    {0, E_6},
-    {0, E_7},
-    {0, E_8},
+    {0, SW5_CS1},
+    {0, SW5_CS2},
+    {0, SW5_CS3},
+    {0, SW5_CS4},
+    {0, SW5_CS5},
+    {0, SW5_CS6},
+    {0, SW5_CS7},
+    {0, SW5_CS8},
 
-    {0, F_1},
-    {0, F_2},
-    {0, F_3},
-    {0, F_4},
-    {0, F_5},
-    {0, F_6},
-    {0, F_7},
-    {0, F_8},
+    {0, SW6_CS1},
+    {0, SW6_CS2},
+    {0, SW6_CS3},
+    {0, SW6_CS4},
+    {0, SW6_CS5},
+    {0, SW6_CS6},
+    {0, SW6_CS7},
+    {0, SW6_CS8},
 
-    {0, G_1},
-    {0, G_2},
-    {0, G_3},
-    {0, G_4},
-    {0, G_5},
-    {0, G_6},
-    {0, G_7},
-    {0, G_8},
+    {0, SW7_CS1},
+    {0, SW7_CS2},
+    {0, SW7_CS3},
+    {0, SW7_CS4},
+    {0, SW7_CS5},
+    {0, SW7_CS6},
+    {0, SW7_CS7},
+    {0, SW7_CS8},
 
-    {0, H_1},
-    {0, H_2},
-    {0, H_3},
-    {0, H_4},
-    {0, H_5},
-    {0, H_6},
-    {0, H_7},
-    {0, H_8},
+    {0, SW8_CS1},
+    {0, SW8_CS2},
+    {0, SW8_CS3},
+    {0, SW8_CS4},
+    {0, SW8_CS5},
+    {0, SW8_CS6},
+    {0, SW8_CS7},
+    {0, SW8_CS8},
 
-    {0, I_1},
-    {0, I_2},
-    {0, I_3},
-    {0, I_4},
-    {0, I_5},
-    {0, I_6},
-    {0, I_7},
-    {0, I_8},
+    {0, SW9_CS1},
+    {0, SW9_CS2},
+    {0, SW9_CS3},
+    {0, SW9_CS4},
+    {0, SW9_CS5},
+    {0, SW9_CS6},
+    {0, SW9_CS7},
+    {0, SW9_CS8},
 
-    {0, J_1},
-    {0, J_2},
-    {0, J_3},
-    {0, J_4},
-    {0, J_5},
-    {0, J_6},
-    {0, J_7},
-    {0, J_8},
+    {0, SW10_CS1},
+    {0, SW10_CS2},
+    {0, SW10_CS3},
+    {0, SW10_CS4},
+    {0, SW10_CS5},
+    {0, SW10_CS6},
+    {0, SW10_CS7},
+    {0, SW10_CS8},
 
-    {0, K_1},
-    {0, K_2},
-    {0, K_3},
-    {0, K_4},
-    {0, K_5},
-    {0, K_6},
-    {0, K_7},
-    {0, K_8},
+    {0, SW11_CS1},
+    {0, SW11_CS2},
+    {0, SW11_CS3},
+    {0, SW11_CS4},
+    {0, SW11_CS5},
+    {0, SW11_CS6},
+    {0, SW11_CS7},
+    {0, SW11_CS8},
 
-    {0, L_1},
-    {0, L_2},
-    {0, L_3},
-    {0, L_4},
-    {0, L_5},
-    {0, L_6},
-    {0, L_7},
-    {0, L_8}
+    {0, SW12_CS1},
+    {0, SW12_CS2},
+    {0, SW12_CS3},
+    {0, SW12_CS4},
+    {0, SW12_CS5},
+    {0, SW12_CS6},
+    {0, SW12_CS7},
+    {0, SW12_CS8}
 };
 #endif
diff --git a/keyboards/wilba_tech/wt75_b/wt75_b.c b/keyboards/wilba_tech/wt75_b/wt75_b.c
index 9095bf5d6f0..5a4b7de39f0 100644
--- a/keyboards/wilba_tech/wt75_b/wt75_b.c
+++ b/keyboards/wilba_tech/wt75_b/wt75_b.c
@@ -9,112 +9,112 @@
 
 #if defined(LED_MATRIX_ENABLE) || defined(MONO_BACKLIGHT_WT75_B)
 const is31fl3736_led_t PROGMEM g_is31fl3736_leds[IS31FL3736_LED_COUNT] = {
-    {0, A_1},
-    {0, A_2},
-    {0, A_3},
-    {0, A_4},
-    {0, A_5},
-    {0, A_6},
-    {0, A_7},
-    {0, A_8},
+    {0, SW1_CS1},
+    {0, SW1_CS2},
+    {0, SW1_CS3},
+    {0, SW1_CS4},
+    {0, SW1_CS5},
+    {0, SW1_CS6},
+    {0, SW1_CS7},
+    {0, SW1_CS8},
 
-    {0, B_1},
-    {0, B_2},
-    {0, B_3},
-    {0, B_4},
-    {0, B_5},
-    {0, B_6},
-    {0, B_7},
-    {0, B_8},
+    {0, SW2_CS1},
+    {0, SW2_CS2},
+    {0, SW2_CS3},
+    {0, SW2_CS4},
+    {0, SW2_CS5},
+    {0, SW2_CS6},
+    {0, SW2_CS7},
+    {0, SW2_CS8},
 
-    {0, C_1},
-    {0, C_2},
-    {0, C_3},
-    {0, C_4},
-    {0, C_5},
-    {0, C_6},
-    {0, C_7},
-    {0, C_8},
+    {0, SW3_CS1},
+    {0, SW3_CS2},
+    {0, SW3_CS3},
+    {0, SW3_CS4},
+    {0, SW3_CS5},
+    {0, SW3_CS6},
+    {0, SW3_CS7},
+    {0, SW3_CS8},
 
-    {0, D_1},
-    {0, D_2},
-    {0, D_3},
-    {0, D_4},
-    {0, D_5},
-    {0, D_6},
-    {0, D_7},
-    {0, D_8},
+    {0, SW4_CS1},
+    {0, SW4_CS2},
+    {0, SW4_CS3},
+    {0, SW4_CS4},
+    {0, SW4_CS5},
+    {0, SW4_CS6},
+    {0, SW4_CS7},
+    {0, SW4_CS8},
 
-    {0, E_1},
-    {0, E_2},
-    {0, E_3},
-    {0, E_4},
-    {0, E_5},
-    {0, E_6},
-    {0, E_7},
-    {0, E_8},
+    {0, SW5_CS1},
+    {0, SW5_CS2},
+    {0, SW5_CS3},
+    {0, SW5_CS4},
+    {0, SW5_CS5},
+    {0, SW5_CS6},
+    {0, SW5_CS7},
+    {0, SW5_CS8},
 
-    {0, F_1},
-    {0, F_2},
-    {0, F_3},
-    {0, F_4},
-    {0, F_5},
-    {0, F_6},
-    {0, F_7},
-    {0, F_8},
+    {0, SW6_CS1},
+    {0, SW6_CS2},
+    {0, SW6_CS3},
+    {0, SW6_CS4},
+    {0, SW6_CS5},
+    {0, SW6_CS6},
+    {0, SW6_CS7},
+    {0, SW6_CS8},
 
-    {0, G_1},
-    {0, G_2},
-    {0, G_3},
-    {0, G_4},
-    {0, G_5},
-    {0, G_6},
-    {0, G_7},
-    {0, G_8},
+    {0, SW7_CS1},
+    {0, SW7_CS2},
+    {0, SW7_CS3},
+    {0, SW7_CS4},
+    {0, SW7_CS5},
+    {0, SW7_CS6},
+    {0, SW7_CS7},
+    {0, SW7_CS8},
 
-    {0, H_1},
-    {0, H_2},
-    {0, H_3},
-    {0, H_4},
-    {0, H_5},
-    {0, H_6},
-    {0, H_7},
-    {0, H_8},
+    {0, SW8_CS1},
+    {0, SW8_CS2},
+    {0, SW8_CS3},
+    {0, SW8_CS4},
+    {0, SW8_CS5},
+    {0, SW8_CS6},
+    {0, SW8_CS7},
+    {0, SW8_CS8},
 
-    {0, I_1},
-    {0, I_2},
-    {0, I_3},
-    {0, I_4},
-    {0, I_5},
-    {0, I_6},
-    {0, I_7},
-    {0, I_8},
+    {0, SW9_CS1},
+    {0, SW9_CS2},
+    {0, SW9_CS3},
+    {0, SW9_CS4},
+    {0, SW9_CS5},
+    {0, SW9_CS6},
+    {0, SW9_CS7},
+    {0, SW9_CS8},
 
-    {0, J_1},
-    {0, J_2},
-    {0, J_3},
-    {0, J_4},
-    {0, J_5},
-    {0, J_6},
-    {0, J_7},
-    {0, J_8},
+    {0, SW10_CS1},
+    {0, SW10_CS2},
+    {0, SW10_CS3},
+    {0, SW10_CS4},
+    {0, SW10_CS5},
+    {0, SW10_CS6},
+    {0, SW10_CS7},
+    {0, SW10_CS8},
 
-    {0, K_1},
-    {0, K_2},
-    {0, K_3},
-    {0, K_4},
-    {0, K_5},
-    {0, K_6},
-    {0, K_7},
-    {0, K_8},
+    {0, SW11_CS1},
+    {0, SW11_CS2},
+    {0, SW11_CS3},
+    {0, SW11_CS4},
+    {0, SW11_CS5},
+    {0, SW11_CS6},
+    {0, SW11_CS7},
+    {0, SW11_CS8},
 
-    {0, L_1},
-    {0, L_2},
-    {0, L_3},
-    {0, L_4},
-    {0, L_5},
-    {0, L_6},
-    {0, L_7},
-    {0, L_8}
+    {0, SW12_CS1},
+    {0, SW12_CS2},
+    {0, SW12_CS3},
+    {0, SW12_CS4},
+    {0, SW12_CS5},
+    {0, SW12_CS6},
+    {0, SW12_CS7},
+    {0, SW12_CS8}
 };
 #endif
diff --git a/keyboards/wilba_tech/wt75_c/wt75_c.c b/keyboards/wilba_tech/wt75_c/wt75_c.c
index c3446b2af67..741bfb95948 100644
--- a/keyboards/wilba_tech/wt75_c/wt75_c.c
+++ b/keyboards/wilba_tech/wt75_c/wt75_c.c
@@ -9,112 +9,112 @@
 
 #if defined(LED_MATRIX_ENABLE) || defined(MONO_BACKLIGHT_WT75_C)
 const is31fl3736_led_t PROGMEM g_is31fl3736_leds[IS31FL3736_LED_COUNT] = {
-    {0, A_1},
-    {0, A_2},
-    {0, A_3},
-    {0, A_4},
-    {0, A_5},
-    {0, A_6},
-    {0, A_7},
-    {0, A_8},
+    {0, SW1_CS1},
+    {0, SW1_CS2},
+    {0, SW1_CS3},
+    {0, SW1_CS4},
+    {0, SW1_CS5},
+    {0, SW1_CS6},
+    {0, SW1_CS7},
+    {0, SW1_CS8},
 
-    {0, B_1},
-    {0, B_2},
-    {0, B_3},
-    {0, B_4},
-    {0, B_5},
-    {0, B_6},
-    {0, B_7},
-    {0, B_8},
+    {0, SW2_CS1},
+    {0, SW2_CS2},
+    {0, SW2_CS3},
+    {0, SW2_CS4},
+    {0, SW2_CS5},
+    {0, SW2_CS6},
+    {0, SW2_CS7},
+    {0, SW2_CS8},
 
-    {0, C_1},
-    {0, C_2},
-    {0, C_3},
-    {0, C_4},
-    {0, C_5},
-    {0, C_6},
-    {0, C_7},
-    {0, C_8},
+    {0, SW3_CS1},
+    {0, SW3_CS2},
+    {0, SW3_CS3},
+    {0, SW3_CS4},
+    {0, SW3_CS5},
+    {0, SW3_CS6},
+    {0, SW3_CS7},
+    {0, SW3_CS8},
 
-    {0, D_1},
-    {0, D_2},
-    {0, D_3},
-    {0, D_4},
-    {0, D_5},
-    {0, D_6},
-    {0, D_7},
-    {0, D_8},
+    {0, SW4_CS1},
+    {0, SW4_CS2},
+    {0, SW4_CS3},
+    {0, SW4_CS4},
+    {0, SW4_CS5},
+    {0, SW4_CS6},
+    {0, SW4_CS7},
+    {0, SW4_CS8},
 
-    {0, E_1},
-    {0, E_2},
-    {0, E_3},
-    {0, E_4},
-    {0, E_5},
-    {0, E_6},
-    {0, E_7},
-    {0, E_8},
+    {0, SW5_CS1},
+    {0, SW5_CS2},
+    {0, SW5_CS3},
+    {0, SW5_CS4},
+    {0, SW5_CS5},
+    {0, SW5_CS6},
+    {0, SW5_CS7},
+    {0, SW5_CS8},
 
-    {0, F_1},
-    {0, F_2},
-    {0, F_3},
-    {0, F_4},
-    {0, F_5},
-    {0, F_6},
-    {0, F_7},
-    {0, F_8},
+    {0, SW6_CS1},
+    {0, SW6_CS2},
+    {0, SW6_CS3},
+    {0, SW6_CS4},
+    {0, SW6_CS5},
+    {0, SW6_CS6},
+    {0, SW6_CS7},
+    {0, SW6_CS8},
 
-    {0, G_1},
-    {0, G_2},
-    {0, G_3},
-    {0, G_4},
-    {0, G_5},
-    {0, G_6},
-    {0, G_7},
-    {0, G_8},
+    {0, SW7_CS1},
+    {0, SW7_CS2},
+    {0, SW7_CS3},
+    {0, SW7_CS4},
+    {0, SW7_CS5},
+    {0, SW7_CS6},
+    {0, SW7_CS7},
+    {0, SW7_CS8},
 
-    {0, H_1},
-    {0, H_2},
-    {0, H_3},
-    {0, H_4},
-    {0, H_5},
-    {0, H_6},
-    {0, H_7},
-    {0, H_8},
+    {0, SW8_CS1},
+    {0, SW8_CS2},
+    {0, SW8_CS3},
+    {0, SW8_CS4},
+    {0, SW8_CS5},
+    {0, SW8_CS6},
+    {0, SW8_CS7},
+    {0, SW8_CS8},
 
-    {0, I_1},
-    {0, I_2},
-    {0, I_3},
-    {0, I_4},
-    {0, I_5},
-    {0, I_6},
-    {0, I_7},
-    {0, I_8},
+    {0, SW9_CS1},
+    {0, SW9_CS2},
+    {0, SW9_CS3},
+    {0, SW9_CS4},
+    {0, SW9_CS5},
+    {0, SW9_CS6},
+    {0, SW9_CS7},
+    {0, SW9_CS8},
 
-    {0, J_1},
-    {0, J_2},
-    {0, J_3},
-    {0, J_4},
-    {0, J_5},
-    {0, J_6},
-    {0, J_7},
-    {0, J_8},
+    {0, SW10_CS1},
+    {0, SW10_CS2},
+    {0, SW10_CS3},
+    {0, SW10_CS4},
+    {0, SW10_CS5},
+    {0, SW10_CS6},
+    {0, SW10_CS7},
+    {0, SW10_CS8},
 
-    {0, K_1},
-    {0, K_2},
-    {0, K_3},
-    {0, K_4},
-    {0, K_5},
-    {0, K_6},
-    {0, K_7},
-    {0, K_8},
+    {0, SW11_CS1},
+    {0, SW11_CS2},
+    {0, SW11_CS3},
+    {0, SW11_CS4},
+    {0, SW11_CS5},
+    {0, SW11_CS6},
+    {0, SW11_CS7},
+    {0, SW11_CS8},
 
-    {0, L_1},
-    {0, L_2},
-    {0, L_3},
-    {0, L_4},
-    {0, L_5},
-    {0, L_6},
-    {0, L_7},
-    {0, L_8}
+    {0, SW12_CS1},
+    {0, SW12_CS2},
+    {0, SW12_CS3},
+    {0, SW12_CS4},
+    {0, SW12_CS5},
+    {0, SW12_CS6},
+    {0, SW12_CS7},
+    {0, SW12_CS8}
 };
 #endif
diff --git a/keyboards/wilba_tech/wt80_a/wt80_a.c b/keyboards/wilba_tech/wt80_a/wt80_a.c
index cf29760b62a..4acf56994df 100644
--- a/keyboards/wilba_tech/wt80_a/wt80_a.c
+++ b/keyboards/wilba_tech/wt80_a/wt80_a.c
@@ -9,112 +9,112 @@
 
 #if defined(LED_MATRIX_ENABLE) || defined(MONO_BACKLIGHT_WT80_A)
 const is31fl3736_led_t PROGMEM g_is31fl3736_leds[IS31FL3736_LED_COUNT] = {
-    {0, A_1},
-    {0, A_2},
-    {0, A_3},
-    {0, A_4},
-    {0, A_5},
-    {0, A_6},
-    {0, A_7},
-    {0, A_8},
+    {0, SW1_CS1},
+    {0, SW1_CS2},
+    {0, SW1_CS3},
+    {0, SW1_CS4},
+    {0, SW1_CS5},
+    {0, SW1_CS6},
+    {0, SW1_CS7},
+    {0, SW1_CS8},
 
-    {0, B_1},
-    {0, B_2},
-    {0, B_3},
-    {0, B_4},
-    {0, B_5},
-    {0, B_6},
-    {0, B_7},
-    {0, B_8},
+    {0, SW2_CS1},
+    {0, SW2_CS2},
+    {0, SW2_CS3},
+    {0, SW2_CS4},
+    {0, SW2_CS5},
+    {0, SW2_CS6},
+    {0, SW2_CS7},
+    {0, SW2_CS8},
 
-    {0, C_1},
-    {0, C_2},
-    {0, C_3},
-    {0, C_4},
-    {0, C_5},
-    {0, C_6},
-    {0, C_7},
-    {0, C_8},
+    {0, SW3_CS1},
+    {0, SW3_CS2},
+    {0, SW3_CS3},
+    {0, SW3_CS4},
+    {0, SW3_CS5},
+    {0, SW3_CS6},
+    {0, SW3_CS7},
+    {0, SW3_CS8},
 
-    {0, D_1},
-    {0, D_2},
-    {0, D_3},
-    {0, D_4},
-    {0, D_5},
-    {0, D_6},
-    {0, D_7},
-    {0, D_8},
+    {0, SW4_CS1},
+    {0, SW4_CS2},
+    {0, SW4_CS3},
+    {0, SW4_CS4},
+    {0, SW4_CS5},
+    {0, SW4_CS6},
+    {0, SW4_CS7},
+    {0, SW4_CS8},
 
-    {0, E_1},
-    {0, E_2},
-    {0, E_3},
-    {0, E_4},
-    {0, E_5},
-    {0, E_6},
-    {0, E_7},
-    {0, E_8},
+    {0, SW5_CS1},
+    {0, SW5_CS2},
+    {0, SW5_CS3},
+    {0, SW5_CS4},
+    {0, SW5_CS5},
+    {0, SW5_CS6},
+    {0, SW5_CS7},
+    {0, SW5_CS8},
 
-    {0, F_1},
-    {0, F_2},
-    {0, F_3},
-    {0, F_4},
-    {0, F_5},
-    {0, F_6},
-    {0, F_7},
-    {0, F_8},
+    {0, SW6_CS1},
+    {0, SW6_CS2},
+    {0, SW6_CS3},
+    {0, SW6_CS4},
+    {0, SW6_CS5},
+    {0, SW6_CS6},
+    {0, SW6_CS7},
+    {0, SW6_CS8},
 
-    {0, G_1},
-    {0, G_2},
-    {0, G_3},
-    {0, G_4},
-    {0, G_5},
-    {0, G_6},
-    {0, G_7},
-    {0, G_8},
+    {0, SW7_CS1},
+    {0, SW7_CS2},
+    {0, SW7_CS3},
+    {0, SW7_CS4},
+    {0, SW7_CS5},
+    {0, SW7_CS6},
+    {0, SW7_CS7},
+    {0, SW7_CS8},
 
-    {0, H_1},
-    {0, H_2},
-    {0, H_3},
-    {0, H_4},
-    {0, H_5},
-    {0, H_6},
-    {0, H_7},
-    {0, H_8},
+    {0, SW8_CS1},
+    {0, SW8_CS2},
+    {0, SW8_CS3},
+    {0, SW8_CS4},
+    {0, SW8_CS5},
+    {0, SW8_CS6},
+    {0, SW8_CS7},
+    {0, SW8_CS8},
 
-    {0, I_1},
-    {0, I_2},
-    {0, I_3},
-    {0, I_4},
-    {0, I_5},
-    {0, I_6},
-    {0, I_7},
-    {0, I_8},
+    {0, SW9_CS1},
+    {0, SW9_CS2},
+    {0, SW9_CS3},
+    {0, SW9_CS4},
+    {0, SW9_CS5},
+    {0, SW9_CS6},
+    {0, SW9_CS7},
+    {0, SW9_CS8},
 
-    {0, J_1},
-    {0, J_2},
-    {0, J_3},
-    {0, J_4},
-    {0, J_5},
-    {0, J_6},
-    {0, J_7},
-    {0, J_8},
+    {0, SW10_CS1},
+    {0, SW10_CS2},
+    {0, SW10_CS3},
+    {0, SW10_CS4},
+    {0, SW10_CS5},
+    {0, SW10_CS6},
+    {0, SW10_CS7},
+    {0, SW10_CS8},
 
-    {0, K_1},
-    {0, K_2},
-    {0, K_3},
-    {0, K_4},
-    {0, K_5},
-    {0, K_6},
-    {0, K_7},
-    {0, K_8},
+    {0, SW11_CS1},
+    {0, SW11_CS2},
+    {0, SW11_CS3},
+    {0, SW11_CS4},
+    {0, SW11_CS5},
+    {0, SW11_CS6},
+    {0, SW11_CS7},
+    {0, SW11_CS8},
 
-    {0, L_1},
-    {0, L_2},
-    {0, L_3},
-    {0, L_4},
-    {0, L_5},
-    {0, L_6},
-    {0, L_7},
-    {0, L_8}
+    {0, SW12_CS1},
+    {0, SW12_CS2},
+    {0, SW12_CS3},
+    {0, SW12_CS4},
+    {0, SW12_CS5},
+    {0, SW12_CS6},
+    {0, SW12_CS7},
+    {0, SW12_CS8}
 };
 #endif
diff --git a/keyboards/wilba_tech/zeal60/keymaps/tusing/README.md b/keyboards/wilba_tech/zeal60/keymaps/tusing/README.md
deleted file mode 100644
index 1fbd7457420..00000000000
--- a/keyboards/wilba_tech/zeal60/keymaps/tusing/README.md
+++ /dev/null
@@ -1,79 +0,0 @@
-# RGB Underglow Strip on the Zeal60: A Guide
-
-<img src="https://i.imgur.com/UuUdOCb.jpg" width="800">
-
-## Requirements
-
-- WS2812B RGB strip, preferably 60 LEDs/meter
-- Wire, solder
-- Tape, hot glue, or some sort of adhesive
-
-## A. Connecting the strip
-You might find the [**full PCB image**](https://cdn.shopify.com/s/files/1/0490/7329/files/zeal60jumpers.png) helpful. Ignore the red boxes!
-
-1. Connect V+ to the receiving end of the thermistor labeled F1; connect GND to the board's GND pin. (*Avoid connecting +V to the board's +5V pin* - you will likely overload the thermistor, and you will limit your maximum brightness.)
-
-    <img src="https://i.imgur.com/jd7qivh.png" width="300">
-
-2. Connect DI to PB0.
-
-    <img src="https://i.imgur.com/BiMyMLv.jpg" width="300">
-
-3. Should look something like this when finished:
-
-    <img src="https://i.imgur.com/ngxYMuA.jpg" width="600">
-
-*Optional:* To allow considerably more light to escape, consider angling the strip outwards by using some sort of fulcrum under the strip. (I used a thick wire.)
-
-## B. Enabling the strip
-1. If it is not present already, add the following to your ***keymap's*** ```Makefile```:
-
-    ```Makefile
-    RGBLIGHT_ENABLE = yes
-    AUDIO_ENABLE = no     #Underglow animations cannot be used with audio.
-    ```
-2. If it is not present already, add the following to your *keymap's* ```config.h```, and edit the values as necessary:
-
-    ```c
-    // Set up RGB underglow.
-    #define WS2812_DI_PIN B0          // The pin your RGB strip is wired to
-    #define RGBLED_NUM 35          // Number of LEDs
-    #define RGBLIGHT_HUE_STEP 5    // How much each press of rgb_hue changes hue
-    #define RGBLIGHT_SAT_STEP 10   // How much each press of rgb_sat changes sat
-    #define RGBLIGHT_VAL_STEP 10   // How much each press of rgb_val changes val
-    ```
-3. If they are not present already, add the following keycodes to your keymap to control the RGB strip: ```RGB_TOG``` (on/off), ```RGB_MOD``` (step through modes), ```RGB_HUI```, ```RGB_HUD```, ```RGB_SAI```, ```RGB_SAD```, ```RGB_VAI```, ```RGB_VAD``` (HSV increase/decrease). Add these to your keymap.
-
-## C. Dealing with current limits
-USB 2.0 ports on laptops provide up to 500mA max, but USB 3.0 ports can provide up to 900mA; USB 3.1 up to 1.5A; and powered USB hubs even more. We can run our keyboard at a higher brightness if we draw more power. **The Zeal60 uses 500mA at max brightness.** This means that **you have about 400mA remaining for the strip to use on a USB 3.0 port**; 1000mA free on a USB 3.1 port, so on and so forth.
-
-***Warning:*** **This means you will need to turn *off* your RGB strip before connecting to a USB 2.0 port**, as USB 2.0 cannot sustain the current necessary!
-
-1. If not present already, add the following to your keymap's ```config.h```. Change the numbers based on your needs. The ones below are safe underestimates.
-
-    ```c
-    // Enable current limiting for RGB underglow.
-    #define RGBSTRIP_CURRENT_LIMIT 400    // Strip current limit in mA. (USB amperage - 500mA for keyboard)
-    #define RGBSTRIP_MAX_CURRENT_PER_LIGHT 50 // mA per light when at max brightness.
-    ```
-    *Example:* I use a USB port capable of providing 1800 mA. The keyboard uses 500mA, so my personal value (in the `tusing` keymap) for `RGBSTRIP_CURRENT_LIMIT` is 1300. The particular WS2812B RGB strip I have uses a maximum of 60 mA per LED, so that is my personal value for `RGBSTRIP_MAX_CURRENT_PER_LIGHT`.
-2. Toggle on the LED strip (```RGB_TOG```) and step through animations (```RGB_MOD```) to test it out!
-
-## D. Sources and resources
-### A. Connecting the strip.
-* [In-depth description of connecting an RGB strip to the GH60](https://www.reddit.com/r/MechanicalKeyboards/comments/4d5or2/my_first_custom_build_satan_gh60_rbg_underglow_in/d1nz3o7/)
-* [32U4 Pinout](https://40.media.tumblr.com/93b6bbd4113418c2b45459bb177e67c5/tumblr_mi49a20QMB1s5t695o1_1280.png)
-* [Redditor describes connecting RGB strips on his Satan GH60](https://www.reddit.com/r/MechanicalKeyboards/comments/4hbjw4/finally_finished_my_satan_gh60_also_granite_o/d2qn8zx/?context=3)
-* [Another Redditor on RGB with the Satan GH60](https://www.reddit.com/r/MechanicalKeyboards/comments/4ewzdx/gh60_satan_with_the_rgb_mod/d251uu6/ )
-
-### B. Enabling the strip.
-* [QMK Wiki portion on underglow](https://github.com/jackhumbert/qmk_firmware/wiki#rgb-under-glow-mod)
-* [Planck ```Makefile```, ```config.h```, and ```keymap.c``` config example](https://github.com/jackhumbert/qmk_firmware/tree/master/keyboards/planck/keymaps/yang)
-* [Video demonstrating keycode functions and RGB modes on a KC60](https://www.youtube.com/watch?v=VKrpPAHlisY)
-
-### C. Dealing with current limits.
-* [Discussion of cutting jumpers and adding resistors to lower current from Zeal60](https://www.reddit.com/r/MechanicalKeyboards/comments/5hou92/photos_zeal60_lets_just_say_santa_came_early_this/db23qid/)
-* [A selection of 900mA-1.5A current hold fuses - look for an SMD 0805-sized fuse.](https://goo.gl/748avG)
-* [Video detailing technique to solder 0805 resistors](https://www.youtube.com/watch?v=PU7wLcuqc-I&t=123s&list=FLheMlKEVQ5cmVXazUt6HrxQ&index=2)
-* [QMK feature request to implement max power draw limits in ```config.h```](https://github.com/jackhumbert/qmk_firmware/issues/954)
-* [Commit enabling max power draw limits in ```config.h```](https://github.com/jackhumbert/qmk_firmware/commit/83e613ad239459582ae28f78b6c81535b9b138d7)
diff --git a/keyboards/wilba_tech/zeal60/keymaps/tusing/config.h b/keyboards/wilba_tech/zeal60/keymaps/tusing/config.h
deleted file mode 100644
index e797f819413..00000000000
--- a/keyboards/wilba_tech/zeal60/keymaps/tusing/config.h
+++ /dev/null
@@ -1,45 +0,0 @@
-#pragma once
-
-/* Enable/disable LEDs based on layout. */
-#undef RGB_BACKLIGHT_USE_SPLIT_BACKSPACE
-#define RGB_BACKLIGHT_USE_SPLIT_BACKSPACE 0
-
-#undef RGB_BACKLIGHT_USE_SPLIT_LEFT_SHIFT
-#define RGB_BACKLIGHT_USE_SPLIT_LEFT_SHIFT 0
-
-#undef RGB_BACKLIGHT_USE_SPLIT_RIGHT_SHIFT
-#define RGB_BACKLIGHT_USE_SPLIT_RIGHT_SHIFT 0
-
-#undef RGB_BACKLIGHT_USE_7U_SPACEBAR
-#define RGB_BACKLIGHT_USE_7U_SPACEBAR 0
-
-#undef RGB_BACKLIGHT_USE_ISO_ENTER
-#define RGB_BACKLIGHT_USE_ISO_ENTER 0
-
-#undef RGB_BACKLIGHT_DISABLE_HHKB_BLOCKER_LEDS
-#define RGB_BACKLIGHT_DISABLE_HHKB_BLOCKER_LEDS 0
-
-// Set up RGB underglow.
-#define WS2812_DI_PIN B0          // The pin your RGB strip is wired to
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 35          // Number of LEDs
-#define RGBLIGHT_HUE_STEP 5    // How much each press of rgb_hue changes hue
-#define RGBLIGHT_SAT_STEP 10   // How much each press of rgb_sat changes sat
-#define RGBLIGHT_VAL_STEP 10   // How much each press of rgb_val changes val
-
-// Enable current limiting for RGB underglow.
-#define RGBSTRIP_CURRENT_LIMIT 1300    // Strip current limit in mA. (USB amperage - 500mA for keyboard)
-#define RGBSTRIP_MAX_CURRENT_PER_LIGHT 40 // mA per light when at max brightness.
-
-// Scale brightnes according to BRIGHTNESS_CORRECTION_TABLE in quantum/rgblight.c.
-// This allows to mitigate uneven brightness from LED underglow strips.
-// #define LED_BRIGHTNESS_CORRECTION
diff --git a/keyboards/wilba_tech/zeal60/keymaps/tusing/keymap.c b/keyboards/wilba_tech/zeal60/keymaps/tusing/keymap.c
deleted file mode 100644
index 21cb2cd73fc..00000000000
--- a/keyboards/wilba_tech/zeal60/keymaps/tusing/keymap.c
+++ /dev/null
@@ -1,48 +0,0 @@
-// Default layout for Zeal60
-#include QMK_KEYBOARD_H
-
-// For readability.
-#define   _x_   KC_NO
-#define AUD_PRV LCTL(KC_MPRV) // Previous music track
-#define AUD_PLY LCTL(KC_MPLY) // Pause music
-#define AUD_NXT LCTL(KC_MNXT) // Next music track
-
-// Zeal60-specific keys:
-//  EF_INC, EF_DEC,   // next/previous backlight effect
-//  H1_INC, H1_DEC,   // Color 1 hue increase/decrease
-//  S1_INC, S1_DEC,   // Color 1 saturation increase/decrease
-//  H2_INC, H2_DEC,   // Color 2 hue increase/decrease
-//  S2_INC, S2_DEC,   // Color 2 saturation increase/decrease
-//  BR_INC, BR_DEC,   // backlight brightness increase/decrease
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-// Default layer: Pressing caps-lock momentarily switches to Layer 1.
-// This is the default layer. Pressing an empty keycode on another layer will take you here.
-    [0] = {
-        {KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC},
-        {KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS},
-        {MO(1),   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,    _x_  },
-        {KC_LSFT,   _x_  , KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,   _x_  },
-        {KC_LCTL, KC_LGUI, KC_LALT,   _x_  ,   _x_  ,   _x_  ,   _x_  , KC_SPC,    _x_  ,   _x_  , KC_LEFT, KC_UP,   KC_DOWN, KC_RGHT}
-    },
-
-// Layer 1: Pressing enter switches to layer 2, where backlight controls live.
-// This is a momentary layer: once you let go of caps, you'll be back in layer 1.
-    [1] = {
-        {KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL },
-        {_______, KC_VOLD, KC_MUTE, KC_VOLU, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_INS,  KC_DEL,  _______},
-        {_______, AUD_PRV, AUD_PLY, AUD_NXT, _______, _______, _______, _______, _______, _______, _______, _______, TO(2)  ,   _x_  },
-        {KC_CAPS,   _x_  , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _x_  },
-        {KC_RCTL, KC_RGUI, KC_RALT,   _x_  ,   _x_  ,   _x_  ,   _x_  , _______,   _x_  ,   _x_  , KC_HOME, KC_PGUP, KC_PGDN,  KC_END}
-    },
-
-// Layer 2: Zeal60 and backlight configuration. (Get here quickly by pressing Caps+Enter from Layer 1.)
-// This is a persistent layer. Get back to the default layer by pressing enter.
-    [2] = {
-        {QK_BOOT, EF_DEC,  EF_INC,  BR_DEC,  BR_INC,  ES_DEC,  ES_INC,  _______, _______, _______, _______, _______, _______, _______},
-        {_______, H1_DEC,  H1_INC,  S1_DEC,  S1_INC,  _______, _______, _______, _______, _______, _______, _______, _______, _______},
-        {_______, H2_DEC,  H2_INC,  S2_DEC,  S2_INC,  _______, _______, _______, _______, _______, _______, _______, TO(0)  ,   _x_  },
-        {RGB_MOD,   _x_  , RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, _______, _______, _______, _______, _______, _______, _______,   _x_  },
-        {RGB_TOG, RGB_VAD, RGB_VAI,   _x_  ,   _x_  ,   _x_  ,   _x_  , _______,   _x_  ,   _x_  , _______, _______, _______, _______}
-    }
-};
diff --git a/keyboards/wilba_tech/zeal60/keymaps/tusing/rules.mk b/keyboards/wilba_tech/zeal60/keymaps/tusing/rules.mk
deleted file mode 100644
index 762905da03f..00000000000
--- a/keyboards/wilba_tech/zeal60/keymaps/tusing/rules.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-RGBLIGHT_ENABLE = yes
-AUDIO_ENABLE = no  # Underglow cannot be used with audio.
diff --git a/keyboards/winkeyless/bface/keymaps/kpeatt/keymap.c b/keyboards/winkeyless/bface/keymaps/kpeatt/keymap.c
deleted file mode 100644
index a74ec357011..00000000000
--- a/keyboards/winkeyless/bface/keymaps/kpeatt/keymap.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
-Copyright 2017 Kyle Peatt <kpeatt@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include QMK_KEYBOARD_H
-
-#define ______ KC_TRNS
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    /* Qwerty
-    * ,-----------------------------------------------------------------------------------------.
-    * | Esc |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |   Bkspc   |
-    * |-----------------------------------------------------------------------------------------+
-    * | Tab    |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |    \   |
-    * |-----------------------------------------------------------------------------------------+
-    * | Caps/FN |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |    Enter    |
-    * |-----------------------------------------------------------------------------------------+
-    * | Shift     |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  |     RShift      |
-    * |-----------------------------------------------------------------------------------------+
-    * | Ctrl |  GUI  |  Alt  |              Space                |  Alt  |  GUI  |  Ctrl |  Fn  |
-    * `-----------------------------------------------------------------------------------------'
-    */
-
-    [0] = LAYOUT_60_ansi(
-        QK_GESC, KC_1,  KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,   KC_0,    KC_MINS, KC_EQL, KC_BSPC,
-        KC_TAB,  KC_Q,  KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,    KC_O,   KC_P,    KC_LBRC, KC_RBRC,KC_BSLS,
-        LT(1, KC_CAPS), KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,    KC_L,   KC_SCLN, KC_QUOT, KC_ENT,
-        KC_LSFT,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
-        KC_LCTL,KC_LGUI,KC_LALT,                KC_SPC,                          KC_RALT,KC_RGUI, KC_RCTL, MO(1)
-    ),
-
-    /* FN Layer
-    * ,-----------------------------------------------------------------------------------------.
-    * |  `~ | F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9  | F10  | F11  | F12  |        |
-    * |-----------------------------------------------------------------------------------------+
-    * |        |     |  Up |     |     |     |     |     |     |     |RGBMOD| Val+| Val- |RBGTOG|
-    * |-----------------------------------------------------------------------------------------+
-    * |         | Left| Down|Right|     |     |     |     | Sat+| Sat-| Hue+| Hue-|             |
-    * |-----------------------------------------------------------------------------------------+
-    * |           |     |     |     |     |     |     |     |     |     |     |     |     |     |
-    * |-----------------------------------------------------------------------------------------+
-    * |      |       |       |                                   |     |      |     |     |     |
-    * `-----------------------------------------------------------------------------------------'
-    */
-
-    [1] = LAYOUT_60_ansi(
-        KC_GRV, KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12, ______,
-        ______,______,KC_UP,______,______,______,______,______,______,______,RGB_MOD,RGB_VAI,RGB_VAD,RGB_TOG,
-        ______,KC_LEFT,KC_DOWN,KC_RGHT,______, ______, ______,______,RGB_SAI,RGB_SAD,RGB_HUI,RGB_HUD,______,
-        ______,______,______,______,______, ______, ______,______,______,______,______,        ______,
-        ______,______,______,                ______,                        ______,______,______,______
-    ),
-    /* You can copy this layer as base for a new fn layer * /
-	[n] = LAYOUT_60_ansi(
-        ______,______,______,______,______,______,______,______,______,______,______,______,______,______,
-        ______,______,______,______,______,______,______,______,______,______,______,______,______,______,
-        ______,______,______,______,______,______,______,______,______,______,______,______,______,
-        ______,______,______,______,______,______,______,______,______,______,______,        ______,
-        ______,______,______,                ______,                        ______,______,______,______
-    ), // */
-};
diff --git a/keyboards/winkeyless/bface/keymaps/kpeatt/readme.md b/keyboards/winkeyless/bface/keymaps/kpeatt/readme.md
deleted file mode 100644
index a7eef1e5fcf..00000000000
--- a/keyboards/winkeyless/bface/keymaps/kpeatt/readme.md
+++ /dev/null
@@ -1,10 +0,0 @@
-kpeatt's bface layout
-======================
-
-## Keyboard Notes
-- This is for a clone bface PCB that is no longer for sale as far as I can tell. [Used to be sold on KBDFans](https://www.aliexpress.com/item/bface-60-RGB-underground-copy-pcb-from-china-gh60-pcb-Customize-keyboard-PCB/32731084597.html).
-- To put in reset mode hold `left ctrl` while inserting the USB cable
-- Use flashing instructions in the main `bface` directory
-
-### Build
-To build this keymap, run `make bface:kpeatt` from the qmk_firmware directory.
diff --git a/keyboards/winkeyless/bface/keymaps/p3lim/README.md b/keyboards/winkeyless/bface/keymaps/p3lim/README.md
deleted file mode 100644
index 94e84e7f221..00000000000
--- a/keyboards/winkeyless/bface/keymaps/p3lim/README.md
+++ /dev/null
@@ -1,21 +0,0 @@
-# p3lim's b.face layout
-
-![](https://user-images.githubusercontent.com/26496/61170794-bf8a2c80-a56e-11e9-893f-f1766e7a9a04.png)
-
-My layout using the winkeyless b.face X2 PCB.
-
-### Building & Flashing
-
-- Set up QMK
-	- `pip install --user qmk`
-	- `qmk setup`
-- Add udev rules if on Linux
-	- Follow the docs: <https://docs.qmk.fm/#/faq_build?id=linux-udev-rules>
-- Build and flash
-	- `qmk flash -kb winkeyless/bface -km p3lim`
-- Hold bottom-left key while connecting to put in flashing mode
-
-### Layout notes
-
-The keys indicated with a gray color in the image above was not supported by the layout so a custom matrix was made.
-The two additional keys were on pins 22+41 and 22+42, C3+B1 and C3+B2, which is mapped to col 10 row 1 and col 10 row 2 in the matrix.
diff --git a/keyboards/winkeyless/bface/keymaps/p3lim/keymap.c b/keyboards/winkeyless/bface/keymaps/p3lim/keymap.c
deleted file mode 100644
index f702810f9c2..00000000000
--- a/keyboards/winkeyless/bface/keymaps/p3lim/keymap.c
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
-Copyright 2019-2021 Adrian L Lange <legal@p3lim.net>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include QMK_KEYBOARD_H
-
-#define LAYOUT_p3lim(\
-  K04, K14, K24, K34, K44, K54, K16, KB6, KB7, K17, KA4, KB4, KC4, KE4, \
-  K03, K13, K23, K33, K43, K53, K26, KC6, KC7, K27, KA3, KB3, KC3, \
-  K02, K12, K22, K32, K42, K52, K36, KD6, KD7, K37, KA2, KB2, KC2, KD2, \
-  K01, K11, K21, K31, K41, K51, K46, KE6, KE7, K47, KA1, KB1, KC1, \
-  K00, K10, K20,           K56,                K57, KB0, KC0  \
-){ \
-  { K00,   K10,   K20,   KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KB0,   KC0,   KC_NO, KC_NO }, \
-  { K01,   K11,   K21,   K31,   K41,   K51,   KC_NO, KC_NO, KC_NO, KC_NO, KA1,   KB1,   KC1,   KC_NO, KC_NO }, \
-  { K02,   K12,   K22,   K32,   K42,   K52,   KC_NO, KC_NO, KC_NO, KC_NO, KA2,   KB2,   KC2,   KD2,   KC_NO }, \
-  { K03,   K13,   K23,   K33,   K43,   K53,   KC_NO, KC_NO, KC_NO, KC_NO, KA3,   KB3,   KC3,   KC_NO, KC_NO }, \
-  { K04,   K14,   K24,   K34,   K44,   K54,   KC_NO, KC_NO, KC_NO, KC_NO, KA4,   KB4,   KC4,   KC_NO, KE4   }, \
-  { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
-  { KC_NO, K16,   K26,   K36,   K46,   K56,   KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KB6,   KC6,   KD6,   KE6   }, \
-  { KC_NO, K17,   K27,   K37,   K47,   K57,   KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KB7,   KC7,   KD7,   KE7   } \
-}
-
-enum my_keycodes {
-	C_ESC0 = SAFE_RANGE, // layer 0 esc
-	C_ESC1,              // layer 1 esc
-	C_NO1,               // æ, requires RCTL to be a compose key in software
-	C_NO2,               // ø, requires RCTL to be a compose key in software
-	C_NO3                // å, requires RCTL to be a compose key in software
-};
-
-// use compiler macros for simpler stuff
-#define C_KVM1 LCA(KC_1)
-#define C_KVM2 LCA(KC_2)
-#define C_KVM3 LCA(KC_3)
-#define C_KVM4 LCA(KC_4)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	/* QWERTY
-	* ,-----------------------------------------------------------------------------------------.
-	* | Esc |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |   Bkspc   |
-	* |-----------------------------------------------------------------------------------------+
-	* |   Tab  |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |        |
-	* |---------------------------------------------------------------------------------| Enter |
-	* |   Ctrl  |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |  \  |       |
-	* |-----------------------------------------------------------------------------------------+
-	* |   Shift   |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  |   Shift   | Del |
-	* |-----------------------------------------------------------------------------------------+
-	* |  FN1  | Alt |  GUI   |              Space                      |  FN2   | Alt |  Ctrl   |
-	* `-----------------------------------------------------------------------------------------'
-	*/
-	[0] = LAYOUT_p3lim(
-		C_ESC0,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
-		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,
-		KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,
-		KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_DEL,
-		MO(1),   KC_LALT, KC_LGUI,                   KC_SPC,                             MO(2),   KC_RGUI, KC_RCTL
-	),
-
-	/* FN1
-	* ,-----------------------------------------------------------------------------------------.
-	* |  `  | F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9  | F10 | F11 | F12 |           |
-	* |-----------------------------------------------------------------------------------------+
-	* |  Caps  | Home| Up  | End | PgUp|     |     |     |     |     |     |     |     |        |
-	* |---------------------------------------------------------------------------------|       |
-	* |         | Left| Down|Right| PgDn|PrtSc|     |     |     |     |     |     |     |       |
-	* |-----------------------------------------------------------------------------------------+
-	* |           | KVM1| KVM2| KVM3| KVM4|     |     |     |     |     |     |           |     |
-	* |-----------------------------------------------------------------------------------------+
-	* |       |     |        |                                         |        |     |         |
-	* `-----------------------------------------------------------------------------------------'
-	*/
-	[1] = LAYOUT_p3lim(
-		C_ESC1,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,
-		KC_CAPS, KC_HOME, KC_UP,   KC_END,  KC_PGUP, _______, _______, _______, _______, _______, _______, _______, _______,
-		_______, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_PSCR, _______, _______, _______, _______, _______, _______, _______, _______,
-		_______, C_KVM1,  C_KVM2,  C_KVM3,  C_KVM4,  _______, _______, _______, _______, _______, _______, _______, _______,
-		_______, _______, _______,                   _______,                            KC_NO,   _______, _______
-	),
-
-	/* FN2
-	* ,-----------------------------------------------------------------------------------------.
-	* |     |     |     |     |     |     |     |     |     |     |     |     |     |           |
-	* |-----------------------------------------------------------------------------------------+
-	* |        |     |     |     |     |     |     |     |     |     |     |  Å  |     |        |
-	* |---------------------------------------------------------------------------------|       |
-	* |         |     |     |     |     |     |     |     |     |     |  Ø  |  Æ  |     |       |
-	* |-----------------------------------------------------------------------------------------+
-	* |           |     |     |     |     |     |     |     |     |     |     |           |     |
-	* |-----------------------------------------------------------------------------------------+
-	* |       |     |        |                                         |        |     |         |
-	* `-----------------------------------------------------------------------------------------'
-	*/
-	[2] = LAYOUT_p3lim(
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, C_NO3,   _______,
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, C_NO2,   C_NO1,   _______, _______,
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-		KC_NO,   _______, _______,                   _______,                            _______, _______, _______
-	),
-	/*
-	[n] = LAYOUT_p3lim(
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-		_______, _______, _______,                   _______,                            _______, _______, _______
-	),
-	*/
-};
-
-static bool grave_esc_shifted = false;
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record){
-	const uint8_t mods = get_mods();
-	uint8_t shifted = mods & MOD_MASK_SHIFT;
-
-	switch(keycode){
-		case C_ESC0: // layer 0
-			if(record->event.pressed){
-				grave_esc_shifted = shifted;
-				register_code(shifted ? KC_GRAVE : KC_ESCAPE);
-			} else
-				unregister_code(grave_esc_shifted ? KC_GRAVE : KC_ESCAPE);
-			return false;
-		case C_ESC1: // layer 1
-			if(record->event.pressed){
-				grave_esc_shifted = shifted;
-				register_code(shifted ? KC_ESCAPE : KC_GRAVE);
-			} else
-				unregister_code(grave_esc_shifted ? KC_ESCAPE : KC_GRAVE);
-			return false;
-		case C_NO1: // æ
-			if(record->event.pressed){
-				// we use shift for A and E to make it capitalized, no need to handle it here
-				tap_code(KC_RCTL);
-				tap_code(KC_A);
-				tap_code(KC_E);
-			}
-			return false;
-		case C_NO2: // ø
-			// the "/" symbol can't be shifted, so we have to deal with that
-			if(record->event.pressed){
-				if(shifted){
-					unregister_code(KC_LSFT); // reset the shift state, I always use LSFT personally
-					tap_code(KC_RCTL);
-					tap_code(KC_SLSH);
-					tap_code16(S(KC_O));
-					register_code(KC_LSFT); // enable the shift state again to keep state consistent
-				} else {
-					tap_code(KC_RCTL);
-					tap_code(KC_SLSH);
-					tap_code(KC_O);
-				}
-			}
-			return false;
-		case C_NO3: // å
-			// the "o" symbol can't be shifted, so we have to deal with that
-			if(record->event.pressed){
-				if(shifted){
-					unregister_code(KC_LSFT); // reset the shift state, I always use LSFT personally
-					tap_code(KC_RCTL);
-					tap_code(KC_O);
-					tap_code16(S(KC_A));
-					register_code(KC_LSFT); // enable the shift state again to keep state consistent
-				} else {
-					tap_code(KC_RCTL);
-					tap_code(KC_O);
-					tap_code(KC_A);
-				}
-			}
-			return false;
-	}
-	return true;
-}
diff --git a/keyboards/winkeyless/bface/keymaps/p3lim/rules.mk b/keyboards/winkeyless/bface/keymaps/p3lim/rules.mk
deleted file mode 100644
index e0ed6f0c2d6..00000000000
--- a/keyboards/winkeyless/bface/keymaps/p3lim/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-RGBLIGHT_ENABLE = no
diff --git a/keyboards/wolf/m60_b/info.json b/keyboards/wolf/m60_b/info.json
index 6d39d0bbf87..474974d3835 100644
--- a/keyboards/wolf/m60_b/info.json
+++ b/keyboards/wolf/m60_b/info.json
@@ -11,8 +11,7 @@
         "extrakey": true,
         "mousekey": true,
         "nkro": true,
-        "rgb_matrix": true,
-        "rgblight": false
+        "rgb_matrix": true
     },
     "ws2812": {
         "pin": "D1"
diff --git a/keyboards/wren/keymaps/walterhanley/config.h b/keyboards/wren/keymaps/walterhanley/config.h
deleted file mode 100644
index 3dd5b47c160..00000000000
--- a/keyboards/wren/keymaps/walterhanley/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2021 Walter Hanley
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-// Lower board power consumption to boost compatibility
-#define USB_MAX_POWER_CONSUMPTION 250
diff --git a/keyboards/wren/keymaps/walterhanley/keymap.c b/keyboards/wren/keymaps/walterhanley/keymap.c
deleted file mode 100644
index bf6afc9ac66..00000000000
--- a/keyboards/wren/keymaps/walterhanley/keymap.c
+++ /dev/null
@@ -1,170 +0,0 @@
-/* Copyright 2021 Walter Hanley
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-
-// Cmd-tab tablesetting
-bool is_cmd_tab_active = false;
-uint16_t cmd_tab_timer = 0;
-
-// Alt-tab tablesetting
-bool is_alt_tab_active = false;
-uint16_t alt_tab_timer = 0;
-
-// Defines keycode alias
-#define ECTL LCTL_T(KC_ESC)
-#define EGUI LGUI_T(KC_ESC)
-#define DELSYM LT(_SYMBOL, KC_DEL)
-#define SCLNAV LT(_NAV, KC_SCLN)
-#define TGNLCK TG(_NLCK)
-
-// Defines names for use in layer keycodes and the keymap
-enum layer_names {
-    _MAC,
-    _WIN,
-    _NLCK,
-    _SYMBOL,
-    _NAV
-};
-
-// Defines the keycodes used by our macros in process_record_user
-enum custom_keycodes {
-    NSEAL = SAFE_RANGE,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Mac */
-    [_MAC] = LAYOUT(
-     KC_PSLS, KC_7,    KC_8,    KC_9,    KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                      KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_GRV,  KC_INS,  KC_HOME, KC_PGUP, KC_NO,
-     KC_PAST, KC_4,    KC_5,    KC_6,    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS, KC_DEL,  KC_END,  KC_PGDN, KC_NO,
-     KC_PMNS, KC_1,    KC_2,    KC_3,    ECTL,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L,    SCLNAV,  KC_QUOT, KC_NO,   KC_UP,   KC_NO,   KC_NO,
-     KC_PPLS, KC_0,    KC_DOT,  KC_ENT,  SC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                      KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SC_RSPC, KC_LEFT, KC_DOWN, KC_RGHT, KC_NO,
-                                                           TGNLCK,  KC_LALT, KC_LGUI, KC_BSPC, KC_ENT,  KC_SPC,  DELSYM,  KC_RGUI, KC_RALT, KC_MUTE
-    ),
-
-    /* Windows */
-    [_WIN] = LAYOUT(
-     KC_PSLS, KC_7,    KC_8,    KC_9,    KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                      KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_GRV,  KC_INS,  KC_HOME, KC_PGUP, KC_NO,
-     KC_PAST, KC_4,    KC_5,    KC_6,    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS, KC_DEL,  KC_END,  KC_PGDN, KC_NO,
-     KC_PMNS, KC_1,    KC_2,    KC_3,    EGUI,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L,    SCLNAV,  KC_QUOT, KC_NO,   KC_UP,   KC_NO,   KC_NO,
-     KC_PPLS, KC_0,    KC_DOT,  KC_ENT,  SC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                      KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SC_RSPC, KC_LEFT, KC_DOWN, KC_RGHT, KC_NO,
-                                                           TGNLCK,  KC_LALT, KC_LCTL, KC_BSPC, KC_ENT,  KC_SPC,  DELSYM,  KC_RCTL, KC_RALT, KC_MUTE
-    ),
-
-    /* In-Keyboard Numlock */
-    [_NLCK] = LAYOUT(
-     KC_PSLS, KC_HOME, KC_UP,   KC_PGUP, _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-     KC_PAST, KC_LEFT, KC_5,    KC_RGHT, _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-     KC_PMNS, KC_END,  KC_DOWN, KC_PGDN, _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-     KC_PPLS, KC_INS,  KC_DOT,  KC_ENT,  _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-                                                           TGNLCK,  _______, _______, _______, _______, _______, _______, _______, _______, _______
-    ),
-
-    /* Symbols, F-Keys, and Text Macros */
-    [_SYMBOL] = LAYOUT(
-     NSEAL,   _______, _______, _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                     KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, _______, _______,
-     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-     _______, _______, _______, _______, _______, _______, KC_UNDS, KC_LCBR, KC_LBRC, _______,                   _______, KC_RBRC, KC_RCBR, KC_MINS, _______, _______, _______, _______, _______, _______,
-     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-                                                           _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-    ),
-
-    /* Nav Cluster and Settings*/
-    [_NAV] = LAYOUT(
-     DF(_MAC), _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-     DF(_WIN), _______, _______, _______, _______, KC_PGUP, KC_HOME, KC_UP,   KC_END,  _______,                   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-     _______,  _______, _______, _______, _______, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, _______,                   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-     _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-                                                            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-    )
-};
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (index == 0) { /* First encoder */
-        // Encoder functionality for _MAC layer
-        if (IS_LAYER_ON(_MAC))
-        {
-            if (clockwise) {
-                if (!is_cmd_tab_active) {
-                    is_cmd_tab_active = true;
-                    register_code(KC_LGUI);
-                }
-                cmd_tab_timer = timer_read();
-                tap_code16(KC_TAB);
-            } else {
-                if (!is_cmd_tab_active) {
-                    is_cmd_tab_active = true;
-                    register_code(KC_LGUI);
-                }
-                cmd_tab_timer = timer_read();
-                tap_code16(S(KC_TAB));
-            }
-        }
-        // Encoder functionality for _WIN layer
-        else if (IS_LAYER_ON(_WIN)) {
-            if (clockwise) {
-                if (!is_alt_tab_active) {
-                    is_alt_tab_active = true;
-                    register_code(KC_LALT);
-                }
-                alt_tab_timer = timer_read();
-                tap_code16(KC_TAB);
-            } else {
-                if (!is_alt_tab_active) {
-                    is_alt_tab_active = true;
-                    register_code(KC_LALT);
-                }
-                alt_tab_timer = timer_read();
-                tap_code16(S(KC_TAB));
-            }
-        }
-    } else if (index == 1) { /* Second encoder */
-        if (clockwise) {
-            tap_code(KC_VOLU);
-        } else {
-            tap_code(KC_VOLD);
-        }
-    }
-    return true;
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case NSEAL:
-            if (record->event.pressed) {
-                // when keycode NSEAL is pressed
-                SEND_STRING("What the fuck did you just fucking say about me, you little bitch? I'll have you know I graduated top of my class in the Navy Seals, and I've been involved in numerous secret raids on Al-Quaeda, and I have over 300 confirmed kills. I am trained in gorilla warfare and I'm the top sniper in the entire US armed forces. You are nothing to me but just another target. I will wipe you the fuck out with precision the likes of which has never been seen before on this Earth, mark my fucking words. You think you can get away with saying that shit to me over the Internet? Think again, fucker. As we speak I am contacting my secret network of spies across the USA and your IP is being traced right now so you better prepare for the storm, maggot. The storm that wipes out the pathetic little thing you call your life. You're fucking dead, kid. I can be anywhere, anytime, and I can kill you in over seven hundred ways, and that's just with my bare hands. Not only am I extensively trained in unarmed combat, but I have access to the entire arsenal of the United States Marine Corps and I will use it to its full extent to wipe your miserable ass off the face of the continent, you little shit. If only you could have known what unholy retribution your little 'clever' comment was about to bring down upon you, maybe you would have held your fucking tongue. But you couldn't, you didn't, and now you're paying the price, you goddamn idiot. I will shit fury all over you and you will drown in it. You're fucking dead, kiddo.");
-            } else {
-                // when keycode NSEAL is released
-            }
-            break;
-    }
-    return true;
-}
-
-void matrix_scan_user(void) {
-    if (is_cmd_tab_active) {
-        if (timer_elapsed(cmd_tab_timer) > 1000) {
-            unregister_code(KC_LGUI);
-            is_cmd_tab_active = false;
-        }
-    }
-    if (is_alt_tab_active) {
-        if (timer_elapsed(alt_tab_timer) > 1000) {
-            unregister_code(KC_LALT);
-            is_alt_tab_active = false;
-        }
-    }
-}
diff --git a/keyboards/wren/keymaps/walterhanley/readme.md b/keyboards/wren/keymaps/walterhanley/readme.md
deleted file mode 100644
index 27e32360dc4..00000000000
--- a/keyboards/wren/keymaps/walterhanley/readme.md
+++ /dev/null
@@ -1,12 +0,0 @@
-![Author's Layout](https://github.com/walterhanley/wren-keyboard/blob/main/images/author-layout.png?raw=true)
-
-# Author's Wren Layout
-
-This is my personal Wren layout, which includes a few layers and macros that 
-I find useful. It started as a clone of the default keymap, but will likely
-diverge more as time goes on.
-
-Please note that this layout preserves the entire keyboard matrix, but only 
-includes keycodes for a numpad/nav cluster configuration. Depending on your 
-configuration, you may need to replace some of the existing KC_NO values 
-with actual keycodes.
diff --git a/keyboards/xelus/ninjin/config.h b/keyboards/xelus/ninjin/config.h
index 9db59dcc66c..7a8ac2f0130 100644
--- a/keyboards/xelus/ninjin/config.h
+++ b/keyboards/xelus/ninjin/config.h
@@ -20,8 +20,8 @@
 #define WS2812_PWM_DRIVER PWMD1
 #define WS2812_PWM_CHANNEL 3
 #define WS2812_PWM_PAL_MODE 2
-#define WS2812_DMA_STREAM STM32_DMA1_STREAM5
-#define WS2812_DMA_CHANNEL 3
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM5
+#define WS2812_PWM_DMA_CHANNEL 3
 #define WS2812_EXTERNAL_PULLUP
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/xelus/pachi/rgb/rev1/rev1.c b/keyboards/xelus/pachi/rgb/rev1/rev1.c
index b5786f9c3c3..b45dded891e 100644
--- a/keyboards/xelus/pachi/rgb/rev1/rev1.c
+++ b/keyboards/xelus/pachi/rgb/rev1/rev1.c
@@ -29,131 +29,131 @@ const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
  *   |  |         G location
  *   |  |         |         B location
  *   |  |         |         | */
-    {0, CS39_SW1, CS38_SW1, CS37_SW1}, //A1
-    {0, CS36_SW1, CS35_SW1, CS34_SW1}, //A2
-    {0, CS33_SW1, CS32_SW1, CS31_SW1}, //A3
-    {0, CS30_SW1, CS29_SW1, CS28_SW1}, //A4
-    {0, CS27_SW1, CS26_SW1, CS25_SW1}, //A5
-    {0, CS24_SW1, CS23_SW1, CS22_SW1}, //A6
-    {0, CS21_SW1, CS20_SW1, CS19_SW1}, //A7
-    {0, CS18_SW1, CS17_SW1, CS16_SW1}, //A8
-    {0, CS15_SW1, CS14_SW1, CS13_SW1}, //A9
-    {0, CS12_SW1, CS11_SW1, CS10_SW1}, //A10
-    {0, CS9_SW1 , CS8_SW1 , CS7_SW1 }, //A11
-    {0, CS6_SW1 , CS5_SW1 , CS4_SW1 }, //A12
-    {0, CS3_SW1 , CS2_SW1 , CS1_SW1 }, //A13
+    {0, SW1_CS39, SW1_CS38, SW1_CS37}, //A1
+    {0, SW1_CS36, SW1_CS35, SW1_CS34}, //A2
+    {0, SW1_CS33, SW1_CS32, SW1_CS31}, //A3
+    {0, SW1_CS30, SW1_CS29, SW1_CS28}, //A4
+    {0, SW1_CS27, SW1_CS26, SW1_CS25}, //A5
+    {0, SW1_CS24, SW1_CS23, SW1_CS22}, //A6
+    {0, SW1_CS21, SW1_CS20, SW1_CS19}, //A7
+    {0, SW1_CS18, SW1_CS17, SW1_CS16}, //A8
+    {0, SW1_CS15, SW1_CS14, SW1_CS13}, //A9
+    {0, SW1_CS12, SW1_CS11, SW1_CS10}, //A10
+    {0, SW1_CS9 , SW1_CS8 , SW1_CS7 }, //A11
+    {0, SW1_CS6 , SW1_CS5 , SW1_CS4 }, //A12
+    {0, SW1_CS3 , SW1_CS2 , SW1_CS1 }, //A13
 
-    {0, CS39_SW2, CS38_SW2, CS37_SW2}, //B1
-    {0, CS36_SW2, CS35_SW2, CS34_SW2}, //B2
-    {0, CS33_SW2, CS32_SW2, CS31_SW2}, //B3
-    {0, CS30_SW2, CS29_SW2, CS28_SW2}, //B4
-    {0, CS27_SW2, CS26_SW2, CS25_SW2}, //B5
-    {0, CS24_SW2, CS23_SW2, CS22_SW2}, //B6
-    {0, CS21_SW2, CS20_SW2, CS19_SW2}, //B7
-    {0, CS18_SW2, CS17_SW2, CS16_SW2}, //B8
-    {0, CS15_SW2, CS14_SW2, CS13_SW2}, //B9
-    {0, CS12_SW2, CS11_SW2, CS10_SW2}, //B10
-    {0, CS9_SW2 , CS8_SW2 , CS7_SW2 }, //B11
-    {0, CS6_SW2 , CS5_SW2 , CS4_SW2 }, //B12
-    {0, CS3_SW2 , CS2_SW2 , CS1_SW2 }, //B13
+    {0, SW2_CS39, SW2_CS38, SW2_CS37}, //B1
+    {0, SW2_CS36, SW2_CS35, SW2_CS34}, //B2
+    {0, SW2_CS33, SW2_CS32, SW2_CS31}, //B3
+    {0, SW2_CS30, SW2_CS29, SW2_CS28}, //B4
+    {0, SW2_CS27, SW2_CS26, SW2_CS25}, //B5
+    {0, SW2_CS24, SW2_CS23, SW2_CS22}, //B6
+    {0, SW2_CS21, SW2_CS20, SW2_CS19}, //B7
+    {0, SW2_CS18, SW2_CS17, SW2_CS16}, //B8
+    {0, SW2_CS15, SW2_CS14, SW2_CS13}, //B9
+    {0, SW2_CS12, SW2_CS11, SW2_CS10}, //B10
+    {0, SW2_CS9 , SW2_CS8 , SW2_CS7 }, //B11
+    {0, SW2_CS6 , SW2_CS5 , SW2_CS4 }, //B12
+    {0, SW2_CS3 , SW2_CS2 , SW2_CS1 }, //B13
 
-    {0, CS39_SW3, CS38_SW3, CS37_SW3}, //C1
-    {0, CS36_SW3, CS35_SW3, CS34_SW3}, //C2
-    {0, CS33_SW3, CS32_SW3, CS31_SW3}, //C3
-    {0, CS30_SW3, CS29_SW3, CS28_SW3}, //C4
-    {0, CS27_SW3, CS26_SW3, CS25_SW3}, //C5
-    {0, CS24_SW3, CS23_SW3, CS22_SW3}, //C6
-    {0, CS21_SW3, CS20_SW3, CS19_SW3}, //C7
-    {0, CS18_SW3, CS17_SW3, CS16_SW3}, //C8
-    {0, CS15_SW3, CS14_SW3, CS13_SW3}, //C9
-    {0, CS12_SW3, CS11_SW3, CS10_SW3}, //C10
-    {0, CS9_SW3 , CS8_SW3 , CS7_SW3 }, //C11
-    {0, CS6_SW3 , CS5_SW3 , CS4_SW3 }, //C12
-    {0, CS3_SW3 , CS2_SW3 , CS1_SW3 }, //C13
+    {0, SW3_CS39, SW3_CS38, SW3_CS37}, //C1
+    {0, SW3_CS36, SW3_CS35, SW3_CS34}, //C2
+    {0, SW3_CS33, SW3_CS32, SW3_CS31}, //C3
+    {0, SW3_CS30, SW3_CS29, SW3_CS28}, //C4
+    {0, SW3_CS27, SW3_CS26, SW3_CS25}, //C5
+    {0, SW3_CS24, SW3_CS23, SW3_CS22}, //C6
+    {0, SW3_CS21, SW3_CS20, SW3_CS19}, //C7
+    {0, SW3_CS18, SW3_CS17, SW3_CS16}, //C8
+    {0, SW3_CS15, SW3_CS14, SW3_CS13}, //C9
+    {0, SW3_CS12, SW3_CS11, SW3_CS10}, //C10
+    {0, SW3_CS9 , SW3_CS8 , SW3_CS7 }, //C11
+    {0, SW3_CS6 , SW3_CS5 , SW3_CS4 }, //C12
+    {0, SW3_CS3 , SW3_CS2 , SW3_CS1 }, //C13
 
-    {0, CS39_SW4, CS38_SW4, CS37_SW4}, //D1
-    {0, CS36_SW4, CS35_SW4, CS34_SW4}, //D2
-    {0, CS33_SW4, CS32_SW4, CS31_SW4}, //D3
-    {0, CS30_SW4, CS29_SW4, CS28_SW4}, //D4
-    {0, CS27_SW4, CS26_SW4, CS25_SW4}, //D5
-    {0, CS24_SW4, CS23_SW4, CS22_SW4}, //D6
-    {0, CS21_SW4, CS20_SW4, CS19_SW4}, //D7
-    {0, CS18_SW4, CS17_SW4, CS16_SW4}, //D8
-    {0, CS15_SW4, CS14_SW4, CS13_SW4}, //D9
-    {0, CS12_SW4, CS11_SW4, CS10_SW4}, //D10
-    {0, CS9_SW4 , CS8_SW4 , CS7_SW4 }, //D11
-    {0, CS6_SW4 , CS5_SW4 , CS4_SW4 }, //D12
-    {0, CS3_SW4 , CS2_SW4 , CS1_SW4 }, //D13
+    {0, SW4_CS39, SW4_CS38, SW4_CS37}, //D1
+    {0, SW4_CS36, SW4_CS35, SW4_CS34}, //D2
+    {0, SW4_CS33, SW4_CS32, SW4_CS31}, //D3
+    {0, SW4_CS30, SW4_CS29, SW4_CS28}, //D4
+    {0, SW4_CS27, SW4_CS26, SW4_CS25}, //D5
+    {0, SW4_CS24, SW4_CS23, SW4_CS22}, //D6
+    {0, SW4_CS21, SW4_CS20, SW4_CS19}, //D7
+    {0, SW4_CS18, SW4_CS17, SW4_CS16}, //D8
+    {0, SW4_CS15, SW4_CS14, SW4_CS13}, //D9
+    {0, SW4_CS12, SW4_CS11, SW4_CS10}, //D10
+    {0, SW4_CS9 , SW4_CS8 , SW4_CS7 }, //D11
+    {0, SW4_CS6 , SW4_CS5 , SW4_CS4 }, //D12
+    {0, SW4_CS3 , SW4_CS2 , SW4_CS1 }, //D13
 
-    {0, CS39_SW5, CS38_SW5, CS37_SW5}, //E1
-    {0, CS36_SW5, CS35_SW5, CS34_SW5}, //E2
-    {0, CS33_SW5, CS32_SW5, CS31_SW5}, //E3
-    {0, CS30_SW5, CS29_SW5, CS28_SW5}, //E4
-    {0, CS27_SW5, CS26_SW5, CS25_SW5}, //E5
-    {0, CS24_SW5, CS23_SW5, CS22_SW5}, //E6
-    {0, CS21_SW5, CS20_SW5, CS19_SW5}, //E7
-    {0, CS18_SW5, CS17_SW5, CS16_SW5}, //E8
-    {0, CS15_SW5, CS14_SW5, CS13_SW5}, //E9
-    {0, CS12_SW5, CS11_SW5, CS10_SW5}, //E10
-    {0, CS9_SW5 , CS8_SW5 , CS7_SW5 }, //E11
-    {0, CS6_SW5 , CS5_SW5 , CS4_SW5 }, //E12
-    {0, CS3_SW5 , CS2_SW5 , CS1_SW5 }, //E13
+    {0, SW5_CS39, SW5_CS38, SW5_CS37}, //E1
+    {0, SW5_CS36, SW5_CS35, SW5_CS34}, //E2
+    {0, SW5_CS33, SW5_CS32, SW5_CS31}, //E3
+    {0, SW5_CS30, SW5_CS29, SW5_CS28}, //E4
+    {0, SW5_CS27, SW5_CS26, SW5_CS25}, //E5
+    {0, SW5_CS24, SW5_CS23, SW5_CS22}, //E6
+    {0, SW5_CS21, SW5_CS20, SW5_CS19}, //E7
+    {0, SW5_CS18, SW5_CS17, SW5_CS16}, //E8
+    {0, SW5_CS15, SW5_CS14, SW5_CS13}, //E9
+    {0, SW5_CS12, SW5_CS11, SW5_CS10}, //E10
+    {0, SW5_CS9 , SW5_CS8 , SW5_CS7 }, //E11
+    {0, SW5_CS6 , SW5_CS5 , SW5_CS4 }, //E12
+    {0, SW5_CS3 , SW5_CS2 , SW5_CS1 }, //E13
 
-    {0, CS39_SW6, CS38_SW6, CS37_SW6}, //F1
-    {0, CS36_SW6, CS35_SW6, CS34_SW6}, //F2
-    {0, CS33_SW6, CS32_SW6, CS31_SW6}, //F3
-    {0, CS30_SW6, CS29_SW6, CS28_SW6}, //F4
-    {0, CS27_SW6, CS26_SW6, CS25_SW6}, //F5
-    {0, CS24_SW6, CS23_SW6, CS22_SW6}, //F6
-    {0, CS21_SW6, CS20_SW6, CS19_SW6}, //F7
-    {0, CS18_SW6, CS17_SW6, CS16_SW6}, //F8
-    {0, CS15_SW6, CS14_SW6, CS13_SW6}, //F9
-    {0, CS12_SW6, CS11_SW6, CS10_SW6}, //F10
-    {0, CS9_SW6 , CS8_SW6 , CS7_SW6 }, //F11
-    {0, CS6_SW6 , CS5_SW6 , CS4_SW6 }, //F12
-    {0, CS3_SW6 , CS2_SW6 , CS1_SW6 }, //F13
+    {0, SW6_CS39, SW6_CS38, SW6_CS37}, //F1
+    {0, SW6_CS36, SW6_CS35, SW6_CS34}, //F2
+    {0, SW6_CS33, SW6_CS32, SW6_CS31}, //F3
+    {0, SW6_CS30, SW6_CS29, SW6_CS28}, //F4
+    {0, SW6_CS27, SW6_CS26, SW6_CS25}, //F5
+    {0, SW6_CS24, SW6_CS23, SW6_CS22}, //F6
+    {0, SW6_CS21, SW6_CS20, SW6_CS19}, //F7
+    {0, SW6_CS18, SW6_CS17, SW6_CS16}, //F8
+    {0, SW6_CS15, SW6_CS14, SW6_CS13}, //F9
+    {0, SW6_CS12, SW6_CS11, SW6_CS10}, //F10
+    {0, SW6_CS9 , SW6_CS8 , SW6_CS7 }, //F11
+    {0, SW6_CS6 , SW6_CS5 , SW6_CS4 }, //F12
+    {0, SW6_CS3 , SW6_CS2 , SW6_CS1 }, //F13
 
-    {0, CS39_SW7, CS38_SW7, CS37_SW7}, //G1
-    {0, CS36_SW7, CS35_SW7, CS34_SW7}, //G2
-    {0, CS33_SW7, CS32_SW7, CS31_SW7}, //G3
-    {0, CS30_SW7, CS29_SW7, CS28_SW7}, //G4
-    {0, CS27_SW7, CS26_SW7, CS25_SW7}, //G5
-    {0, CS24_SW7, CS23_SW7, CS22_SW7}, //G6
-    {0, CS21_SW7, CS20_SW7, CS19_SW7}, //G7
-    {0, CS18_SW7, CS17_SW7, CS16_SW7}, //G8
-    {0, CS15_SW7, CS14_SW7, CS13_SW7}, //G9
-    {0, CS12_SW7, CS11_SW7, CS10_SW7}, //G10
-    {0, CS9_SW7 , CS8_SW7 , CS7_SW7 }, //G11
-    {0, CS6_SW7 , CS5_SW7 , CS4_SW7 }, //G12
-    {0, CS3_SW7 , CS2_SW7 , CS1_SW7 }, //G13
+    {0, SW7_CS39, SW7_CS38, SW7_CS37}, //G1
+    {0, SW7_CS36, SW7_CS35, SW7_CS34}, //G2
+    {0, SW7_CS33, SW7_CS32, SW7_CS31}, //G3
+    {0, SW7_CS30, SW7_CS29, SW7_CS28}, //G4
+    {0, SW7_CS27, SW7_CS26, SW7_CS25}, //G5
+    {0, SW7_CS24, SW7_CS23, SW7_CS22}, //G6
+    {0, SW7_CS21, SW7_CS20, SW7_CS19}, //G7
+    {0, SW7_CS18, SW7_CS17, SW7_CS16}, //G8
+    {0, SW7_CS15, SW7_CS14, SW7_CS13}, //G9
+    {0, SW7_CS12, SW7_CS11, SW7_CS10}, //G10
+    {0, SW7_CS9 , SW7_CS8 , SW7_CS7 }, //G11
+    {0, SW7_CS6 , SW7_CS5 , SW7_CS4 }, //G12
+    {0, SW7_CS3 , SW7_CS2 , SW7_CS1 }, //G13
 
-    {0, CS39_SW8, CS38_SW8, CS37_SW8}, //H1
-    {0, CS36_SW8, CS35_SW8, CS34_SW8}, //H2
-    {0, CS33_SW8, CS32_SW8, CS31_SW8}, //H3
-    {0, CS30_SW8, CS29_SW8, CS28_SW8}, //H4
-    {0, CS27_SW8, CS26_SW8, CS25_SW8}, //H5
-    {0, CS24_SW8, CS23_SW8, CS22_SW8}, //H6
-    {0, CS21_SW8, CS20_SW8, CS19_SW8}, //H7
-    {0, CS18_SW8, CS17_SW8, CS16_SW8}, //H8
-    {0, CS15_SW8, CS14_SW8, CS13_SW8}, //H9
-    {0, CS12_SW8, CS11_SW8, CS10_SW8}, //H10
-    {0, CS9_SW8 , CS8_SW8 , CS7_SW8 }, //H11
-    {0, CS6_SW8 , CS5_SW8 , CS4_SW8 }, //H12
-    {0, CS3_SW8 , CS2_SW8 , CS1_SW8 }, //H13
+    {0, SW8_CS39, SW8_CS38, SW8_CS37}, //H1
+    {0, SW8_CS36, SW8_CS35, SW8_CS34}, //H2
+    {0, SW8_CS33, SW8_CS32, SW8_CS31}, //H3
+    {0, SW8_CS30, SW8_CS29, SW8_CS28}, //H4
+    {0, SW8_CS27, SW8_CS26, SW8_CS25}, //H5
+    {0, SW8_CS24, SW8_CS23, SW8_CS22}, //H6
+    {0, SW8_CS21, SW8_CS20, SW8_CS19}, //H7
+    {0, SW8_CS18, SW8_CS17, SW8_CS16}, //H8
+    {0, SW8_CS15, SW8_CS14, SW8_CS13}, //H9
+    {0, SW8_CS12, SW8_CS11, SW8_CS10}, //H10
+    {0, SW8_CS9 , SW8_CS8 , SW8_CS7 }, //H11
+    {0, SW8_CS6 , SW8_CS5 , SW8_CS4 }, //H12
+    {0, SW8_CS3 , SW8_CS2 , SW8_CS1 }, //H13
 
-    {0, CS39_SW9, CS38_SW9, CS37_SW9}, //I1
-    {0, CS36_SW9, CS35_SW9, CS34_SW9}, //I2
-    {0, CS33_SW9, CS32_SW9, CS31_SW9}, //I3
-    {0, CS30_SW9, CS29_SW9, CS28_SW9}, //I4
-    {0, CS27_SW9, CS26_SW9, CS25_SW9}, //I5
-    {0, CS24_SW9, CS23_SW9, CS22_SW9}, //I6
-    {0, CS21_SW9, CS20_SW9, CS19_SW9}, //I7
-    {0, CS18_SW9, CS17_SW9, CS16_SW9}, //I8
-    {0, CS15_SW9, CS14_SW9, CS13_SW9}, //I9
-    {0, CS12_SW9, CS11_SW9, CS10_SW9}, //I10
-    {0, CS9_SW9 , CS8_SW9 , CS7_SW9 }, //I11
-    {0, CS6_SW9 , CS5_SW9 , CS4_SW9 }, //I12
-    {0, CS3_SW9 , CS2_SW9 , CS1_SW9 }  //I13
+    {0, SW9_CS39, SW9_CS38, SW9_CS37}, //I1
+    {0, SW9_CS36, SW9_CS35, SW9_CS34}, //I2
+    {0, SW9_CS33, SW9_CS32, SW9_CS31}, //I3
+    {0, SW9_CS30, SW9_CS29, SW9_CS28}, //I4
+    {0, SW9_CS27, SW9_CS26, SW9_CS25}, //I5
+    {0, SW9_CS24, SW9_CS23, SW9_CS22}, //I6
+    {0, SW9_CS21, SW9_CS20, SW9_CS19}, //I7
+    {0, SW9_CS18, SW9_CS17, SW9_CS16}, //I8
+    {0, SW9_CS15, SW9_CS14, SW9_CS13}, //I9
+    {0, SW9_CS12, SW9_CS11, SW9_CS10}, //I10
+    {0, SW9_CS9 , SW9_CS8 , SW9_CS7 }, //I11
+    {0, SW9_CS6 , SW9_CS5 , SW9_CS4 }, //I12
+    {0, SW9_CS3 , SW9_CS2 , SW9_CS1 }  //I13
 };
 
 __attribute__ ((weak))
diff --git a/keyboards/xelus/pachi/rgb/rev2/rev2.c b/keyboards/xelus/pachi/rgb/rev2/rev2.c
index f38d2c67b51..f595e889c3b 100644
--- a/keyboards/xelus/pachi/rgb/rev2/rev2.c
+++ b/keyboards/xelus/pachi/rgb/rev2/rev2.c
@@ -29,131 +29,131 @@ const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
  *   |  |         G location
  *   |  |         |         B location
  *   |  |         |         | */
-    {0, CS39_SW1, CS38_SW1, CS37_SW1}, //A1
-    {0, CS36_SW1, CS35_SW1, CS34_SW1}, //A2
-    {0, CS33_SW1, CS32_SW1, CS31_SW1}, //A3
-    {0, CS30_SW1, CS29_SW1, CS28_SW1}, //A4
-    {0, CS27_SW1, CS26_SW1, CS25_SW1}, //A5
-    {0, CS24_SW1, CS23_SW1, CS22_SW1}, //A6
-    {0, CS21_SW1, CS20_SW1, CS19_SW1}, //A7
-    {0, CS18_SW1, CS17_SW1, CS16_SW1}, //A8
-    {0, CS15_SW1, CS14_SW1, CS13_SW1}, //A9
-    {0, CS12_SW1, CS11_SW1, CS10_SW1}, //A10
-    {0, CS9_SW1 , CS8_SW1 , CS7_SW1 }, //A11
-    {0, CS6_SW1 , CS5_SW1 , CS4_SW1 }, //A12
-    {0, CS3_SW1 , CS2_SW1 , CS1_SW1 }, //A13
+    {0, SW1_CS39, SW1_CS38, SW1_CS37}, //A1
+    {0, SW1_CS36, SW1_CS35, SW1_CS34}, //A2
+    {0, SW1_CS33, SW1_CS32, SW1_CS31}, //A3
+    {0, SW1_CS30, SW1_CS29, SW1_CS28}, //A4
+    {0, SW1_CS27, SW1_CS26, SW1_CS25}, //A5
+    {0, SW1_CS24, SW1_CS23, SW1_CS22}, //A6
+    {0, SW1_CS21, SW1_CS20, SW1_CS19}, //A7
+    {0, SW1_CS18, SW1_CS17, SW1_CS16}, //A8
+    {0, SW1_CS15, SW1_CS14, SW1_CS13}, //A9
+    {0, SW1_CS12, SW1_CS11, SW1_CS10}, //A10
+    {0, SW1_CS9 , SW1_CS8 , SW1_CS7 }, //A11
+    {0, SW1_CS6 , SW1_CS5 , SW1_CS4 }, //A12
+    {0, SW1_CS3 , SW1_CS2 , SW1_CS1 }, //A13
 
-    {0, CS39_SW2, CS38_SW2, CS37_SW2}, //B1
-    {0, CS36_SW2, CS35_SW2, CS34_SW2}, //B2
-    {0, CS33_SW2, CS32_SW2, CS31_SW2}, //B3
-    {0, CS30_SW2, CS29_SW2, CS28_SW2}, //B4
-    {0, CS27_SW2, CS26_SW2, CS25_SW2}, //B5
-    {0, CS24_SW2, CS23_SW2, CS22_SW2}, //B6
-    {0, CS21_SW2, CS20_SW2, CS19_SW2}, //B7
-    {0, CS18_SW2, CS17_SW2, CS16_SW2}, //B8
-    {0, CS15_SW2, CS14_SW2, CS13_SW2}, //B9
-    {0, CS12_SW2, CS11_SW2, CS10_SW2}, //B10
-    {0, CS9_SW2 , CS8_SW2 , CS7_SW2 }, //B11
-    {0, CS6_SW2 , CS5_SW2 , CS4_SW2 }, //B12
-    {0, CS3_SW2 , CS2_SW2 , CS1_SW2 }, //B13
+    {0, SW2_CS39, SW2_CS38, SW2_CS37}, //B1
+    {0, SW2_CS36, SW2_CS35, SW2_CS34}, //B2
+    {0, SW2_CS33, SW2_CS32, SW2_CS31}, //B3
+    {0, SW2_CS30, SW2_CS29, SW2_CS28}, //B4
+    {0, SW2_CS27, SW2_CS26, SW2_CS25}, //B5
+    {0, SW2_CS24, SW2_CS23, SW2_CS22}, //B6
+    {0, SW2_CS21, SW2_CS20, SW2_CS19}, //B7
+    {0, SW2_CS18, SW2_CS17, SW2_CS16}, //B8
+    {0, SW2_CS15, SW2_CS14, SW2_CS13}, //B9
+    {0, SW2_CS12, SW2_CS11, SW2_CS10}, //B10
+    {0, SW2_CS9 , SW2_CS8 , SW2_CS7 }, //B11
+    {0, SW2_CS6 , SW2_CS5 , SW2_CS4 }, //B12
+    {0, SW2_CS3 , SW2_CS2 , SW2_CS1 }, //B13
 
-    {0, CS39_SW3, CS38_SW3, CS37_SW3}, //C1
-    {0, CS36_SW3, CS35_SW3, CS34_SW3}, //C2
-    {0, CS33_SW3, CS32_SW3, CS31_SW3}, //C3
-    {0, CS30_SW3, CS29_SW3, CS28_SW3}, //C4
-    {0, CS27_SW3, CS26_SW3, CS25_SW3}, //C5
-    {0, CS24_SW3, CS23_SW3, CS22_SW3}, //C6
-    {0, CS21_SW3, CS20_SW3, CS19_SW3}, //C7
-    {0, CS18_SW3, CS17_SW3, CS16_SW3}, //C8
-    {0, CS15_SW3, CS14_SW3, CS13_SW3}, //C9
-    {0, CS12_SW3, CS11_SW3, CS10_SW3}, //C10
-    {0, CS9_SW3 , CS8_SW3 , CS7_SW3 }, //C11
-    {0, CS6_SW3 , CS5_SW3 , CS4_SW3 }, //C12
-    {0, CS3_SW3 , CS2_SW3 , CS1_SW3 }, //C13
+    {0, SW3_CS39, SW3_CS38, SW3_CS37}, //C1
+    {0, SW3_CS36, SW3_CS35, SW3_CS34}, //C2
+    {0, SW3_CS33, SW3_CS32, SW3_CS31}, //C3
+    {0, SW3_CS30, SW3_CS29, SW3_CS28}, //C4
+    {0, SW3_CS27, SW3_CS26, SW3_CS25}, //C5
+    {0, SW3_CS24, SW3_CS23, SW3_CS22}, //C6
+    {0, SW3_CS21, SW3_CS20, SW3_CS19}, //C7
+    {0, SW3_CS18, SW3_CS17, SW3_CS16}, //C8
+    {0, SW3_CS15, SW3_CS14, SW3_CS13}, //C9
+    {0, SW3_CS12, SW3_CS11, SW3_CS10}, //C10
+    {0, SW3_CS9 , SW3_CS8 , SW3_CS7 }, //C11
+    {0, SW3_CS6 , SW3_CS5 , SW3_CS4 }, //C12
+    {0, SW3_CS3 , SW3_CS2 , SW3_CS1 }, //C13
 
-    {0, CS39_SW4, CS38_SW4, CS37_SW4}, //D1
-    {0, CS36_SW4, CS35_SW4, CS34_SW4}, //D2
-    {0, CS33_SW4, CS32_SW4, CS31_SW4}, //D3
-    {0, CS30_SW4, CS29_SW4, CS28_SW4}, //D4
-    {0, CS27_SW4, CS26_SW4, CS25_SW4}, //D5
-    {0, CS24_SW4, CS23_SW4, CS22_SW4}, //D6
-    {0, CS21_SW4, CS20_SW4, CS19_SW4}, //D7
-    {0, CS18_SW4, CS17_SW4, CS16_SW4}, //D8
-    {0, CS15_SW4, CS14_SW4, CS13_SW4}, //D9
-    {0, CS12_SW4, CS11_SW4, CS10_SW4}, //D10
-    {0, CS9_SW4 , CS8_SW4 , CS7_SW4 }, //D11
-    {0, CS6_SW4 , CS5_SW4 , CS4_SW4 }, //D12
-    {0, CS3_SW4 , CS2_SW4 , CS1_SW4 }, //D13
+    {0, SW4_CS39, SW4_CS38, SW4_CS37}, //D1
+    {0, SW4_CS36, SW4_CS35, SW4_CS34}, //D2
+    {0, SW4_CS33, SW4_CS32, SW4_CS31}, //D3
+    {0, SW4_CS30, SW4_CS29, SW4_CS28}, //D4
+    {0, SW4_CS27, SW4_CS26, SW4_CS25}, //D5
+    {0, SW4_CS24, SW4_CS23, SW4_CS22}, //D6
+    {0, SW4_CS21, SW4_CS20, SW4_CS19}, //D7
+    {0, SW4_CS18, SW4_CS17, SW4_CS16}, //D8
+    {0, SW4_CS15, SW4_CS14, SW4_CS13}, //D9
+    {0, SW4_CS12, SW4_CS11, SW4_CS10}, //D10
+    {0, SW4_CS9 , SW4_CS8 , SW4_CS7 }, //D11
+    {0, SW4_CS6 , SW4_CS5 , SW4_CS4 }, //D12
+    {0, SW4_CS3 , SW4_CS2 , SW4_CS1 }, //D13
 
-    {0, CS39_SW5, CS38_SW5, CS37_SW5}, //E1
-    {0, CS36_SW5, CS35_SW5, CS34_SW5}, //E2
-    {0, CS33_SW5, CS32_SW5, CS31_SW5}, //E3
-    {0, CS30_SW5, CS29_SW5, CS28_SW5}, //E4
-    {0, CS27_SW5, CS26_SW5, CS25_SW5}, //E5
-    {0, CS24_SW5, CS23_SW5, CS22_SW5}, //E6
-    {0, CS21_SW5, CS20_SW5, CS19_SW5}, //E7
-    {0, CS18_SW5, CS17_SW5, CS16_SW5}, //E8
-    {0, CS15_SW5, CS14_SW5, CS13_SW5}, //E9
-    {0, CS12_SW5, CS11_SW5, CS10_SW5}, //E10
-    {0, CS9_SW5 , CS8_SW5 , CS7_SW5 }, //E11
-    {0, CS6_SW5 , CS5_SW5 , CS4_SW5 }, //E12
-    {0, CS3_SW5 , CS2_SW5 , CS1_SW5 }, //E13
+    {0, SW5_CS39, SW5_CS38, SW5_CS37}, //E1
+    {0, SW5_CS36, SW5_CS35, SW5_CS34}, //E2
+    {0, SW5_CS33, SW5_CS32, SW5_CS31}, //E3
+    {0, SW5_CS30, SW5_CS29, SW5_CS28}, //E4
+    {0, SW5_CS27, SW5_CS26, SW5_CS25}, //E5
+    {0, SW5_CS24, SW5_CS23, SW5_CS22}, //E6
+    {0, SW5_CS21, SW5_CS20, SW5_CS19}, //E7
+    {0, SW5_CS18, SW5_CS17, SW5_CS16}, //E8
+    {0, SW5_CS15, SW5_CS14, SW5_CS13}, //E9
+    {0, SW5_CS12, SW5_CS11, SW5_CS10}, //E10
+    {0, SW5_CS9 , SW5_CS8 , SW5_CS7 }, //E11
+    {0, SW5_CS6 , SW5_CS5 , SW5_CS4 }, //E12
+    {0, SW5_CS3 , SW5_CS2 , SW5_CS1 }, //E13
 
-    {0, CS39_SW6, CS38_SW6, CS37_SW6}, //F1
-    {0, CS36_SW6, CS35_SW6, CS34_SW6}, //F2
-    {0, CS33_SW6, CS32_SW6, CS31_SW6}, //F3
-    {0, CS30_SW6, CS29_SW6, CS28_SW6}, //F4
-    {0, CS27_SW6, CS26_SW6, CS25_SW6}, //F5
-    {0, CS24_SW6, CS23_SW6, CS22_SW6}, //F6
-    {0, CS21_SW6, CS20_SW6, CS19_SW6}, //F7
-    {0, CS18_SW6, CS17_SW6, CS16_SW6}, //F8
-    {0, CS15_SW6, CS14_SW6, CS13_SW6}, //F9
-    {0, CS12_SW6, CS11_SW6, CS10_SW6}, //F10
-    {0, CS9_SW6 , CS8_SW6 , CS7_SW6 }, //F11
-    {0, CS6_SW6 , CS5_SW6 , CS4_SW6 }, //F12
-    {0, CS3_SW6 , CS2_SW6 , CS1_SW6 }, //F13
+    {0, SW6_CS39, SW6_CS38, SW6_CS37}, //F1
+    {0, SW6_CS36, SW6_CS35, SW6_CS34}, //F2
+    {0, SW6_CS33, SW6_CS32, SW6_CS31}, //F3
+    {0, SW6_CS30, SW6_CS29, SW6_CS28}, //F4
+    {0, SW6_CS27, SW6_CS26, SW6_CS25}, //F5
+    {0, SW6_CS24, SW6_CS23, SW6_CS22}, //F6
+    {0, SW6_CS21, SW6_CS20, SW6_CS19}, //F7
+    {0, SW6_CS18, SW6_CS17, SW6_CS16}, //F8
+    {0, SW6_CS15, SW6_CS14, SW6_CS13}, //F9
+    {0, SW6_CS12, SW6_CS11, SW6_CS10}, //F10
+    {0, SW6_CS9 , SW6_CS8 , SW6_CS7 }, //F11
+    {0, SW6_CS6 , SW6_CS5 , SW6_CS4 }, //F12
+    {0, SW6_CS3 , SW6_CS2 , SW6_CS1 }, //F13
 
-    {0, CS39_SW7, CS38_SW7, CS37_SW7}, //G1
-    {0, CS36_SW7, CS35_SW7, CS34_SW7}, //G2
-    {0, CS33_SW7, CS32_SW7, CS31_SW7}, //G3
-    {0, CS30_SW7, CS29_SW7, CS28_SW7}, //G4
-    {0, CS27_SW7, CS26_SW7, CS25_SW7}, //G5
-    {0, CS24_SW7, CS23_SW7, CS22_SW7}, //G6
-    {0, CS21_SW7, CS20_SW7, CS19_SW7}, //G7
-    {0, CS18_SW7, CS17_SW7, CS16_SW7}, //G8
-    {0, CS15_SW7, CS14_SW7, CS13_SW7}, //G9
-    {0, CS12_SW7, CS11_SW7, CS10_SW7}, //G10
-    {0, CS9_SW7 , CS8_SW7 , CS7_SW7 }, //G11
-    {0, CS6_SW7 , CS5_SW7 , CS4_SW7 }, //G12
-    {0, CS3_SW7 , CS2_SW7 , CS1_SW7 }, //G13
+    {0, SW7_CS39, SW7_CS38, SW7_CS37}, //G1
+    {0, SW7_CS36, SW7_CS35, SW7_CS34}, //G2
+    {0, SW7_CS33, SW7_CS32, SW7_CS31}, //G3
+    {0, SW7_CS30, SW7_CS29, SW7_CS28}, //G4
+    {0, SW7_CS27, SW7_CS26, SW7_CS25}, //G5
+    {0, SW7_CS24, SW7_CS23, SW7_CS22}, //G6
+    {0, SW7_CS21, SW7_CS20, SW7_CS19}, //G7
+    {0, SW7_CS18, SW7_CS17, SW7_CS16}, //G8
+    {0, SW7_CS15, SW7_CS14, SW7_CS13}, //G9
+    {0, SW7_CS12, SW7_CS11, SW7_CS10}, //G10
+    {0, SW7_CS9 , SW7_CS8 , SW7_CS7 }, //G11
+    {0, SW7_CS6 , SW7_CS5 , SW7_CS4 }, //G12
+    {0, SW7_CS3 , SW7_CS2 , SW7_CS1 }, //G13
 
-    {0, CS39_SW8, CS38_SW8, CS37_SW8}, //H1
-    {0, CS36_SW8, CS35_SW8, CS34_SW8}, //H2
-    {0, CS33_SW8, CS32_SW8, CS31_SW8}, //H3
-    {0, CS30_SW8, CS29_SW8, CS28_SW8}, //H4
-    {0, CS27_SW8, CS26_SW8, CS25_SW8}, //H5
-    {0, CS24_SW8, CS23_SW8, CS22_SW8}, //H6
-    {0, CS21_SW8, CS20_SW8, CS19_SW8}, //H7
-    {0, CS18_SW8, CS17_SW8, CS16_SW8}, //H8
-    {0, CS15_SW8, CS14_SW8, CS13_SW8}, //H9
-    {0, CS12_SW8, CS11_SW8, CS10_SW8}, //H10
-    {0, CS9_SW8 , CS8_SW8 , CS7_SW8 }, //H11
-    {0, CS6_SW8 , CS5_SW8 , CS4_SW8 }, //H12
-    {0, CS3_SW8 , CS2_SW8 , CS1_SW8 }, //H13
+    {0, SW8_CS39, SW8_CS38, SW8_CS37}, //H1
+    {0, SW8_CS36, SW8_CS35, SW8_CS34}, //H2
+    {0, SW8_CS33, SW8_CS32, SW8_CS31}, //H3
+    {0, SW8_CS30, SW8_CS29, SW8_CS28}, //H4
+    {0, SW8_CS27, SW8_CS26, SW8_CS25}, //H5
+    {0, SW8_CS24, SW8_CS23, SW8_CS22}, //H6
+    {0, SW8_CS21, SW8_CS20, SW8_CS19}, //H7
+    {0, SW8_CS18, SW8_CS17, SW8_CS16}, //H8
+    {0, SW8_CS15, SW8_CS14, SW8_CS13}, //H9
+    {0, SW8_CS12, SW8_CS11, SW8_CS10}, //H10
+    {0, SW8_CS9 , SW8_CS8 , SW8_CS7 }, //H11
+    {0, SW8_CS6 , SW8_CS5 , SW8_CS4 }, //H12
+    {0, SW8_CS3 , SW8_CS2 , SW8_CS1 }, //H13
 
-    {0, CS39_SW9, CS38_SW9, CS37_SW9}, //I1
-    {0, CS36_SW9, CS35_SW9, CS34_SW9}, //I2
-    {0, CS33_SW9, CS32_SW9, CS31_SW9}, //I3
-    {0, CS30_SW9, CS29_SW9, CS28_SW9}, //I4
-    {0, CS27_SW9, CS26_SW9, CS25_SW9}, //I5
-    {0, CS24_SW9, CS23_SW9, CS22_SW9}, //I6
-    {0, CS21_SW9, CS20_SW9, CS19_SW9}, //I7
-    {0, CS18_SW9, CS17_SW9, CS16_SW9}, //I8
-    {0, CS15_SW9, CS14_SW9, CS13_SW9}, //I9
-    {0, CS12_SW9, CS11_SW9, CS10_SW9}, //I10
-    {0, CS9_SW9 , CS8_SW9 , CS7_SW9 }, //I11
-    {0, CS6_SW9 , CS5_SW9 , CS4_SW9 }, //I12
-    {0, CS3_SW9 , CS2_SW9 , CS1_SW9 }  //I13
+    {0, SW9_CS39, SW9_CS38, SW9_CS37}, //I1
+    {0, SW9_CS36, SW9_CS35, SW9_CS34}, //I2
+    {0, SW9_CS33, SW9_CS32, SW9_CS31}, //I3
+    {0, SW9_CS30, SW9_CS29, SW9_CS28}, //I4
+    {0, SW9_CS27, SW9_CS26, SW9_CS25}, //I5
+    {0, SW9_CS24, SW9_CS23, SW9_CS22}, //I6
+    {0, SW9_CS21, SW9_CS20, SW9_CS19}, //I7
+    {0, SW9_CS18, SW9_CS17, SW9_CS16}, //I8
+    {0, SW9_CS15, SW9_CS14, SW9_CS13}, //I9
+    {0, SW9_CS12, SW9_CS11, SW9_CS10}, //I10
+    {0, SW9_CS9 , SW9_CS8 , SW9_CS7 }, //I11
+    {0, SW9_CS6 , SW9_CS5 , SW9_CS4 }, //I12
+    {0, SW9_CS3 , SW9_CS2 , SW9_CS1 }  //I13
 };
 
 __attribute__ ((weak))
diff --git a/keyboards/xelus/valor/rev2/config.h b/keyboards/xelus/valor/rev2/config.h
index f601945a152..9491d1f175d 100644
--- a/keyboards/xelus/valor/rev2/config.h
+++ b/keyboards/xelus/valor/rev2/config.h
@@ -40,9 +40,9 @@
 #define WS2812_PWM_DRIVER PWMD1
 #define WS2812_PWM_CHANNEL 2
 #define WS2812_PWM_PAL_MODE 1
-#define WS2812_DMA_STREAM STM32_DMA1_STREAM6
-#define WS2812_DMA_CHANNEL 7
-#define WS2812_DMAMUX_ID STM32_DMAMUX1_TIM1_UP
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM6
+#define WS2812_PWM_DMA_CHANNEL 7
+#define WS2812_PWM_DMAMUX_ID STM32_DMAMUX1_TIM1_UP
 
 // RGB Pullup
 #define WS2812_EXTERNAL_PULLUP
diff --git a/keyboards/xelus/xs60/hotswap/config.h b/keyboards/xelus/xs60/hotswap/config.h
index 56ecd57ec9d..877313776ad 100644
--- a/keyboards/xelus/xs60/hotswap/config.h
+++ b/keyboards/xelus/xs60/hotswap/config.h
@@ -40,4 +40,4 @@
 #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
 
 // Bitbang WS2812
-#define NOP_FUDGE 0.4
+#define WS2812_BITBANG_NOP_FUDGE 0.4
diff --git a/keyboards/xelus/xs60/soldered/config.h b/keyboards/xelus/xs60/soldered/config.h
index 4b7be4d4414..5b966800c68 100644
--- a/keyboards/xelus/xs60/soldered/config.h
+++ b/keyboards/xelus/xs60/soldered/config.h
@@ -42,4 +42,4 @@
 #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
 
 // Bitbang WS2812
-#define NOP_FUDGE 0.4
+#define WS2812_BITBANG_NOP_FUDGE 0.4
diff --git a/keyboards/xiudi/xd96/info.json b/keyboards/xiudi/xd96/info.json
index 98ebfcb4831..2b4ee4aad0a 100644
--- a/keyboards/xiudi/xd96/info.json
+++ b/keyboards/xiudi/xd96/info.json
@@ -1,373 +1,373 @@
 {
-  "keyboard_name": "XD96",
-  "manufacturer": "KPrepublic",
-  "url": "",
-  "maintainer": "qmk",
-  "usb": {
-    "vid": "0x7844",
-    "pid": "0x9696",
-    "device_version": "0.0.1"
-  },
-  "backlight": {
-    "pin": "B5",
-    "levels": 10
-  },
-  "rgblight": {
-    "led_count": 16,
-    "max_brightness": 50,
-    "animations": {
-      "breathing": true,
-      "rainbow_mood": true,
-      "rainbow_swirl": true,
-      "snake": true,
-      "knight": true,
-      "christmas": true,
-      "static_gradient": true,
-      "rgb_test": true,
-      "alternating": true,
-      "twinkle": true
-    }
-  },
-  "indicators": {
-    "caps_lock": "B6",
-    "num_lock": "C6",
-    "on_state": 0
-  },
-  "ws2812": {
-    "pin": "C7"
-  },
-  "processor": "atmega32u4",
-  "bootloader": "atmel-dfu",
-  "layouts": {
-    "LAYOUT_96_ansi": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0},
-        {"matrix": [0, 1], "x": 1, "y": 0},
-        {"matrix": [0, 2], "x": 2, "y": 0},
-        {"matrix": [0, 3], "x": 3, "y": 0},
-        {"matrix": [0, 4], "x": 4, "y": 0},
-        {"matrix": [0, 5], "x": 5, "y": 0},
-        {"matrix": [0, 6], "x": 6, "y": 0},
-        {"matrix": [0, 7], "x": 7, "y": 0},
-        {"matrix": [0, 8], "x": 8, "y": 0},
-        {"matrix": [0, 9], "x": 9, "y": 0},
-        {"matrix": [0, 10], "x": 10, "y": 0},
-        {"matrix": [0, 11], "x": 11, "y": 0},
-        {"matrix": [0, 12], "x": 12, "y": 0},
-        {"matrix": [0, 13], "x": 13, "y": 0},
-        {"matrix": [5, 6], "x": 14, "y": 0},
-        {"matrix": [0, 14], "x": 15, "y": 0},
-        {"matrix": [0, 15], "x": 16, "y": 0},
-        {"matrix": [0, 16], "x": 17, "y": 0},
-        {"matrix": [0, 17], "x": 18, "y": 0},
-
-        {"matrix": [1, 0], "x": 0, "y": 1},
-        {"matrix": [1, 1], "x": 1, "y": 1},
-        {"matrix": [1, 2], "x": 2, "y": 1},
-        {"matrix": [1, 3], "x": 3, "y": 1},
-        {"matrix": [1, 4], "x": 4, "y": 1},
-        {"matrix": [1, 5], "x": 5, "y": 1},
-        {"matrix": [1, 6], "x": 6, "y": 1},
-        {"matrix": [1, 7], "x": 7, "y": 1},
-        {"matrix": [1, 8], "x": 8, "y": 1},
-        {"matrix": [1, 9], "x": 9, "y": 1},
-        {"matrix": [1, 10], "x": 10, "y": 1},
-        {"matrix": [1, 11], "x": 11, "y": 1},
-        {"matrix": [1, 12], "x": 12, "y": 1},
-        {"matrix": [1, 13], "x": 13, "y": 1, "w": 2},
-        {"matrix": [1, 14], "x": 15, "y": 1},
-        {"matrix": [1, 15], "x": 16, "y": 1},
-        {"matrix": [1, 16], "x": 17, "y": 1},
-        {"matrix": [1, 17], "x": 18, "y": 1},
-
-        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
-        {"matrix": [2, 1], "x": 1.5, "y": 2},
-        {"matrix": [2, 2], "x": 2.5, "y": 2},
-        {"matrix": [2, 3], "x": 3.5, "y": 2},
-        {"matrix": [2, 4], "x": 4.5, "y": 2},
-        {"matrix": [2, 5], "x": 5.5, "y": 2},
-        {"matrix": [2, 6], "x": 6.5, "y": 2},
-        {"matrix": [2, 7], "x": 7.5, "y": 2},
-        {"matrix": [2, 8], "x": 8.5, "y": 2},
-        {"matrix": [2, 9], "x": 9.5, "y": 2},
-        {"matrix": [2, 10], "x": 10.5, "y": 2},
-        {"matrix": [2, 11], "x": 11.5, "y": 2},
-        {"matrix": [2, 12], "x": 12.5, "y": 2},
-        {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
-        {"matrix": [2, 14], "x": 15, "y": 2},
-        {"matrix": [2, 15], "x": 16, "y": 2},
-        {"matrix": [2, 16], "x": 17, "y": 2},
-
-        {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
-        {"matrix": [3, 1], "x": 1.75, "y": 3},
-        {"matrix": [3, 2], "x": 2.75, "y": 3},
-        {"matrix": [3, 3], "x": 3.75, "y": 3},
-        {"matrix": [3, 4], "x": 4.75, "y": 3},
-        {"matrix": [3, 5], "x": 5.75, "y": 3},
-        {"matrix": [3, 6], "x": 6.75, "y": 3},
-        {"matrix": [3, 7], "x": 7.75, "y": 3},
-        {"matrix": [3, 8], "x": 8.75, "y": 3},
-        {"matrix": [3, 9], "x": 9.75, "y": 3},
-        {"matrix": [3, 10], "x": 10.75, "y": 3},
-        {"matrix": [3, 11], "x": 11.75, "y": 3},
-        {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
-        {"matrix": [3, 14], "x": 15, "y": 3},
-        {"matrix": [3, 15], "x": 16, "y": 3},
-        {"matrix": [3, 16], "x": 17, "y": 3},
-        {"matrix": [2, 17], "x": 18, "y": 2, "h": 2},
-
-        {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
-        {"matrix": [4, 2], "x": 2.25, "y": 4},
-        {"matrix": [4, 3], "x": 3.25, "y": 4},
-        {"matrix": [4, 4], "x": 4.25, "y": 4},
-        {"matrix": [4, 5], "x": 5.25, "y": 4},
-        {"matrix": [4, 6], "x": 6.25, "y": 4},
-        {"matrix": [4, 7], "x": 7.25, "y": 4},
-        {"matrix": [4, 8], "x": 8.25, "y": 4},
-        {"matrix": [4, 9], "x": 9.25, "y": 4},
-        {"matrix": [4, 10], "x": 10.25, "y": 4},
-        {"matrix": [4, 11], "x": 11.25, "y": 4},
-        {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
-        {"matrix": [4, 13], "x": 14, "y": 4},
-        {"matrix": [4, 14], "x": 15, "y": 4},
-        {"matrix": [4, 15], "x": 16, "y": 4},
-        {"matrix": [4, 16], "x": 17, "y": 4},
-
-        {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
-        {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
-        {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
-        {"matrix": [5, 5], "x": 3.75, "y": 5, "w": 6.25},
-        {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
-        {"matrix": [5, 8], "x": 11.5, "y": 5, "w": 1.5},
-        {"matrix": [5, 12], "x": 13, "y": 5},
-        {"matrix": [5, 13], "x": 14, "y": 5},
-        {"matrix": [5, 14], "x": 15, "y": 5},
-        {"matrix": [5, 15], "x": 16, "y": 5},
-        {"matrix": [5, 16], "x": 17, "y": 5},
-        {"matrix": [4, 17], "x": 18, "y": 4, "h": 2}
-      ]
+    "keyboard_name": "XD96",
+    "manufacturer": "KPrepublic",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0x7844",
+        "pid": "0x9696",
+        "device_version": "0.0.1"
     },
-    "LAYOUT_96_iso": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0},
-        {"matrix": [0, 1], "x": 1, "y": 0},
-        {"matrix": [0, 2], "x": 2, "y": 0},
-        {"matrix": [0, 3], "x": 3, "y": 0},
-        {"matrix": [0, 4], "x": 4, "y": 0},
-        {"matrix": [0, 5], "x": 5, "y": 0},
-        {"matrix": [0, 6], "x": 6, "y": 0},
-        {"matrix": [0, 7], "x": 7, "y": 0},
-        {"matrix": [0, 8], "x": 8, "y": 0},
-        {"matrix": [0, 9], "x": 9, "y": 0},
-        {"matrix": [0, 10], "x": 10, "y": 0},
-        {"matrix": [0, 11], "x": 11, "y": 0},
-        {"matrix": [0, 12], "x": 12, "y": 0},
-        {"matrix": [0, 13], "x": 13, "y": 0},
-        {"matrix": [5, 6], "x": 14, "y": 0},
-        {"matrix": [0, 14], "x": 15, "y": 0},
-        {"matrix": [0, 15], "x": 16, "y": 0},
-        {"matrix": [0, 16], "x": 17, "y": 0},
-        {"matrix": [0, 17], "x": 18, "y": 0},
-
-        {"matrix": [1, 0], "x": 0, "y": 1},
-        {"matrix": [1, 1], "x": 1, "y": 1},
-        {"matrix": [1, 2], "x": 2, "y": 1},
-        {"matrix": [1, 3], "x": 3, "y": 1},
-        {"matrix": [1, 4], "x": 4, "y": 1},
-        {"matrix": [1, 5], "x": 5, "y": 1},
-        {"matrix": [1, 6], "x": 6, "y": 1},
-        {"matrix": [1, 7], "x": 7, "y": 1},
-        {"matrix": [1, 8], "x": 8, "y": 1},
-        {"matrix": [1, 9], "x": 9, "y": 1},
-        {"matrix": [1, 10], "x": 10, "y": 1},
-        {"matrix": [1, 11], "x": 11, "y": 1},
-        {"matrix": [1, 12], "x": 12, "y": 1},
-        {"matrix": [1, 13], "x": 13, "y": 1, "w": 2},
-        {"matrix": [1, 14], "x": 15, "y": 1},
-        {"matrix": [1, 15], "x": 16, "y": 1},
-        {"matrix": [1, 16], "x": 17, "y": 1},
-        {"matrix": [1, 17], "x": 18, "y": 1},
-
-        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
-        {"matrix": [2, 1], "x": 1.5, "y": 2},
-        {"matrix": [2, 2], "x": 2.5, "y": 2},
-        {"matrix": [2, 3], "x": 3.5, "y": 2},
-        {"matrix": [2, 4], "x": 4.5, "y": 2},
-        {"matrix": [2, 5], "x": 5.5, "y": 2},
-        {"matrix": [2, 6], "x": 6.5, "y": 2},
-        {"matrix": [2, 7], "x": 7.5, "y": 2},
-        {"matrix": [2, 8], "x": 8.5, "y": 2},
-        {"matrix": [2, 9], "x": 9.5, "y": 2},
-        {"matrix": [2, 10], "x": 10.5, "y": 2},
-        {"matrix": [2, 11], "x": 11.5, "y": 2},
-        {"matrix": [2, 12], "x": 12.5, "y": 2},
-        {"matrix": [2, 14], "x": 15, "y": 2},
-        {"matrix": [2, 15], "x": 16, "y": 2},
-        {"matrix": [2, 16], "x": 17, "y": 2},
-
-        {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
-        {"matrix": [3, 1], "x": 1.75, "y": 3},
-        {"matrix": [3, 2], "x": 2.75, "y": 3},
-        {"matrix": [3, 3], "x": 3.75, "y": 3},
-        {"matrix": [3, 4], "x": 4.75, "y": 3},
-        {"matrix": [3, 5], "x": 5.75, "y": 3},
-        {"matrix": [3, 6], "x": 6.75, "y": 3},
-        {"matrix": [3, 7], "x": 7.75, "y": 3},
-        {"matrix": [3, 8], "x": 8.75, "y": 3},
-        {"matrix": [3, 9], "x": 9.75, "y": 3},
-        {"matrix": [3, 10], "x": 10.75, "y": 3},
-        {"matrix": [3, 11], "x": 11.75, "y": 3},
-        {"matrix": [3, 13], "x": 12.75, "y": 3},
-        {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
-        {"matrix": [3, 14], "x": 15, "y": 3},
-        {"matrix": [3, 15], "x": 16, "y": 3},
-        {"matrix": [3, 16], "x": 17, "y": 3},
-        {"matrix": [2, 17], "x": 18, "y": 2, "h": 2},
-
-        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-        {"matrix": [4, 1], "x": 1.25, "y": 4},
-        {"matrix": [4, 2], "x": 2.25, "y": 4},
-        {"matrix": [4, 3], "x": 3.25, "y": 4},
-        {"matrix": [4, 4], "x": 4.25, "y": 4},
-        {"matrix": [4, 5], "x": 5.25, "y": 4},
-        {"matrix": [4, 6], "x": 6.25, "y": 4},
-        {"matrix": [4, 7], "x": 7.25, "y": 4},
-        {"matrix": [4, 8], "x": 8.25, "y": 4},
-        {"matrix": [4, 9], "x": 9.25, "y": 4},
-        {"matrix": [4, 10], "x": 10.25, "y": 4},
-        {"matrix": [4, 11], "x": 11.25, "y": 4},
-        {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
-        {"matrix": [4, 13], "x": 14, "y": 4},
-        {"matrix": [4, 14], "x": 15, "y": 4},
-        {"matrix": [4, 15], "x": 16, "y": 4},
-        {"matrix": [4, 16], "x": 17, "y": 4},
-
-        {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
-        {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
-        {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
-        {"matrix": [5, 5], "x": 3.75, "y": 5, "w": 6.25},
-        {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
-        {"matrix": [5, 8], "x": 11.5, "y": 5, "w": 1.5},
-        {"matrix": [5, 12], "x": 13, "y": 5},
-        {"matrix": [5, 13], "x": 14, "y": 5},
-        {"matrix": [5, 14], "x": 15, "y": 5},
-        {"matrix": [5, 15], "x": 16, "y": 5},
-        {"matrix": [5, 16], "x": 17, "y": 5},
-        {"matrix": [4, 17], "x": 18, "y": 4, "h": 2}
-      ]
+    "backlight": {
+        "pin": "B5",
+        "levels": 10
     },
-    "LAYOUT_all": {
-      "layout": [
-        {"matrix": [0, 0], "x": 0, "y": 0},
-        {"matrix": [0, 1], "x": 1, "y": 0},
-        {"matrix": [0, 2], "x": 2, "y": 0},
-        {"matrix": [0, 3], "x": 3, "y": 0},
-        {"matrix": [0, 4], "x": 4, "y": 0},
-        {"matrix": [0, 5], "x": 5, "y": 0},
-        {"matrix": [0, 6], "x": 6, "y": 0},
-        {"matrix": [0, 7], "x": 7, "y": 0},
-        {"matrix": [0, 8], "x": 8, "y": 0},
-        {"matrix": [0, 9], "x": 9, "y": 0},
-        {"matrix": [0, 10], "x": 10, "y": 0},
-        {"matrix": [0, 11], "x": 11, "y": 0},
-        {"matrix": [0, 12], "x": 12, "y": 0},
-        {"matrix": [0, 13], "x": 13, "y": 0},
-        {"matrix": [5, 6], "x": 14, "y": 0},
-        {"matrix": [0, 14], "x": 15, "y": 0},
-        {"matrix": [0, 15], "x": 16, "y": 0},
-        {"matrix": [0, 16], "x": 17, "y": 0},
-        {"matrix": [0, 17], "x": 18, "y": 0},
+    "rgblight": {
+        "led_count": 16,
+        "max_brightness": 50,
+        "animations": {
+            "breathing": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "snake": true,
+            "knight": true,
+            "christmas": true,
+            "static_gradient": true,
+            "rgb_test": true,
+            "alternating": true,
+            "twinkle": true
+        }
+    },
+    "indicators": {
+        "caps_lock": "B6",
+        "num_lock": "C6",
+        "on_state": 0
+    },
+    "ws2812": {
+        "pin": "C7"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "layouts": {
+        "LAYOUT_96_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [5, 6], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+                {"matrix": [0, 15], "x": 16, "y": 0},
+                {"matrix": [0, 16], "x": 17, "y": 0},
+                {"matrix": [0, 17], "x": 18, "y": 0},
 
-        {"matrix": [1, 0], "x": 0, "y": 1},
-        {"matrix": [1, 1], "x": 1, "y": 1},
-        {"matrix": [1, 2], "x": 2, "y": 1},
-        {"matrix": [1, 3], "x": 3, "y": 1},
-        {"matrix": [1, 4], "x": 4, "y": 1},
-        {"matrix": [1, 5], "x": 5, "y": 1},
-        {"matrix": [1, 6], "x": 6, "y": 1},
-        {"matrix": [1, 7], "x": 7, "y": 1},
-        {"matrix": [1, 8], "x": 8, "y": 1},
-        {"matrix": [1, 9], "x": 9, "y": 1},
-        {"matrix": [1, 10], "x": 10, "y": 1},
-        {"matrix": [1, 11], "x": 11, "y": 1},
-        {"matrix": [1, 12], "x": 12, "y": 1},
-        {"matrix": [1, 13], "x": 13, "y": 1},
-        {"matrix": [5, 3], "x": 14, "y": 1},
-        {"matrix": [1, 14], "x": 15, "y": 1},
-        {"matrix": [1, 15], "x": 16, "y": 1},
-        {"matrix": [1, 16], "x": 17, "y": 1},
-        {"matrix": [1, 17], "x": 18, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1, "w": 2},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+                {"matrix": [1, 15], "x": 16, "y": 1},
+                {"matrix": [1, 16], "x": 17, "y": 1},
+                {"matrix": [1, 17], "x": 18, "y": 1},
 
-        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
-        {"matrix": [2, 1], "x": 1.5, "y": 2},
-        {"matrix": [2, 2], "x": 2.5, "y": 2},
-        {"matrix": [2, 3], "x": 3.5, "y": 2},
-        {"matrix": [2, 4], "x": 4.5, "y": 2},
-        {"matrix": [2, 5], "x": 5.5, "y": 2},
-        {"matrix": [2, 6], "x": 6.5, "y": 2},
-        {"matrix": [2, 7], "x": 7.5, "y": 2},
-        {"matrix": [2, 8], "x": 8.5, "y": 2},
-        {"matrix": [2, 9], "x": 9.5, "y": 2},
-        {"matrix": [2, 10], "x": 10.5, "y": 2},
-        {"matrix": [2, 11], "x": 11.5, "y": 2},
-        {"matrix": [2, 12], "x": 12.5, "y": 2},
-        {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
-        {"matrix": [2, 14], "x": 15, "y": 2},
-        {"matrix": [2, 15], "x": 16, "y": 2},
-        {"matrix": [2, 16], "x": 17, "y": 2},
-        {"matrix": [2, 17], "x": 18, "y": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [2, 8], "x": 8.5, "y": 2},
+                {"matrix": [2, 9], "x": 9.5, "y": 2},
+                {"matrix": [2, 10], "x": 10.5, "y": 2},
+                {"matrix": [2, 11], "x": 11.5, "y": 2},
+                {"matrix": [2, 12], "x": 12.5, "y": 2},
+                {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+                {"matrix": [2, 15], "x": 16, "y": 2},
+                {"matrix": [2, 16], "x": 17, "y": 2},
 
-        {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
-        {"matrix": [3, 1], "x": 1.75, "y": 3},
-        {"matrix": [3, 2], "x": 2.75, "y": 3},
-        {"matrix": [3, 3], "x": 3.75, "y": 3},
-        {"matrix": [3, 4], "x": 4.75, "y": 3},
-        {"matrix": [3, 5], "x": 5.75, "y": 3},
-        {"matrix": [3, 6], "x": 6.75, "y": 3},
-        {"matrix": [3, 7], "x": 7.75, "y": 3},
-        {"matrix": [3, 8], "x": 8.75, "y": 3},
-        {"matrix": [3, 9], "x": 9.75, "y": 3},
-        {"matrix": [3, 10], "x": 10.75, "y": 3},
-        {"matrix": [3, 11], "x": 11.75, "y": 3},
-        {"matrix": [3, 12], "x": 12.75, "y": 3},
-        {"matrix": [3, 13], "x": 13.75, "y": 3, "w": 1.25},
-        {"matrix": [3, 14], "x": 15, "y": 3},
-        {"matrix": [3, 15], "x": 16, "y": 3},
-        {"matrix": [3, 16], "x": 17, "y": 3},
-        {"matrix": [3, 17], "x": 18, "y": 3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [3, 5], "x": 5.75, "y": 3},
+                {"matrix": [3, 6], "x": 6.75, "y": 3},
+                {"matrix": [3, 7], "x": 7.75, "y": 3},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "x": 11.75, "y": 3},
+                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+                {"matrix": [3, 15], "x": 16, "y": 3},
+                {"matrix": [3, 16], "x": 17, "y": 3},
+                {"matrix": [2, 17], "x": 18, "y": 2, "h": 2},
 
-        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-        {"matrix": [4, 1], "x": 1.25, "y": 4},
-        {"matrix": [4, 2], "x": 2.25, "y": 4},
-        {"matrix": [4, 3], "x": 3.25, "y": 4},
-        {"matrix": [4, 4], "x": 4.25, "y": 4},
-        {"matrix": [4, 5], "x": 5.25, "y": 4},
-        {"matrix": [4, 6], "x": 6.25, "y": 4},
-        {"matrix": [4, 7], "x": 7.25, "y": 4},
-        {"matrix": [4, 8], "x": 8.25, "y": 4},
-        {"matrix": [4, 9], "x": 9.25, "y": 4},
-        {"matrix": [4, 10], "x": 10.25, "y": 4},
-        {"matrix": [4, 11], "x": 11.25, "y": 4},
-        {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
-        {"matrix": [4, 13], "x": 14, "y": 4},
-        {"matrix": [4, 14], "x": 15, "y": 4},
-        {"matrix": [4, 15], "x": 16, "y": 4},
-        {"matrix": [4, 16], "x": 17, "y": 4},
-        {"matrix": [4, 17], "x": 18, "y": 4},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4},
+                {"matrix": [4, 15], "x": 16, "y": 4},
+                {"matrix": [4, 16], "x": 17, "y": 4},
 
-        {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
-        {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
-        {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
-        {"matrix": [5, 5], "x": 3.75, "y": 5, "w": 6.25},
-        {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
-        {"matrix": [5, 8], "x": 11.5, "y": 5, "w": 1.5},
-        {"matrix": [5, 12], "x": 13, "y": 5},
-        {"matrix": [5, 13], "x": 14, "y": 5},
-        {"matrix": [5, 14], "x": 15, "y": 5},
-        {"matrix": [5, 15], "x": 16, "y": 5},
-        {"matrix": [5, 16], "x": 17, "y": 5},
-        {"matrix": [5, 17], "x": 18, "y": 5}
-      ]
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
+                {"matrix": [5, 8], "x": 11.5, "y": 5, "w": 1.5},
+                {"matrix": [5, 12], "x": 13, "y": 5},
+                {"matrix": [5, 13], "x": 14, "y": 5},
+                {"matrix": [5, 14], "x": 15, "y": 5},
+                {"matrix": [5, 15], "x": 16, "y": 5},
+                {"matrix": [5, 16], "x": 17, "y": 5},
+                {"matrix": [4, 17], "x": 18, "y": 4, "h": 2}
+            ]
+        },
+        "LAYOUT_96_iso": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [5, 6], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+                {"matrix": [0, 15], "x": 16, "y": 0},
+                {"matrix": [0, 16], "x": 17, "y": 0},
+                {"matrix": [0, 17], "x": 18, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1, "w": 2},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+                {"matrix": [1, 15], "x": 16, "y": 1},
+                {"matrix": [1, 16], "x": 17, "y": 1},
+                {"matrix": [1, 17], "x": 18, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [2, 8], "x": 8.5, "y": 2},
+                {"matrix": [2, 9], "x": 9.5, "y": 2},
+                {"matrix": [2, 10], "x": 10.5, "y": 2},
+                {"matrix": [2, 11], "x": 11.5, "y": 2},
+                {"matrix": [2, 12], "x": 12.5, "y": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+                {"matrix": [2, 15], "x": 16, "y": 2},
+                {"matrix": [2, 16], "x": 17, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [3, 5], "x": 5.75, "y": 3},
+                {"matrix": [3, 6], "x": 6.75, "y": 3},
+                {"matrix": [3, 7], "x": 7.75, "y": 3},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "x": 11.75, "y": 3},
+                {"matrix": [3, 12], "x": 12.75, "y": 3},
+                {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+                {"matrix": [3, 15], "x": 16, "y": 3},
+                {"matrix": [3, 16], "x": 17, "y": 3},
+                {"matrix": [2, 17], "x": 18, "y": 2, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4},
+                {"matrix": [4, 15], "x": 16, "y": 4},
+                {"matrix": [4, 16], "x": 17, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
+                {"matrix": [5, 8], "x": 11.5, "y": 5, "w": 1.5},
+                {"matrix": [5, 12], "x": 13, "y": 5},
+                {"matrix": [5, 13], "x": 14, "y": 5},
+                {"matrix": [5, 14], "x": 15, "y": 5},
+                {"matrix": [5, 15], "x": 16, "y": 5},
+                {"matrix": [5, 16], "x": 17, "y": 5},
+                {"matrix": [4, 17], "x": 18, "y": 4, "h": 2}
+            ]
+        },
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [5, 6], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+                {"matrix": [0, 15], "x": 16, "y": 0},
+                {"matrix": [0, 16], "x": 17, "y": 0},
+                {"matrix": [0, 17], "x": 18, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1},
+                {"matrix": [5, 9], "x": 14, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+                {"matrix": [1, 15], "x": 16, "y": 1},
+                {"matrix": [1, 16], "x": 17, "y": 1},
+                {"matrix": [1, 17], "x": 18, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [2, 8], "x": 8.5, "y": 2},
+                {"matrix": [2, 9], "x": 9.5, "y": 2},
+                {"matrix": [2, 10], "x": 10.5, "y": 2},
+                {"matrix": [2, 11], "x": 11.5, "y": 2},
+                {"matrix": [2, 12], "x": 12.5, "y": 2},
+                {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+                {"matrix": [2, 15], "x": 16, "y": 2},
+                {"matrix": [2, 16], "x": 17, "y": 2},
+                {"matrix": [2, 17], "x": 18, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [3, 5], "x": 5.75, "y": 3},
+                {"matrix": [3, 6], "x": 6.75, "y": 3},
+                {"matrix": [3, 7], "x": 7.75, "y": 3},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "x": 11.75, "y": 3},
+                {"matrix": [3, 12], "x": 12.75, "y": 3},
+                {"matrix": [3, 13], "x": 13.75, "y": 3, "w": 1.25},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+                {"matrix": [3, 15], "x": 16, "y": 3},
+                {"matrix": [3, 16], "x": 17, "y": 3},
+                {"matrix": [3, 17], "x": 18, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4},
+                {"matrix": [4, 15], "x": 16, "y": 4},
+                {"matrix": [4, 16], "x": 17, "y": 4},
+                {"matrix": [4, 17], "x": 18, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5},
+                {"matrix": [5, 8], "x": 11.5, "y": 5, "w": 1.5},
+                {"matrix": [5, 12], "x": 13, "y": 5},
+                {"matrix": [5, 13], "x": 14, "y": 5},
+                {"matrix": [5, 14], "x": 15, "y": 5},
+                {"matrix": [5, 15], "x": 16, "y": 5},
+                {"matrix": [5, 16], "x": 17, "y": 5},
+                {"matrix": [5, 17], "x": 18, "y": 5}
+            ]
+        }
     }
-  }
 }
diff --git a/keyboards/xiudi/xd96/keymaps/default/keymap.c b/keyboards/xiudi/xd96/keymaps/default/keymap.c
index 3d904759caa..d0cfbe23b16 100644
--- a/keyboards/xiudi/xd96/keymaps/default/keymap.c
+++ b/keyboards/xiudi/xd96/keymaps/default/keymap.c
@@ -4,35 +4,22 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-  [0] = LAYOUT_96_ansi(
-/* ┌─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┐ */
-    KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_INS,   KC_DEL,   KC_HOME,  KC_END,   KC_PGUP,  KC_PGDN,
-/* ├─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┴─────────┼─────────┼─────────┼─────────┼─────────┤ */
-	  KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,            KC_NUM,   KC_PSLS,  KC_PAST,  KC_PMNS,
-/* ├─────────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬──────────────┼─────────┼─────────┼─────────┼─────────┤ */
-	  KC_TAB, 	     KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,       KC_P7,    KC_P8,    KC_P9,
-/* ├──────────────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──────────────├─────────├─────────├─────────├         ┤ */
-	  KC_CAPS,          KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_ENT,               KC_P4,    KC_P5,    KC_P6,    KC_PPLS,
-/* ├─────────────────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───────────┬─────────┼─────────┼─────────┼─────────┼─────────┤ */
-	  KC_LSFT,              KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,          KC_UP,    KC_P1,    KC_P2,    KC_P3,
-/* ├───────────┬─────────┴─┬───────┴───┬─────┴─────────┴─────────┴─────────┴─────────┴─────────┴───────┬─┴─────────┴──┬──────┴───────┬─────────┼─────────┼─────────┼─────────┼─────────┼         ┤ */
-	  KC_LCTL,    KC_LGUI,    KC_LALT,    KC_SPC,                                                         L1_RALT,       KC_RCTL,       KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_P0,    KC_PDOT,  KC_PENT
-/* └───────────┴───────────┴───────────┴───────────────────────────────────────────────────────────────┴──────────────┴──────────────┴─────────┴─────────┴─────────┴─────────┴─────────┴─────────┘ */
-  ),
+    [0] = LAYOUT_96_ansi(
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL,  KC_HOME, KC_END,  KC_PGUP, KC_PGDN,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_P7,   KC_P8,   KC_P9,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,           KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   KC_P1,   KC_P2,   KC_P3,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             L1_RALT, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT, KC_P0,   KC_PDOT, KC_PENT
+    ),
+
+    [1] = LAYOUT_96_ansi(
+        _______, BL_TOGG, BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______, _______, _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                            _______, _______,          _______, _______, _______, _______, _______, _______
+    )
 
-  [1] = LAYOUT_96_ansi(
-/* ┌─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┐ */
-    _______,  BL_TOGG,  BL_STEP,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-/* ├─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┴─────────┼─────────┼─────────┼─────────┼─────────┤ */
-	  _______,  RGB_TOG,  RGB_MOD,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,  _______,  _______,
-/* ├─────────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬──────────────┼─────────┼─────────┼─────────┼─────────┤ */
-	  _______, 	     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,       _______,  _______,  _______,
-/* ├──────────────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──────────────├─────────├─────────├─────────┼         ┤ */
-	  _______,          _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,  _______,  _______,
-/* ├─────────────────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───────────┬─────────┼─────────┼─────────┼─────────┼─────────┤ */
-	  _______,              _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,          _______,  _______,  _______,  _______,
-/* ├───────────┬─────────┴─┬───────┴───┬─────┴─────────┴─────────┴─────────┴─────────┴─────────┴───────┬─┴─────────┴──┬──────┴───────┬─────────┼─────────┼─────────┼─────────┼─────────┼         ┤ */
-	  _______,    _______,    _______,    _______,                                                        _______,       _______,       _______,  _______,  _______,  _______,  _______,  _______
-/* └───────────┴───────────┴───────────┴───────────────────────────────────────────────────────────────┴──────────────┴──────────────┴─────────┴─────────┴─────────┴─────────┴─────────┴─────────┘ */
-  )
 };
diff --git a/keyboards/xiudi/xd96/keymaps/default_iso/keymap.c b/keyboards/xiudi/xd96/keymaps/default_iso/keymap.c
index 7c26664b0ec..a485d2f9ef4 100644
--- a/keyboards/xiudi/xd96/keymaps/default_iso/keymap.c
+++ b/keyboards/xiudi/xd96/keymaps/default_iso/keymap.c
@@ -4,35 +4,22 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-  [0] = LAYOUT_96_iso(
-/* ┌─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┐ */
-    KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_INS,   KC_DEL,   KC_HOME,  KC_END,   KC_PGUP,  KC_PGDN,
-/* ├─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┴─────────┼─────────┼─────────┼─────────┼─────────┤ */
-	  KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,            KC_NUM,   KC_PSLS,  KC_PAST,  KC_PMNS,
-/* ├─────────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬──────────────┼─────────┼─────────┼─────────┼─────────┤ */
-	  KC_TAB, 	     KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,                 KC_P7,    KC_P8,    KC_P9,
-/* ├──────────────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬           ├─────────├─────────├─────────├         ┤ */
-	  KC_CAPS,          KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS,  KC_ENT,     KC_P4,    KC_P5,    KC_P6,    KC_PPLS,
-/* ├───────────┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴─────────┴─┬─────────┼─────────┼─────────┼─────────┼─────────┤ */
-	  KC_LSFT,    KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,          KC_UP,    KC_P1,    KC_P2,    KC_P3,
-/* ├───────────┼─────────┴─┬───────┴───┬─────┴─────────┴─────────┴─────────┴─────────┴─────────┴───────┬─┴─────────┴──┬──────┴───────┬─────────┼─────────┼─────────┼─────────┼─────────┼         ┤ */
-	  KC_LCTL,    KC_LGUI,    KC_LALT,    KC_SPC,                                                         L1_RALT,       KC_RCTL,       KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_P0,    KC_PDOT,  KC_PENT
-/* └───────────┴───────────┴───────────┴───────────────────────────────────────────────────────────────┴──────────────┴──────────────┴─────────┴─────────┴─────────┴─────────┴─────────┴─────────┘ */
-  ),
+    [0] = LAYOUT_96_iso(
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL,  KC_HOME, KC_END,  KC_PGUP, KC_PGDN,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,                   KC_P7,   KC_P8,   KC_P9,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,           KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   KC_P1,   KC_P2,   KC_P3,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             L1_RALT, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT, KC_P0,   KC_PDOT, KC_PENT
+    ),
+
+    [1] = LAYOUT_96_iso(
+        _______, BL_TOGG, BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                            _______, _______,          _______, _______, _______, _______, _______, _______
+    )
 
-  [1] = LAYOUT_96_iso(
-/* ┌─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┐ */
-    _______,  BL_TOGG,  BL_STEP,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-/* ├─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┴─────────┼─────────┼─────────┼─────────┼─────────┤ */
-	  _______,  RGB_TOG,  RGB_MOD,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,  _______,  _______,
-/* ├─────────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬──────────────┼─────────┼─────────┼─────────┼─────────┤ */
-	  _______, 	     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                 _______,  _______,  _______,
-/* ├──────────────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬           ├─────────├─────────├─────────┼         ┤ */
-	  _______,          _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
-/* ├───────────┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴─────────┴─┬─────────┼─────────┼─────────┼─────────┼─────────┤ */
-	  _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,          _______,  _______,  _______,  _______,
-/* ├───────────┼─────────┴─┬───────┴───┬─────┴─────────┴─────────┴─────────┴─────────┴─────────┴───────┬─┴─────────┴──┬──────┴───────┬─────────┼─────────┼─────────┼─────────┼─────────┼         ┤ */
-	  _______,    _______,    _______,    _______,                                                        _______,       _______,       _______,  _______,  _______,  _______,  _______,  _______
-/* └───────────┴───────────┴───────────┴───────────────────────────────────────────────────────────────┴──────────────┴──────────────┴─────────┴─────────┴─────────┴─────────┴─────────┴─────────┘ */
-  )
 };
diff --git a/keyboards/xiudi/xd96/keymaps/via/keymap.c b/keyboards/xiudi/xd96/keymaps/via/keymap.c
index 8fdb8efe210..2d6524958dc 100644
--- a/keyboards/xiudi/xd96/keymaps/via/keymap.c
+++ b/keyboards/xiudi/xd96/keymaps/via/keymap.c
@@ -2,67 +2,40 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-  [0] = LAYOUT_96_ansi(
-/* ┌─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┐ */
-    KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_INS,   KC_DEL,   KC_HOME,  KC_END,   KC_PGUP,  KC_PGDN,
-/* ├─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┴─────────┼─────────┼─────────┼─────────┼─────────┤ */
-      KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,            KC_NUM,  KC_PSLS,  KC_PAST,  KC_PMNS,
-/* ├─────────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬──────────────┼─────────┼─────────┼─────────┼─────────┤ */
-      KC_TAB, 	     KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,       KC_P7,    KC_P8,    KC_P9,
-/* ├──────────────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──────────────├─────────├─────────├─────────├         ┤ */
-      KC_CAPS,          KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_ENT,               KC_P4,    KC_P5,    KC_P6,    KC_PPLS,
-/* ├─────────────────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───────────┬─────────┼─────────┼─────────┼─────────┼─────────┤ */
-      KC_LSFT,              KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,          KC_UP,    KC_P1,    KC_P2,    KC_P3,
-/* ├───────────┬─────────┴─┬───────┴───┬─────┴─────────┴─────────┴─────────┴─────────┴─────────┴───────┬─┴─────────┴──┬──────┴───────┬─────────┼─────────┼─────────┼─────────┼─────────┼         ┤ */
-      KC_LCTL,    KC_LGUI,    KC_LALT,    KC_SPC,                                                         MO(1),        KC_RCTL,       KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_P0,    KC_PDOT,  KC_PENT
-/* └───────────┴───────────┴───────────┴───────────────────────────────────────────────────────────────┴──────────────┴──────────────┴─────────┴─────────┴─────────┴─────────┴─────────┴─────────┘ */
-  ),
+    [0] = LAYOUT_96_ansi(
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,  KC_DEL,  KC_HOME, KC_END,  KC_PGUP, KC_PGDN,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_P7,   KC_P8,   KC_P9,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,           KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   KC_P1,   KC_P2,   KC_P3,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             MO(1),   KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT, KC_P0,   KC_PDOT, KC_PENT
+    ),
 
-  [1] = LAYOUT_96_ansi(
-/* ┌─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┐ */
-    _______,  BL_TOGG,  BL_STEP,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-/* ├─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┴─────────┼─────────┼─────────┼─────────┼─────────┤ */
-      _______,  RGB_TOG,  RGB_MOD,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,  _______,  _______,
-/* ├─────────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬──────────────┼─────────┼─────────┼─────────┼─────────┤ */
-      _______, 	     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,       _______,  _______,  _______,
-/* ├──────────────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──────────────├─────────├─────────├─────────┼         ┤ */
-      _______,          _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,  _______,  _______,
-/* ├─────────────────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───────────┬─────────┼─────────┼─────────┼─────────┼─────────┤ */
-      _______,              _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,          _______,  _______,  _______,  _______,
-/* ├───────────┬─────────┴─┬───────┴───┬─────┴─────────┴─────────┴─────────┴─────────┴─────────┴───────┬─┴─────────┴──┬──────┴───────┬─────────┼─────────┼─────────┼─────────┼─────────┼         ┤ */
-      _______,    _______,    _______,    _______,                                                        _______,       _______,       _______,  _______,  _______,  _______,  _______,  _______
-/* └───────────┴───────────┴───────────┴───────────────────────────────────────────────────────────────┴──────────────┴──────────────┴─────────┴─────────┴─────────┴─────────┴─────────┴─────────┘ */
-  ),
+    [1] = LAYOUT_96_ansi(
+        _______, BL_TOGG, BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______, _______, _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                            _______, _______,          _______, _______, _______, _______, _______, _______
+    ),
 
-  [2] = LAYOUT_96_ansi(
-/* ┌─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┐ */
-    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-/* ├─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┴─────────┼─────────┼─────────┼─────────┼─────────┤ */
-      _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,  _______,  _______,
-/* ├─────────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬──────────────┼─────────┼─────────┼─────────┼─────────┤ */
-      _______, 	     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,       _______,  _______,  _______,
-/* ├──────────────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──────────────├─────────├─────────├─────────┼         ┤ */
-      _______,          _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,  _______,  _______,
-/* ├─────────────────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───────────┬─────────┼─────────┼─────────┼─────────┼─────────┤ */
-      _______,              _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,          _______,  _______,  _______,  _______,
-/* ├───────────┬─────────┴─┬───────┴───┬─────┴─────────┴─────────┴─────────┴─────────┴─────────┴───────┬─┴─────────┴──┬──────┴───────┬─────────┼─────────┼─────────┼─────────┼─────────┼         ┤ */
-      _______,    _______,    _______,    _______,                                                        _______,       _______,       _______,  _______,  _______,  _______,  _______,  _______
-/* └───────────┴───────────┴───────────┴───────────────────────────────────────────────────────────────┴──────────────┴──────────────┴─────────┴─────────┴─────────┴─────────┴─────────┴─────────┘ */
-  ),
+    [2] = LAYOUT_96_ansi(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______, _______, _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                            _______, _______,          _______, _______, _______, _______, _______, _______
+    ),
+
+    [3] = LAYOUT_96_ansi(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______, _______, _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                            _______, _______,          _______, _______, _______, _______, _______, _______
+    ),
 
-  [3] = LAYOUT_96_ansi(
-/* ┌─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┐ */
-    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-/* ├─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┴─────────┼─────────┼─────────┼─────────┼─────────┤ */
-      _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,  _______,  _______,
-/* ├─────────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬──────────────┼─────────┼─────────┼─────────┼─────────┤ */
-      _______, 	     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,       _______,  _______,  _______,
-/* ├──────────────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──────────────├─────────├─────────├─────────┼         ┤ */
-      _______,          _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,  _______,  _______,
-/* ├─────────────────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───────────┬─────────┼─────────┼─────────┼─────────┼─────────┤ */
-      _______,              _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,          _______,  _______,  _______,  _______,
-/* ├───────────┬─────────┴─┬───────┴───┬─────┴─────────┴─────────┴─────────┴─────────┴─────────┴───────┬─┴─────────┴──┬──────┴───────┬─────────┼─────────┼─────────┼─────────┼─────────┼         ┤ */
-      _______,    _______,    _______,    _______,                                                        _______,       _______,       _______,  _______,  _______,  _______,  _______,  _______
-/* └───────────┴───────────┴───────────┴───────────────────────────────────────────────────────────────┴──────────────┴──────────────┴─────────┴─────────┴─────────┴─────────┴─────────┴─────────┘ */
-  ),
 };
diff --git a/keyboards/xiudi/xd96/matrix_diagram.md b/keyboards/xiudi/xd96/matrix_diagram.md
new file mode 100644
index 00000000000..ba4181b0c78
--- /dev/null
+++ b/keyboards/xiudi/xd96/matrix_diagram.md
@@ -0,0 +1,42 @@
+# Matrix Diagram for KPrepublic XD96
+
+```
+Spaced Function Row ────────────────────────────────────────┐
+┌───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐
+│00 │ │01 │02 │03 │04 │ │06 │07 │08 │09 │ │0A │0B │0C │0D │
+└───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘
+                                                    ┌───────┐       ┌───────┐
+                          2u Function Row Backspace │0D     │       │0G     │
+                                                    └───────┘       └───────┘
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+│00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │56 │0E │0F │0G │0H │
+├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤    ┌───────┐                            ┌───┐
+│10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │59 │1E │1F │1G │1H │    │1D     │ 2u Backspace               │   │
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┼───┼───┼───┤    └─┬─────┤      ┌─────┐               │1H │   ┌───┐
+│20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D   │2E │2F │2G │2H │      │2D   │      │     │               │   │   │   │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬────┼───┼───┼───┼───┤   ┌──┴─────┤   ┌──┴┐3D  │               ├───┤   │2H │ 2u Numpad Plus
+│30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3D  │3E │3F │3G │3H │   │3D      │   │3C │    │               │   │   │   │
+├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼───┼───┼───┼───┤   └────────┘   └───┴────┘   ┌───────┐   │3H │   ├───┤
+│40  │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4C    │4D │4E │4F │4G │4H │    ANSI         ISO         │4E     │   │   │   │   │
+├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┴┬──┴──┬───┼───┼───┼───┼───┼───┤    Enter        Enter       └───────┘   └───┘   │4H │ 2u Numpad Enter
+│50  │51  │52  │55                      │5A   │58   │5C │5D │5E │5F │5G │5H │                              2u Zero            │   │
+└────┴────┴────┴────────────────────────┴─────┴─────┴───┴───┴───┴───┴───┴───┘                              on Shift Row       └───┘
+┌────────┐                                   ┌───┬──────────┬───────┐
+│40      │ 2.25u LShift      1u/2.75u RShift │4B │4D        │5E     │ 2u Numpad Zero
+└────────┘                                   └───┴──────────┴───────┘
+                                             ┌────┬────┬────┐
+                             3x 1.25u RShift │4B  │4C  │4D  │
+                                             └────┴────┴────┘
+┌────┬────┬────┬────────────────────────┬────┬────┬────┬────┐
+│50  │51  │52  │55                      │5A  │58  │5C  │5D  │ ANSI
+└────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+┌─────┬───┬─────┬───────────────────────┬─────┬─────┬───┬───┐
+│50   │51 │52   │55                     │5A   │58   │5C │5D │ Tsangan
+└─────┴───┴─────┴───────────────────────┴─────┴─────┴───┴───┘
+┌─────┬─────┬───────────────────────────┬─────┬─────┬───┬───┐
+│50   │51   │55                         │5A   │58   │5C │5D │ WKL
+└─────┴─────┴───────────────────────────┴─────┴─────┴───┴───┘
+      ┌───┬─────┬───────────────────────────┬─────┬───┐
+      │51 │52   │55                         │58   │5C │ HHKB
+      └───┴─────┴───────────────────────────┴─────┴───┘
+```
diff --git a/keyboards/xiudi/xd96/readme.md b/keyboards/xiudi/xd96/readme.md
index 5f4038ef3fd..47a91c834d1 100644
--- a/keyboards/xiudi/xd96/readme.md
+++ b/keyboards/xiudi/xd96/readme.md
@@ -9,7 +9,7 @@ Keyboard with 96 Keys & RGB LED Underglow
 
 * Keyboard Maintainer: QMK Community
 * Hardware Supported: XD96
-* Hardware Availability: [KPrepublic](https://kprepublic.com/products/xd96-pcb-90-custom-mechanical-keyboard-supports-tkg-tools-underglow-rgb-programmed); [AliExpress](https://aliexpress.com/item/cospad-Custom-Mechanical-Keyboard-Kit-up-tp-24-keys-Supports-TKG-TOOLS-Underglow-RGB-PCB-20/32818383873.html)
+* Hardware Availability: [KPrepublic](https://kprepublic.com/products/xd96-pcb-90-custom-mechanical-keyboard-supports-tkg-tools-underglow-rgb-programmed); [AliExpress](https://www.aliexpress.com/i/2251832661406145.html)
 
 Make example for this keyboard (after setting up your build environment):
 
diff --git a/keyboards/yandrstudio/buff67v3/config.h b/keyboards/yandrstudio/buff67v3/config.h
index 9d3f3e44c06..7ff76360877 100644
--- a/keyboards/yandrstudio/buff67v3/config.h
+++ b/keyboards/yandrstudio/buff67v3/config.h
@@ -23,8 +23,8 @@
 
 #    define WS2812_PWM_DRIVER PWMD3  // default: PWMD2
 #    define WS2812_PWM_CHANNEL 1  // default: 2
-#    define WS2812_DMA_STREAM STM32_DMA1_STREAM3  // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
-#    define WS2812_DMA_CHANNEL 3  // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
+#    define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM3  // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
+#    define WS2812_PWM_DMA_CHANNEL 3  // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
 
 #endif
 
diff --git a/keyboards/yandrstudio/eau_r2/config.h b/keyboards/yandrstudio/eau_r2/config.h
index aa9b295e020..3a741b3dfff 100644
--- a/keyboards/yandrstudio/eau_r2/config.h
+++ b/keyboards/yandrstudio/eau_r2/config.h
@@ -17,5 +17,5 @@
 
 #define WS2812_PWM_DRIVER PWMD1
 #define WS2812_PWM_CHANNEL 1
-#define WS2812_DMA_STREAM STM32_DMA1_STREAM5
-#define WS2812_DMA_CHANNEL 5
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM5
+#define WS2812_PWM_DMA_CHANNEL 5
diff --git a/keyboards/yandrstudio/nightstar75/config.h b/keyboards/yandrstudio/nightstar75/config.h
index 4d5c6629996..f29bd573b80 100644
--- a/keyboards/yandrstudio/nightstar75/config.h
+++ b/keyboards/yandrstudio/nightstar75/config.h
@@ -20,5 +20,5 @@
 #define WS2812_PWM_DRIVER PWMD3  // default: PWMD2
 #define WS2812_PWM_CHANNEL 2     // default: 2
 #define WS2812_PWM_PAL_MODE 2
-#define WS2812_DMA_STREAM STM32_DMA1_STREAM3
-#define WS2812_DMA_CHANNEL 3
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM3
+#define WS2812_PWM_DMA_CHANNEL 3
diff --git a/keyboards/yandrstudio/nz64/config.h b/keyboards/yandrstudio/nz64/config.h
index 81b549b60d7..6dd155f74ec 100644
--- a/keyboards/yandrstudio/nz64/config.h
+++ b/keyboards/yandrstudio/nz64/config.h
@@ -18,5 +18,5 @@
 #define WS2812_PWM_DRIVER PWMD3  // default: PWMD2
 #define WS2812_PWM_CHANNEL 2  // default: 2
 #define WS2812_PWM_PAL_MODE 2  // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 2
-#define WS2812_DMA_STREAM STM32_DMA1_STREAM2  // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
-#define WS2812_DMA_CHANNEL 5  // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM2  // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
+#define WS2812_PWM_DMA_CHANNEL 5  // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
diff --git a/keyboards/yandrstudio/nz67v2/config.h b/keyboards/yandrstudio/nz67v2/config.h
index 7ecdfeafcfc..a7ae3e713ce 100644
--- a/keyboards/yandrstudio/nz67v2/config.h
+++ b/keyboards/yandrstudio/nz67v2/config.h
@@ -18,5 +18,5 @@
 
 #define WS2812_PWM_DRIVER PWMD3  // default: PWMD2
 #define WS2812_PWM_CHANNEL 2  // default: 2
-#define WS2812_DMA_STREAM STM32_DMA1_STREAM3  // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
-#define WS2812_DMA_CHANNEL 3  // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM3  // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
+#define WS2812_PWM_DMA_CHANNEL 3  // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
diff --git a/keyboards/yandrstudio/tg67/config.h b/keyboards/yandrstudio/tg67/config.h
index 686696be7d5..99deee32ac6 100644
--- a/keyboards/yandrstudio/tg67/config.h
+++ b/keyboards/yandrstudio/tg67/config.h
@@ -18,5 +18,5 @@
 #define WS2812_PWM_DRIVER PWMD3
 #define WS2812_PWM_CHANNEL 2
 #define WS2812_PWM_PAL_MODE 2
-#define WS2812_DMA_STREAM STM32_DMA1_STREAM3
-#define WS2812_DMA_CHANNEL 3
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM3
+#define WS2812_PWM_DMA_CHANNEL 3
diff --git a/keyboards/yandrstudio/yr6095/config.h b/keyboards/yandrstudio/yr6095/config.h
index 05a8922788f..98372166261 100644
--- a/keyboards/yandrstudio/yr6095/config.h
+++ b/keyboards/yandrstudio/yr6095/config.h
@@ -19,5 +19,5 @@
 
 #define WS2812_PWM_DRIVER PWMD3
 #define WS2812_PWM_CHANNEL 2
-#define WS2812_DMA_STREAM STM32_DMA1_STREAM3
-#define WS2812_DMA_CHANNEL 3
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM3
+#define WS2812_PWM_DMA_CHANNEL 3
diff --git a/keyboards/yandrstudio/yr80/config.h b/keyboards/yandrstudio/yr80/config.h
index 08e10e243ed..71d8e725879 100644
--- a/keyboards/yandrstudio/yr80/config.h
+++ b/keyboards/yandrstudio/yr80/config.h
@@ -21,5 +21,5 @@
 #define WS2812_PWM_DRIVER PWMD3
 #define WS2812_PWM_CHANNEL 2
 #define WS2812_PWM_PAL_MODE 2
-#define WS2812_DMA_STREAM STM32_DMA1_STREAM3
-#define WS2812_DMA_CHANNEL 3
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM3
+#define WS2812_PWM_DMA_CHANNEL 3
diff --git a/keyboards/yanghu/unicorne/config.h b/keyboards/yanghu/unicorne/config.h
index 99d38fe44ab..8e625c6336c 100644
--- a/keyboards/yanghu/unicorne/config.h
+++ b/keyboards/yanghu/unicorne/config.h
@@ -31,6 +31,6 @@
 #define WS2812_PWM_DRIVER PWMD3
 #define WS2812_PWM_CHANNEL 4
 #define WS2812_PWM_PAL_MODE 2
-#define WS2812_DMA_STREAM STM32_DMA1_STREAM2
-#define WS2812_DMA_CHANNEL 5
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM2
+#define WS2812_PWM_DMA_CHANNEL 5
 #define WS2812_EXTERNAL_PULLUP
diff --git a/keyboards/ymdk/id75/config.h b/keyboards/ymdk/id75/config.h
index 14ed1d644c0..cb5ac78304a 100644
--- a/keyboards/ymdk/id75/config.h
+++ b/keyboards/ymdk/id75/config.h
@@ -19,5 +19,5 @@
 #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 WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM7
+#define WS2812_PWM_DMA_CHANNEL 7
diff --git a/keyboards/ymdk/melody96/hotswap/info.json b/keyboards/ymdk/melody96/hotswap/info.json
index 61112d88ab3..6a00e050502 100644
--- a/keyboards/ymdk/melody96/hotswap/info.json
+++ b/keyboards/ymdk/melody96/hotswap/info.json
@@ -14,7 +14,6 @@
     },
     "diode_direction": "ROW2COL",
     "features": {
-        "audio": false,
         "backlight": true,
         "bootmagic": true,
         "command": false,
diff --git a/keyboards/ymdk/ymd75/rev4/iso/config.h b/keyboards/ymdk/ymd75/rev4/iso/config.h
index 58c4b34d617..3a0dddaad88 100644
--- a/keyboards/ymdk/ymd75/rev4/iso/config.h
+++ b/keyboards/ymdk/ymd75/rev4/iso/config.h
@@ -5,5 +5,5 @@
 #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 WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM7
+#define WS2812_PWM_DMA_CHANNEL 7
diff --git a/keyboards/yoichiro/lunakey_pico/info.json b/keyboards/yoichiro/lunakey_pico/info.json
index bf4b2a25109..d80aaf06129 100644
--- a/keyboards/yoichiro/lunakey_pico/info.json
+++ b/keyboards/yoichiro/lunakey_pico/info.json
@@ -11,8 +11,7 @@
         "console": false,
         "command": false,
         "nkro": false,
-        "rgblight": true,
-        "audio": false
+        "rgblight": true
     },
     "matrix_pins": {
         "cols": ["GP21", "GP20", "GP19", "GP18", "GP17", "GP16"],
diff --git a/keyboards/zvecr/split_blackpill/config.h b/keyboards/zvecr/split_blackpill/config.h
index 41739356422..dd26e9ca325 100644
--- a/keyboards/zvecr/split_blackpill/config.h
+++ b/keyboards/zvecr/split_blackpill/config.h
@@ -20,8 +20,8 @@
 
 #define WS2812_PWM_DRIVER PWMD3
 #define WS2812_PWM_CHANNEL 1
-#define WS2812_DMA_STREAM STM32_DMA1_STREAM3
-#define WS2812_DMA_CHANNEL 3
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM3
+#define WS2812_PWM_DMA_CHANNEL 3
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/zvecr/zv48/config.h b/keyboards/zvecr/zv48/config.h
index e503f07b801..a67a46a1850 100644
--- a/keyboards/zvecr/zv48/config.h
+++ b/keyboards/zvecr/zv48/config.h
@@ -22,8 +22,8 @@
 #define WS2812_PWM_DRIVER PWMD3
 #define WS2812_PWM_CHANNEL 4
 #define WS2812_PWM_PAL_MODE 2
-#define WS2812_DMA_STREAM STM32_DMA1_STREAM2
-#define WS2812_DMA_CHANNEL 5
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM2
+#define WS2812_PWM_DMA_CHANNEL 5
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/zvecr/zv48/f401/info.json b/keyboards/zvecr/zv48/f401/keyboard.json
similarity index 100%
rename from keyboards/zvecr/zv48/f401/info.json
rename to keyboards/zvecr/zv48/f401/keyboard.json
diff --git a/keyboards/zvecr/zv48/f401/rules.mk b/keyboards/zvecr/zv48/f401/rules.mk
deleted file mode 100644
index 4df55cd2206..00000000000
--- a/keyboards/zvecr/zv48/f401/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-# Disable unsupported hardware
-AUDIO_SUPPORTED = no
-BACKLIGHT_SUPPORTED = no
diff --git a/lib/python/qmk/build_targets.py b/lib/python/qmk/build_targets.py
index 80f587bcc04..d974d04020c 100644
--- a/lib/python/qmk/build_targets.py
+++ b/lib/python/qmk/build_targets.py
@@ -119,9 +119,10 @@ class BuildTarget:
         command = self.compile_command(build_target=build_target, dry_run=True, **env_vars)
         from qmk.cli.generate.compilation_database import write_compilation_database  # Lazy load due to circular references
         output_path = QMK_FIRMWARE / 'compile_commands.json'
-        write_compilation_database(command=command, output_path=output_path, skip_clean=skip_clean, **env_vars)
-        if output_path.exists() and HAS_QMK_USERSPACE:
+        ret = write_compilation_database(command=command, output_path=output_path, skip_clean=skip_clean, **env_vars)
+        if ret and output_path.exists() and HAS_QMK_USERSPACE:
             shutil.copy(str(output_path), str(QMK_USERSPACE / 'compile_commands.json'))
+        return ret
 
     def compile(self, build_target: str = None, dry_run: bool = False, **env_vars) -> None:
         if self._clean or self._compiledb:
diff --git a/lib/python/qmk/cli/__init__.py b/lib/python/qmk/cli/__init__.py
index e4a8166349b..6d05a5fc21c 100644
--- a/lib/python/qmk/cli/__init__.py
+++ b/lib/python/qmk/cli/__init__.py
@@ -81,6 +81,7 @@ subcommands = [
     'qmk.cli.new.keymap',
     'qmk.cli.painter',
     'qmk.cli.pytest',
+    'qmk.cli.test.c',
     'qmk.cli.userspace.add',
     'qmk.cli.userspace.compile',
     'qmk.cli.userspace.doctor',
diff --git a/lib/python/qmk/cli/find.py b/lib/python/qmk/cli/find.py
index 55a05300924..8f3a29c90ce 100644
--- a/lib/python/qmk/cli/find.py
+++ b/lib/python/qmk/cli/find.py
@@ -1,7 +1,7 @@
 """Command to search through all keyboards and keymaps for a given search criteria.
 """
 from milc import cli
-from qmk.search import search_keymap_targets
+from qmk.search import filter_help, search_keymap_targets
 
 
 @cli.argument(
@@ -11,7 +11,7 @@ from qmk.search import search_keymap_targets
     action='append',
     default=[],
     help=  # noqa: `format-python` and `pytest` don't agree here.
-    "Filter the list of keyboards based on their info.json data. Accepts the formats key=value, function(key), or function(key,value), eg. 'features.rgblight=true'. Valid functions are 'absent', 'contains', 'exists' and 'length'. May be passed multiple times; all filters need to match. Value may include wildcards such as '*' and '?'."  # noqa: `format-python` and `pytest` don't agree here.
+    f"Filter the list of keyboards based on their info.json data. Accepts the formats key=value, function(key), or function(key,value), eg. 'features.rgblight=true'. Valid functions are {filter_help()}. May be passed multiple times; all filters need to match. Value may include wildcards such as '*' and '?'."  # noqa: `format-python` and `pytest` don't agree here.
 )
 @cli.argument('-p', '--print', arg_only=True, action='append', default=[], help="For each matched target, print the value of the supplied info.json key. May be passed multiple times.")
 @cli.argument('-km', '--keymap', type=str, default='default', help="The keymap name to build. Default is 'default'.")
diff --git a/lib/python/qmk/cli/generate/compilation_database.py b/lib/python/qmk/cli/generate/compilation_database.py
index 5100d2b6d25..a2190fee66c 100755
--- a/lib/python/qmk/cli/generate/compilation_database.py
+++ b/lib/python/qmk/cli/generate/compilation_database.py
@@ -17,6 +17,7 @@ from qmk.constants import QMK_FIRMWARE
 from qmk.decorators import automagic_keyboard, automagic_keymap
 from qmk.keyboard import keyboard_completer, keyboard_folder
 from qmk.keymap import keymap_completer
+from qmk.build_targets import KeyboardKeymapBuildTarget
 
 
 @lru_cache(maxsize=10)
@@ -138,4 +139,5 @@ def generate_compilation_database(cli: MILC) -> Union[bool, int]:
     elif not current_keymap:
         cli.log.error('Could not determine keymap!')
 
-    return write_compilation_database(current_keyboard, current_keymap, QMK_FIRMWARE / 'compile_commands.json')
+    target = KeyboardKeymapBuildTarget(current_keyboard, current_keymap)
+    return target.generate_compilation_database()
diff --git a/lib/python/qmk/cli/generate/make_dependencies.py b/lib/python/qmk/cli/generate/make_dependencies.py
index 9b695e907de..331132a20f5 100755
--- a/lib/python/qmk/cli/generate/make_dependencies.py
+++ b/lib/python/qmk/cli/generate/make_dependencies.py
@@ -18,10 +18,11 @@ from qmk.path import normpath, FileType
 @cli.argument('-km', '--keymap', completer=keymap_completer, help='The keymap to build a firmware for. Ignored when a configurator export is supplied.')
 @cli.subcommand('Generates the list of dependencies associated with a keyboard build and its generated files.', hidden=True)
 def generate_make_dependencies(cli):
-    """Generates the list of dependent info.json, rules.mk, and config.h files for a keyboard.
+    """Generates the list of dependent config files for a keyboard.
     """
     interesting_files = [
         'info.json',
+        'keyboard.json',
         'rules.mk',
         'post_rules.mk',
         'config.h',
diff --git a/lib/python/qmk/cli/new/keyboard.py b/lib/python/qmk/cli/new/keyboard.py
index ce956d0ce14..700afc96a62 100644
--- a/lib/python/qmk/cli/new/keyboard.py
+++ b/lib/python/qmk/cli/new/keyboard.py
@@ -15,7 +15,7 @@ from qmk.json_schema import load_jsonschema
 from qmk.path import keyboard
 from qmk.json_encoders import InfoJSONEncoder
 from qmk.json_schema import deep_update, json_load
-from qmk.constants import MCU2BOOTLOADER
+from qmk.constants import MCU2BOOTLOADER, QMK_FIRMWARE
 
 COMMUNITY = Path('layouts/default/')
 TEMPLATE = Path('data/templates/keyboard/')
@@ -251,9 +251,9 @@ def new_keyboard(cli):
 
     # merge in infos
     community_info = Path(COMMUNITY / f'{default_layout}/info.json')
-    augment_community_info(community_info, keyboard(kb_name) / community_info.name)
+    augment_community_info(community_info, keyboard(kb_name) / 'keyboard.json')
 
     cli.log.info(f'{{fg_green}}Created a new keyboard called {{fg_cyan}}{kb_name}{{fg_green}}.{{fg_reset}}')
-    cli.log.info(f'To start working on things, `cd` into {{fg_cyan}}keyboards/{kb_name}{{fg_reset}},')
-    cli.log.info('or open the directory in your preferred text editor.')
-    cli.log.info(f"And build with {{fg_yellow}}qmk compile -kb {kb_name} -km default{{fg_reset}}.")
+    cli.log.info(f"Build Command: {{fg_yellow}}qmk compile -kb {kb_name} -km default{{fg_reset}}.")
+    cli.log.info(f'Project Location: {{fg_cyan}}{QMK_FIRMWARE}/{keyboard(kb_name)}{{fg_reset}},')
+    cli.log.info("{{fg_yellow}}Now update the config files to match the hardware!{{fg_reset}}")
diff --git a/lib/python/qmk/cli/painter/convert_graphics.py b/lib/python/qmk/cli/painter/convert_graphics.py
index 16a6db8c2f9..553c26aa5d5 100644
--- a/lib/python/qmk/cli/painter/convert_graphics.py
+++ b/lib/python/qmk/cli/painter/convert_graphics.py
@@ -10,7 +10,7 @@ from PIL import Image
 @cli.argument('-v', '--verbose', arg_only=True, action='store_true', help='Turns on verbose output.')
 @cli.argument('-i', '--input', required=True, help='Specify input graphic file.')
 @cli.argument('-o', '--output', default='', help='Specify output directory. Defaults to same directory as input.')
-@cli.argument('-f', '--format', required=True, help='Output format, valid types: %s' % (', '.join(valid_formats.keys())))
+@cli.argument('-f', '--format', required=True, help=f'Output format, valid types: {", ".join(valid_formats.keys())}')
 @cli.argument('-r', '--no-rle', arg_only=True, action='store_true', help='Disables the use of RLE when encoding images.')
 @cli.argument('-d', '--no-deltas', arg_only=True, action='store_true', help='Disables the use of delta frames when encoding animations.')
 @cli.argument('-w', '--raw', arg_only=True, action='store_true', help='Writes out the QGF file as raw data instead of c/h combo.')
@@ -54,24 +54,26 @@ def painter_convert_graphics(cli):
     out_bytes = out_data.getvalue()
 
     if cli.args.raw:
-        raw_file = cli.args.output / (cli.args.input.stem + ".qgf")
+        raw_file = cli.args.output / f"{cli.args.input.stem}.qgf"
         with open(raw_file, 'wb') as raw:
             raw.write(out_bytes)
         return
 
     # Work out the text substitutions for rendering the output data
-    subs = generate_subs(cli, out_bytes, image_metadata=metadata)
+    args_str = " ".join((f"--{arg} {getattr(cli.args, arg.replace('-', '_'))}" for arg in ["input", "output", "format", "no-rle", "no-deltas"]))
+    command = f"qmk painter-convert-graphics {args_str}"
+    subs = generate_subs(cli, out_bytes, image_metadata=metadata, command=command)
 
     # Render and write the header file
     header_text = render_header(subs)
-    header_file = cli.args.output / (cli.args.input.stem + ".qgf.h")
+    header_file = cli.args.output / f"{cli.args.input.stem}.qgf.h"
     with open(header_file, 'w') as header:
         print(f"Writing {header_file}...")
         header.write(header_text)
 
     # Render and write the source file
     source_text = render_source(subs)
-    source_file = cli.args.output / (cli.args.input.stem + ".qgf.c")
+    source_file = cli.args.output / f"{cli.args.input.stem}.qgf.c"
     with open(source_file, 'w') as source:
         print(f"Writing {source_file}...")
         source.write(source_text)
diff --git a/lib/python/qmk/cli/painter/make_font.py b/lib/python/qmk/cli/painter/make_font.py
index ae59ed818cf..8fab18cf8cd 100644
--- a/lib/python/qmk/cli/painter/make_font.py
+++ b/lib/python/qmk/cli/painter/make_font.py
@@ -1,6 +1,7 @@
 """This script automates the conversion of font files into a format QMK firmware understands.
 """
 
+import sys
 from io import BytesIO
 from qmk.path import normpath
 from qmk.painter_qff import _generate_font_glyphs_list, QFFFont
@@ -57,8 +58,11 @@ def _image_to_qff(cli, input_):
         return
 
     # Work out the text substitutions for rendering the output data
+    subcommand = sys.argv[1]  # hacky way of telling apart painter-convert-font and painter-convert-font-image
+    args_str = " ".join((f"--{arg} {getattr(cli.args, arg.replace('-', '_'))}" for arg in ["input", "output", "no-ascii", "unicode-glyphs", "format", "no-rle"]))
+    command = f"qmk {subcommand} {args_str}"
     metadata = {"glyphs": _generate_font_glyphs_list(not cli.args.no_ascii, cli.args.unicode_glyphs)}
-    subs = generate_subs(cli, out_bytes, font_metadata=metadata)
+    subs = generate_subs(cli, out_bytes, font_metadata=metadata, command=command)
 
     # Render and write the header file
     header_text = render_header(subs)
diff --git a/lib/python/qmk/cli/test/__init__.py b/lib/python/qmk/cli/test/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/lib/python/qmk/cli/test/c.py b/lib/python/qmk/cli/test/c.py
new file mode 100644
index 00000000000..7a4e20d5e69
--- /dev/null
+++ b/lib/python/qmk/cli/test/c.py
@@ -0,0 +1,47 @@
+import fnmatch
+import re
+from subprocess import DEVNULL
+
+from milc import cli
+
+from qmk.commands import find_make, get_make_parallel_args, build_environment
+
+
+@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('-l', '--list', arg_only=True, action='store_true', help='List available tests.')
+@cli.argument('-t', '--test', arg_only=True, action='append', default=[], help="Test to run from the available list. Supports wildcard globs. May be passed multiple times.")
+@cli.subcommand("QMK C Unit Tests.", hidden=False if cli.config.user.developer else True)
+def test_c(cli):
+    """Run native unit tests.
+    """
+    list_tests = cli.run([find_make(), 'list-tests', 'SILENT=true'])
+    available_tests = sorted(list_tests.stdout.strip().split())
+
+    if cli.args.list:
+        return print("\n".join(available_tests))
+
+    # expand any wildcards
+    filtered_tests = set()
+    for test in cli.args.test:
+        regex = re.compile(fnmatch.translate(test))
+        filtered_tests |= set(filter(regex.match, available_tests))
+
+    for invalid in filtered_tests - set(available_tests):
+        cli.log.warning(f'Invalid test provided: {invalid}')
+
+    # convert test names to build targets
+    targets = list(map(lambda x: f'test:{x}', filtered_tests or ['all']))
+
+    if cli.args.clean:
+        targets.insert(0, 'clean')
+
+    # Add in the environment vars
+    for key, value in build_environment(cli.args.env).items():
+        targets.append(f'{key}={value}')
+
+    command = [find_make(), *get_make_parallel_args(cli.config.test_c.parallel), *targets]
+
+    cli.log.info('Compiling tests with {fg_cyan}%s', ' '.join(command))
+    return cli.run(command, capture_output=False, stdin=DEVNULL).returncode
diff --git a/lib/python/qmk/info.py b/lib/python/qmk/info.py
index 13588abdb85..24492846680 100644
--- a/lib/python/qmk/info.py
+++ b/lib/python/qmk/info.py
@@ -863,7 +863,17 @@ def unknown_processor_rules(info_data, rules):
 def merge_info_jsons(keyboard, info_data):
     """Return a merged copy of all the info.json files for a keyboard.
     """
-    for info_file in find_info_json(keyboard):
+    config_files = find_info_json(keyboard)
+
+    # keyboard.json can only exist at the deepest part of the tree
+    keyboard_json_count = 0
+    for index, info_file in enumerate(config_files):
+        if Path(info_file).name == 'keyboard.json':
+            keyboard_json_count += 1
+            if index != 0 or keyboard_json_count > 1:
+                _log_error(info_data, f'Invalid keyboard.json location detected: {info_file}.')
+
+    for info_file in config_files:
         # Load and validate the JSON data
         new_info_data = json_load(info_file)
 
@@ -921,7 +931,7 @@ def find_info_json(keyboard):
     base_path = Path('keyboards')
     keyboard_path = base_path / keyboard
     keyboard_parent = keyboard_path.parent
-    info_jsons = [keyboard_path / 'info.json']
+    info_jsons = [keyboard_path / 'info.json', keyboard_path / 'keyboard.json']
 
     # Add DEFAULT_FOLDER before parents, if present
     rules = rules_mk(keyboard)
@@ -933,6 +943,7 @@ def find_info_json(keyboard):
         if keyboard_parent == base_path:
             break
         info_jsons.append(keyboard_parent / 'info.json')
+        info_jsons.append(keyboard_parent / 'keyboard.json')
         keyboard_parent = keyboard_parent.parent
 
     # Return a list of the info.json files that actually exist
diff --git a/lib/python/qmk/json_schema.py b/lib/python/qmk/json_schema.py
index b00df749ccf..1d5f863807f 100644
--- a/lib/python/qmk/json_schema.py
+++ b/lib/python/qmk/json_schema.py
@@ -7,6 +7,7 @@ from collections.abc import Mapping
 from functools import lru_cache
 from typing import OrderedDict
 from pathlib import Path
+from copy import deepcopy
 
 from milc import cli
 
@@ -22,7 +23,8 @@ def _dict_raise_on_duplicates(ordered_pairs):
     return d
 
 
-def json_load(json_file, strict=True):
+@lru_cache(maxsize=20)
+def _json_load_impl(json_file, strict=True):
     """Load a json file from disk.
 
     Note: file must be a Path object.
@@ -42,7 +44,11 @@ def json_load(json_file, strict=True):
         exit(1)
 
 
-@lru_cache(maxsize=0)
+def json_load(json_file, strict=True):
+    return deepcopy(_json_load_impl(json_file=json_file, strict=strict))
+
+
+@lru_cache(maxsize=20)
 def load_jsonschema(schema_name):
     """Read a jsonschema file from disk.
     """
@@ -57,7 +63,7 @@ def load_jsonschema(schema_name):
     return json_load(schema_path)
 
 
-@lru_cache(maxsize=0)
+@lru_cache(maxsize=1)
 def compile_schema_store():
     """Compile all our schemas into a schema store.
     """
@@ -73,7 +79,7 @@ def compile_schema_store():
     return schema_store
 
 
-@lru_cache(maxsize=0)
+@lru_cache(maxsize=20)
 def create_validator(schema):
     """Creates a validator for the given schema id.
     """
diff --git a/lib/python/qmk/keyboard.py b/lib/python/qmk/keyboard.py
index b56505d649c..0fcc2e868d1 100644
--- a/lib/python/qmk/keyboard.py
+++ b/lib/python/qmk/keyboard.py
@@ -166,9 +166,9 @@ def keyboard_folder_or_all(keyboard):
 
 
 def _find_name(path):
-    """Determine the keyboard name by stripping off the base_path and rules.mk.
+    """Determine the keyboard name by stripping off the base_path and filename.
     """
-    return path.replace(base_path, "").replace(os.path.sep + "rules.mk", "")
+    return path.replace(base_path, "").rsplit(os.path.sep, 1)[0]
 
 
 def keyboard_completer(prefix, action, parser, parsed_args):
@@ -181,8 +181,10 @@ def list_keyboards(resolve_defaults=True):
     """Returns a list of all keyboards - optionally processing any DEFAULT_FOLDER.
     """
     # We avoid pathlib here because this is performance critical code.
-    kb_wildcard = os.path.join(base_path, "**", "rules.mk")
-    paths = [path for path in glob(kb_wildcard, recursive=True) if os.path.sep + 'keymaps' + os.path.sep not in path]
+    paths = []
+    for marker in ['rules.mk', 'keyboard.json']:
+        kb_wildcard = os.path.join(base_path, "**", marker)
+        paths += [path for path in glob(kb_wildcard, recursive=True) if os.path.sep + 'keymaps' + os.path.sep not in path]
 
     found = map(_find_name, paths)
     if resolve_defaults:
diff --git a/lib/python/qmk/painter.py b/lib/python/qmk/painter.py
index 66ebe4ec8ef..f9f4b6d8d5a 100644
--- a/lib/python/qmk/painter.py
+++ b/lib/python/qmk/painter.py
@@ -138,7 +138,7 @@ def _render_image_metadata(metadata):
     return "\n".join(lines)
 
 
-def generate_subs(cli, out_bytes, *, font_metadata=None, image_metadata=None):
+def generate_subs(cli, out_bytes, *, font_metadata=None, image_metadata=None, command):
     if font_metadata is not None and image_metadata is not None:
         raise ValueError("Cant generate subs for font and image at the same time")
 
@@ -149,14 +149,13 @@ def generate_subs(cli, out_bytes, *, font_metadata=None, image_metadata=None):
         "byte_count": len(out_bytes),
         "bytes_lines": render_bytes(out_bytes),
         "format": cli.args.format,
+        "generator_command": command,
     }
 
     if font_metadata is not None:
-        command = sys.argv[1]  # extract whether we are in `painter-convert-font` or `painter-convert-font-image`
         subs.update({
             "generated_type": "font",
             "var_prefix": "font",
-            "generator_command": f"qmk {command} -i {cli.args.input.name} -f {cli.args.format}{' --no-ascii' if cli.args.no_ascii else ''}",
             # not using triple quotes to avoid extra indentation/weird formatted code
             "metadata": "\n".join([
                 "// Font's metadata",
@@ -169,8 +168,7 @@ def generate_subs(cli, out_bytes, *, font_metadata=None, image_metadata=None):
         subs.update({
             "generated_type": "image",
             "var_prefix": "gfx",
-            "generator_command": f"qmk painter-convert-graphics -i {cli.args.input.name} -f {cli.args.format}",
-            # not using triple quotes to avoid extra indentation/weird formatted code
+            "generator_command": command,
             "metadata": _render_image_metadata(image_metadata),
         })
 
diff --git a/lib/python/qmk/painter_qgf.py b/lib/python/qmk/painter_qgf.py
index 3d2a14f31c9..ecd4a36530e 100644
--- a/lib/python/qmk/painter_qgf.py
+++ b/lib/python/qmk/painter_qgf.py
@@ -328,8 +328,9 @@ def _compress_image(frame, last_frame, *, use_rle, use_deltas, format_, **_kwarg
 
 
 # Helper function to save each frame to the output file
-def _write_frame(idx, frame, last_frame, *, fp, frame_offsets, **kwargs):
-    # Not an argument of the function as it would consume from **kwargs
+def _write_frame(idx, frame, last_frame, *, fp, frame_offsets, metadata, **kwargs):
+    # Not an argument of the function as it would then not be part of kwargs
+    # This would cause an issue with `_compress_image(**kwargs)` missing an argument
     format_ = kwargs["format_"]
 
     # (potentially) Apply RLE and/or delta, and work out output image's information
@@ -371,6 +372,21 @@ def _write_frame(idx, frame, last_frame, *, fp, frame_offsets, **kwargs):
         vprint(f'{f"Frame {idx:3d} delta":26s} {fp.tell():5d}d / {fp.tell():04X}h')
         delta_descriptor.write(fp)
 
+    # Store metadata, showed later in a comment in the generated file
+    frame_metadata = {
+        "compression": frame_descriptor.compression,
+        "delta": frame_descriptor.is_delta,
+        "delay": frame_descriptor.delay,
+    }
+    if frame_metadata["delta"]:
+        frame_metadata.update({"delta_rect": [
+            delta_descriptor.left,
+            delta_descriptor.top,
+            delta_descriptor.right,
+            delta_descriptor.bottom,
+        ]})
+    metadata.append(frame_metadata)
+
     # Write out the data for this frame to the output
     data_descriptor = QGFFrameDataDescriptorV1()
     data_descriptor.data = image_data
@@ -384,6 +400,10 @@ def _save(im, fp, _filename):
     # Work out from the parameters if we need to do anything special
     encoderinfo = im.encoderinfo.copy()
 
+    # Store image file in metadata structure
+    metadata = encoderinfo.get("metadata", [])
+    metadata.append({"width": im.width, "height": im.height})
+
     # Helper for prints, noop taking any args if not verbose
     global vprint
     verbose = encoderinfo.get("verbose", False)
@@ -418,7 +438,7 @@ def _save(im, fp, _filename):
     frame_offsets.write(fp)
 
     # Iterate over each if the input frames, writing it to the output in the process
-    write_frame = functools.partial(_write_frame, format_=encoderinfo["qmk_format"], fp=fp, use_deltas=encoderinfo.get("use_deltas", True), use_rle=encoderinfo.get("use_rle", True), frame_offsets=frame_offsets)
+    write_frame = functools.partial(_write_frame, format_=encoderinfo["qmk_format"], fp=fp, use_deltas=encoderinfo.get("use_deltas", True), use_rle=encoderinfo.get("use_rle", True), frame_offsets=frame_offsets, metadata=metadata)
     for_all_frames(write_frame)
 
     # Go back and update the graphics descriptor now that we can determine the final file size
diff --git a/lib/python/qmk/path.py b/lib/python/qmk/path.py
index 74364ee04b0..85a8f48c4f8 100644
--- a/lib/python/qmk/path.py
+++ b/lib/python/qmk/path.py
@@ -15,8 +15,9 @@ def is_keyboard(keyboard_name):
     if keyboard_name:
         keyboard_path = QMK_FIRMWARE / 'keyboards' / keyboard_name
         rules_mk = keyboard_path / 'rules.mk'
+        keyboard_json = keyboard_path / 'keyboard.json'
 
-        return rules_mk.exists()
+        return rules_mk.exists() or keyboard_json.exists()
 
 
 def under_qmk_firmware(path=Path(os.environ['ORIG_CWD'])):
diff --git a/lib/python/qmk/search.py b/lib/python/qmk/search.py
index 84cf6cbe326..33550a3db27 100644
--- a/lib/python/qmk/search.py
+++ b/lib/python/qmk/search.py
@@ -5,7 +5,7 @@ import functools
 import fnmatch
 import logging
 import re
-from typing import List, Tuple
+from typing import Callable, List, Optional, Tuple
 from dotty_dict import dotty, Dotty
 from milc import cli
 
@@ -15,6 +15,82 @@ from qmk.keyboard import list_keyboards, keyboard_folder
 from qmk.keymap import list_keymaps, locate_keymap
 from qmk.build_targets import KeyboardKeymapBuildTarget, BuildTarget
 
+TargetInfo = Tuple[str, str, dict]
+
+
+# by using a class for filters, we dont need to worry about capturing values
+# see details <https://github.com/qmk/qmk_firmware/pull/21090>
+class FilterFunction:
+    """Base class for filters.
+    It provides:
+        - __init__: capture key and value
+
+    Each subclass should provide:
+        - func_name: how it will be specified on CLI
+            >>> qmk find -f <func_name>...
+        - apply: function that actually applies the filter
+            ie: return whether the input kb/km satisfies the condition
+    """
+
+    key: str
+    value: Optional[str]
+
+    func_name: str
+    apply: Callable[[TargetInfo], bool]
+
+    def __init__(self, key, value):
+        self.key = key
+        self.value = value
+
+
+class Exists(FilterFunction):
+    func_name = "exists"
+
+    def apply(self, target_info: TargetInfo) -> bool:
+        _kb, _km, info = target_info
+        return self.key in info
+
+
+class Absent(FilterFunction):
+    func_name = "absent"
+
+    def apply(self, target_info: TargetInfo) -> bool:
+        _kb, _km, info = target_info
+        return self.key not in info
+
+
+class Length(FilterFunction):
+    func_name = "length"
+
+    def apply(self, target_info: TargetInfo) -> bool:
+        _kb, _km, info = target_info
+        return (self.key in info and len(info[self.key]) == int(self.value))
+
+
+class Contains(FilterFunction):
+    func_name = "contains"
+
+    def apply(self, target_info: TargetInfo) -> bool:
+        _kb, _km, info = target_info
+        return (self.key in info and self.value in info[self.key])
+
+
+def _get_filter_class(func_name: str, key: str, value: str) -> Optional[FilterFunction]:
+    """Initialize a filter subclass based on regex findings and return it.
+    None if no there's no filter with the name queried.
+    """
+
+    for subclass in FilterFunction.__subclasses__():
+        if func_name == subclass.func_name:
+            return subclass(key, value)
+
+    return None
+
+
+def filter_help() -> str:
+    names = [f"'{f.func_name}'" for f in FilterFunction.__subclasses__()]
+    return ", ".join(names[:-1]) + f" and {names[-1]}"
+
 
 def _set_log_level(level):
     cli.acquire_lock()
@@ -48,11 +124,12 @@ def _keymap_exists(keyboard, keymap):
         return keyboard if locate_keymap(keyboard, keymap) is not None else None
 
 
-def _load_keymap_info(kb_km):
+def _load_keymap_info(target: Tuple[str, str]) -> TargetInfo:
     """Returns a tuple of (keyboard, keymap, info.json) for the given keyboard/keymap combination.
     """
+    kb, km = target
     with ignore_logging():
-        return (kb_km[0], kb_km[1], keymap_json(kb_km[0], kb_km[1]))
+        return (kb, km, keymap_json(kb, km))
 
 
 def expand_make_targets(targets: List[str]) -> List[Tuple[str, str]]:
@@ -139,26 +216,14 @@ def _filter_keymap_targets(target_list: List[Tuple[str, str]], filters: List[str
                 key = function_match.group('key')
                 value = function_match.group('value')
 
-                if value is not None:
-                    if func_name == 'length':
-                        valid_keymaps = filter(lambda e, key=key, value=value: key in e[2] and len(e[2].get(key)) == int(value), valid_keymaps)
-                    elif func_name == 'contains':
-                        valid_keymaps = filter(lambda e, key=key, value=value: key in e[2] and value in e[2].get(key), valid_keymaps)
-                    else:
-                        cli.log.warning(f'Unrecognized filter expression: {function_match.group(0)}')
-                        continue
+                filter_class = _get_filter_class(func_name, key, value)
+                if filter_class is None:
+                    cli.log.warning(f'Unrecognized filter expression: {function_match.group(0)}')
+                    continue
+                valid_keymaps = filter(filter_class.apply, valid_keymaps)
 
-                    cli.log.info(f'Filtering on condition: {{fg_green}}{func_name}{{fg_reset}}({{fg_cyan}}{key}{{fg_reset}}, {{fg_cyan}}{value}{{fg_reset}})...')
-                else:
-                    if func_name == 'exists':
-                        valid_keymaps = filter(lambda e, key=key: key in e[2], valid_keymaps)
-                    elif func_name == 'absent':
-                        valid_keymaps = filter(lambda e, key=key: key not in e[2], valid_keymaps)
-                    else:
-                        cli.log.warning(f'Unrecognized filter expression: {function_match.group(0)}')
-                        continue
-
-                    cli.log.info(f'Filtering on condition: {{fg_green}}{func_name}{{fg_reset}}({{fg_cyan}}{key}{{fg_reset}})...')
+                value_str = f", {{fg_cyan}}{value}{{fg_reset}})" if value is not None else ""
+                cli.log.info(f'Filtering on condition: {{fg_green}}{func_name}{{fg_reset}}({{fg_cyan}}{key}{{fg_reset}}{value_str}...')
 
             elif equals_match is not None:
                 key = equals_match.group('key')
diff --git a/platforms/avr/drivers/audio_pwm_hardware.c b/platforms/avr/drivers/audio_pwm_hardware.c
index 6799cf2fdde..16264cf0a22 100644
--- a/platforms/avr/drivers/audio_pwm_hardware.c
+++ b/platforms/avr/drivers/audio_pwm_hardware.c
@@ -213,15 +213,15 @@ void channel_2_stop(void) {
 }
 #endif
 
-void audio_driver_initialize(void) {
+void audio_driver_initialize_impl(void) {
 #ifdef AUDIO1_PIN_SET
     channel_1_stop();
-    setPinOutput(AUDIO1_PIN);
+    gpio_set_pin_output(AUDIO1_PIN);
 #endif
 
 #ifdef AUDIO2_PIN_SET
     channel_2_stop();
-    setPinOutput(AUDIO2_PIN);
+    gpio_set_pin_output(AUDIO2_PIN);
 #endif
 
     // TCCR3A / TCCR3B: Timer/Counter #3 Control Registers TCCR3A/TCCR3B, TCCR1A/TCCR1B
@@ -254,7 +254,7 @@ void audio_driver_initialize(void) {
 #endif
 }
 
-void audio_driver_stop(void) {
+void audio_driver_stop_impl(void) {
 #ifdef AUDIO1_PIN_SET
     channel_1_stop();
 #endif
@@ -264,7 +264,7 @@ void audio_driver_stop(void) {
 #endif
 }
 
-void audio_driver_start(void) {
+void audio_driver_start_impl(void) {
 #ifdef AUDIO1_PIN_SET
     channel_1_start();
     if (playing_note) {
diff --git a/platforms/avr/drivers/backlight_pwm.c b/platforms/avr/drivers/backlight_pwm.c
index 74d25753a4e..f6ab9391e27 100644
--- a/platforms/avr/drivers/backlight_pwm.c
+++ b/platforms/avr/drivers/backlight_pwm.c
@@ -291,11 +291,11 @@ ISR(TIMERx_OVF_vect) {
 #endif // BACKLIGHT_BREATHING
 
 void backlight_init_ports(void) {
-    setPinOutput(BACKLIGHT_PIN);
+    gpio_set_pin_output(BACKLIGHT_PIN);
 #if BACKLIGHT_ON_STATE == 1
-    writePinLow(BACKLIGHT_PIN);
+    gpio_write_pin_low(BACKLIGHT_PIN);
 #else
-    writePinHigh(BACKLIGHT_PIN);
+    gpio_write_pin_high(BACKLIGHT_PIN);
 #endif
 
     // I could write a wall of text here to explain... but TL;DW
diff --git a/platforms/avr/drivers/ps2/ps2_io.c b/platforms/avr/drivers/ps2/ps2_io.c
index b75a1ab0bec..fb874743729 100644
--- a/platforms/avr/drivers/ps2/ps2_io.c
+++ b/platforms/avr/drivers/ps2/ps2_io.c
@@ -19,18 +19,18 @@ void clock_init(void) {}
 
 void clock_lo(void) {
     // Transition from input with pull-up to output low via Hi-Z instead of output high
-    writePinLow(PS2_CLOCK_PIN);
-    setPinOutput(PS2_CLOCK_PIN);
+    gpio_write_pin_low(PS2_CLOCK_PIN);
+    gpio_set_pin_output(PS2_CLOCK_PIN);
 }
 
 void clock_hi(void) {
-    setPinInputHigh(PS2_CLOCK_PIN);
+    gpio_set_pin_input_high(PS2_CLOCK_PIN);
 }
 
 bool clock_in(void) {
-    setPinInputHigh(PS2_CLOCK_PIN);
+    gpio_set_pin_input_high(PS2_CLOCK_PIN);
     wait_us(1);
-    return readPin(PS2_CLOCK_PIN);
+    return gpio_read_pin(PS2_CLOCK_PIN);
 }
 
 /*
@@ -40,16 +40,16 @@ void data_init(void) {}
 
 void data_lo(void) {
     // Transition from input with pull-up to output low via Hi-Z instead of output high
-    writePinLow(PS2_DATA_PIN);
-    setPinOutput(PS2_DATA_PIN);
+    gpio_write_pin_low(PS2_DATA_PIN);
+    gpio_set_pin_output(PS2_DATA_PIN);
 }
 
 void data_hi(void) {
-    setPinInputHigh(PS2_DATA_PIN);
+    gpio_set_pin_input_high(PS2_DATA_PIN);
 }
 
 bool data_in(void) {
-    setPinInputHigh(PS2_DATA_PIN);
+    gpio_set_pin_input_high(PS2_DATA_PIN);
     wait_us(1);
-    return readPin(PS2_DATA_PIN);
+    return gpio_read_pin(PS2_DATA_PIN);
 }
diff --git a/platforms/avr/drivers/serial.c b/platforms/avr/drivers/serial.c
index 730d9b7a012..b529f9b45ee 100644
--- a/platforms/avr/drivers/serial.c
+++ b/platforms/avr/drivers/serial.c
@@ -239,28 +239,28 @@ inline static void serial_delay_half2(void) {
 
 inline static void serial_output(void) ALWAYS_INLINE;
 inline static void serial_output(void) {
-    setPinOutput(SOFT_SERIAL_PIN);
+    gpio_set_pin_output(SOFT_SERIAL_PIN);
 }
 
 // make the serial pin an input with pull-up resistor
 inline static void serial_input_with_pullup(void) ALWAYS_INLINE;
 inline static void serial_input_with_pullup(void) {
-    setPinInputHigh(SOFT_SERIAL_PIN);
+    gpio_set_pin_input_high(SOFT_SERIAL_PIN);
 }
 
 inline static uint8_t serial_read_pin(void) ALWAYS_INLINE;
 inline static uint8_t serial_read_pin(void) {
-    return !!readPin(SOFT_SERIAL_PIN);
+    return !!gpio_read_pin(SOFT_SERIAL_PIN);
 }
 
 inline static void serial_low(void) ALWAYS_INLINE;
 inline static void serial_low(void) {
-    writePinLow(SOFT_SERIAL_PIN);
+    gpio_write_pin_low(SOFT_SERIAL_PIN);
 }
 
 inline static void serial_high(void) ALWAYS_INLINE;
 inline static void serial_high(void) {
-    writePinHigh(SOFT_SERIAL_PIN);
+    gpio_write_pin_high(SOFT_SERIAL_PIN);
 }
 
 void soft_serial_initiator_init(void) {
diff --git a/platforms/avr/drivers/spi_master.c b/platforms/avr/drivers/spi_master.c
index ae9df03c02d..74b847c71a2 100644
--- a/platforms/avr/drivers/spi_master.c
+++ b/platforms/avr/drivers/spi_master.c
@@ -41,10 +41,10 @@ static uint8_t currentSlaveConfig = 0;
 static bool    currentSlave2X     = false;
 
 void spi_init(void) {
-    writePinHigh(SPI_SS_PIN);
-    setPinOutput(SPI_SCK_PIN);
-    setPinOutput(SPI_MOSI_PIN);
-    setPinInput(SPI_MISO_PIN);
+    gpio_write_pin_high(SPI_SS_PIN);
+    gpio_set_pin_output(SPI_SCK_PIN);
+    gpio_set_pin_output(SPI_MOSI_PIN);
+    gpio_set_pin_input(SPI_MISO_PIN);
 
     SPCR = (_BV(SPE) | _BV(MSTR));
 }
@@ -105,8 +105,8 @@ bool spi_start(pin_t slavePin, bool lsbFirst, uint8_t mode, uint16_t divisor) {
         SPSR |= _BV(SPI2X);
     }
     currentSlavePin = slavePin;
-    setPinOutput(currentSlavePin);
-    writePinLow(currentSlavePin);
+    gpio_set_pin_output(currentSlavePin);
+    gpio_write_pin_low(currentSlavePin);
 
     return true;
 }
@@ -169,8 +169,8 @@ spi_status_t spi_receive(uint8_t *data, uint16_t length) {
 
 void spi_stop(void) {
     if (currentSlavePin != NO_PIN) {
-        setPinOutput(currentSlavePin);
-        writePinHigh(currentSlavePin);
+        gpio_set_pin_output(currentSlavePin);
+        gpio_write_pin_high(currentSlavePin);
         currentSlavePin = NO_PIN;
         SPSR &= ~(_BV(SPI2X));
         SPCR &= ~(currentSlaveConfig);
diff --git a/platforms/avr/platform.mk b/platforms/avr/platform.mk
index aef449cadf7..a625f2e5d01 100644
--- a/platforms/avr/platform.mk
+++ b/platforms/avr/platform.mk
@@ -201,17 +201,17 @@ else ifeq ($(strip $(BOOTLOADER)), qmk-hid)
 QMK_BOOTLOADER_TYPE = HID
 endif
 
-bootloader:
+bootloader: cpfirmware
 ifeq ($(strip $(QMK_BOOTLOADER_TYPE)),)
 	$(call CATASTROPHIC_ERROR,Invalid BOOTLOADER,Please set BOOTLOADER to "qmk-dfu" or "qmk-hid" first!)
 else
-	make -C lib/lufa/Bootloaders/$(QMK_BOOTLOADER_TYPE)/ clean
+	make -C lib/lufa/Bootloaders/$(QMK_BOOTLOADER_TYPE)/ clean TARGET=Bootloader$(QMK_BOOTLOADER_TYPE)
 	$(QMK_BIN) generate-dfu-header --quiet --keyboard $(KEYBOARD) --output lib/lufa/Bootloaders/$(QMK_BOOTLOADER_TYPE)/Keyboard.h
 	$(eval MAX_SIZE=$(shell n=`$(CC) -E -mmcu=$(MCU) -D__ASSEMBLER__ $(CFLAGS) $(OPT_DEFS) platforms/avr/bootloader_size.c 2> /dev/null | sed -ne 's/\r//;/^#/n;/^AVR_SIZE:/,$${s/^AVR_SIZE: //;p;}'` && echo $$(($$n)) || echo 0))
 	$(eval PROGRAM_SIZE_KB=$(shell n=`expr $(MAX_SIZE) / 1024` && echo $$(($$n)) || echo 0))
 	$(eval BOOT_SECTION_SIZE_KB=$(shell n=`expr  $(BOOTLOADER_SIZE) / 1024` && echo $$(($$n)) || echo 0))
 	$(eval FLASH_SIZE_KB=$(shell n=`expr $(PROGRAM_SIZE_KB) + $(BOOT_SECTION_SIZE_KB)` && echo $$(($$n)) || echo 0))
-	make -C lib/lufa/Bootloaders/$(QMK_BOOTLOADER_TYPE)/ MCU=$(MCU) ARCH=$(ARCH) F_CPU=$(F_CPU) FLASH_SIZE_KB=$(FLASH_SIZE_KB) BOOT_SECTION_SIZE_KB=$(BOOT_SECTION_SIZE_KB)
+	make -C lib/lufa/Bootloaders/$(QMK_BOOTLOADER_TYPE)/ MCU=$(MCU) ARCH=$(ARCH) F_CPU=$(F_CPU) FLASH_SIZE_KB=$(FLASH_SIZE_KB) BOOT_SECTION_SIZE_KB=$(BOOT_SECTION_SIZE_KB) TARGET=Bootloader$(QMK_BOOTLOADER_TYPE)
 	printf "Bootloader$(QMK_BOOTLOADER_TYPE).hex copied to $(TARGET)_bootloader.hex\n"
 	cp lib/lufa/Bootloaders/$(QMK_BOOTLOADER_TYPE)/Bootloader$(QMK_BOOTLOADER_TYPE).hex $(TARGET)_bootloader.hex
 endif
diff --git a/platforms/chibios/boards/BONSAI_C4/configs/config.h b/platforms/chibios/boards/BONSAI_C4/configs/config.h
index 193b028bdec..e933cd6fd11 100644
--- a/platforms/chibios/boards/BONSAI_C4/configs/config.h
+++ b/platforms/chibios/boards/BONSAI_C4/configs/config.h
@@ -77,11 +77,11 @@
 #    ifndef WS2812_PWM_PAL_MODE
 #        define WS2812_PWM_PAL_MODE 1
 #    endif
-#    ifndef WS2812_DMA_STREAM
-#        define WS2812_DMA_STREAM STM32_DMA2_STREAM5
+#    ifndef WS2812_PWM_DMA_STREAM
+#        define WS2812_PWM_DMA_STREAM STM32_DMA2_STREAM5
 #    endif
-#    ifndef WS2812_DMA_CHANNEL
-#        define WS2812_DMA_CHANNEL 6
+#    ifndef WS2812_PWM_DMA_CHANNEL
+#        define WS2812_PWM_DMA_CHANNEL 6
 #    endif
 #endif
 
diff --git a/platforms/chibios/boards/GENERIC_PROMICRO_RP2040/configs/config.h b/platforms/chibios/boards/GENERIC_PROMICRO_RP2040/configs/config.h
index 9209e99e760..73c2b40f469 100644
--- a/platforms/chibios/boards/GENERIC_PROMICRO_RP2040/configs/config.h
+++ b/platforms/chibios/boards/GENERIC_PROMICRO_RP2040/configs/config.h
@@ -1,4 +1,4 @@
-// Copyright 2022 Stefan Kerkmann
+// Copyright 2024 Stefan Kerkmann
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #pragma once
@@ -55,8 +55,32 @@
 #    define SERIAL_USART_RX_PIN GP1
 #endif
 
+/**======================
+ **      UART Driver
+ *========================**/
+
+#if !defined(UART_DRIVER)
+#    define UART_DRIVER SIOD0
+#endif
+
+#if !defined(UART_TX_PIN)
+#    define UART_TX_PIN GP0
+#endif
+
+#if !defined(UART_RX_PIN)
+#    define UART_RX_PIN GP1
+#endif
+
+#if !defined(UART_CTS_PIN)
+#    define UART_CTS_PIN GP2
+#endif
+
+#if !defined(UART_RTS_PIN)
+#    define UART_RTS_PIN GP3
+#endif
+
 /**======================
  **    Double-tap
  *========================**/
 
-#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET 
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
diff --git a/platforms/chibios/boards/QMK_BLOK/configs/config.h b/platforms/chibios/boards/QMK_BLOK/configs/config.h
index 168afb1fc46..834dc497d3b 100644
--- a/platforms/chibios/boards/QMK_BLOK/configs/config.h
+++ b/platforms/chibios/boards/QMK_BLOK/configs/config.h
@@ -3,6 +3,10 @@
 
 #pragma once
 
+/**======================
+ **    I2C Driver
+ *========================**/
+
 #ifndef I2C_DRIVER
 #    define I2C_DRIVER I2CD0
 #endif
@@ -13,6 +17,26 @@
 #    define I2C1_SCL_PIN D0
 #endif
 
+/**======================
+ **      UART Driver
+ *========================**/
+
+#ifndef UART_DRIVER
+#    define UART_DRIVER SIOD0
+#endif
+
+#ifndef UART_TX_PIN
+#    define UART_TX_PIN D3
+#endif
+
+#ifndef UART_RX_PIN
+#    define UART_RX_PIN D2
+#endif
+
+/**======================
+ **    Double-tap
+ *========================**/
+
 #ifndef RP2040_BOOTLOADER_DOUBLE_TAP_RESET
 #    define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
 #endif
diff --git a/platforms/chibios/boards/QMK_PM2040/configs/config.h b/platforms/chibios/boards/QMK_PM2040/configs/config.h
index ec85ae0cf40..f8b46b7fe45 100644
--- a/platforms/chibios/boards/QMK_PM2040/configs/config.h
+++ b/platforms/chibios/boards/QMK_PM2040/configs/config.h
@@ -3,6 +3,10 @@
 
 #pragma once
 
+/**======================
+ **    I2C Driver
+ *========================**/
+
 #ifndef I2C_DRIVER
 #    define I2C_DRIVER I2CD1
 #endif
@@ -13,6 +17,26 @@
 #    define I2C1_SCL_PIN D0
 #endif
 
+/**======================
+ **      UART Driver
+ *========================**/
+
+#ifndef UART_DRIVER
+#    define UART_DRIVER SIOD0
+#endif
+
+#ifndef UART_TX_PIN
+#    define UART_TX_PIN D3
+#endif
+
+#ifndef UART_RX_PIN
+#    define UART_RX_PIN D2
+#endif
+
+/**======================
+ **    Double-tap
+ *========================**/
+
 #ifndef RP2040_BOOTLOADER_DOUBLE_TAP_RESET
 #    define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
 #endif
diff --git a/platforms/chibios/chibios_config.h b/platforms/chibios/chibios_config.h
index f1636f9da05..8f46fe07360 100644
--- a/platforms/chibios/chibios_config.h
+++ b/platforms/chibios/chibios_config.h
@@ -69,6 +69,20 @@
 #    ifndef SPI_MISO_PAL_MODE
 #        define SPI_MISO_PAL_MODE (PAL_MODE_ALTERNATE_SPI | PAL_RP_PAD_SLEWFAST | PAL_RP_PAD_DRIVE4)
 #    endif
+
+#    ifndef UART_TX_PAL_MODE
+#        define UART_TX_PAL_MODE PAL_MODE_ALTERNATE_UART
+#    endif
+#    ifndef UART_RX_PAL_MODE
+#        define UART_RX_PAL_MODE PAL_MODE_ALTERNATE_UART
+#    endif
+#    ifndef UART_CTS_PAL_MODE
+#        define UART_CTS_PAL_MODE PAL_MODE_ALTERNATE_UART
+#    endif
+#    ifndef UART_RTS_PAL_MODE
+#        define UART_RTS_PAL_MODE PAL_MODE_ALTERNATE_UART
+#    endif
+
 #endif
 
 // STM32 compatibility
@@ -94,6 +108,11 @@
 #    if defined(STM32F1XX) || defined(STM32F2XX) || defined(STM32F4XX) || defined(STM32L1XX)
 #        define USE_I2CV1
 #    endif
+
+#    if defined(STM32G0XX) || defined(STM32G4XX) || defined(STM32L5XX) || defined(STM32H7XX)
+#        define USE_USARTV3
+#    endif
+
 #endif
 
 // GD32 compatibility
diff --git a/platforms/chibios/drivers/audio_dac_additive.c b/platforms/chibios/drivers/audio_dac_additive.c
index d6fde42b68f..8e29053301f 100644
--- a/platforms/chibios/drivers/audio_dac_additive.c
+++ b/platforms/chibios/drivers/audio_dac_additive.c
@@ -303,7 +303,7 @@ static const DACConfig dac_conf = {.init = AUDIO_DAC_OFF_VALUE, .datamode = DAC_
  */
 static const DACConversionGroup dac_conv_cfg = {.num_channels = 1U, .end_cb = dac_end, .error_cb = dac_error, .trigger = DAC_TRG(0b000)};
 
-void audio_driver_initialize(void) {
+void audio_driver_initialize_impl(void) {
     if ((AUDIO_PIN == A4) || (AUDIO_PIN_ALT == A4)) {
         palSetLineMode(A4, PAL_MODE_INPUT_ANALOG);
         dacStart(&DACD1, &dac_conf);
@@ -350,11 +350,11 @@ void audio_driver_initialize(void) {
     gptStart(&GPTD6, &gpt6cfg1);
 }
 
-void audio_driver_stop(void) {
+void audio_driver_stop_impl(void) {
     state = OUTPUT_SHOULD_STOP;
 }
 
-void audio_driver_start(void) {
+void audio_driver_start_impl(void) {
     gptStartContinuous(&GPTD6, 2U);
 
     for (uint8_t i = 0; i < AUDIO_MAX_SIMULTANEOUS_TONES; i++) {
diff --git a/platforms/chibios/drivers/audio_dac_basic.c b/platforms/chibios/drivers/audio_dac_basic.c
index 9a3f3fea1f3..99b938e610a 100644
--- a/platforms/chibios/drivers/audio_dac_basic.c
+++ b/platforms/chibios/drivers/audio_dac_basic.c
@@ -190,7 +190,7 @@ static void gpt_audio_state_cb(GPTDriver *gptp) {
     }
 }
 
-void audio_driver_initialize(void) {
+void audio_driver_initialize_impl(void) {
     if ((AUDIO_PIN == A4) || (AUDIO_PIN_ALT == A4)) {
         palSetPadMode(GPIOA, 4, PAL_MODE_INPUT_ANALOG);
         dacStart(&DACD1, &dac_conf_ch1);
@@ -223,7 +223,7 @@ void audio_driver_initialize(void) {
     gptStart(&AUDIO_STATE_TIMER, &gptStateUpdateCfg);
 }
 
-void audio_driver_stop(void) {
+void audio_driver_stop_impl(void) {
     if ((AUDIO_PIN == A4) || (AUDIO_PIN_ALT == A4)) {
         gptStopTimer(&GPTD6);
 
@@ -241,7 +241,7 @@ void audio_driver_stop(void) {
     gptStopTimer(&AUDIO_STATE_TIMER);
 }
 
-void audio_driver_start(void) {
+void audio_driver_start_impl(void) {
     if ((AUDIO_PIN == A4) || (AUDIO_PIN_ALT == A4)) {
         dacStartConversion(&DACD1, &dac_conv_grp_ch1, (dacsample_t *)dac_buffer_1, AUDIO_DAC_BUFFER_SIZE);
     }
diff --git a/platforms/chibios/drivers/audio_pwm_hardware.c b/platforms/chibios/drivers/audio_pwm_hardware.c
index 21b5c6892cd..1ba7ec13bcf 100644
--- a/platforms/chibios/drivers/audio_pwm_hardware.c
+++ b/platforms/chibios/drivers/audio_pwm_hardware.c
@@ -87,7 +87,7 @@ static void audio_callback(virtual_timer_t *vtp, void *p) {
     chSysUnlockFromISR();
 }
 
-void audio_driver_initialize(void) {
+void audio_driver_initialize_impl(void) {
     pwmStart(&AUDIO_PWM_DRIVER, &pwmCFG);
 
     // connect the AUDIO_PIN to the PWM hardware
@@ -100,7 +100,7 @@ void audio_driver_initialize(void) {
     chVTObjectInit(&audio_vt);
 }
 
-void audio_driver_start(void) {
+void audio_driver_start_impl(void) {
     channel_1_stop();
     channel_1_start();
 
@@ -115,7 +115,7 @@ void audio_driver_start(void) {
     }
 }
 
-void audio_driver_stop(void) {
+void audio_driver_stop_impl(void) {
     channel_1_stop();
     chVTReset(&audio_vt);
 }
diff --git a/platforms/chibios/drivers/audio_pwm_software.c b/platforms/chibios/drivers/audio_pwm_software.c
index 663a9eca165..f48323900b4 100644
--- a/platforms/chibios/drivers/audio_pwm_software.c
+++ b/platforms/chibios/drivers/audio_pwm_software.c
@@ -121,7 +121,7 @@ GPTConfig   gptCFG = {
     .callback  = gpt_callback,
 };
 
-void audio_driver_initialize(void) {
+void audio_driver_initialize_impl(void) {
     pwmStart(&AUDIO_PWM_DRIVER, &pwmCFG);
 
     palSetLineMode(AUDIO_PIN, PAL_MODE_OUTPUT_PUSHPULL);
@@ -138,7 +138,7 @@ void audio_driver_initialize(void) {
     gptStart(&AUDIO_STATE_TIMER, &gptCFG);
 }
 
-void audio_driver_start(void) {
+void audio_driver_start_impl(void) {
     channel_1_stop();
     channel_1_start();
 
@@ -147,7 +147,7 @@ void audio_driver_start(void) {
     }
 }
 
-void audio_driver_stop(void) {
+void audio_driver_stop_impl(void) {
     channel_1_stop();
     gptStopTimer(&AUDIO_STATE_TIMER);
 }
diff --git a/platforms/chibios/drivers/serial.c b/platforms/chibios/drivers/serial.c
index f199716a2b2..fa8481d2dcf 100644
--- a/platforms/chibios/drivers/serial.c
+++ b/platforms/chibios/drivers/serial.c
@@ -62,25 +62,25 @@ inline static void serial_delay_blip(void) {
     wait_us(1);
 }
 inline static void serial_output(void) {
-    setPinOutput(SOFT_SERIAL_PIN);
+    gpio_set_pin_output(SOFT_SERIAL_PIN);
 }
 inline static void serial_input(void) {
-    setPinInputHigh(SOFT_SERIAL_PIN);
+    gpio_set_pin_input_high(SOFT_SERIAL_PIN);
 }
 inline static bool serial_read_pin(void) {
-    return !!readPin(SOFT_SERIAL_PIN);
+    return !!gpio_read_pin(SOFT_SERIAL_PIN);
 }
 inline static void serial_low(void) {
-    writePinLow(SOFT_SERIAL_PIN);
+    gpio_write_pin_low(SOFT_SERIAL_PIN);
 }
 inline static void serial_high(void) {
-    writePinHigh(SOFT_SERIAL_PIN);
+    gpio_write_pin_high(SOFT_SERIAL_PIN);
 }
 
 void interrupt_handler(void *arg);
 
 // Use thread + palWaitLineTimeout instead of palSetLineCallback
-//  - Methods like setPinOutput and palEnableLineEvent/palDisableLineEvent
+//  - Methods like gpio_set_pin_output and palEnableLineEvent/palDisableLineEvent
 //    cause the interrupt to lock up, which would limit to only receiving data...
 static THD_WORKING_AREA(waThread1, 128);
 static THD_FUNCTION(Thread1, arg) {
diff --git a/platforms/chibios/drivers/spi_master.c b/platforms/chibios/drivers/spi_master.c
index 481a2e422aa..57fc53d49f6 100644
--- a/platforms/chibios/drivers/spi_master.c
+++ b/platforms/chibios/drivers/spi_master.c
@@ -32,12 +32,12 @@ __attribute__((weak)) void spi_init(void) {
         is_initialised = true;
 
         // Try releasing special pins for a short time
-        setPinInput(SPI_SCK_PIN);
+        gpio_set_pin_input(SPI_SCK_PIN);
         if (SPI_MOSI_PIN != NO_PIN) {
-            setPinInput(SPI_MOSI_PIN);
+            gpio_set_pin_input(SPI_MOSI_PIN);
         }
         if (SPI_MISO_PIN != NO_PIN) {
-            setPinInput(SPI_MISO_PIN);
+            gpio_set_pin_input(SPI_MISO_PIN);
         }
 
         chThdSleepMilliseconds(10);
@@ -271,10 +271,10 @@ bool spi_start(pin_t slavePin, bool lsbFirst, uint8_t mode, uint16_t divisor) {
 #if SPI_SELECT_MODE == SPI_SELECT_MODE_PAD
     spiConfig.ssport = PAL_PORT(slavePin);
     spiConfig.sspad  = PAL_PAD(slavePin);
-    setPinOutput(slavePin);
+    gpio_set_pin_output(slavePin);
 #elif SPI_SELECT_MODE == SPI_SELECT_MODE_NONE
     if (slavePin != NO_PIN) {
-        setPinOutput(slavePin);
+        gpio_set_pin_output(slavePin);
     }
 #else
 #    error "Unsupported SPI_SELECT_MODE"
@@ -284,7 +284,7 @@ bool spi_start(pin_t slavePin, bool lsbFirst, uint8_t mode, uint16_t divisor) {
     spiSelect(&SPI_DRIVER);
 #if SPI_SELECT_MODE == SPI_SELECT_MODE_NONE
     if (slavePin != NO_PIN) {
-        writePinLow(slavePin);
+        gpio_write_pin_low(slavePin);
     }
 #endif
 
@@ -319,7 +319,7 @@ void spi_stop(void) {
     if (spiStarted) {
 #if SPI_SELECT_MODE == SPI_SELECT_MODE_NONE
         if (currentSlavePin != NO_PIN) {
-            writePinHigh(currentSlavePin);
+            gpio_write_pin_high(currentSlavePin);
         }
 #endif
         spiUnselect(&SPI_DRIVER);
diff --git a/platforms/chibios/drivers/uart.c b/platforms/chibios/drivers/uart.c
deleted file mode 100644
index 39a59dd4450..00000000000
--- a/platforms/chibios/drivers/uart.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/* Copyright 2021
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-#include "uart.h"
-
-#if defined(MCU_KINETIS)
-static SerialConfig serialConfig = {SERIAL_DEFAULT_BITRATE};
-#elif defined(WB32F3G71xx) || defined(WB32FQ95xx)
-static SerialConfig serialConfig = {SERIAL_DEFAULT_BITRATE, SD1_WRDLEN, SD1_STPBIT, SD1_PARITY, SD1_ATFLCT};
-#else
-static SerialConfig serialConfig = {SERIAL_DEFAULT_BITRATE, SD1_CR1, SD1_CR2, SD1_CR3};
-#endif
-
-void uart_init(uint32_t baud) {
-    static bool is_initialised = false;
-
-    if (!is_initialised) {
-        is_initialised = true;
-
-#if defined(MCU_KINETIS)
-        serialConfig.sc_speed = baud;
-#else
-        serialConfig.speed = baud;
-#endif
-
-#if defined(USE_GPIOV1)
-        palSetLineMode(SD1_TX_PIN, SD1_TX_PAL_MODE);
-        palSetLineMode(SD1_RX_PIN, SD1_RX_PAL_MODE);
-#else
-        palSetLineMode(SD1_TX_PIN, PAL_MODE_ALTERNATE(SD1_TX_PAL_MODE) | PAL_OUTPUT_TYPE_PUSHPULL | PAL_OUTPUT_SPEED_HIGHEST);
-        palSetLineMode(SD1_RX_PIN, PAL_MODE_ALTERNATE(SD1_RX_PAL_MODE) | PAL_OUTPUT_TYPE_PUSHPULL | PAL_OUTPUT_SPEED_HIGHEST);
-#endif
-        sdStart(&SERIAL_DRIVER, &serialConfig);
-    }
-}
-
-void uart_write(uint8_t data) {
-    sdPut(&SERIAL_DRIVER, data);
-}
-
-uint8_t uart_read(void) {
-    msg_t res = sdGet(&SERIAL_DRIVER);
-
-    return (uint8_t)res;
-}
-
-void uart_transmit(const uint8_t *data, uint16_t length) {
-    sdWrite(&SERIAL_DRIVER, data, length);
-}
-
-void uart_receive(uint8_t *data, uint16_t length) {
-    sdRead(&SERIAL_DRIVER, data, length);
-}
-
-bool uart_available(void) {
-    return !sdGetWouldBlock(&SERIAL_DRIVER);
-}
diff --git a/platforms/chibios/drivers/uart.h b/platforms/chibios/drivers/uart.h
index 16983072cec..c1945575f13 100644
--- a/platforms/chibios/drivers/uart.h
+++ b/platforms/chibios/drivers/uart.h
@@ -1,18 +1,7 @@
-/* Copyright 2021
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
+// Copyright 2024 Stefan Kerkmann
+// Copyright 2021 QMK
+// Copyright 2024 Stefan Kerkmann
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #pragma once
 
@@ -24,93 +13,188 @@
 #include "gpio.h"
 #include "chibios_config.h"
 
-#ifndef SERIAL_DRIVER
-#    define SERIAL_DRIVER SD1
+// ======== DEPRECATED DEFINES - DO NOT USE ========
+#ifdef SERIAL_DRIVER
+#    define UART_DRIVER SERIAL_DRIVER
+#endif
+#ifdef SD1_TX_PIN
+#    define UART_TX_PIN SD1_TX_PIN
+#endif
+#ifdef SD1_RX_PIN
+#    define UART_RX_PIN SD1_RX_PIN
+#endif
+#ifdef SD1_CTS_PIN
+#    define UART_CTS_PIN SD1_CTS_PIN
+#endif
+#ifdef SD1_RTS_PIN
+#    define UART_RTS_PIN SD1_RTS_PIN
+#endif
+#ifdef SD1_TX_PAL_MODE
+#    define UART_TX_PAL_MODE SD1_TX_PAL_MODE
+#endif
+#ifdef SD1_RX_PAL_MODE
+#    define UART_RX_PAL_MODE SD1_RX_PAL_MODE
+#endif
+#ifdef SD1_CTS_PAL_MODE
+#    define UART_RTS_PAL_MODE SD1_CTS_PAL_MODE
+#endif
+#ifdef SD1_RTS_PAL_MODE
+#    define UART_TX_PAL_MODE SD1_RTS_PAL_MODE
+#endif
+#ifdef SD1_CR1
+#    define UART_CR1 SD1_CR1
+#endif
+#ifdef SD1_CR2
+#    define UART_CR2 SD1_CR2
+#endif
+#ifdef SD1_CR3
+#    define UART_CR3 SD1_CR3
+#endif
+#ifdef SD1_WRDLEN
+#    define UART_WRDLEN SD1_WRDLEN
+#endif
+#ifdef SD1_STPBIT
+#    define UART_STPBIT SD1_STPBIT
+#endif
+#ifdef SD1_PARITY
+#    define UART_PARITY SD1_PARITY
+#endif
+#ifdef SD1_ATFLCT
+#    define UART_ATFLCT SD1_ATFLCT
+#endif
+// ========
+
+#ifndef UART_DRIVER
+#    if (HAL_USE_SERIAL == TRUE)
+#        define UART_DRIVER SD1
+#    elif (HAL_USE_SIO == TRUE)
+#        define UART_DRIVER SIOD1
+#    endif
 #endif
 
-#ifndef SD1_TX_PIN
-#    define SD1_TX_PIN A9
+#ifndef UART_TX_PIN
+#    define UART_TX_PIN A9
 #endif
 
-#ifndef SD1_RX_PIN
-#    define SD1_RX_PIN A10
+#ifndef UART_RX_PIN
+#    define UART_RX_PIN A10
 #endif
 
-#ifndef SD1_CTS_PIN
-#    define SD1_CTS_PIN A11
+#ifndef UART_CTS_PIN
+#    define UART_CTS_PIN A11
 #endif
 
-#ifndef SD1_RTS_PIN
-#    define SD1_RTS_PIN A12
+#ifndef UART_RTS_PIN
+#    define UART_RTS_PIN A12
 #endif
 
 #ifdef USE_GPIOV1
-#    ifndef SD1_TX_PAL_MODE
-#        define SD1_TX_PAL_MODE PAL_MODE_ALTERNATE_PUSHPULL
+#    ifndef UART_TX_PAL_MODE
+#        define UART_TX_PAL_MODE PAL_MODE_ALTERNATE_PUSHPULL
 #    endif
-#    ifndef SD1_RX_PAL_MODE
-#        define SD1_RX_PAL_MODE PAL_MODE_INPUT
+#    ifndef UART_RX_PAL_MODE
+#        define UART_RX_PAL_MODE PAL_MODE_INPUT
 #    endif
-#    ifndef SD1_CTS_PAL_MODE
-#        define SD1_CTS_PAL_MODE PAL_MODE_INPUT
+#    ifndef UART_CTS_PAL_MODE
+#        define UART_CTS_PAL_MODE PAL_MODE_INPUT
 #    endif
-#    ifndef SD1_RTS_PAL_MODE
-#        define SD1_RTS_PAL_MODE PAL_MODE_ALTERNATE_PUSHPULL
+#    ifndef UART_RTS_PAL_MODE
+#        define UART_RTS_PAL_MODE PAL_MODE_ALTERNATE_PUSHPULL
 #    endif
 #else
-#    ifndef SD1_TX_PAL_MODE
-#        define SD1_TX_PAL_MODE 7
+#    ifndef UART_TX_PAL_MODE
+#        define UART_TX_PAL_MODE 7
 #    endif
 
-#    ifndef SD1_RX_PAL_MODE
-#        define SD1_RX_PAL_MODE 7
+#    ifndef UART_RX_PAL_MODE
+#        define UART_RX_PAL_MODE 7
 #    endif
 
-#    ifndef SD1_CTS_PAL_MODE
-#        define SD1_CTS_PAL_MODE 7
+#    ifndef UART_CTS_PAL_MODE
+#        define UART_CTS_PAL_MODE 7
 #    endif
 
-#    ifndef SD1_RTS_PAL_MODE
-#        define SD1_RTS_PAL_MODE 7
+#    ifndef UART_RTS_PAL_MODE
+#        define UART_RTS_PAL_MODE 7
 #    endif
 #endif
 
-#ifndef SD1_CR1
-#    define SD1_CR1 0
+#ifndef UART_CR1
+#    define UART_CR1 0
 #endif
 
-#ifndef SD1_CR2
-#    define SD1_CR2 0
+#ifndef UART_CR2
+#    define UART_CR2 0
 #endif
 
-#ifndef SD1_CR3
-#    define SD1_CR3 0
+#ifndef UART_CR3
+#    define UART_CR3 0
 #endif
 
-#ifndef SD1_WRDLEN
-#    define SD1_WRDLEN 3
+#ifndef UART_WRDLEN
+#    define UART_WRDLEN 3
 #endif
 
-#ifndef SD1_STPBIT
-#    define SD1_STPBIT 0
+#ifndef UART_STPBIT
+#    define UART_STPBIT 0
 #endif
 
-#ifndef SD1_PARITY
-#    define SD1_PARITY 0
+#ifndef UART_PARITY
+#    define UART_PARITY 0
 #endif
 
-#ifndef SD1_ATFLCT
-#    define SD1_ATFLCT 0
+#ifndef UART_ATFLCT
+#    define UART_ATFLCT 0
 #endif
 
+/**
+ * @brief Initialize the UART driver. This function must be called only once,
+ * before any of the below functions can be called.
+ *
+ * @param baud The baud rate to transmit and receive at. This may depend on the
+ * device you are communicating with. Common values are 1200, 2400, 4800, 9600,
+ * 19200, 38400, 57600, and 115200.
+ */
 void uart_init(uint32_t baud);
 
+/**
+ * @brief Transmit a single byte.
+ *
+ * @param data The byte to transmit.
+ */
 void uart_write(uint8_t data);
 
+/**
+ * @brief Receive a single byte.
+ *
+ * @return uint8_t The byte read from the receive buffer. This function will
+ * block if the buffer is empty (ie. no data to read).
+ */
 uint8_t uart_read(void);
 
+/**
+ * @brief Transmit multiple bytes.
+ *
+ * @param data A pointer to the data to write from.
+ * @param length The number of bytes to write. Take care not to overrun the
+ * length of `data`.
+ */
 void uart_transmit(const uint8_t *data, uint16_t length);
 
+/**
+ * @brief Receive multiple bytes.
+ *
+ * @param data A pointer to the buffer to read into.
+ * @param length The number of bytes to read. Take care not to overrun the
+ * length of `data`.
+ */
 void uart_receive(uint8_t *data, uint16_t length);
 
+/**
+ * @brief Return whether the receive buffer contains data. Call this function
+ * to determine if `uart_read()` will return data immediately.
+ *
+ * @return true If there is data available to read.
+ * @return false If there is no data available to read.
+ */
 bool uart_available(void);
diff --git a/platforms/chibios/drivers/uart_serial.c b/platforms/chibios/drivers/uart_serial.c
new file mode 100644
index 00000000000..6aff4eae47a
--- /dev/null
+++ b/platforms/chibios/drivers/uart_serial.c
@@ -0,0 +1,65 @@
+// Copyright 2024 Stefan Kerkmann (@KarlK90)
+// Copyright 2021 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "uart.h"
+
+#if defined(MCU_KINETIS)
+static SerialConfig serialConfig = {SERIAL_DEFAULT_BITRATE};
+#elif defined(WB32F3G71xx) || defined(WB32FQ95xx)
+static SerialConfig serialConfig = {
+    SERIAL_DEFAULT_BITRATE, UART_WRDLEN, UART_STPBIT, UART_PARITY, UART_ATFLCT,
+};
+#else
+static SerialConfig serialConfig = {
+    SERIAL_DEFAULT_BITRATE,
+    UART_CR1,
+    UART_CR2,
+    UART_CR3,
+};
+#endif
+
+void uart_init(uint32_t baud) {
+    static bool is_initialised = false;
+
+    if (is_initialised) {
+        return;
+    }
+    is_initialised = true;
+
+#if defined(MCU_KINETIS)
+    serialConfig.sc_speed = baud;
+#else
+    serialConfig.speed = baud;
+#endif
+
+#if defined(USE_GPIOV1)
+    palSetLineMode(UART_TX_PIN, UART_TX_PAL_MODE);
+    palSetLineMode(UART_RX_PIN, UART_RX_PAL_MODE);
+#else
+    palSetLineMode(UART_TX_PIN, PAL_MODE_ALTERNATE(UART_TX_PAL_MODE) | PAL_OUTPUT_TYPE_PUSHPULL | PAL_OUTPUT_SPEED_HIGHEST);
+    palSetLineMode(UART_RX_PIN, PAL_MODE_ALTERNATE(UART_RX_PAL_MODE) | PAL_OUTPUT_TYPE_PUSHPULL | PAL_OUTPUT_SPEED_HIGHEST);
+#endif
+
+    sdStart(&UART_DRIVER, &serialConfig);
+}
+
+void uart_write(uint8_t data) {
+    sdPut(&UART_DRIVER, data);
+}
+
+uint8_t uart_read(void) {
+    return (uint8_t)sdGet(&UART_DRIVER);
+}
+
+void uart_transmit(const uint8_t *data, uint16_t length) {
+    sdWrite(&UART_DRIVER, data, length);
+}
+
+void uart_receive(uint8_t *data, uint16_t length) {
+    sdRead(&UART_DRIVER, data, length);
+}
+
+bool uart_available(void) {
+    return !sdGetWouldBlock(&UART_DRIVER);
+}
diff --git a/platforms/chibios/drivers/uart_sio.c b/platforms/chibios/drivers/uart_sio.c
new file mode 100644
index 00000000000..442df1c54d8
--- /dev/null
+++ b/platforms/chibios/drivers/uart_sio.c
@@ -0,0 +1,77 @@
+// Copyright 2024 Stefan Kerkmann (@KarlK90)
+// Copyright 2021 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "uart.h"
+
+#if defined(MCU_RP)
+// 38400 baud, 8 data bits, 1 stop bit, no parity, no flow control
+static SIOConfig sioConfig = {
+    .baud      = SIO_DEFAULT_BITRATE,
+    .UARTLCR_H = (UART_UARTLCR_H_WLEN_8BITS | UART_UARTLCR_H_FEN),
+    .UARTCR    = 0U,
+    .UARTIFLS  = (UART_UARTIFLS_RXIFLSEL_1_8F | UART_UARTIFLS_TXIFLSEL_1_8E),
+    .UARTDMACR = 0U,
+};
+#else
+static SIOConfig sioConfig = {
+    .baud  = SIO_DEFAULT_BITRATE,
+#    if defined(MCU_STM32) && defined(USE_USARTV3)
+    .presc = USART_PRESC1,
+#    endif
+    .cr1   = UART_CR1,
+    .cr2   = UART_CR2,
+    .cr3   = UART_CR3,
+};
+#endif
+
+void uart_init(uint32_t baud) {
+    static bool is_initialised = false;
+
+    if (is_initialised) {
+        return;
+    }
+    is_initialised = true;
+
+    sioConfig.baud = baud;
+
+#if defined(USE_GPIOV1)
+    palSetLineMode(UART_TX_PIN, UART_TX_PAL_MODE);
+    palSetLineMode(UART_RX_PIN, UART_RX_PAL_MODE);
+#else
+    palSetLineMode(UART_TX_PIN, PAL_MODE_ALTERNATE(UART_TX_PAL_MODE) | PAL_OUTPUT_TYPE_PUSHPULL | PAL_OUTPUT_SPEED_HIGHEST);
+    palSetLineMode(UART_RX_PIN, PAL_MODE_ALTERNATE(UART_RX_PAL_MODE) | PAL_OUTPUT_TYPE_PUSHPULL | PAL_OUTPUT_SPEED_HIGHEST);
+#endif
+
+    sioStart(&UART_DRIVER, &sioConfig);
+}
+
+void uart_write(uint8_t data) {
+    chnPutTimeout(&UART_DRIVER, data, TIME_INFINITE);
+}
+
+uint8_t uart_read(void) {
+    msg_t result = chnGetTimeout(&UART_DRIVER, TIME_INFINITE);
+
+    if (sioHasRXErrorsX(&UART_DRIVER)) {
+        sioGetAndClearErrors(&UART_DRIVER);
+    }
+
+    return (uint8_t)result;
+}
+
+void uart_transmit(const uint8_t *data, uint16_t length) {
+    chnWrite(&UART_DRIVER, data, length);
+}
+
+void uart_receive(uint8_t *data, uint16_t length) {
+    chnRead(&UART_DRIVER, data, length);
+
+    if (sioHasRXErrorsX(&UART_DRIVER)) {
+        sioGetAndClearErrors(&UART_DRIVER);
+    }
+}
+
+bool uart_available() {
+    return !sioIsRXEmptyX(&UART_DRIVER);
+}
diff --git a/platforms/chibios/drivers/vendor/RP/RP2040/ws2812_vendor.c b/platforms/chibios/drivers/vendor/RP/RP2040/ws2812_vendor.c
index de317e269a6..799d96b3c64 100644
--- a/platforms/chibios/drivers/vendor/RP/RP2040/ws2812_vendor.c
+++ b/platforms/chibios/drivers/vendor/RP/RP2040/ws2812_vendor.c
@@ -136,7 +136,7 @@ static const pio_program_t ws2812_program = {
 };
 
 static uint32_t                WS2812_BUFFER[WS2812_LED_COUNT];
-static const rp_dma_channel_t* WS2812_DMA_CHANNEL;
+static const rp_dma_channel_t* dma_channel;
 static uint32_t                RP_DMA_MODE_WS2812;
 static int                     STATE_MACHINE = -1;
 
@@ -236,9 +236,9 @@ bool ws2812_init(void) {
     pio_sm_init(pio, STATE_MACHINE, offset, &config);
     pio_sm_set_enabled(pio, STATE_MACHINE, true);
 
-    WS2812_DMA_CHANNEL = dmaChannelAlloc(RP_DMA_CHANNEL_ID_ANY, RP_DMA_PRIORITY_WS2812, (rp_dmaisr_t)ws2812_dma_callback, NULL);
-    dmaChannelEnableInterruptX(WS2812_DMA_CHANNEL);
-    dmaChannelSetDestinationX(WS2812_DMA_CHANNEL, (uint32_t)&pio->txf[STATE_MACHINE]);
+    dma_channel = dmaChannelAlloc(RP_DMA_CHANNEL_ID_ANY, RP_DMA_PRIORITY_WS2812, (rp_dmaisr_t)ws2812_dma_callback, NULL);
+    dmaChannelEnableInterruptX(dma_channel);
+    dmaChannelSetDestinationX(dma_channel, (uint32_t)&pio->txf[STATE_MACHINE]);
 
     // clang-format off
     RP_DMA_MODE_WS2812 = DMA_CTRL_TRIG_INCR_READ |
@@ -256,7 +256,7 @@ static inline void sync_ws2812_transfer(void) {
         // count of LEDs in milliseconds. This is safely much longer than it
         // would take to push all the data out.
         dprintln("ERROR: WS2812 DMA transfer has stalled, aborting!");
-        dmaChannelDisableX(WS2812_DMA_CHANNEL);
+        dmaChannelDisableX(dma_channel);
         pio_sm_clear_fifos(pio, STATE_MACHINE);
         pio_sm_restart(pio, STATE_MACHINE);
         chSemReset(&TRANSFER_COUNTER, 0);
@@ -284,8 +284,8 @@ void ws2812_setleds(rgb_led_t* ledarray, uint16_t leds) {
 #endif
     }
 
-    dmaChannelSetSourceX(WS2812_DMA_CHANNEL, (uint32_t)WS2812_BUFFER);
-    dmaChannelSetCounterX(WS2812_DMA_CHANNEL, leds);
-    dmaChannelSetModeX(WS2812_DMA_CHANNEL, RP_DMA_MODE_WS2812);
-    dmaChannelEnableX(WS2812_DMA_CHANNEL);
+    dmaChannelSetSourceX(dma_channel, (uint32_t)WS2812_BUFFER);
+    dmaChannelSetCounterX(dma_channel, leds);
+    dmaChannelSetModeX(dma_channel, RP_DMA_MODE_WS2812);
+    dmaChannelEnableX(dma_channel);
 }
diff --git a/platforms/chibios/drivers/ws2812_bitbang.c b/platforms/chibios/drivers/ws2812_bitbang.c
index 883a845d884..1ed87c4381e 100644
--- a/platforms/chibios/drivers/ws2812_bitbang.c
+++ b/platforms/chibios/drivers/ws2812_bitbang.c
@@ -3,18 +3,23 @@
 #include "gpio.h"
 #include "chibios_config.h"
 
+// DEPRECATED - DO NOT USE
+#if defined(NOP_FUDGE)
+#    define WS2812_BITBANG_NOP_FUDGE NOP_FUDGE
+#endif
+
 /* Adapted from https://github.com/bigjosh/SimpleNeoPixelDemo/ */
 
-#ifndef NOP_FUDGE
+#ifndef WS2812_BITBANG_NOP_FUDGE
 #    if defined(STM32F0XX) || defined(STM32F1XX) || defined(GD32VF103) || defined(STM32F3XX) || defined(STM32F4XX) || defined(STM32L0XX) || defined(WB32F3G71xx) || defined(WB32FQ95xx)
-#        define NOP_FUDGE 0.4
+#        define WS2812_BITBANG_NOP_FUDGE 0.4
 #    else
 #        if defined(RP2040)
 #            error "Please use `vendor` WS2812 driver for RP2040"
 #        else
-#            error "NOP_FUDGE configuration required"
+#            error "WS2812_BITBANG_NOP_FUDGE configuration required"
 #        endif
-#        define NOP_FUDGE 1 // this just pleases the compile so the above error is easier to spot
+#        define WS2812_BITBANG_NOP_FUDGE 1 // this just pleases the compile so the above error is easier to spot
 #    endif
 #endif
 
@@ -33,7 +38,7 @@
 #endif
 
 #define NUMBER_NOPS 6
-#define CYCLES_PER_SEC (CPU_CLOCK / NUMBER_NOPS * NOP_FUDGE)
+#define CYCLES_PER_SEC (CPU_CLOCK / NUMBER_NOPS * WS2812_BITBANG_NOP_FUDGE)
 #define NS_PER_SEC (1000000000L) // Note that this has to be SIGNED since we want to be able to check for negative values of derivatives
 #define NS_PER_CYCLE (NS_PER_SEC / CYCLES_PER_SEC)
 #define NS_TO_CYCLES(n) ((n) / NS_PER_CYCLE)
@@ -57,15 +62,15 @@ void sendByte(uint8_t byte) {
         // using something like wait_ns(is_one ? T1L : T0L) here throws off timings
         if (is_one) {
             // 1
-            writePinHigh(WS2812_DI_PIN);
+            gpio_write_pin_high(WS2812_DI_PIN);
             wait_ns(WS2812_T1H);
-            writePinLow(WS2812_DI_PIN);
+            gpio_write_pin_low(WS2812_DI_PIN);
             wait_ns(WS2812_T1L);
         } else {
             // 0
-            writePinHigh(WS2812_DI_PIN);
+            gpio_write_pin_high(WS2812_DI_PIN);
             wait_ns(WS2812_T0H);
-            writePinLow(WS2812_DI_PIN);
+            gpio_write_pin_low(WS2812_DI_PIN);
             wait_ns(WS2812_T0L);
         }
     }
diff --git a/platforms/chibios/drivers/ws2812_pwm.c b/platforms/chibios/drivers/ws2812_pwm.c
index 6bba22767f7..e0b3bfd5b55 100644
--- a/platforms/chibios/drivers/ws2812_pwm.c
+++ b/platforms/chibios/drivers/ws2812_pwm.c
@@ -2,6 +2,18 @@
 #include "gpio.h"
 #include "chibios_config.h"
 
+// ======== DEPRECATED DEFINES - DO NOT USE ========
+#ifdef WS2812_DMA_STREAM
+#    define WS2812_PWM_DMA_STREAM WS2812_DMA_STREAM
+#endif
+#ifdef WS2812_DMA_CHANNEL
+#    define WS2812_PWM_DMA_CHANNEL WS2812_DMA_CHANNEL
+#endif
+#ifdef WS2812_DMAMUX_ID
+#    define WS2812_PWM_DMAMUX_ID WS2812_DMAMUX_ID
+#endif
+// ========
+
 /* Adapted from https://github.com/joewa/WS2812-LED-Driver_ChibiOS/ */
 
 #ifdef RGBW
@@ -19,14 +31,14 @@
 #ifndef WS2812_PWM_PAL_MODE
 #    define WS2812_PWM_PAL_MODE 2 // DI Pin's alternate function value
 #endif
-#ifndef WS2812_DMA_STREAM
-#    define WS2812_DMA_STREAM STM32_DMA1_STREAM2 // DMA Stream for TIMx_UP
+#ifndef WS2812_PWM_DMA_STREAM
+#    define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM2 // DMA Stream for TIMx_UP
 #endif
-#ifndef WS2812_DMA_CHANNEL
-#    define WS2812_DMA_CHANNEL 2 // DMA Channel for TIMx_UP
+#ifndef WS2812_PWM_DMA_CHANNEL
+#    define WS2812_PWM_DMA_CHANNEL 2 // DMA Channel for TIMx_UP
 #endif
-#if (STM32_DMA_SUPPORTS_DMAMUX == TRUE) && !defined(WS2812_DMAMUX_ID)
-#    error "please consult your MCU's datasheet and specify in your config.h: #define WS2812_DMAMUX_ID STM32_DMAMUX1_TIM?_UP"
+#if (STM32_DMA_SUPPORTS_DMAMUX == TRUE) && !defined(WS2812_PWM_DMAMUX_ID)
+#    error "please consult your MCU's datasheet and specify in your config.h: #define WS2812_PWM_DMAMUX_ID STM32_DMAMUX1_TIM?_UP"
 #endif
 
 /* Summarize https://www.st.com/resource/en/application_note/an4013-stm32-crossseries-timer-overview-stmicroelectronics.pdf to
@@ -270,20 +282,20 @@
 // For all other STM32 DMA transfer will automatically zero pad. We only need to set the right peripheral width.
 #if defined(STM32F2XX) || defined(STM32F4XX) || defined(STM32F7XX)
 #    if defined(WS2812_PWM_TIMER_32BIT)
-#        define WS2812_DMA_MEMORY_WIDTH STM32_DMA_CR_MSIZE_WORD
-#        define WS2812_DMA_PERIPHERAL_WIDTH STM32_DMA_CR_PSIZE_WORD
+#        define WS2812_PWM_DMA_MEMORY_WIDTH STM32_DMA_CR_MSIZE_WORD
+#        define WS2812_PWM_DMA_PERIPHERAL_WIDTH STM32_DMA_CR_PSIZE_WORD
 typedef uint32_t ws2812_buffer_t;
 #    else
-#        define WS2812_DMA_MEMORY_WIDTH STM32_DMA_CR_MSIZE_HWORD
-#        define WS2812_DMA_PERIPHERAL_WIDTH STM32_DMA_CR_PSIZE_HWORD
+#        define WS2812_PWM_DMA_MEMORY_WIDTH STM32_DMA_CR_MSIZE_HWORD
+#        define WS2812_PWM_DMA_PERIPHERAL_WIDTH STM32_DMA_CR_PSIZE_HWORD
 typedef uint16_t ws2812_buffer_t;
 #    endif
 #else
-#    define WS2812_DMA_MEMORY_WIDTH STM32_DMA_CR_MSIZE_BYTE
+#    define WS2812_PWM_DMA_MEMORY_WIDTH STM32_DMA_CR_MSIZE_BYTE
 #    if defined(WS2812_PWM_TIMER_32BIT)
-#        define WS2812_DMA_PERIPHERAL_WIDTH STM32_DMA_CR_PSIZE_WORD
+#        define WS2812_PWM_DMA_PERIPHERAL_WIDTH STM32_DMA_CR_PSIZE_WORD
 #    else
-#        define WS2812_DMA_PERIPHERAL_WIDTH STM32_DMA_CR_PSIZE_HWORD
+#        define WS2812_PWM_DMA_PERIPHERAL_WIDTH STM32_DMA_CR_PSIZE_HWORD
 #    endif
 typedef uint8_t ws2812_buffer_t;
 #endif
@@ -326,26 +338,26 @@ void ws2812_init(void) {
     // Configure DMA
     // dmaInit(); // Joe added this
 #if defined(WB32F3G71xx) || defined(WB32FQ95xx)
-    dmaStreamAlloc(WS2812_DMA_STREAM - WB32_DMA_STREAM(0), 10, NULL, NULL);
-    dmaStreamSetSource(WS2812_DMA_STREAM, ws2812_frame_buffer);
-    dmaStreamSetDestination(WS2812_DMA_STREAM, &(WS2812_PWM_DRIVER.tim->CCR[WS2812_PWM_CHANNEL - 1])); // Ziel ist der An-Zeit im Cap-Comp-Register
-    dmaStreamSetMode(WS2812_DMA_STREAM, WB32_DMA_CHCFG_HWHIF(WS2812_DMA_CHANNEL) | WB32_DMA_CHCFG_DIR_M2P | WB32_DMA_CHCFG_PSIZE_WORD | WB32_DMA_CHCFG_MSIZE_WORD | WB32_DMA_CHCFG_MINC | WB32_DMA_CHCFG_CIRC | WB32_DMA_CHCFG_TCIE | WB32_DMA_CHCFG_PL(3));
+    dmaStreamAlloc(WS2812_PWM_DMA_STREAM - WB32_DMA_STREAM(0), 10, NULL, NULL);
+    dmaStreamSetSource(WS2812_PWM_DMA_STREAM, ws2812_frame_buffer);
+    dmaStreamSetDestination(WS2812_PWM_DMA_STREAM, &(WS2812_PWM_DRIVER.tim->CCR[WS2812_PWM_CHANNEL - 1])); // Ziel ist der An-Zeit im Cap-Comp-Register
+    dmaStreamSetMode(WS2812_PWM_DMA_STREAM, WB32_DMA_CHCFG_HWHIF(WS2812_PWM_DMA_CHANNEL) | WB32_DMA_CHCFG_DIR_M2P | WB32_DMA_CHCFG_PSIZE_WORD | WB32_DMA_CHCFG_MSIZE_WORD | WB32_DMA_CHCFG_MINC | WB32_DMA_CHCFG_CIRC | WB32_DMA_CHCFG_TCIE | WB32_DMA_CHCFG_PL(3));
 #else
-    dmaStreamAlloc(WS2812_DMA_STREAM - STM32_DMA_STREAM(0), 10, NULL, NULL);
-    dmaStreamSetPeripheral(WS2812_DMA_STREAM, &(WS2812_PWM_DRIVER.tim->CCR[WS2812_PWM_CHANNEL - 1])); // Ziel ist der An-Zeit im Cap-Comp-Register
-    dmaStreamSetMemory0(WS2812_DMA_STREAM, ws2812_frame_buffer);
-    dmaStreamSetMode(WS2812_DMA_STREAM, STM32_DMA_CR_CHSEL(WS2812_DMA_CHANNEL) | STM32_DMA_CR_DIR_M2P | WS2812_DMA_PERIPHERAL_WIDTH | WS2812_DMA_MEMORY_WIDTH | STM32_DMA_CR_MINC | STM32_DMA_CR_CIRC | STM32_DMA_CR_PL(3));
+    dmaStreamAlloc(WS2812_PWM_DMA_STREAM - STM32_DMA_STREAM(0), 10, NULL, NULL);
+    dmaStreamSetPeripheral(WS2812_PWM_DMA_STREAM, &(WS2812_PWM_DRIVER.tim->CCR[WS2812_PWM_CHANNEL - 1])); // Ziel ist der An-Zeit im Cap-Comp-Register
+    dmaStreamSetMemory0(WS2812_PWM_DMA_STREAM, ws2812_frame_buffer);
+    dmaStreamSetMode(WS2812_PWM_DMA_STREAM, STM32_DMA_CR_CHSEL(WS2812_PWM_DMA_CHANNEL) | STM32_DMA_CR_DIR_M2P | WS2812_PWM_DMA_PERIPHERAL_WIDTH | WS2812_PWM_DMA_MEMORY_WIDTH | STM32_DMA_CR_MINC | STM32_DMA_CR_CIRC | STM32_DMA_CR_PL(3));
 #endif
-    dmaStreamSetTransactionSize(WS2812_DMA_STREAM, WS2812_BIT_N);
+    dmaStreamSetTransactionSize(WS2812_PWM_DMA_STREAM, WS2812_BIT_N);
     // M2P: Memory 2 Periph; PL: Priority Level
 
 #if (STM32_DMA_SUPPORTS_DMAMUX == TRUE)
     // If the MCU has a DMAMUX we need to assign the correct resource
-    dmaSetRequestSource(WS2812_DMA_STREAM, WS2812_DMAMUX_ID);
+    dmaSetRequestSource(WS2812_PWM_DMA_STREAM, WS2812_PWM_DMAMUX_ID);
 #endif
 
     // Start DMA
-    dmaStreamEnable(WS2812_DMA_STREAM);
+    dmaStreamEnable(WS2812_PWM_DMA_STREAM);
 
     // Configure PWM
     // NOTE: It's required that preload be enabled on the timer channel CCR register. This is currently enabled in the
diff --git a/platforms/chibios/platform.mk b/platforms/chibios/platform.mk
index f38a888012e..b13eed39be8 100644
--- a/platforms/chibios/platform.mk
+++ b/platforms/chibios/platform.mk
@@ -402,6 +402,17 @@ ifeq ($(strip $(MCU)), risc-v)
                -mabi=$(MCU_ABI) \
                -mcmodel=$(MCU_CMODEL) \
                -mstrict-align
+
+    # Deal with different arch revisions and gcc renaming them
+    ifneq ($(shell echo 'int main() { asm("csrc 0x300,8"); return 0; }' | $(TOOLCHAIN)gcc $(MCUFLAGS) $(TOOLCHAIN_CFLAGS) -x c -o /dev/null - 2>/dev/null >/dev/null; echo $$?),0)
+        MCUFLAGS = -march=$(MCU_ARCH)_zicsr \
+                   -mabi=$(MCU_ABI) \
+                   -mcmodel=$(MCU_CMODEL) \
+                   -mstrict-align
+        ifneq ($(shell echo 'int main() { asm("csrc 0x300,8"); return 0; }' | $(TOOLCHAIN)gcc $(MCUFLAGS) $(TOOLCHAIN_CFLAGS) -x c -o /dev/null - 2>/dev/null >/dev/null; echo $$?),0)
+            $(call CATASTROPHIC_ERROR,Incompatible toolchain,No compatible RISC-V toolchain found. Can't work out correct architecture.)
+        endif
+    endif
 else
     # ARM toolchain specific configuration
     TOOLCHAIN ?= arm-none-eabi-
diff --git a/platforms/test/drivers/audio_pwm_hardware.c b/platforms/test/drivers/audio_pwm_hardware.c
index 336e4f58449..3a0384117a4 100644
--- a/platforms/test/drivers/audio_pwm_hardware.c
+++ b/platforms/test/drivers/audio_pwm_hardware.c
@@ -15,6 +15,6 @@
 
 #include "audio.h"
 
-void audio_driver_initialize(void) {}
-void audio_driver_start() {}
-void audio_driver_stop() {}
+void audio_driver_initialize_impl(void) {}
+void audio_driver_start_impl() {}
+void audio_driver_stop_impl() {}
diff --git a/quantum/audio/audio.c b/quantum/audio/audio.c
index c1a15004930..b2611c5f099 100644
--- a/quantum/audio/audio.c
+++ b/quantum/audio/audio.c
@@ -20,6 +20,7 @@
 #include "debug.h"
 #include "wait.h"
 #include "util.h"
+#include "gpio.h"
 
 /* audio system:
  *
@@ -121,6 +122,32 @@ static bool    audio_initialized    = false;
 static bool    audio_driver_stopped = true;
 audio_config_t audio_config;
 
+#ifndef AUDIO_POWER_CONTROL_PIN_ON_STATE
+#    define AUDIO_POWER_CONTROL_PIN_ON_STATE 1
+#endif
+
+void audio_driver_initialize(void) {
+#ifdef AUDIO_POWER_CONTROL_PIN
+    gpio_set_pin_output_push_pull(AUDIO_POWER_CONTROL_PIN);
+    gpio_write_pin(AUDIO_POWER_CONTROL_PIN, !AUDIO_POWER_CONTROL_PIN_ON_STATE);
+#endif
+    audio_driver_initialize_impl();
+}
+
+void audio_driver_stop(void) {
+    audio_driver_stop_impl();
+#ifdef AUDIO_POWER_CONTROL_PIN
+    gpio_write_pin(AUDIO_POWER_CONTROL_PIN, !AUDIO_POWER_CONTROL_PIN_ON_STATE);
+#endif
+}
+
+void audio_driver_start(void) {
+#ifdef AUDIO_POWER_CONTROL_PIN
+    gpio_write_pin(AUDIO_POWER_CONTROL_PIN, AUDIO_POWER_CONTROL_PIN_ON_STATE);
+#endif
+    audio_driver_start_impl();
+}
+
 void eeconfig_update_audio_current(void) {
     eeconfig_update_audio(audio_config.raw);
 }
diff --git a/quantum/audio/audio.h b/quantum/audio/audio.h
index eb0bedc6f9f..054331d6f33 100644
--- a/quantum/audio/audio.h
+++ b/quantum/audio/audio.h
@@ -215,9 +215,9 @@ void audio_startup(void);
 // hardware interface
 
 // implementation in the driver_avr/arm_* respective parts
-void audio_driver_initialize(void);
-void audio_driver_start(void);
-void audio_driver_stop(void);
+void audio_driver_initialize_impl(void);
+void audio_driver_start_impl(void);
+void audio_driver_stop_impl(void);
 
 /**
  * @brief get the number of currently active tones
diff --git a/quantum/backlight/backlight_driver_common.c b/quantum/backlight/backlight_driver_common.c
index 8c3fe461d7c..fb2770ee3c8 100644
--- a/quantum/backlight/backlight_driver_common.c
+++ b/quantum/backlight/backlight_driver_common.c
@@ -26,23 +26,23 @@ static const pin_t backlight_pin = BACKLIGHT_PIN;
 
 static inline void backlight_on(pin_t backlight_pin) {
 #if BACKLIGHT_ON_STATE == 0
-    writePinLow(backlight_pin);
+    gpio_write_pin_low(backlight_pin);
 #else
-    writePinHigh(backlight_pin);
+    gpio_write_pin_high(backlight_pin);
 #endif
 }
 
 static inline void backlight_off(pin_t backlight_pin) {
 #if BACKLIGHT_ON_STATE == 0
-    writePinHigh(backlight_pin);
+    gpio_write_pin_high(backlight_pin);
 #else
-    writePinLow(backlight_pin);
+    gpio_write_pin_low(backlight_pin);
 #endif
 }
 
 void backlight_pins_init(void) {
     // Setup backlight pin as output and output to off state.
-    FOR_EACH_LED(setPinOutput(backlight_pin); backlight_off(backlight_pin);)
+    FOR_EACH_LED(gpio_set_pin_output(backlight_pin); backlight_off(backlight_pin);)
 }
 
 void backlight_pins_on(void) {
diff --git a/quantum/bootmagic/bootmagic.c b/quantum/bootmagic/bootmagic.c
index efce6bfd121..419ec5229e4 100644
--- a/quantum/bootmagic/bootmagic.c
+++ b/quantum/bootmagic/bootmagic.c
@@ -20,44 +20,54 @@
 #include "eeconfig.h"
 #include "bootloader.h"
 
+#ifndef BOOTMAGIC_DEBOUNCE
+#    if defined(DEBOUNCE) && DEBOUNCE > 0
+#        define BOOTMAGIC_DEBOUNCE (DEBOUNCE * 2)
+#    else
+#        define BOOTMAGIC_DEBOUNCE 30
+#    endif
+#endif
+
 /** \brief Reset eeprom
  *
  * ...just incase someone wants to only change the eeprom behaviour
  */
-__attribute__((weak)) void bootmagic_lite_reset_eeprom(void) {
+__attribute__((weak)) void bootmagic_reset_eeprom(void) {
     eeconfig_disable();
 }
 
-/** \brief The lite version of TMK's bootmagic based on Wilba.
- *
- *  100% less potential for accidentally making the keyboard do stupid things.
+/** \brief Decide reboot based on current matrix state
  */
-__attribute__((weak)) void bootmagic_lite(void) {
-    // We need multiple scans because debouncing can't be turned off.
-    matrix_scan();
-#if defined(DEBOUNCE) && DEBOUNCE > 0
-    wait_ms(DEBOUNCE * 2);
-#else
-    wait_ms(30);
-#endif
-    matrix_scan();
-
+__attribute__((weak)) bool bootmagic_should_reset(void) {
     // If the configured key (commonly Esc) is held down on power up,
     // reset the EEPROM valid state and jump to bootloader.
     // This isn't very generalized, but we need something that doesn't
     // rely on user's keymaps in firmware or EEPROM.
-    uint8_t row = BOOTMAGIC_LITE_ROW;
-    uint8_t col = BOOTMAGIC_LITE_COLUMN;
+    uint8_t row = BOOTMAGIC_ROW;
+    uint8_t col = BOOTMAGIC_COLUMN;
 
-#if defined(SPLIT_KEYBOARD) && defined(BOOTMAGIC_LITE_ROW_RIGHT) && defined(BOOTMAGIC_LITE_COLUMN_RIGHT)
+#if defined(SPLIT_KEYBOARD) && defined(BOOTMAGIC_ROW_RIGHT) && defined(BOOTMAGIC_COLUMN_RIGHT)
     if (!is_keyboard_left()) {
-        row = BOOTMAGIC_LITE_ROW_RIGHT;
-        col = BOOTMAGIC_LITE_COLUMN_RIGHT;
+        row = BOOTMAGIC_ROW_RIGHT;
+        col = BOOTMAGIC_COLUMN_RIGHT;
     }
 #endif
 
-    if (matrix_get_row(row) & (1 << col)) {
-        bootmagic_lite_reset_eeprom();
+    return matrix_get_row(row) & (1 << col);
+}
+
+/** \brief The abridged version of TMK's bootmagic based on Wilba.
+ *
+ *  100% less potential for accidentally making the keyboard do stupid things.
+ */
+__attribute__((weak)) void bootmagic_scan(void) {
+    // We need multiple scans because debouncing can't be turned off.
+    matrix_scan();
+    wait_ms(BOOTMAGIC_DEBOUNCE);
+    matrix_scan();
+
+    if (bootmagic_should_reset()) {
+        bootmagic_reset_eeprom();
 
         // Jump to bootloader.
         bootloader_jump();
@@ -65,5 +75,5 @@ __attribute__((weak)) void bootmagic_lite(void) {
 }
 
 void bootmagic(void) {
-    bootmagic_lite();
+    bootmagic_scan();
 }
diff --git a/quantum/bootmagic/bootmagic.h b/quantum/bootmagic/bootmagic.h
index 4b5f5f7c5e8..ee6fb49748e 100644
--- a/quantum/bootmagic/bootmagic.h
+++ b/quantum/bootmagic/bootmagic.h
@@ -15,11 +15,26 @@
  */
 #pragma once
 
-#ifndef BOOTMAGIC_LITE_COLUMN
-#    define BOOTMAGIC_LITE_COLUMN 0
+// ======== DEPRECATED DEFINES - DO NOT USE ========
+#ifdef BOOTMAGIC_LITE_ROW
+#    define BOOTMAGIC_ROW BOOTMAGIC_LITE_ROW
 #endif
-#ifndef BOOTMAGIC_LITE_ROW
-#    define BOOTMAGIC_LITE_ROW 0
+#ifdef BOOTMAGIC_LITE_COLUMN
+#    define BOOTMAGIC_COLUMN BOOTMAGIC_LITE_COLUMN
+#endif
+#ifdef BOOTMAGIC_LITE_ROW_RIGHT
+#    define BOOTMAGIC_ROW_RIGHT BOOTMAGIC_LITE_ROW_RIGHT
+#endif
+#ifdef BOOTMAGIC_LITE_COLUMN_RIGHT
+#    define BOOTMAGIC_COLUMN_RIGHT BOOTMAGIC_LITE_COLUMN_RIGHT
+#endif
+// ========
+
+#ifndef BOOTMAGIC_COLUMN
+#    define BOOTMAGIC_COLUMN 0
+#endif
+#ifndef BOOTMAGIC_ROW
+#    define BOOTMAGIC_ROW 0
 #endif
 
 void bootmagic(void);
diff --git a/quantum/dip_switch.c b/quantum/dip_switch.c
index e901f3e0c4f..69cf6652919 100644
--- a/quantum/dip_switch.c
+++ b/quantum/dip_switch.c
@@ -94,7 +94,7 @@ void dip_switch_init(void) {
     }
 #    endif
     for (uint8_t i = 0; i < NUM_DIP_SWITCHES; i++) {
-        setPinInputHigh(dip_switch_pad[i]);
+        gpio_set_pin_input_high(dip_switch_pad[i]);
     }
     dip_switch_read(true);
 #endif
@@ -123,7 +123,7 @@ void dip_switch_read(bool forced) {
 
     for (uint8_t i = 0; i < NUM_DIP_SWITCHES; i++) {
 #ifdef DIP_SWITCH_PINS
-        dip_switch_state[i] = !readPin(dip_switch_pad[i]);
+        dip_switch_state[i] = !gpio_read_pin(dip_switch_pad[i]);
 #endif
 #ifdef DIP_SWITCH_MATRIX_GRID
         dip_switch_state[i] = peek_matrix(dip_switch_pad[i].row, dip_switch_pad[i].col, read_raw);
diff --git a/quantum/encoder.c b/quantum/encoder.c
index 7ab194ed529..735eb1cd71f 100644
--- a/quantum/encoder.c
+++ b/quantum/encoder.c
@@ -1,82 +1,111 @@
-/*
- * Copyright 2018 Jack Humbert <jack.humb@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+// Copyright 2022-2023 Nick Brassel (@tzarc)
+// SPDX-License-Identifier: GPL-2.0-or-later
 
-#include "encoder.h"
-#include "keyboard.h"
+#include <string.h>
 #include "action.h"
-#include "keycodes.h"
+#include "encoder.h"
 #include "wait.h"
 
-#ifdef SPLIT_KEYBOARD
-#    include "split_util.h"
-#endif
-
-// for memcpy
-#include <string.h>
-
 #ifndef ENCODER_MAP_KEY_DELAY
-#    include "action.h"
 #    define ENCODER_MAP_KEY_DELAY TAP_CODE_DELAY
 #endif
 
-#if !defined(ENCODER_RESOLUTIONS) && !defined(ENCODER_RESOLUTION)
-#    define ENCODER_RESOLUTION 4
-#endif
-
-#if !defined(ENCODERS_PAD_A) || !defined(ENCODERS_PAD_B)
-#    error "No encoder pads defined by ENCODERS_PAD_A and ENCODERS_PAD_B"
-#endif
-
-extern volatile bool isLeftHand;
-
-static pin_t encoders_pad_a[NUM_ENCODERS_MAX_PER_SIDE] = ENCODERS_PAD_A;
-static pin_t encoders_pad_b[NUM_ENCODERS_MAX_PER_SIDE] = ENCODERS_PAD_B;
-
-#ifdef ENCODER_RESOLUTIONS
-static uint8_t encoder_resolutions[NUM_ENCODERS] = ENCODER_RESOLUTIONS;
-#endif
-
-#ifndef ENCODER_DIRECTION_FLIP
-#    define ENCODER_CLOCKWISE true
-#    define ENCODER_COUNTER_CLOCKWISE false
-#else
-#    define ENCODER_CLOCKWISE false
-#    define ENCODER_COUNTER_CLOCKWISE true
-#endif
-static int8_t encoder_LUT[] = {0, -1, 1, 0, 1, 0, 0, -1, -1, 0, 0, 1, 0, 1, -1, 0};
-
-static uint8_t encoder_state[NUM_ENCODERS]  = {0};
-static int8_t  encoder_pulses[NUM_ENCODERS] = {0};
-
-// encoder counts
-static uint8_t thisCount;
-#ifdef SPLIT_KEYBOARD
-// encoder offsets for each hand
-static uint8_t thisHand, thatHand;
-// encoder counts for each hand
-static uint8_t thatCount;
-#endif
-
-static uint8_t encoder_value[NUM_ENCODERS] = {0};
-
-__attribute__((weak)) void encoder_wait_pullup_charge(void) {
-    wait_us(100);
+__attribute__((weak)) bool should_process_encoder(void) {
+    return is_keyboard_master();
 }
 
+static encoder_events_t encoder_events;
+
+void encoder_init(void) {
+    memset(&encoder_events, 0, sizeof(encoder_events));
+    encoder_driver_init();
+}
+
+static bool encoder_handle_queue(void) {
+    bool changed = false;
+    while (encoder_events.tail != encoder_events.head) {
+        encoder_event_t event = encoder_events.queue[encoder_events.tail];
+        encoder_events.tail   = (encoder_events.tail + 1) % MAX_QUEUED_ENCODER_EVENTS;
+
+#ifdef ENCODER_MAP_ENABLE
+
+        // The delays below cater for Windows and its wonderful requirements.
+        action_exec(event.clockwise ? MAKE_ENCODER_CW_EVENT(event.index, true) : MAKE_ENCODER_CCW_EVENT(event.index, true));
+#    if ENCODER_MAP_KEY_DELAY > 0
+        wait_ms(ENCODER_MAP_KEY_DELAY);
+#    endif // ENCODER_MAP_KEY_DELAY > 0
+
+        action_exec(event.clockwise ? MAKE_ENCODER_CW_EVENT(event.index, false) : MAKE_ENCODER_CCW_EVENT(event.index, false));
+#    if ENCODER_MAP_KEY_DELAY > 0
+        wait_ms(ENCODER_MAP_KEY_DELAY);
+#    endif // ENCODER_MAP_KEY_DELAY > 0
+
+#else // ENCODER_MAP_ENABLE
+
+        encoder_update_kb(event.index, event.clockwise ? true : false);
+
+#endif // ENCODER_MAP_ENABLE
+
+        changed = true;
+    }
+    return changed;
+}
+
+bool encoder_task(void) {
+    bool changed = false;
+
+#ifdef SPLIT_KEYBOARD
+    // Attempt to process existing encoder events in case split handling has already enqueued events
+    if (should_process_encoder()) {
+        changed |= encoder_handle_queue();
+    }
+#endif // SPLIT_KEYBOARD
+
+    // Let the encoder driver produce events
+    encoder_driver_task();
+
+    // Process any events that were enqueued
+    if (should_process_encoder()) {
+        changed |= encoder_handle_queue();
+    }
+
+    return changed;
+}
+
+bool encoder_queue_event(uint8_t index, bool clockwise) {
+    // Drop out if we're full
+    if ((encoder_events.head + 1) % MAX_QUEUED_ENCODER_EVENTS == encoder_events.tail) {
+        return false;
+    }
+
+    // Append the event
+    encoder_event_t new_event                 = {.index = index, .clockwise = clockwise ? 1 : 0};
+    encoder_events.queue[encoder_events.head] = new_event;
+
+    // Increment the head index
+    encoder_events.head = (encoder_events.head + 1) % MAX_QUEUED_ENCODER_EVENTS;
+
+    return true;
+}
+
+void encoder_retrieve_events(encoder_events_t *events) {
+    memcpy(events, &encoder_events, sizeof(encoder_events));
+}
+
+#ifdef SPLIT_KEYBOARD
+void encoder_set_tail_index(uint8_t tail_index) {
+    encoder_events.tail = tail_index;
+}
+
+void encoder_handle_slave_events(encoder_events_t *events) {
+    while (events->tail != events->head) {
+        encoder_event_t event = events->queue[events->tail];
+        events->tail          = (events->tail + 1) % MAX_QUEUED_ENCODER_EVENTS;
+        encoder_queue_event(event.index, event.clockwise ? true : false);
+    }
+}
+#endif // SPLIT_KEYBOARD
+
 __attribute__((weak)) bool encoder_update_user(uint8_t index, bool clockwise) {
     return true;
 }
@@ -106,192 +135,3 @@ __attribute__((weak)) bool encoder_update_kb(uint8_t index, bool clockwise) {
 #endif // ENCODER_TESTS
     return res;
 }
-
-__attribute__((weak)) bool should_process_encoder(void) {
-    return is_keyboard_master();
-}
-
-void encoder_init(void) {
-#ifdef SPLIT_KEYBOARD
-    thisHand  = isLeftHand ? 0 : NUM_ENCODERS_LEFT;
-    thatHand  = NUM_ENCODERS_LEFT - thisHand;
-    thisCount = isLeftHand ? NUM_ENCODERS_LEFT : NUM_ENCODERS_RIGHT;
-    thatCount = isLeftHand ? NUM_ENCODERS_RIGHT : NUM_ENCODERS_LEFT;
-#else // SPLIT_KEYBOARD
-    thisCount                = NUM_ENCODERS;
-#endif
-
-#ifdef ENCODER_TESTS
-    // Annoying that we have to clear out values during initialisation here, but
-    // because all the arrays are static locals, rerunning tests in the same
-    // executable doesn't reset any of these. Kinda crappy having test-only code
-    // here, but it's the simplest solution.
-    memset(encoder_value, 0, sizeof(encoder_value));
-    memset(encoder_state, 0, sizeof(encoder_state));
-    memset(encoder_pulses, 0, sizeof(encoder_pulses));
-    static const pin_t encoders_pad_a_left[] = ENCODERS_PAD_A;
-    static const pin_t encoders_pad_b_left[] = ENCODERS_PAD_B;
-    for (uint8_t i = 0; i < thisCount; i++) {
-        encoders_pad_a[i] = encoders_pad_a_left[i];
-        encoders_pad_b[i] = encoders_pad_b_left[i];
-    }
-#endif
-
-#if defined(SPLIT_KEYBOARD) && defined(ENCODERS_PAD_A_RIGHT) && defined(ENCODERS_PAD_B_RIGHT)
-    // Re-initialise the pads if it's the right-hand side
-    if (!isLeftHand) {
-        static const pin_t encoders_pad_a_right[] = ENCODERS_PAD_A_RIGHT;
-        static const pin_t encoders_pad_b_right[] = ENCODERS_PAD_B_RIGHT;
-        for (uint8_t i = 0; i < thisCount; i++) {
-            encoders_pad_a[i] = encoders_pad_a_right[i];
-            encoders_pad_b[i] = encoders_pad_b_right[i];
-        }
-    }
-#endif // defined(SPLIT_KEYBOARD) && defined(ENCODERS_PAD_A_RIGHT) && defined(ENCODERS_PAD_B_RIGHT)
-
-    // Encoder resolutions is handled purely master-side, so concatenate the two arrays
-#if defined(SPLIT_KEYBOARD) && defined(ENCODER_RESOLUTIONS)
-#    if defined(ENCODER_RESOLUTIONS_RIGHT)
-    static const uint8_t encoder_resolutions_right[NUM_ENCODERS_RIGHT] = ENCODER_RESOLUTIONS_RIGHT;
-#    else  // defined(ENCODER_RESOLUTIONS_RIGHT)
-    static const uint8_t encoder_resolutions_right[NUM_ENCODERS_RIGHT] = ENCODER_RESOLUTIONS;
-#    endif // defined(ENCODER_RESOLUTIONS_RIGHT)
-    for (uint8_t i = 0; i < NUM_ENCODERS_RIGHT; i++) {
-        encoder_resolutions[NUM_ENCODERS_LEFT + i] = encoder_resolutions_right[i];
-    }
-#endif // defined(SPLIT_KEYBOARD) && defined(ENCODER_RESOLUTIONS)
-
-    for (uint8_t i = 0; i < thisCount; i++) {
-        setPinInputHigh(encoders_pad_a[i]);
-        setPinInputHigh(encoders_pad_b[i]);
-    }
-    encoder_wait_pullup_charge();
-    for (uint8_t i = 0; i < thisCount; i++) {
-        encoder_state[i] = (readPin(encoders_pad_a[i]) << 0) | (readPin(encoders_pad_b[i]) << 1);
-    }
-}
-
-#ifdef ENCODER_MAP_ENABLE
-static void encoder_exec_mapping(uint8_t index, bool clockwise) {
-    // The delays below cater for Windows and its wonderful requirements.
-    action_exec(clockwise ? MAKE_ENCODER_CW_EVENT(index, true) : MAKE_ENCODER_CCW_EVENT(index, true));
-#    if ENCODER_MAP_KEY_DELAY > 0
-    wait_ms(ENCODER_MAP_KEY_DELAY);
-#    endif // ENCODER_MAP_KEY_DELAY > 0
-
-    action_exec(clockwise ? MAKE_ENCODER_CW_EVENT(index, false) : MAKE_ENCODER_CCW_EVENT(index, false));
-#    if ENCODER_MAP_KEY_DELAY > 0
-    wait_ms(ENCODER_MAP_KEY_DELAY);
-#    endif // ENCODER_MAP_KEY_DELAY > 0
-}
-#endif // ENCODER_MAP_ENABLE
-
-static bool encoder_update(uint8_t index, uint8_t state) {
-    bool    changed = false;
-    uint8_t i       = index;
-
-#ifdef ENCODER_RESOLUTIONS
-    const uint8_t resolution = encoder_resolutions[i];
-#else
-    const uint8_t resolution = ENCODER_RESOLUTION;
-#endif
-
-#ifdef SPLIT_KEYBOARD
-    index += thisHand;
-#endif
-    encoder_pulses[i] += encoder_LUT[state & 0xF];
-
-#ifdef ENCODER_DEFAULT_POS
-    if ((encoder_pulses[i] >= resolution) || (encoder_pulses[i] <= -resolution) || ((state & 0x3) == ENCODER_DEFAULT_POS)) {
-        if (encoder_pulses[i] >= 1) {
-#else
-    if (encoder_pulses[i] >= resolution) {
-#endif
-
-            encoder_value[index]++;
-            changed = true;
-#ifdef SPLIT_KEYBOARD
-            if (should_process_encoder())
-#endif // SPLIT_KEYBOARD
-#ifdef ENCODER_MAP_ENABLE
-                encoder_exec_mapping(index, ENCODER_COUNTER_CLOCKWISE);
-#else  // ENCODER_MAP_ENABLE
-        encoder_update_kb(index, ENCODER_COUNTER_CLOCKWISE);
-#endif // ENCODER_MAP_ENABLE
-        }
-
-#ifdef ENCODER_DEFAULT_POS
-        if (encoder_pulses[i] <= -1) {
-#else
-    if (encoder_pulses[i] <= -resolution) { // direction is arbitrary here, but this clockwise
-#endif
-            encoder_value[index]--;
-            changed = true;
-#ifdef SPLIT_KEYBOARD
-            if (should_process_encoder())
-#endif // SPLIT_KEYBOARD
-#ifdef ENCODER_MAP_ENABLE
-                encoder_exec_mapping(index, ENCODER_CLOCKWISE);
-#else  // ENCODER_MAP_ENABLE
-        encoder_update_kb(index, ENCODER_CLOCKWISE);
-#endif // ENCODER_MAP_ENABLE
-        }
-        encoder_pulses[i] %= resolution;
-#ifdef ENCODER_DEFAULT_POS
-        encoder_pulses[i] = 0;
-    }
-#endif
-    return changed;
-}
-
-bool encoder_read(void) {
-    bool changed = false;
-    for (uint8_t i = 0; i < thisCount; i++) {
-        uint8_t new_status = (readPin(encoders_pad_a[i]) << 0) | (readPin(encoders_pad_b[i]) << 1);
-        if ((encoder_state[i] & 0x3) != new_status) {
-            encoder_state[i] <<= 2;
-            encoder_state[i] |= new_status;
-            changed |= encoder_update(i, encoder_state[i]);
-        }
-    }
-    return changed;
-}
-
-#ifdef SPLIT_KEYBOARD
-void last_encoder_activity_trigger(void);
-
-void encoder_state_raw(uint8_t *slave_state) {
-    memcpy(slave_state, &encoder_value[thisHand], sizeof(uint8_t) * thisCount);
-}
-
-void encoder_update_raw(uint8_t *slave_state) {
-    bool changed = false;
-    for (uint8_t i = 0; i < thatCount; i++) { // Note inverted logic -- we want the opposite side
-        const uint8_t index = i + thatHand;
-        int8_t        delta = slave_state[i] - encoder_value[index];
-        while (delta > 0) {
-            delta--;
-            encoder_value[index]++;
-            changed = true;
-#    ifdef ENCODER_MAP_ENABLE
-            encoder_exec_mapping(index, ENCODER_COUNTER_CLOCKWISE);
-#    else  // ENCODER_MAP_ENABLE
-            encoder_update_kb(index, ENCODER_COUNTER_CLOCKWISE);
-#    endif // ENCODER_MAP_ENABLE
-        }
-        while (delta < 0) {
-            delta++;
-            encoder_value[index]--;
-            changed = true;
-#    ifdef ENCODER_MAP_ENABLE
-            encoder_exec_mapping(index, ENCODER_CLOCKWISE);
-#    else  // ENCODER_MAP_ENABLE
-            encoder_update_kb(index, ENCODER_CLOCKWISE);
-#    endif // ENCODER_MAP_ENABLE
-        }
-    }
-
-    // Update the last encoder input time -- handled external to encoder_read() when we're running a split
-    if (changed) last_encoder_activity_trigger();
-}
-#endif
diff --git a/quantum/encoder.h b/quantum/encoder.h
index 1cbac98cb57..90414a43a06 100644
--- a/quantum/encoder.h
+++ b/quantum/encoder.h
@@ -22,45 +22,88 @@
 #include "gpio.h"
 #include "util.h"
 
+#ifdef ENCODER_ENABLE
+
+__attribute__((weak)) bool should_process_encoder(void);
+
 void encoder_init(void);
-bool encoder_read(void);
+bool encoder_task(void);
+bool encoder_queue_event(uint8_t index, bool clockwise);
 
 bool encoder_update_kb(uint8_t index, bool clockwise);
 bool encoder_update_user(uint8_t index, bool clockwise);
 
-#ifdef SPLIT_KEYBOARD
+#    ifdef SPLIT_KEYBOARD
 
-void encoder_state_raw(uint8_t* slave_state);
-void encoder_update_raw(uint8_t* slave_state);
+#        if defined(ENCODERS_PAD_A_RIGHT)
+#            ifndef NUM_ENCODERS_LEFT
+#                define NUM_ENCODERS_LEFT ARRAY_SIZE(((pin_t[])ENCODERS_PAD_A))
+#            endif
+#            ifndef NUM_ENCODERS_RIGHT
+#                define NUM_ENCODERS_RIGHT ARRAY_SIZE(((pin_t[])ENCODERS_PAD_A_RIGHT))
+#            endif
+#        else
+#            ifndef NUM_ENCODERS_LEFT
+#                define NUM_ENCODERS_LEFT ARRAY_SIZE(((pin_t[])ENCODERS_PAD_A))
+#            endif
+#            ifndef NUM_ENCODERS_RIGHT
+#                define NUM_ENCODERS_RIGHT NUM_ENCODERS_LEFT
+#            endif
+#        endif
+#        ifndef NUM_ENCODERS
+#            define NUM_ENCODERS (NUM_ENCODERS_LEFT + NUM_ENCODERS_RIGHT)
+#        endif
 
-#    if defined(ENCODERS_PAD_A_RIGHT)
-#        define NUM_ENCODERS_LEFT ARRAY_SIZE(((pin_t[])ENCODERS_PAD_A))
-#        define NUM_ENCODERS_RIGHT ARRAY_SIZE(((pin_t[])ENCODERS_PAD_A_RIGHT))
-#    else
-#        define NUM_ENCODERS_LEFT ARRAY_SIZE(((pin_t[])ENCODERS_PAD_A))
-#        define NUM_ENCODERS_RIGHT NUM_ENCODERS_LEFT
-#    endif
-#    define NUM_ENCODERS (NUM_ENCODERS_LEFT + NUM_ENCODERS_RIGHT)
+#    else // SPLIT_KEYBOARD
 
-#else // SPLIT_KEYBOARD
+#        ifndef NUM_ENCODERS
+#            define NUM_ENCODERS ARRAY_SIZE(((pin_t[])ENCODERS_PAD_A))
+#        endif
+#        define NUM_ENCODERS_LEFT NUM_ENCODERS
+#        define NUM_ENCODERS_RIGHT 0
 
-#    define NUM_ENCODERS ARRAY_SIZE(((pin_t[])ENCODERS_PAD_A))
-#    define NUM_ENCODERS_LEFT NUM_ENCODERS
-#    define NUM_ENCODERS_RIGHT 0
+#    endif // SPLIT_KEYBOARD
 
-#endif // SPLIT_KEYBOARD
+#    ifndef NUM_ENCODERS
+#        define NUM_ENCODERS 0
+#        define NUM_ENCODERS_LEFT 0
+#        define NUM_ENCODERS_RIGHT 0
+#    endif // NUM_ENCODERS
 
-#ifndef NUM_ENCODERS
-#    define NUM_ENCODERS 0
-#    define NUM_ENCODERS_LEFT 0
-#    define NUM_ENCODERS_RIGHT 0
-#endif // NUM_ENCODERS
+#    define NUM_ENCODERS_MAX_PER_SIDE MAX(NUM_ENCODERS_LEFT, NUM_ENCODERS_RIGHT)
 
-#define NUM_ENCODERS_MAX_PER_SIDE MAX(NUM_ENCODERS_LEFT, NUM_ENCODERS_RIGHT)
+#    ifndef MAX_QUEUED_ENCODER_EVENTS
+#        define MAX_QUEUED_ENCODER_EVENTS MAX(4, ((NUM_ENCODERS_MAX_PER_SIDE) + 1))
+#    endif // MAX_QUEUED_ENCODER_EVENTS
 
-#ifdef ENCODER_MAP_ENABLE
-#    define NUM_DIRECTIONS 2
-#    define ENCODER_CCW_CW(ccw, cw) \
-        { (cw), (ccw) }
+typedef struct encoder_event_t {
+    uint8_t index : 7;
+    uint8_t clockwise : 1;
+} encoder_event_t;
+
+typedef struct encoder_events_t {
+    uint8_t         head;
+    uint8_t         tail;
+    encoder_event_t queue[MAX_QUEUED_ENCODER_EVENTS];
+} encoder_events_t;
+
+// Get the current queued events
+void encoder_retrieve_events(encoder_events_t *events);
+
+#    ifdef SPLIT_KEYBOARD
+void encoder_set_tail_index(uint8_t tail_index);
+void encoder_handle_slave_events(encoder_events_t *events);
+#    endif // SPLIT_KEYBOARD
+
+#    ifdef ENCODER_MAP_ENABLE
+#        define NUM_DIRECTIONS 2
+#        define ENCODER_CCW_CW(ccw, cw) \
+            { (cw), (ccw) }
 extern const uint16_t encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS];
-#endif // ENCODER_MAP_ENABLE
+#    endif // ENCODER_MAP_ENABLE
+
+// "Custom encoder lite" support
+void encoder_driver_init(void);
+void encoder_driver_task(void);
+
+#endif // ENCODER_ENABLE
diff --git a/quantum/encoder/tests/config_encoder_common.h b/quantum/encoder/tests/config_encoder_common.h
new file mode 100644
index 00000000000..6b3b20182b5
--- /dev/null
+++ b/quantum/encoder/tests/config_encoder_common.h
@@ -0,0 +1,6 @@
+// Copyright 2023 Nick Brassel (@tzarc)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+// Override the one in quantum/util because it doesn't like working on x64 builds.
+#define ARRAY_SIZE(array) (sizeof((array)) / sizeof((array)[0]))
diff --git a/quantum/encoder/tests/config_mock.h b/quantum/encoder/tests/config_mock.h
index 703dcaf1036..9eb59ddc881 100644
--- a/quantum/encoder/tests/config_mock.h
+++ b/quantum/encoder/tests/config_mock.h
@@ -1,6 +1,7 @@
-// Copyright 2022 Nick Brassel (@tzarc)
+// Copyright 2022-2023 Nick Brassel (@tzarc)
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
+#include "config_encoder_common.h"
 
 #define MATRIX_ROWS 1
 #define MATRIX_COLS 1
diff --git a/quantum/encoder/tests/config_mock_split_left_eq_right.h b/quantum/encoder/tests/config_mock_split_left_eq_right.h
index c80ac4d5198..ea795657ef1 100644
--- a/quantum/encoder/tests/config_mock_split_left_eq_right.h
+++ b/quantum/encoder/tests/config_mock_split_left_eq_right.h
@@ -1,6 +1,7 @@
-// Copyright 2022 Nick Brassel (@tzarc)
+// Copyright 2022-2023 Nick Brassel (@tzarc)
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
+#include "config_encoder_common.h"
 
 #define MATRIX_ROWS 1
 #define MATRIX_COLS 1
diff --git a/quantum/encoder/tests/config_mock_split_left_gt_right.h b/quantum/encoder/tests/config_mock_split_left_gt_right.h
index 91d5f3d6058..abcfe039189 100644
--- a/quantum/encoder/tests/config_mock_split_left_gt_right.h
+++ b/quantum/encoder/tests/config_mock_split_left_gt_right.h
@@ -1,6 +1,7 @@
-// Copyright 2022 Nick Brassel (@tzarc)
+// Copyright 2022-2023 Nick Brassel (@tzarc)
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
+#include "config_encoder_common.h"
 
 #define MATRIX_ROWS 1
 #define MATRIX_COLS 1
diff --git a/quantum/encoder/tests/config_mock_split_left_lt_right.h b/quantum/encoder/tests/config_mock_split_left_lt_right.h
index 4108a184a68..075c774b0d1 100644
--- a/quantum/encoder/tests/config_mock_split_left_lt_right.h
+++ b/quantum/encoder/tests/config_mock_split_left_lt_right.h
@@ -1,6 +1,7 @@
-// Copyright 2022 Nick Brassel (@tzarc)
+// Copyright 2022-2023 Nick Brassel (@tzarc)
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
+#include "config_encoder_common.h"
 
 #define MATRIX_ROWS 1
 #define MATRIX_COLS 1
diff --git a/quantum/encoder/tests/config_mock_split_no_left.h b/quantum/encoder/tests/config_mock_split_no_left.h
index 9db7fa7e41b..dfd8358929b 100644
--- a/quantum/encoder/tests/config_mock_split_no_left.h
+++ b/quantum/encoder/tests/config_mock_split_no_left.h
@@ -1,6 +1,7 @@
-// Copyright 2022 Nick Brassel (@tzarc)
+// Copyright 2022-2023 Nick Brassel (@tzarc)
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
+#include "config_encoder_common.h"
 
 #define MATRIX_ROWS 1
 #define MATRIX_COLS 1
diff --git a/quantum/encoder/tests/config_mock_split_no_right.h b/quantum/encoder/tests/config_mock_split_no_right.h
index 14f18015e66..5683eade8c9 100644
--- a/quantum/encoder/tests/config_mock_split_no_right.h
+++ b/quantum/encoder/tests/config_mock_split_no_right.h
@@ -1,6 +1,7 @@
-// Copyright 2022 Nick Brassel (@tzarc)
+// Copyright 2022-2023 Nick Brassel (@tzarc)
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
+#include "config_encoder_common.h"
 
 #define MATRIX_ROWS 1
 #define MATRIX_COLS 1
diff --git a/quantum/encoder/tests/config_mock_split_role.h b/quantum/encoder/tests/config_mock_split_role.h
index c80ac4d5198..ea795657ef1 100644
--- a/quantum/encoder/tests/config_mock_split_role.h
+++ b/quantum/encoder/tests/config_mock_split_role.h
@@ -1,6 +1,7 @@
-// Copyright 2022 Nick Brassel (@tzarc)
+// Copyright 2022-2023 Nick Brassel (@tzarc)
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
+#include "config_encoder_common.h"
 
 #define MATRIX_ROWS 1
 #define MATRIX_COLS 1
diff --git a/quantum/encoder/tests/encoder_tests.cpp b/quantum/encoder/tests/encoder_tests.cpp
index b7c18aeec00..499e413aed4 100644
--- a/quantum/encoder/tests/encoder_tests.cpp
+++ b/quantum/encoder/tests/encoder_tests.cpp
@@ -41,7 +41,7 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
 
 bool setAndRead(pin_t pin, bool val) {
     setPin(pin, val);
-    return encoder_read();
+    return encoder_task();
 }
 
 class EncoderTest : public ::testing::Test {};
diff --git a/quantum/encoder/tests/encoder_tests_split_left_eq_right.cpp b/quantum/encoder/tests/encoder_tests_split_left_eq_right.cpp
index 916e47b1851..7d6b3e30e6b 100644
--- a/quantum/encoder/tests/encoder_tests_split_left_eq_right.cpp
+++ b/quantum/encoder/tests/encoder_tests_split_left_eq_right.cpp
@@ -33,22 +33,29 @@ struct update {
 uint8_t updates_array_idx = 0;
 update  updates[32];
 
+bool isMaster;
 bool isLeftHand;
 
+extern "C" {
+bool is_keyboard_master(void) {
+    return isMaster;
+}
+
 bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!isLeftHand) {
+    if (!is_keyboard_master()) {
         // this method has no effect on slave half
-        printf("ignoring update on right hand (%d,%s)\n", index, clockwise ? "CW" : "CC");
+        printf("ignoring update on slave (%d,%s)\n", index, clockwise ? "CW" : "CC");
         return true;
     }
     updates[updates_array_idx % 32] = {index, clockwise};
     updates_array_idx++;
     return true;
 }
+};
 
 bool setAndRead(pin_t pin, bool val) {
     setPin(pin, val);
-    return encoder_read();
+    return encoder_task();
 }
 
 class EncoderSplitTestLeftEqRight : public ::testing::Test {
@@ -63,6 +70,7 @@ class EncoderSplitTestLeftEqRight : public ::testing::Test {
 };
 
 TEST_F(EncoderSplitTestLeftEqRight, TestInitLeft) {
+    isMaster   = true;
     isLeftHand = true;
     encoder_init();
     EXPECT_EQ(pinIsInputHigh[0], true);
@@ -77,6 +85,7 @@ TEST_F(EncoderSplitTestLeftEqRight, TestInitLeft) {
 }
 
 TEST_F(EncoderSplitTestLeftEqRight, TestInitRight) {
+    isMaster   = true;
     isLeftHand = false;
     encoder_init();
     EXPECT_EQ(pinIsInputHigh[0], false);
@@ -90,7 +99,8 @@ TEST_F(EncoderSplitTestLeftEqRight, TestInitRight) {
     EXPECT_EQ(updates_array_idx, 0); // no updates received
 }
 
-TEST_F(EncoderSplitTestLeftEqRight, TestOneClockwiseLeft) {
+TEST_F(EncoderSplitTestLeftEqRight, TestOneClockwiseLeftMaster) {
+    isMaster   = true;
     isLeftHand = true;
     encoder_init();
     // send 4 pulses. with resolution 4, that's one step and we should get 1 update.
@@ -102,9 +112,19 @@ TEST_F(EncoderSplitTestLeftEqRight, TestOneClockwiseLeft) {
     EXPECT_EQ(updates_array_idx, 1); // one update received
     EXPECT_EQ(updates[0].index, 0);
     EXPECT_EQ(updates[0].clockwise, true);
+
+    int              events_queued = 0;
+    encoder_events_t events;
+    encoder_retrieve_events(&events);
+    while (events.tail != events.head) {
+        events.tail = (events.tail + 1) % MAX_QUEUED_ENCODER_EVENTS;
+        ++events_queued;
+    }
+    EXPECT_EQ(events_queued, 0); // No events should be queued on master
 }
 
-TEST_F(EncoderSplitTestLeftEqRight, TestOneClockwiseRightSent) {
+TEST_F(EncoderSplitTestLeftEqRight, TestOneClockwiseRightMaster) {
+    isMaster   = true;
     isLeftHand = false;
     encoder_init();
     // send 4 pulses. with resolution 4, that's one step and we should get 1 update.
@@ -113,23 +133,60 @@ TEST_F(EncoderSplitTestLeftEqRight, TestOneClockwiseRightSent) {
     setAndRead(6, true);
     setAndRead(7, true);
 
-    uint8_t slave_state[32] = {0};
-    encoder_state_raw(slave_state);
+    EXPECT_EQ(updates_array_idx, 1); // one update received
+    EXPECT_EQ(updates[0].index, 3);
+    EXPECT_EQ(updates[0].clockwise, true);
 
-    EXPECT_EQ(slave_state[0], 0);
-    EXPECT_EQ(slave_state[1], 0xFF);
+    int              events_queued = 0;
+    encoder_events_t events;
+    encoder_retrieve_events(&events);
+    while (events.tail != events.head) {
+        events.tail = (events.tail + 1) % MAX_QUEUED_ENCODER_EVENTS;
+        ++events_queued;
+    }
+    EXPECT_EQ(events_queued, 0); // No events should be queued on master
 }
 
-TEST_F(EncoderSplitTestLeftEqRight, TestMultipleEncodersRightReceived) {
+TEST_F(EncoderSplitTestLeftEqRight, TestOneClockwiseLeftSlave) {
+    isMaster   = false;
     isLeftHand = true;
     encoder_init();
+    // send 4 pulses. with resolution 4, that's one step and we should get 1 update.
+    setAndRead(0, false);
+    setAndRead(1, false);
+    setAndRead(0, true);
+    setAndRead(1, true);
 
-    uint8_t slave_state[32] = {1, 0xFF}; // First right encoder is CCW, Second right encoder CW
-    encoder_update_raw(slave_state);
+    EXPECT_EQ(updates_array_idx, 0); // no updates received
 
-    EXPECT_EQ(updates_array_idx, 2); // two updates received, one for each changed item on the right side
-    EXPECT_EQ(updates[0].index, 2);
-    EXPECT_EQ(updates[0].clockwise, false);
-    EXPECT_EQ(updates[1].index, 3);
-    EXPECT_EQ(updates[1].clockwise, true);
+    int              events_queued = 0;
+    encoder_events_t events;
+    encoder_retrieve_events(&events);
+    while (events.tail != events.head) {
+        events.tail = (events.tail + 1) % MAX_QUEUED_ENCODER_EVENTS;
+        ++events_queued;
+    }
+    EXPECT_EQ(events_queued, 1); // One event should be queued on slave
+}
+
+TEST_F(EncoderSplitTestLeftEqRight, TestOneClockwiseRightSlave) {
+    isMaster   = false;
+    isLeftHand = false;
+    encoder_init();
+    // send 4 pulses. with resolution 4, that's one step and we should get 1 update.
+    setAndRead(6, false);
+    setAndRead(7, false);
+    setAndRead(6, true);
+    setAndRead(7, true);
+
+    EXPECT_EQ(updates_array_idx, 0); // no updates received
+
+    int              events_queued = 0;
+    encoder_events_t events;
+    encoder_retrieve_events(&events);
+    while (events.tail != events.head) {
+        events.tail = (events.tail + 1) % MAX_QUEUED_ENCODER_EVENTS;
+        ++events_queued;
+    }
+    EXPECT_EQ(events_queued, 1); // One event should be queued on slave
 }
diff --git a/quantum/encoder/tests/encoder_tests_split_left_gt_right.cpp b/quantum/encoder/tests/encoder_tests_split_left_gt_right.cpp
index 7b64bb29813..2beb4e39720 100644
--- a/quantum/encoder/tests/encoder_tests_split_left_gt_right.cpp
+++ b/quantum/encoder/tests/encoder_tests_split_left_gt_right.cpp
@@ -33,22 +33,29 @@ struct update {
 uint8_t updates_array_idx = 0;
 update  updates[32];
 
+bool isMaster;
 bool isLeftHand;
 
+extern "C" {
+bool is_keyboard_master(void) {
+    return isMaster;
+}
+
 bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!isLeftHand) {
+    if (!is_keyboard_master()) {
         // this method has no effect on slave half
-        printf("ignoring update on right hand (%d,%s)\n", index, clockwise ? "CW" : "CC");
+        printf("ignoring update on slave (%d,%s)\n", index, clockwise ? "CW" : "CC");
         return true;
     }
     updates[updates_array_idx % 32] = {index, clockwise};
     updates_array_idx++;
     return true;
 }
+};
 
 bool setAndRead(pin_t pin, bool val) {
     setPin(pin, val);
-    return encoder_read();
+    return encoder_task();
 }
 
 class EncoderSplitTestLeftGreaterThanRight : public ::testing::Test {
@@ -94,7 +101,8 @@ TEST_F(EncoderSplitTestLeftGreaterThanRight, TestInitRight) {
     EXPECT_EQ(updates_array_idx, 0); // no updates received
 }
 
-TEST_F(EncoderSplitTestLeftGreaterThanRight, TestOneClockwiseLeft) {
+TEST_F(EncoderSplitTestLeftGreaterThanRight, TestOneClockwiseLeftMaster) {
+    isMaster   = true;
     isLeftHand = true;
     encoder_init();
     // send 4 pulses. with resolution 4, that's one step and we should get 1 update.
@@ -106,9 +114,19 @@ TEST_F(EncoderSplitTestLeftGreaterThanRight, TestOneClockwiseLeft) {
     EXPECT_EQ(updates_array_idx, 1); // one update received
     EXPECT_EQ(updates[0].index, 0);
     EXPECT_EQ(updates[0].clockwise, true);
+
+    int              events_queued = 0;
+    encoder_events_t events;
+    encoder_retrieve_events(&events);
+    while (events.tail != events.head) {
+        events.tail = (events.tail + 1) % MAX_QUEUED_ENCODER_EVENTS;
+        ++events_queued;
+    }
+    EXPECT_EQ(events_queued, 0); // No events should be queued on master
 }
 
-TEST_F(EncoderSplitTestLeftGreaterThanRight, TestOneClockwiseRightSent) {
+TEST_F(EncoderSplitTestLeftGreaterThanRight, TestOneClockwiseRightMaster) {
+    isMaster   = true;
     isLeftHand = false;
     encoder_init();
     // send 4 pulses. with resolution 4, that's one step and we should get 1 update.
@@ -117,23 +135,60 @@ TEST_F(EncoderSplitTestLeftGreaterThanRight, TestOneClockwiseRightSent) {
     setAndRead(6, true);
     setAndRead(7, true);
 
-    uint8_t slave_state[32] = {0};
-    encoder_state_raw(slave_state);
+    EXPECT_EQ(updates_array_idx, 1); // one update received
+    EXPECT_EQ(updates[0].index, 3);
+    EXPECT_EQ(updates[0].clockwise, true);
 
-    EXPECT_EQ(slave_state[0], 0xFF);
-    EXPECT_EQ(slave_state[1], 0);
+    int              events_queued = 0;
+    encoder_events_t events;
+    encoder_retrieve_events(&events);
+    while (events.tail != events.head) {
+        events.tail = (events.tail + 1) % MAX_QUEUED_ENCODER_EVENTS;
+        ++events_queued;
+    }
+    EXPECT_EQ(events_queued, 0); // No events should be queued on master
 }
 
-TEST_F(EncoderSplitTestLeftGreaterThanRight, TestMultipleEncodersRightReceived) {
+TEST_F(EncoderSplitTestLeftGreaterThanRight, TestOneClockwiseLeftSlave) {
+    isMaster   = false;
     isLeftHand = true;
     encoder_init();
+    // send 4 pulses. with resolution 4, that's one step and we should get 1 update.
+    setAndRead(0, false);
+    setAndRead(1, false);
+    setAndRead(0, true);
+    setAndRead(1, true);
 
-    uint8_t slave_state[32] = {1, 0xFF}; // First right encoder is CCW, Second right encoder no change, third right encoder CW
-    encoder_update_raw(slave_state);
+    EXPECT_EQ(updates_array_idx, 0); // no updates received
 
-    EXPECT_EQ(updates_array_idx, 2); // two updates received, one for each changed item on the right side
-    EXPECT_EQ(updates[0].index, 3);
-    EXPECT_EQ(updates[0].clockwise, false);
-    EXPECT_EQ(updates[1].index, 4);
-    EXPECT_EQ(updates[1].clockwise, true);
+    int              events_queued = 0;
+    encoder_events_t events;
+    encoder_retrieve_events(&events);
+    while (events.tail != events.head) {
+        events.tail = (events.tail + 1) % MAX_QUEUED_ENCODER_EVENTS;
+        ++events_queued;
+    }
+    EXPECT_EQ(events_queued, 1); // One event should be queued on slave
+}
+
+TEST_F(EncoderSplitTestLeftGreaterThanRight, TestOneClockwiseRightSlave) {
+    isMaster   = false;
+    isLeftHand = false;
+    encoder_init();
+    // send 4 pulses. with resolution 4, that's one step and we should get 1 update.
+    setAndRead(6, false);
+    setAndRead(7, false);
+    setAndRead(6, true);
+    setAndRead(7, true);
+
+    EXPECT_EQ(updates_array_idx, 0); // no updates received
+
+    int              events_queued = 0;
+    encoder_events_t events;
+    encoder_retrieve_events(&events);
+    while (events.tail != events.head) {
+        events.tail = (events.tail + 1) % MAX_QUEUED_ENCODER_EVENTS;
+        ++events_queued;
+    }
+    EXPECT_EQ(events_queued, 1); // One event should be queued on slave
 }
diff --git a/quantum/encoder/tests/encoder_tests_split_left_lt_right.cpp b/quantum/encoder/tests/encoder_tests_split_left_lt_right.cpp
index a6519c57625..5612f8b6589 100644
--- a/quantum/encoder/tests/encoder_tests_split_left_lt_right.cpp
+++ b/quantum/encoder/tests/encoder_tests_split_left_lt_right.cpp
@@ -33,22 +33,29 @@ struct update {
 uint8_t updates_array_idx = 0;
 update  updates[32];
 
+bool isMaster;
 bool isLeftHand;
 
+extern "C" {
+bool is_keyboard_master(void) {
+    return isMaster;
+}
+
 bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!isLeftHand) {
+    if (!is_keyboard_master()) {
         // this method has no effect on slave half
-        printf("ignoring update on right hand (%d,%s)\n", index, clockwise ? "CW" : "CC");
+        printf("ignoring update on slave (%d,%s)\n", index, clockwise ? "CW" : "CC");
         return true;
     }
     updates[updates_array_idx % 32] = {index, clockwise};
     updates_array_idx++;
     return true;
 }
+};
 
 bool setAndRead(pin_t pin, bool val) {
     setPin(pin, val);
-    return encoder_read();
+    return encoder_task();
 }
 
 class EncoderSplitTestLeftLessThanRight : public ::testing::Test {
@@ -94,7 +101,8 @@ TEST_F(EncoderSplitTestLeftLessThanRight, TestInitRight) {
     EXPECT_EQ(updates_array_idx, 0); // no updates received
 }
 
-TEST_F(EncoderSplitTestLeftLessThanRight, TestOneClockwiseLeft) {
+TEST_F(EncoderSplitTestLeftLessThanRight, TestOneClockwiseLeftMaster) {
+    isMaster   = true;
     isLeftHand = true;
     encoder_init();
     // send 4 pulses. with resolution 4, that's one step and we should get 1 update.
@@ -106,9 +114,19 @@ TEST_F(EncoderSplitTestLeftLessThanRight, TestOneClockwiseLeft) {
     EXPECT_EQ(updates_array_idx, 1); // one update received
     EXPECT_EQ(updates[0].index, 0);
     EXPECT_EQ(updates[0].clockwise, true);
+
+    int              events_queued = 0;
+    encoder_events_t events;
+    encoder_retrieve_events(&events);
+    while (events.tail != events.head) {
+        events.tail = (events.tail + 1) % MAX_QUEUED_ENCODER_EVENTS;
+        ++events_queued;
+    }
+    EXPECT_EQ(events_queued, 0); // No events should be queued on master
 }
 
-TEST_F(EncoderSplitTestLeftLessThanRight, TestOneClockwiseRightSent) {
+TEST_F(EncoderSplitTestLeftLessThanRight, TestOneClockwiseRightMaster) {
+    isMaster   = true;
     isLeftHand = false;
     encoder_init();
     // send 4 pulses. with resolution 4, that's one step and we should get 1 update.
@@ -117,23 +135,60 @@ TEST_F(EncoderSplitTestLeftLessThanRight, TestOneClockwiseRightSent) {
     setAndRead(6, true);
     setAndRead(7, true);
 
-    uint8_t slave_state[32] = {0};
-    encoder_state_raw(slave_state);
+    EXPECT_EQ(updates_array_idx, 1); // one update received
+    EXPECT_EQ(updates[0].index, 3);
+    EXPECT_EQ(updates[0].clockwise, true);
 
-    EXPECT_EQ(slave_state[0], 0);
-    EXPECT_EQ(slave_state[1], 0xFF);
+    int              events_queued = 0;
+    encoder_events_t events;
+    encoder_retrieve_events(&events);
+    while (events.tail != events.head) {
+        events.tail = (events.tail + 1) % MAX_QUEUED_ENCODER_EVENTS;
+        ++events_queued;
+    }
+    EXPECT_EQ(events_queued, 0); // No events should be queued on master
 }
 
-TEST_F(EncoderSplitTestLeftLessThanRight, TestMultipleEncodersRightReceived) {
+TEST_F(EncoderSplitTestLeftLessThanRight, TestOneClockwiseLeftSlave) {
+    isMaster   = false;
     isLeftHand = true;
     encoder_init();
+    // send 4 pulses. with resolution 4, that's one step and we should get 1 update.
+    setAndRead(0, false);
+    setAndRead(1, false);
+    setAndRead(0, true);
+    setAndRead(1, true);
 
-    uint8_t slave_state[32] = {1, 0, 0xFF}; // First right encoder is CCW, Second right encoder no change, third right encoder CW
-    encoder_update_raw(slave_state);
+    EXPECT_EQ(updates_array_idx, 0); // no updates received
 
-    EXPECT_EQ(updates_array_idx, 2); // two updates received, one for each changed item on the right side
-    EXPECT_EQ(updates[0].index, 2);
-    EXPECT_EQ(updates[0].clockwise, false);
-    EXPECT_EQ(updates[1].index, 4);
-    EXPECT_EQ(updates[1].clockwise, true);
+    int              events_queued = 0;
+    encoder_events_t events;
+    encoder_retrieve_events(&events);
+    while (events.tail != events.head) {
+        events.tail = (events.tail + 1) % MAX_QUEUED_ENCODER_EVENTS;
+        ++events_queued;
+    }
+    EXPECT_EQ(events_queued, 1); // One event should be queued on slave
+}
+
+TEST_F(EncoderSplitTestLeftLessThanRight, TestOneClockwiseRightSlave) {
+    isMaster   = false;
+    isLeftHand = false;
+    encoder_init();
+    // send 4 pulses. with resolution 4, that's one step and we should get 1 update.
+    setAndRead(6, false);
+    setAndRead(7, false);
+    setAndRead(6, true);
+    setAndRead(7, true);
+
+    EXPECT_EQ(updates_array_idx, 0); // no updates received
+
+    int              events_queued = 0;
+    encoder_events_t events;
+    encoder_retrieve_events(&events);
+    while (events.tail != events.head) {
+        events.tail = (events.tail + 1) % MAX_QUEUED_ENCODER_EVENTS;
+        ++events_queued;
+    }
+    EXPECT_EQ(events_queued, 1); // One event should be queued on slave
 }
diff --git a/quantum/encoder/tests/encoder_tests_split_no_left.cpp b/quantum/encoder/tests/encoder_tests_split_no_left.cpp
index b6b2d7e2d19..980e4074ffd 100644
--- a/quantum/encoder/tests/encoder_tests_split_no_left.cpp
+++ b/quantum/encoder/tests/encoder_tests_split_no_left.cpp
@@ -33,22 +33,29 @@ struct update {
 uint8_t updates_array_idx = 0;
 update  updates[32];
 
+bool isMaster;
 bool isLeftHand;
 
+extern "C" {
+bool is_keyboard_master(void) {
+    return isMaster;
+}
+
 bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!isLeftHand) {
+    if (!is_keyboard_master()) {
         // this method has no effect on slave half
-        printf("ignoring update on right hand (%d,%s)\n", index, clockwise ? "CW" : "CC");
+        printf("ignoring update on slave (%d,%s)\n", index, clockwise ? "CW" : "CC");
         return true;
     }
     updates[updates_array_idx % 32] = {index, clockwise};
     updates_array_idx++;
     return true;
 }
+};
 
 bool setAndRead(pin_t pin, bool val) {
     setPin(pin, val);
-    return encoder_read();
+    return encoder_task();
 }
 
 class EncoderSplitTestNoLeft : public ::testing::Test {
@@ -82,19 +89,8 @@ TEST_F(EncoderSplitTestNoLeft, TestInitRight) {
     EXPECT_EQ(updates_array_idx, 0); // no updates received
 }
 
-TEST_F(EncoderSplitTestNoLeft, TestOneClockwiseLeft) {
-    isLeftHand = true;
-    encoder_init();
-    // send 4 pulses. with resolution 4, that's one step and we should get 1 update.
-    setAndRead(0, false);
-    setAndRead(1, false);
-    setAndRead(0, true);
-    setAndRead(1, true);
-
-    EXPECT_EQ(updates_array_idx, 0); // no updates received
-}
-
-TEST_F(EncoderSplitTestNoLeft, TestOneClockwiseRightSent) {
+TEST_F(EncoderSplitTestNoLeft, TestOneClockwiseLeftMaster) {
+    isMaster   = true;
     isLeftHand = false;
     encoder_init();
     // send 4 pulses. with resolution 4, that's one step and we should get 1 update.
@@ -103,23 +99,38 @@ TEST_F(EncoderSplitTestNoLeft, TestOneClockwiseRightSent) {
     setAndRead(2, true);
     setAndRead(3, true);
 
-    uint8_t slave_state[32] = {0};
-    encoder_state_raw(slave_state);
+    EXPECT_EQ(updates_array_idx, 1); // one update received
+    EXPECT_EQ(updates[0].index, 1);
+    EXPECT_EQ(updates[0].clockwise, true);
 
-    EXPECT_EQ(slave_state[0], 0);
-    EXPECT_EQ(slave_state[1], 0xFF);
+    int              events_queued = 0;
+    encoder_events_t events;
+    encoder_retrieve_events(&events);
+    while (events.tail != events.head) {
+        events.tail = (events.tail + 1) % MAX_QUEUED_ENCODER_EVENTS;
+        ++events_queued;
+    }
+    EXPECT_EQ(events_queued, 0); // No events should be queued on master
 }
 
-TEST_F(EncoderSplitTestNoLeft, TestMultipleEncodersRightReceived) {
-    isLeftHand = true;
+TEST_F(EncoderSplitTestNoLeft, TestOneClockwiseRightSlave) {
+    isMaster   = false;
+    isLeftHand = false;
     encoder_init();
+    // send 4 pulses. with resolution 4, that's one step and we should get 1 update.
+    setAndRead(2, false);
+    setAndRead(3, false);
+    setAndRead(2, true);
+    setAndRead(3, true);
 
-    uint8_t slave_state[32] = {1, 0xFF}; // First right encoder is CCW, Second right encoder no change, third right encoder CW
-    encoder_update_raw(slave_state);
+    EXPECT_EQ(updates_array_idx, 0); // no updates received
 
-    EXPECT_EQ(updates_array_idx, 2); // two updates received, one for each changed item on the right side
-    EXPECT_EQ(updates[0].index, 0);
-    EXPECT_EQ(updates[0].clockwise, false);
-    EXPECT_EQ(updates[1].index, 1);
-    EXPECT_EQ(updates[1].clockwise, true);
+    int              events_queued = 0;
+    encoder_events_t events;
+    encoder_retrieve_events(&events);
+    while (events.tail != events.head) {
+        events.tail = (events.tail + 1) % MAX_QUEUED_ENCODER_EVENTS;
+        ++events_queued;
+    }
+    EXPECT_EQ(events_queued, 1); // One event should be queued on slave
 }
diff --git a/quantum/encoder/tests/encoder_tests_split_no_right.cpp b/quantum/encoder/tests/encoder_tests_split_no_right.cpp
index fa0a7c18a80..d39659853b2 100644
--- a/quantum/encoder/tests/encoder_tests_split_no_right.cpp
+++ b/quantum/encoder/tests/encoder_tests_split_no_right.cpp
@@ -33,22 +33,29 @@ struct update {
 uint8_t updates_array_idx = 0;
 update  updates[32];
 
+bool isMaster;
 bool isLeftHand;
 
+extern "C" {
+bool is_keyboard_master(void) {
+    return isMaster;
+}
+
 bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!isLeftHand) {
+    if (!is_keyboard_master()) {
         // this method has no effect on slave half
-        printf("ignoring update on right hand (%d,%s)\n", index, clockwise ? "CW" : "CC");
+        printf("ignoring update on slave (%d,%s)\n", index, clockwise ? "CW" : "CC");
         return true;
     }
     updates[updates_array_idx % 32] = {index, clockwise};
     updates_array_idx++;
     return true;
 }
+};
 
 bool setAndRead(pin_t pin, bool val) {
     setPin(pin, val);
-    return encoder_read();
+    return encoder_task();
 }
 
 class EncoderSplitTestNoRight : public ::testing::Test {
@@ -82,37 +89,48 @@ TEST_F(EncoderSplitTestNoRight, TestInitRight) {
     EXPECT_EQ(updates_array_idx, 0); // no updates received
 }
 
-TEST_F(EncoderSplitTestNoRight, TestOneClockwiseLeft) {
+TEST_F(EncoderSplitTestNoRight, TestOneClockwiseLeftMaster) {
+    isMaster   = true;
     isLeftHand = true;
     encoder_init();
     // send 4 pulses. with resolution 4, that's one step and we should get 1 update.
-    setAndRead(0, false);
-    setAndRead(1, false);
-    setAndRead(0, true);
-    setAndRead(1, true);
+    setAndRead(2, false);
+    setAndRead(3, false);
+    setAndRead(2, true);
+    setAndRead(3, true);
 
-    EXPECT_EQ(updates_array_idx, 1); // one updates received
-    EXPECT_EQ(updates[0].index, 0);
+    EXPECT_EQ(updates_array_idx, 1); // one update received
+    EXPECT_EQ(updates[0].index, 1);
     EXPECT_EQ(updates[0].clockwise, true);
+
+    int              events_queued = 0;
+    encoder_events_t events;
+    encoder_retrieve_events(&events);
+    while (events.tail != events.head) {
+        events.tail = (events.tail + 1) % MAX_QUEUED_ENCODER_EVENTS;
+        ++events_queued;
+    }
+    EXPECT_EQ(events_queued, 0); // No events should be queued on master
 }
 
-TEST_F(EncoderSplitTestNoRight, TestOneClockwiseRightSent) {
-    isLeftHand = false;
-    encoder_init();
-
-    uint8_t slave_state[32] = {0xAA, 0xAA};
-    encoder_state_raw(slave_state);
-
-    EXPECT_EQ(slave_state[0], 0xAA);
-    EXPECT_EQ(slave_state[1], 0xAA);
-}
-
-TEST_F(EncoderSplitTestNoRight, TestMultipleEncodersRightReceived) {
+TEST_F(EncoderSplitTestNoRight, TestOneClockwiseRightSlave) {
+    isMaster   = false;
     isLeftHand = true;
     encoder_init();
+    // send 4 pulses. with resolution 4, that's one step and we should get 1 update.
+    setAndRead(2, false);
+    setAndRead(3, false);
+    setAndRead(2, true);
+    setAndRead(3, true);
 
-    uint8_t slave_state[32] = {1, 0xFF}; // These values would trigger updates if there were encoders on the other side
-    encoder_update_raw(slave_state);
+    EXPECT_EQ(updates_array_idx, 0); // no updates received
 
-    EXPECT_EQ(updates_array_idx, 0); // no updates received -- no right-hand encoders
+    int              events_queued = 0;
+    encoder_events_t events;
+    encoder_retrieve_events(&events);
+    while (events.tail != events.head) {
+        events.tail = (events.tail + 1) % MAX_QUEUED_ENCODER_EVENTS;
+        ++events_queued;
+    }
+    EXPECT_EQ(events_queued, 1); // One event should be queued on slave
 }
diff --git a/quantum/encoder/tests/encoder_tests_split_role.cpp b/quantum/encoder/tests/encoder_tests_split_role.cpp
index 0ab7bfc2a78..b588af8c70a 100644
--- a/quantum/encoder/tests/encoder_tests_split_role.cpp
+++ b/quantum/encoder/tests/encoder_tests_split_role.cpp
@@ -50,7 +50,7 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
 
 bool setAndRead(pin_t pin, bool val) {
     setPin(pin, val);
-    return encoder_read();
+    return encoder_task();
 }
 
 class EncoderSplitTestRole : public ::testing::Test {
@@ -87,9 +87,6 @@ TEST_F(EncoderSplitTestRole, TestPrimaryRight) {
     setAndRead(6, true);
     setAndRead(7, true);
 
-    uint8_t slave_state[32] = {0};
-    encoder_state_raw(slave_state);
-
     EXPECT_EQ(num_updates, 1); // one update received
 }
 
@@ -116,8 +113,5 @@ TEST_F(EncoderSplitTestRole, TestNotPrimaryRight) {
     setAndRead(6, true);
     setAndRead(7, true);
 
-    uint8_t slave_state[32] = {0};
-    encoder_state_raw(slave_state);
-
     EXPECT_EQ(num_updates, 0); // zero updates received
 }
diff --git a/quantum/encoder/tests/mock_split.c b/quantum/encoder/tests/mock_split.c
index f024c2058d6..fb5f074fbb7 100644
--- a/quantum/encoder/tests/mock_split.c
+++ b/quantum/encoder/tests/mock_split.c
@@ -36,7 +36,3 @@ bool setPin(pin_t pin, bool val) {
 }
 
 void last_encoder_activity_trigger(void) {}
-
-__attribute__((weak)) bool is_keyboard_master(void) {
-    return true;
-}
diff --git a/quantum/encoder/tests/mock_split.h b/quantum/encoder/tests/mock_split.h
index 8b4a141078a..0d108afa6e5 100644
--- a/quantum/encoder/tests/mock_split.h
+++ b/quantum/encoder/tests/mock_split.h
@@ -22,9 +22,6 @@
 #define SPLIT_KEYBOARD
 typedef uint8_t pin_t;
 
-void encoder_state_raw(uint8_t* slave_state);
-void encoder_update_raw(uint8_t* slave_state);
-
 extern bool pins[];
 extern bool pinIsInputHigh[];
 
diff --git a/quantum/encoder/tests/rules.mk b/quantum/encoder/tests/rules.mk
index d01c1c66ee5..eb6106039ee 100644
--- a/quantum/encoder/tests/rules.mk
+++ b/quantum/encoder/tests/rules.mk
@@ -3,6 +3,7 @@ encoder_CONFIG := $(QUANTUM_PATH)/encoder/tests/config_mock.h
 
 encoder_SRC := \
 	platforms/test/timer.c \
+	drivers/encoder/encoder_quadrature.c \
 	$(QUANTUM_PATH)/encoder/tests/mock.c \
 	$(QUANTUM_PATH)/encoder/tests/encoder_tests.cpp \
 	$(QUANTUM_PATH)/encoder.c
@@ -13,6 +14,7 @@ encoder_split_left_eq_right_CONFIG := $(QUANTUM_PATH)/encoder/tests/config_mock_
 
 encoder_split_left_eq_right_SRC := \
 	platforms/test/timer.c \
+	drivers/encoder/encoder_quadrature.c \
 	$(QUANTUM_PATH)/encoder/tests/mock_split.c \
 	$(QUANTUM_PATH)/encoder/tests/encoder_tests_split_left_eq_right.cpp \
 	$(QUANTUM_PATH)/encoder.c
@@ -23,6 +25,7 @@ encoder_split_left_gt_right_CONFIG := $(QUANTUM_PATH)/encoder/tests/config_mock_
 
 encoder_split_left_gt_right_SRC := \
 	platforms/test/timer.c \
+	drivers/encoder/encoder_quadrature.c \
 	$(QUANTUM_PATH)/encoder/tests/mock_split.c \
 	$(QUANTUM_PATH)/encoder/tests/encoder_tests_split_left_gt_right.cpp \
 	$(QUANTUM_PATH)/encoder.c
@@ -33,6 +36,7 @@ encoder_split_left_lt_right_CONFIG := $(QUANTUM_PATH)/encoder/tests/config_mock_
 
 encoder_split_left_lt_right_SRC := \
 	platforms/test/timer.c \
+	drivers/encoder/encoder_quadrature.c \
 	$(QUANTUM_PATH)/encoder/tests/mock_split.c \
 	$(QUANTUM_PATH)/encoder/tests/encoder_tests_split_left_lt_right.cpp \
 	$(QUANTUM_PATH)/encoder.c
@@ -43,6 +47,7 @@ encoder_split_no_left_CONFIG := $(QUANTUM_PATH)/encoder/tests/config_mock_split_
 
 encoder_split_no_left_SRC := \
 	platforms/test/timer.c \
+	drivers/encoder/encoder_quadrature.c \
 	$(QUANTUM_PATH)/encoder/tests/mock_split.c \
 	$(QUANTUM_PATH)/encoder/tests/encoder_tests_split_no_left.cpp \
 	$(QUANTUM_PATH)/encoder.c
@@ -53,6 +58,7 @@ encoder_split_no_right_CONFIG := $(QUANTUM_PATH)/encoder/tests/config_mock_split
 
 encoder_split_no_right_SRC := \
 	platforms/test/timer.c \
+	drivers/encoder/encoder_quadrature.c \
 	$(QUANTUM_PATH)/encoder/tests/mock_split.c \
 	$(QUANTUM_PATH)/encoder/tests/encoder_tests_split_no_right.cpp \
 	$(QUANTUM_PATH)/encoder.c
@@ -63,6 +69,7 @@ encoder_split_role_CONFIG := $(QUANTUM_PATH)/encoder/tests/config_mock_split_rol
 
 encoder_split_role_SRC := \
 	platforms/test/timer.c \
+	drivers/encoder/encoder_quadrature.c \
 	$(QUANTUM_PATH)/encoder/tests/mock_split.c \
 	$(QUANTUM_PATH)/encoder/tests/encoder_tests_split_role.cpp \
 	$(QUANTUM_PATH)/encoder.c
diff --git a/quantum/haptic.c b/quantum/haptic.c
index a1fea296258..6a466293a74 100644
--- a/quantum/haptic.c
+++ b/quantum/haptic.c
@@ -96,10 +96,10 @@ void haptic_init(void) {
 #endif
     eeconfig_debug_haptic();
 #ifdef HAPTIC_ENABLE_PIN
-    setPinOutput(HAPTIC_ENABLE_PIN);
+    gpio_set_pin_output(HAPTIC_ENABLE_PIN);
 #endif
 #ifdef HAPTIC_ENABLE_STATUS_LED
-    setPinOutput(HAPTIC_ENABLE_STATUS_LED);
+    gpio_set_pin_output(HAPTIC_ENABLE_STATUS_LED);
 #endif
 }
 
@@ -356,9 +356,9 @@ void haptic_shutdown(void) {
 void haptic_notify_usb_device_state_change(void) {
     update_haptic_enable_gpios();
 #if defined(HAPTIC_ENABLE_PIN)
-    setPinOutput(HAPTIC_ENABLE_PIN);
+    gpio_set_pin_output(HAPTIC_ENABLE_PIN);
 #endif
 #if defined(HAPTIC_ENABLE_STATUS_LED)
-    setPinOutput(HAPTIC_ENABLE_STATUS_LED);
+    gpio_set_pin_output(HAPTIC_ENABLE_STATUS_LED);
 #endif
 }
diff --git a/quantum/haptic.h b/quantum/haptic.h
index 5bd1a71916d..b283d5d2687 100644
--- a/quantum/haptic.h
+++ b/quantum/haptic.h
@@ -84,22 +84,22 @@ void haptic_notify_usb_device_state_change(void);
 #    ifndef HAPTIC_ENABLE_PIN
 #        error HAPTIC_ENABLE_PIN not defined
 #    endif
-#    define HAPTIC_ENABLE_PIN_WRITE_ACTIVE() writePinLow(HAPTIC_ENABLE_PIN)
-#    define HAPTIC_ENABLE_PIN_WRITE_INACTIVE() writePinHigh(HAPTIC_ENABLE_PIN)
+#    define HAPTIC_ENABLE_PIN_WRITE_ACTIVE() gpio_write_pin_low(HAPTIC_ENABLE_PIN)
+#    define HAPTIC_ENABLE_PIN_WRITE_INACTIVE() gpio_write_pin_high(HAPTIC_ENABLE_PIN)
 #else
-#    define HAPTIC_ENABLE_PIN_WRITE_ACTIVE() writePinHigh(HAPTIC_ENABLE_PIN)
-#    define HAPTIC_ENABLE_PIN_WRITE_INACTIVE() writePinLow(HAPTIC_ENABLE_PIN)
+#    define HAPTIC_ENABLE_PIN_WRITE_ACTIVE() gpio_write_pin_high(HAPTIC_ENABLE_PIN)
+#    define HAPTIC_ENABLE_PIN_WRITE_INACTIVE() gpio_write_pin_low(HAPTIC_ENABLE_PIN)
 #endif
 
 #ifdef HAPTIC_ENABLE_STATUS_LED_ACTIVE_LOW
 #    ifndef HAPTIC_ENABLE_STATUS_LED
 #        error HAPTIC_ENABLE_STATUS_LED not defined
 #    endif
-#    define HAPTIC_ENABLE_STATUS_LED_WRITE_ACTIVE() writePinLow(HAPTIC_ENABLE_STATUS_LED)
-#    define HAPTIC_ENABLE_STATUS_LED_WRITE_INACTIVE() writePinHigh(HAPTIC_ENABLE_STATUS_LED)
+#    define HAPTIC_ENABLE_STATUS_LED_WRITE_ACTIVE() gpio_write_pin_low(HAPTIC_ENABLE_STATUS_LED)
+#    define HAPTIC_ENABLE_STATUS_LED_WRITE_INACTIVE() gpio_write_pin_high(HAPTIC_ENABLE_STATUS_LED)
 #else
-#    define HAPTIC_ENABLE_STATUS_LED_WRITE_ACTIVE() writePinHigh(HAPTIC_ENABLE_STATUS_LED)
-#    define HAPTIC_ENABLE_STATUS_LED_WRITE_INACTIVE() writePinLow(HAPTIC_ENABLE_STATUS_LED)
+#    define HAPTIC_ENABLE_STATUS_LED_WRITE_ACTIVE() gpio_write_pin_high(HAPTIC_ENABLE_STATUS_LED)
+#    define HAPTIC_ENABLE_STATUS_LED_WRITE_INACTIVE() gpio_write_pin_low(HAPTIC_ENABLE_STATUS_LED)
 #endif
 
 #ifndef HAPTIC_OFF_IN_LOW_POWER
diff --git a/quantum/joystick.c b/quantum/joystick.c
index 3e9edeb8e2c..32f19b2cd99 100644
--- a/quantum/joystick.c
+++ b/quantum/joystick.c
@@ -43,7 +43,7 @@ __attribute__((weak)) void joystick_axis_init(uint8_t axis) {
     if (axis >= JOYSTICK_AXIS_COUNT) return;
 
 #if defined(JOYSTICK_ANALOG)
-    setPinInput(joystick_axes[axis].input_pin);
+    gpio_set_pin_input(joystick_axes[axis].input_pin);
 #endif
 }
 
diff --git a/quantum/keyboard.c b/quantum/keyboard.c
index 1d6657c2300..5aaa4b452f2 100644
--- a/quantum/keyboard.c
+++ b/quantum/keyboard.c
@@ -689,7 +689,7 @@ void keyboard_task(void) {
 #endif
 
 #ifdef ENCODER_ENABLE
-    if (encoder_read()) {
+    if (encoder_task()) {
         last_encoder_activity_trigger();
         activity_has_occurred = true;
     }
diff --git a/quantum/led.c b/quantum/led.c
index 1e7ee9db76c..e2b59851099 100644
--- a/quantum/led.c
+++ b/quantum/led.c
@@ -98,19 +98,19 @@ __attribute__((weak)) void led_update_ports(led_t led_state) {
 #endif
 
 #ifdef LED_NUM_LOCK_PIN
-    writePin(LED_NUM_LOCK_PIN, led_state.num_lock);
+    gpio_write_pin(LED_NUM_LOCK_PIN, led_state.num_lock);
 #endif
 #ifdef LED_CAPS_LOCK_PIN
-    writePin(LED_CAPS_LOCK_PIN, led_state.caps_lock);
+    gpio_write_pin(LED_CAPS_LOCK_PIN, led_state.caps_lock);
 #endif
 #ifdef LED_SCROLL_LOCK_PIN
-    writePin(LED_SCROLL_LOCK_PIN, led_state.scroll_lock);
+    gpio_write_pin(LED_SCROLL_LOCK_PIN, led_state.scroll_lock);
 #endif
 #ifdef LED_COMPOSE_PIN
-    writePin(LED_COMPOSE_PIN, led_state.compose);
+    gpio_write_pin(LED_COMPOSE_PIN, led_state.compose);
 #endif
 #ifdef LED_KANA_PIN
-    writePin(LED_KANA_PIN, led_state.kana);
+    gpio_write_pin(LED_KANA_PIN, led_state.kana);
 #endif
 }
 
@@ -118,24 +118,24 @@ __attribute__((weak)) void led_update_ports(led_t led_state) {
  */
 __attribute__((weak)) void led_init_ports(void) {
 #ifdef LED_NUM_LOCK_PIN
-    setPinOutput(LED_NUM_LOCK_PIN);
-    writePin(LED_NUM_LOCK_PIN, !LED_PIN_ON_STATE);
+    gpio_set_pin_output(LED_NUM_LOCK_PIN);
+    gpio_write_pin(LED_NUM_LOCK_PIN, !LED_PIN_ON_STATE);
 #endif
 #ifdef LED_CAPS_LOCK_PIN
-    setPinOutput(LED_CAPS_LOCK_PIN);
-    writePin(LED_CAPS_LOCK_PIN, !LED_PIN_ON_STATE);
+    gpio_set_pin_output(LED_CAPS_LOCK_PIN);
+    gpio_write_pin(LED_CAPS_LOCK_PIN, !LED_PIN_ON_STATE);
 #endif
 #ifdef LED_SCROLL_LOCK_PIN
-    setPinOutput(LED_SCROLL_LOCK_PIN);
-    writePin(LED_SCROLL_LOCK_PIN, !LED_PIN_ON_STATE);
+    gpio_set_pin_output(LED_SCROLL_LOCK_PIN);
+    gpio_write_pin(LED_SCROLL_LOCK_PIN, !LED_PIN_ON_STATE);
 #endif
 #ifdef LED_COMPOSE_PIN
-    setPinOutput(LED_COMPOSE_PIN);
-    writePin(LED_COMPOSE_PIN, !LED_PIN_ON_STATE);
+    gpio_set_pin_output(LED_COMPOSE_PIN);
+    gpio_write_pin(LED_COMPOSE_PIN, !LED_PIN_ON_STATE);
 #endif
 #ifdef LED_KANA_PIN
-    setPinOutput(LED_KANA_PIN);
-    writePin(LED_KANA_PIN, !LED_PIN_ON_STATE);
+    gpio_set_pin_output(LED_KANA_PIN);
+    gpio_write_pin(LED_KANA_PIN, !LED_PIN_ON_STATE);
 #endif
 }
 
diff --git a/quantum/matrix.c b/quantum/matrix.c
index f087a215d46..d4586efac24 100644
--- a/quantum/matrix.c
+++ b/quantum/matrix.c
@@ -78,27 +78,27 @@ __attribute__((weak)) void matrix_read_rows_on_col(matrix_row_t current_matrix[]
 
 static inline void setPinOutput_writeLow(pin_t pin) {
     ATOMIC_BLOCK_FORCEON {
-        setPinOutput(pin);
-        writePinLow(pin);
+        gpio_set_pin_output(pin);
+        gpio_write_pin_low(pin);
     }
 }
 
 static inline void setPinOutput_writeHigh(pin_t pin) {
     ATOMIC_BLOCK_FORCEON {
-        setPinOutput(pin);
-        writePinHigh(pin);
+        gpio_set_pin_output(pin);
+        gpio_write_pin_high(pin);
     }
 }
 
 static inline void setPinInputHigh_atomic(pin_t pin) {
     ATOMIC_BLOCK_FORCEON {
-        setPinInputHigh(pin);
+        gpio_set_pin_input_high(pin);
     }
 }
 
 static inline uint8_t readMatrixPin(pin_t pin) {
     if (pin != NO_PIN) {
-        return (readPin(pin) == MATRIX_INPUT_PRESSED_STATE) ? 0 : 1;
+        return (gpio_read_pin(pin) == MATRIX_INPUT_PRESSED_STATE) ? 0 : 1;
     } else {
         return 1;
     }
@@ -113,7 +113,7 @@ __attribute__((weak)) void matrix_init_pins(void) {
         for (int col = 0; col < MATRIX_COLS; col++) {
             pin_t pin = direct_pins[row][col];
             if (pin != NO_PIN) {
-                setPinInputHigh(pin);
+                gpio_set_pin_input_high(pin);
             }
         }
     }
diff --git a/quantum/os_detection.c b/quantum/os_detection.c
index b674f05b354..96b026e2471 100644
--- a/quantum/os_detection.c
+++ b/quantum/os_detection.c
@@ -16,24 +16,32 @@
 
 #include "os_detection.h"
 
-#ifdef OS_DETECTION_ENABLE
+#include <string.h>
+#include "timer.h"
+#ifdef OS_DETECTION_KEYBOARD_RESET
+#    include "quantum.h"
+#endif
 
-#    include <string.h>
-#    include "timer.h"
-#    ifdef OS_DETECTION_KEYBOARD_RESET
-#        include "quantum.h"
-#    endif
+#ifdef OS_DETECTION_DEBUG_ENABLE
+#    include "eeconfig.h"
+#    include "eeprom.h"
+#    include "print.h"
 
-#    ifdef OS_DETECTION_DEBUG_ENABLE
-#        include "eeconfig.h"
-#        include "eeprom.h"
-#        include "print.h"
-
-#        define STORED_USB_SETUPS 50
-#        define EEPROM_USER_OFFSET (uint8_t*)EECONFIG_SIZE
+#    define STORED_USB_SETUPS 50
+#    define EEPROM_USER_OFFSET (uint8_t*)EECONFIG_SIZE
 
 static uint16_t usb_setups[STORED_USB_SETUPS];
-#    endif
+#endif
+
+#ifndef OS_DETECTION_DEBOUNCE
+#    define OS_DETECTION_DEBOUNCE 200
+#endif
+
+// 2s should always be more than enough (otherwise, you may have other issues)
+#if OS_DETECTION_DEBOUNCE > 2000
+#    undef OS_DETECTION_DEBOUNCE
+#    define OS_DETECTION_DEBOUNCE 2000
+#endif
 
 struct setups_data_t {
     uint8_t  count;
@@ -50,18 +58,6 @@ struct setups_data_t setups_data = {
     .cnt_ff = 0,
 };
 
-#    ifndef OS_DETECTION_DEBOUNCE
-#        define OS_DETECTION_DEBOUNCE 200
-#    endif
-
-// 2s should always be more than enough (otherwise, you may have other issues)
-#    if OS_DETECTION_DEBOUNCE > 2000
-#        undef OS_DETECTION_DEBOUNCE
-#        define OS_DETECTION_DEBOUNCE 2000
-#    endif
-
-typedef uint16_t debouncing_t;
-
 static volatile os_variant_t detected_os = OS_UNSURE;
 static os_variant_t          reported_os = OS_UNSURE;
 
@@ -89,13 +85,13 @@ void os_detection_task(void) {
             }
         }
     }
-#    ifdef OS_DETECTION_KEYBOARD_RESET
+#ifdef OS_DETECTION_KEYBOARD_RESET
     // resetting the keyboard on the USB device state change callback results in instability, so delegate that to this task
     // only take action if it's been stable at least once, to avoid issues with some KVMs
     else if (current_usb_device_state == USB_DEVICE_STATE_INIT && reported_usb_device_state != USB_DEVICE_STATE_INIT) {
         soft_reset_keyboard();
     }
-#    endif
+#endif
 }
 
 __attribute__((weak)) bool process_detected_host_os_kb(os_variant_t detected_os) {
@@ -108,9 +104,9 @@ __attribute__((weak)) bool process_detected_host_os_user(os_variant_t detected_o
 
 // Some collected sequences of wLength can be found in tests.
 void process_wlength(const uint16_t w_length) {
-#    ifdef OS_DETECTION_DEBUG_ENABLE
+#ifdef OS_DETECTION_DEBUG_ENABLE
     usb_setups[setups_data.count] = w_length;
-#    endif
+#endif
     setups_data.count++;
     setups_data.last_wlength = w_length;
     if (w_length == 0x2) {
@@ -174,23 +170,23 @@ void os_detection_notify_usb_device_state_change(enum usb_device_state usb_devic
     debouncing               = true;
 }
 
-#    if defined(SPLIT_KEYBOARD) && defined(SPLIT_DETECTED_OS_ENABLE)
+#if defined(SPLIT_KEYBOARD) && defined(SPLIT_DETECTED_OS_ENABLE)
 void slave_update_detected_host_os(os_variant_t os) {
     detected_os = os;
     last_time   = timer_read_fast();
     debouncing  = true;
 }
-#    endif
+#endif
 
-#    ifdef OS_DETECTION_DEBUG_ENABLE
+#ifdef OS_DETECTION_DEBUG_ENABLE
 void print_stored_setups(void) {
-#        ifdef CONSOLE_ENABLE
+#    ifdef CONSOLE_ENABLE
     uint8_t cnt = eeprom_read_byte(EEPROM_USER_OFFSET);
     for (uint16_t i = 0; i < cnt; ++i) {
         uint16_t* addr = (uint16_t*)EEPROM_USER_OFFSET + i * sizeof(uint16_t) + sizeof(uint8_t);
         xprintf("i: %d, wLength: 0x%02X\n", i, eeprom_read_word(addr));
     }
-#        endif
+#    endif
 }
 
 void store_setups_in_eeprom(void) {
@@ -201,6 +197,4 @@ void store_setups_in_eeprom(void) {
     }
 }
 
-#    endif // OS_DETECTION_DEBUG_ENABLE
-
-#endif
+#endif // OS_DETECTION_DEBUG_ENABLE
diff --git a/quantum/os_detection.h b/quantum/os_detection.h
index 470f30943a6..b8cd8983359 100644
--- a/quantum/os_detection.h
+++ b/quantum/os_detection.h
@@ -16,11 +16,9 @@
 
 #pragma once
 
-#ifdef OS_DETECTION_ENABLE
-
-#    include <stdint.h>
-#    include <stdbool.h>
-#    include "usb_device_state.h"
+#include <stdint.h>
+#include <stdbool.h>
+#include "usb_device_state.h"
 
 typedef enum {
     OS_UNSURE,
@@ -40,13 +38,11 @@ void os_detection_task(void);
 bool process_detected_host_os_kb(os_variant_t os);
 bool process_detected_host_os_user(os_variant_t os);
 
-#    if defined(SPLIT_KEYBOARD) && defined(SPLIT_DETECTED_OS_ENABLE)
+#if defined(SPLIT_KEYBOARD) && defined(SPLIT_DETECTED_OS_ENABLE)
 void slave_update_detected_host_os(os_variant_t os);
-#    endif
+#endif
 
-#    ifdef OS_DETECTION_DEBUG_ENABLE
+#ifdef OS_DETECTION_DEBUG_ENABLE
 void print_stored_setups(void);
 void store_setups_in_eeprom(void);
-#    endif
-
-#endif // OS_DETECTION_ENABLE
+#endif
diff --git a/quantum/os_detection/tests/os_detection.cpp b/quantum/os_detection/tests/os_detection.cpp
index 11e93fdea8f..a9f671156b8 100644
--- a/quantum/os_detection/tests/os_detection.cpp
+++ b/quantum/os_detection/tests/os_detection.cpp
@@ -45,6 +45,8 @@ os_variant_t check_sequence(const std::vector<uint16_t> &w_lengths) {
 bool process_detected_host_os_kb(os_variant_t os) {
     reported_count = reported_count + 1;
     reported_os    = os;
+
+    return true;
 }
 
 void assert_not_reported(void) {
diff --git a/quantum/painter/qp.h b/quantum/painter/qp.h
index 873a9d9f329..02acbf589a3 100644
--- a/quantum/painter/qp.h
+++ b/quantum/painter/qp.h
@@ -509,6 +509,12 @@ int16_t qp_drawtext_recolor(painter_device_t device, uint16_t x, uint16_t y, pai
 #    define ILI9341_NUM_DEVICES 0
 #endif // QUANTUM_PAINTER_ILI9341_ENABLE
 
+#ifdef QUANTUM_PAINTER_ILI9486_ENABLE
+#    include "qp_ili9486.h"
+#else // QUANTUM_PAINTER_ILI9486_ENABLE
+#    define ILI9486_NUM_DEVICES 0
+#endif // QUANTUM_PAINTER_ILI9486_ENABLE
+
 #ifdef QUANTUM_PAINTER_ILI9488_ENABLE
 #    include "qp_ili9488.h"
 #else // QUANTUM_PAINTER_ILI9488_ENABLE
diff --git a/quantum/painter/qp_internal.c b/quantum/painter/qp_internal.c
index 0e81467e26f..1f0f9817967 100644
--- a/quantum/painter/qp_internal.c
+++ b/quantum/painter/qp_internal.c
@@ -11,6 +11,7 @@ enum {
     // NOTE: We intentionally do not include surfaces here, despite them conforming to the same API.
     QP_NUM_DEVICES = (ILI9163_NUM_DEVICES)   // ILI9163
                      + (ILI9341_NUM_DEVICES) // ILI9341
+                     + (ILI9486_NUM_DEVICES) // ILI9486
                      + (ILI9488_NUM_DEVICES) // ILI9488
                      + (ST7789_NUM_DEVICES)  // ST7789
                      + (ST7735_NUM_DEVICES)  // ST7735
diff --git a/quantum/painter/rules.mk b/quantum/painter/rules.mk
index ca81cffb032..d991a6d7423 100644
--- a/quantum/painter/rules.mk
+++ b/quantum/painter/rules.mk
@@ -9,6 +9,7 @@ VALID_QUANTUM_PAINTER_DRIVERS := \
     surface \
     ili9163_spi \
     ili9341_spi \
+    ili9486_spi \
     ili9488_spi \
     st7735_spi \
     st7789_spi \
@@ -80,6 +81,17 @@ define handle_quantum_painter_driver
             $(DRIVER_PATH)/painter/tft_panel/qp_tft_panel.c \
             $(DRIVER_PATH)/painter/ili9xxx/qp_ili9341.c \
 
+    else ifeq ($$(strip $$(CURRENT_PAINTER_DRIVER)),ili9486_spi)
+        QUANTUM_PAINTER_NEEDS_COMMS_SPI := yes
+        QUANTUM_PAINTER_NEEDS_COMMS_SPI_DC_RESET := yes
+        OPT_DEFS += -DQUANTUM_PAINTER_ILI9486_ENABLE -DQUANTUM_PAINTER_ILI9486_SPI_ENABLE
+        COMMON_VPATH += \
+            $(DRIVER_PATH)/painter/tft_panel \
+            $(DRIVER_PATH)/painter/ili9xxx
+        SRC += \
+            $(DRIVER_PATH)/painter/tft_panel/qp_tft_panel.c \
+            $(DRIVER_PATH)/painter/ili9xxx/qp_ili9486.c \
+
     else ifeq ($$(strip $$(CURRENT_PAINTER_DRIVER)),ili9488_spi)
         QUANTUM_PAINTER_NEEDS_COMMS_SPI := yes
         QUANTUM_PAINTER_NEEDS_COMMS_SPI_DC_RESET := yes
diff --git a/quantum/pointing_device/pointing_device.c b/quantum/pointing_device/pointing_device.c
index 2fa49ade8e2..bcced166c0d 100644
--- a/quantum/pointing_device/pointing_device.c
+++ b/quantum/pointing_device/pointing_device.c
@@ -149,9 +149,9 @@ __attribute__((weak)) void pointing_device_init(void) {
         pointing_device_driver.init();
 #ifdef POINTING_DEVICE_MOTION_PIN
 #    ifdef POINTING_DEVICE_MOTION_PIN_ACTIVE_LOW
-        setPinInputHigh(POINTING_DEVICE_MOTION_PIN);
+        gpio_set_pin_input_high(POINTING_DEVICE_MOTION_PIN);
 #    else
-        setPinInput(POINTING_DEVICE_MOTION_PIN);
+        gpio_set_pin_input(POINTING_DEVICE_MOTION_PIN);
 #    endif
 #endif
     }
@@ -247,9 +247,9 @@ __attribute__((weak)) bool pointing_device_task(void) {
 #        error POINTING_DEVICE_MOTION_PIN not supported when sharing the pointing device report between sides.
 #    endif
 #    ifdef POINTING_DEVICE_MOTION_PIN_ACTIVE_LOW
-    if (!readPin(POINTING_DEVICE_MOTION_PIN))
+    if (!gpio_read_pin(POINTING_DEVICE_MOTION_PIN))
 #    else
-    if (readPin(POINTING_DEVICE_MOTION_PIN))
+    if (gpio_read_pin(POINTING_DEVICE_MOTION_PIN))
 #    endif
     {
 #endif
diff --git a/quantum/pointing_device/pointing_device_auto_mouse.c b/quantum/pointing_device/pointing_device_auto_mouse.c
index 1b11fffedb7..d9f924e258e 100644
--- a/quantum/pointing_device/pointing_device_auto_mouse.c
+++ b/quantum/pointing_device/pointing_device_auto_mouse.c
@@ -45,7 +45,7 @@ static inline bool layer_hold_check(void) {
 }
 
 /* check all layer activation criteria */
-static inline bool is_auto_mouse_active(void) {
+bool is_auto_mouse_active(void) {
     return auto_mouse_context.status.is_activated || auto_mouse_context.status.mouse_key_tracker || layer_hold_check();
 }
 
@@ -98,6 +98,15 @@ bool get_auto_mouse_toggle(void) {
     return auto_mouse_context.status.is_toggled;
 }
 
+/**
+ * @brief get key tracker value
+ *
+ * @return bool of current layer_toggled state
+ */
+int8_t get_auto_mouse_key_tracker(void) {
+    return auto_mouse_context.status.mouse_key_tracker;
+}
+
 /**
  * @brief Reset auto mouse context
  *
@@ -163,6 +172,15 @@ void set_auto_mouse_debounce(uint8_t debounce) {
     auto_mouse_reset();
 }
 
+/**
+ * @brief Changes the timeout for the mouse auto layer to be disabled
+ *
+ * @param key_tracker
+ */
+void set_auto_mouse_key_tracker(int8_t key_tracker) {
+    auto_mouse_context.status.mouse_key_tracker = key_tracker;
+}
+
 /**
  * @brief toggle mouse layer setting
  *
diff --git a/quantum/pointing_device/pointing_device_auto_mouse.h b/quantum/pointing_device/pointing_device_auto_mouse.h
index 904f18b68e2..a596c065a31 100644
--- a/quantum/pointing_device/pointing_device_auto_mouse.h
+++ b/quantum/pointing_device/pointing_device_auto_mouse.h
@@ -81,9 +81,11 @@ void          set_auto_mouse_timeout(uint16_t timeout);                 // set l
 uint16_t      get_auto_mouse_timeout(void);                             // get layer timeout
 void          set_auto_mouse_debounce(uint8_t debounce);                // set debounce
 uint8_t       get_auto_mouse_debounce(void);                            // get debounce
+void          set_auto_mouse_key_tracker(int8_t key_tracker);           // set key tracker
+int8_t        get_auto_mouse_key_tracker(void);                         // get key tracker
 void          auto_mouse_layer_off(void);                               // disable target layer if appropriate (DO NOT USE in layer_state_set stack!!)
 layer_state_t remove_auto_mouse_layer(layer_state_t state, bool force); // remove auto mouse target layer from state if appropriate (can be forced)
-
+bool          is_auto_mouse_active(void);                               // check if target layer is active
 /* ----------For custom pointing device activation----------------------------------------------------------- */
 bool auto_mouse_activation(report_mouse_t mouse_report); // handles pointing device trigger conditions for target layer activation (overwritable)
 
diff --git a/quantum/split_common/split_util.c b/quantum/split_common/split_util.c
index 2f592bd4cfa..96f19bfd840 100644
--- a/quantum/split_common/split_util.c
+++ b/quantum/split_common/split_util.c
@@ -123,14 +123,14 @@ void split_watchdog_task(void) {
 void matrix_io_delay(void);
 
 static uint8_t peek_matrix_intersection(pin_t out_pin, pin_t in_pin) {
-    setPinInputHigh(in_pin);
-    setPinOutput(out_pin);
-    writePinLow(out_pin);
+    gpio_set_pin_input_high(in_pin);
+    gpio_set_pin_output(out_pin);
+    gpio_write_pin_low(out_pin);
     // It's almost unnecessary, but wait until it's down to low, just in case.
     wait_us(1);
-    uint8_t pin_state = readPin(in_pin);
+    uint8_t pin_state = gpio_read_pin(in_pin);
     // Set out_pin to a setting that is less susceptible to noise.
-    setPinInputHigh(out_pin);
+    gpio_set_pin_input_high(out_pin);
     matrix_io_delay(); // Wait for the pull-up to go HIGH.
     return pin_state;
 }
@@ -138,13 +138,13 @@ static uint8_t peek_matrix_intersection(pin_t out_pin, pin_t in_pin) {
 
 __attribute__((weak)) bool is_keyboard_left_impl(void) {
 #if defined(SPLIT_HAND_PIN)
-    setPinInput(SPLIT_HAND_PIN);
+    gpio_set_pin_input(SPLIT_HAND_PIN);
     wait_us(100);
     // Test pin SPLIT_HAND_PIN for High/Low, if low it's right hand
 #    ifdef SPLIT_HAND_PIN_LOW_IS_LEFT
-    return !readPin(SPLIT_HAND_PIN);
+    return !gpio_read_pin(SPLIT_HAND_PIN);
 #    else
-    return readPin(SPLIT_HAND_PIN);
+    return gpio_read_pin(SPLIT_HAND_PIN);
 #    endif
 #elif defined(SPLIT_HAND_MATRIX_GRID)
 #    ifdef SPLIT_HAND_MATRIX_GRID_LOW_IS_LEFT
diff --git a/quantum/split_common/transaction_id_define.h b/quantum/split_common/transaction_id_define.h
index 4d4d2b95708..05b3bf7b625 100644
--- a/quantum/split_common/transaction_id_define.h
+++ b/quantum/split_common/transaction_id_define.h
@@ -31,6 +31,7 @@ enum serial_transaction_id {
 #ifdef ENCODER_ENABLE
     GET_ENCODERS_CHECKSUM,
     GET_ENCODERS_DATA,
+    PUT_ENCODER_TAIL,
 #endif // ENCODER_ENABLE
 
 #ifndef DISABLE_SYNC_TIMER
diff --git a/quantum/split_common/transactions.c b/quantum/split_common/transactions.c
index 2b9423cd636..2cfa83e7a3f 100644
--- a/quantum/split_common/transactions.c
+++ b/quantum/split_common/transactions.c
@@ -234,21 +234,28 @@ static void master_matrix_handlers_slave(matrix_row_t master_matrix[], matrix_ro
 #ifdef ENCODER_ENABLE
 
 static bool encoder_handlers_master(matrix_row_t master_matrix[], matrix_row_t slave_matrix[]) {
-    static uint32_t last_update = 0;
-    uint8_t         temp_state[NUM_ENCODERS_MAX_PER_SIDE];
+    static uint32_t  last_update = 0;
+    encoder_events_t temp_events;
 
-    bool okay = read_if_checksum_mismatch(GET_ENCODERS_CHECKSUM, GET_ENCODERS_DATA, &last_update, temp_state, split_shmem->encoders.state, sizeof(temp_state));
-    if (okay) encoder_update_raw(temp_state);
+    bool okay = read_if_checksum_mismatch(GET_ENCODERS_CHECKSUM, GET_ENCODERS_DATA, &last_update, &temp_events, &split_shmem->encoders.events, sizeof(temp_events));
+    if (okay) {
+        encoder_handle_slave_events(&split_shmem->encoders.events);
+        transport_write(PUT_ENCODER_TAIL, &split_shmem->encoders.events.tail, sizeof(split_shmem->encoders.events.tail));
+        split_shmem->encoders.checksum = crc8(&split_shmem->encoders.events, sizeof(split_shmem->encoders.events));
+    }
     return okay;
 }
 
 static void encoder_handlers_slave(matrix_row_t master_matrix[], matrix_row_t slave_matrix[]) {
-    uint8_t encoder_state[NUM_ENCODERS_MAX_PER_SIDE];
-    encoder_state_raw(encoder_state);
     // Always prepare the encoder state for read.
-    memcpy(split_shmem->encoders.state, encoder_state, sizeof(encoder_state));
+    encoder_retrieve_events(&split_shmem->encoders.events);
     // Now update the checksum given that the encoders has been written to
-    split_shmem->encoders.checksum = crc8(encoder_state, sizeof(encoder_state));
+    split_shmem->encoders.checksum = crc8(&split_shmem->encoders.events, sizeof(split_shmem->encoders.events));
+}
+
+static void encoder_handlers_slave_reset(uint8_t initiator2target_buffer_size, const void *initiator2target_buffer, uint8_t target2initiator_buffer_size, void *target2initiator_buffer) {
+    uint8_t tail_index = *(uint8_t *)initiator2target_buffer;
+    encoder_set_tail_index(tail_index);
 }
 
 // clang-format off
@@ -256,7 +263,8 @@ static void encoder_handlers_slave(matrix_row_t master_matrix[], matrix_row_t sl
 #    define TRANSACTIONS_ENCODERS_SLAVE() TRANSACTION_HANDLER_SLAVE_AUTOLOCK(encoder)
 #    define TRANSACTIONS_ENCODERS_REGISTRATIONS \
     [GET_ENCODERS_CHECKSUM] = trans_target2initiator_initializer(encoders.checksum), \
-    [GET_ENCODERS_DATA]     = trans_target2initiator_initializer(encoders.state),
+    [GET_ENCODERS_DATA]     = trans_target2initiator_initializer(encoders.events), \
+    [PUT_ENCODER_TAIL]      = trans_initiator2target_initializer_cb(encoders.events.tail, encoder_handlers_slave_reset),
 // clang-format on
 
 #else // ENCODER_ENABLE
diff --git a/quantum/split_common/transport.h b/quantum/split_common/transport.h
index 2e2b918d451..4f6b968fa8a 100644
--- a/quantum/split_common/transport.h
+++ b/quantum/split_common/transport.h
@@ -65,8 +65,8 @@ typedef struct _split_master_matrix_sync_t {
 
 #ifdef ENCODER_ENABLE
 typedef struct _split_slave_encoder_sync_t {
-    uint8_t checksum;
-    uint8_t state[NUM_ENCODERS_MAX_PER_SIDE];
+    uint8_t          checksum;
+    encoder_events_t events;
 } split_slave_encoder_sync_t;
 #endif // ENCODER_ENABLE
 
diff --git a/shell.nix b/shell.nix
index 63e5af0525d..88822b0b17e 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,29 +1,9 @@
 let
   # We specify sources via Niv: use "niv update nixpkgs" to update nixpkgs, for example.
   sources = import ./util/nix/sources.nix { };
-
-  # `tomlkit` >= 0.8.0 is required to build `jsonschema` >= 4.11.0 (older
-  # version do not support some valid TOML syntax: sdispater/tomlkit#148).  The
-  # updated `tomlkit` must be used by `makeRemoveSpecialDependenciesHook`
-  # inside `poetry2nix`, therefore just providing the updated version through
-  # our `nix/pyproject.toml` does not work, and using an overlay is required.
-  pythonOverlay = final: prev: {
-    python3 = prev.python3.override {
-      packageOverrides = self: super: {
-        tomlkit = super.tomlkit.overridePythonAttrs(old: rec {
-          version = "0.11.4";
-          src = super.fetchPypi {
-            inherit (old) pname;
-            inherit version;
-            sha256 = "sha256-MjWpAQ+uVDI+cnw6wG+3IHUv5mNbNCbjedrsYPvUSoM=";
-          };
-        });
-      };
-    };
-  };
 in
 # However, if you want to override Niv's inputs, this will let you do that.
-{ pkgs ? import sources.nixpkgs { overlays = [ pythonOverlay ]; }
+{ pkgs ? import sources.nixpkgs { }
 , poetry2nix ? pkgs.callPackage (import sources.poetry2nix) { }
 , avr ? true
 , arm ? true
@@ -49,18 +29,22 @@ let
   pythonEnv = poetry2nix.mkPoetryEnv {
     projectDir = ./util/nix;
     overrides = poetry2nix.overrides.withDefaults (self: super: {
-      pillow = super.pillow.overridePythonAttrs(old: {
-        # Use preConfigure from nixpkgs to fix library detection issues and
-        # impurities which can break the build process; this also requires
-        # adding propagatedBuildInputs and buildInputs from the same source.
-        propagatedBuildInputs = (old.buildInputs or []) ++ pkgs.python3.pkgs.pillow.propagatedBuildInputs;
-        buildInputs = (old.buildInputs or []) ++ pkgs.python3.pkgs.pillow.buildInputs;
-        preConfigure = (old.preConfigure or "") + pkgs.python3.pkgs.pillow.preConfigure;
-      });
       qmk = super.qmk.overridePythonAttrs(old: {
         # Allow QMK CLI to run "qmk" as a subprocess (the wrapper changes
         # $PATH and breaks these invocations).
         dontWrapPythonPrograms = true;
+
+        # Fix "qmk setup" to use the Python interpreter from the environment
+        # when invoking "qmk doctor" (sys.executable gets its value from
+        # $NIX_PYTHONEXECUTABLE, which is set by the "qmk" wrapper from the
+        # Python environment, so "qmk doctor" then runs with the proper
+        # $NIX_PYTHONPATH too, because sys.executable actually points to
+        # another wrapper from the same Python environment).
+        postPatch = ''
+          substituteInPlace qmk_cli/subcommands/setup.py \
+            --replace "[Path(sys.argv[0]).as_posix()" \
+              "[Path(sys.executable).as_posix(), Path(sys.argv[0]).as_posix()"
+        '';
       });
     });
   };
@@ -68,7 +52,7 @@ in
 mkShell {
   name = "qmk-firmware";
 
-  buildInputs = [ clang-tools dfu-programmer dfu-util diffutils git pythonEnv niv ]
+  buildInputs = [ clang-tools_11 dfu-programmer dfu-util diffutils git pythonEnv niv ]
     ++ lib.optional avr [
       pkgsCross.avr.buildPackages.binutils
       pkgsCross.avr.buildPackages.gcc8
diff --git a/tmk_core/protocol/arm_atsam/shift_register.c b/tmk_core/protocol/arm_atsam/shift_register.c
index 3adb682aa8b..e81db4a19d7 100644
--- a/tmk_core/protocol/arm_atsam/shift_register.c
+++ b/tmk_core/protocol/arm_atsam/shift_register.c
@@ -28,27 +28,27 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define CLOCK_DELAY 10
 
 void shift_init_impl(void) {
-    setPinOutput(SR_EXP_RCLK_PIN);
-    setPinOutput(SPI_DATAOUT_PIN);
-    setPinOutput(SPI_SCLK_PIN);
+    gpio_set_pin_output(SR_EXP_RCLK_PIN);
+    gpio_set_pin_output(SPI_DATAOUT_PIN);
+    gpio_set_pin_output(SPI_SCLK_PIN);
 }
 
 void shift_out_impl(const uint8_t *data, uint16_t length) {
-    writePinLow(SR_EXP_RCLK_PIN);
+    gpio_write_pin_low(SR_EXP_RCLK_PIN);
     for (uint16_t i = 0; i < length; i++) {
         uint8_t val = data[i];
 
         // shift out lsb first
         for (uint8_t bit = 0; bit < 8; bit++) {
-            writePin(SPI_DATAOUT_PIN, !!(val & (1 << bit)));
-            writePin(SPI_SCLK_PIN, true);
+            gpio_write_pin(SPI_DATAOUT_PIN, !!(val & (1 << bit)));
+            gpio_write_pin(SPI_SCLK_PIN, true);
             wait_us(CLOCK_DELAY);
 
-            writePin(SPI_SCLK_PIN, false);
+            gpio_write_pin(SPI_SCLK_PIN, false);
             wait_us(CLOCK_DELAY);
         }
     }
-    writePinHigh(SR_EXP_RCLK_PIN);
+    gpio_write_pin_high(SR_EXP_RCLK_PIN);
     return SPI_STATUS_SUCCESS;
 }
 
@@ -74,13 +74,13 @@ void shift_out(const uint8_t *data, uint16_t length) {
 }
 
 void shift_enable(void) {
-    setPinOutput(SR_EXP_OE_PIN);
-    writePinLow(SR_EXP_OE_PIN);
+    gpio_set_pin_output(SR_EXP_OE_PIN);
+    gpio_write_pin_low(SR_EXP_OE_PIN);
 }
 
 void shift_disable(void) {
-    setPinOutput(SR_EXP_OE_PIN);
-    writePinHigh(SR_EXP_OE_PIN);
+    gpio_set_pin_output(SR_EXP_OE_PIN);
+    gpio_write_pin_high(SR_EXP_OE_PIN);
 }
 
 void shift_init(void) {
diff --git a/tmk_core/protocol/arm_atsam/spi_master.c b/tmk_core/protocol/arm_atsam/spi_master.c
index 3be82fac1d9..fedb9654fde 100644
--- a/tmk_core/protocol/arm_atsam/spi_master.c
+++ b/tmk_core/protocol/arm_atsam/spi_master.c
@@ -60,8 +60,8 @@ bool spi_start(pin_t csPin, bool lsbFirst, uint8_t mode, uint16_t divisor) {
     }
 
     currentSelectPin = csPin;
-    setPinOutput(currentSelectPin);
-    writePinLow(currentSelectPin);
+    gpio_set_pin_output(currentSelectPin);
+    gpio_write_pin_low(currentSelectPin);
 
     SPI_SERCOM->SPI.CTRLA.bit.DORD = lsbFirst; // Data Order - LSB is transferred first
     SPI_SERCOM->SPI.CTRLA.bit.CPOL = 1;        // Clock Polarity - SCK high when idle. Leading edge of cycle is falling. Trailing rising.
@@ -94,8 +94,8 @@ spi_status_t spi_transmit(const uint8_t *data, uint16_t length) {
 
 void spi_stop(void) {
     if (currentSelectPin != NO_PIN) {
-        setPinOutput(currentSelectPin);
-        writePinHigh(currentSelectPin);
+        gpio_set_pin_output(currentSelectPin);
+        gpio_write_pin_high(currentSelectPin);
         currentSelectPin = NO_PIN;
     }
 }
diff --git a/tmk_core/protocol/chibios/chibios.c b/tmk_core/protocol/chibios/chibios.c
index 91bb252c7c3..76a37ae538a 100644
--- a/tmk_core/protocol/chibios/chibios.c
+++ b/tmk_core/protocol/chibios/chibios.c
@@ -192,15 +192,18 @@ void protocol_pre_task(void) {
             /* Remote wakeup */
             if ((USB_DRIVER.status & USB_GETSTATUS_REMOTE_WAKEUP_ENABLED) && suspend_wakeup_condition()) {
                 usbWakeupHost(&USB_DRIVER);
-                restart_usb_driver(&USB_DRIVER);
+#    if USB_SUSPEND_WAKEUP_DELAY > 0
+                // Some hubs, kvm switches, and monitors do
+                // weird things, with USB device state bouncing
+                // around wildly on wakeup, yielding race
+                // conditions that can corrupt the keyboard state.
+                //
+                // Pause for a while to let things settle...
+                wait_ms(USB_SUSPEND_WAKEUP_DELAY);
+#    endif
             }
         }
         /* Woken up */
-        // variables has been already cleared by the wakeup hook
-        send_keyboard_report();
-#    ifdef MOUSEKEY_ENABLE
-        mousekey_send();
-#    endif /* MOUSEKEY_ENABLE */
     }
 #endif
 }
@@ -218,4 +221,5 @@ void protocol_post_task(void) {
 #ifdef RAW_ENABLE
     raw_hid_task();
 #endif
+    usb_idle_task();
 }
diff --git a/tmk_core/protocol/chibios/chibios.mk b/tmk_core/protocol/chibios/chibios.mk
index 8eaf5b10d29..aee3f5f0564 100644
--- a/tmk_core/protocol/chibios/chibios.mk
+++ b/tmk_core/protocol/chibios/chibios.mk
@@ -6,6 +6,8 @@ SRC += $(CHIBIOS_DIR)/usb_main.c
 SRC += $(CHIBIOS_DIR)/chibios.c
 SRC += usb_descriptor.c
 SRC += $(CHIBIOS_DIR)/usb_driver.c
+SRC += $(CHIBIOS_DIR)/usb_endpoints.c
+SRC += $(CHIBIOS_DIR)/usb_report_handling.c
 SRC += $(CHIBIOS_DIR)/usb_util.c
 SRC += $(LIBSRC)
 
diff --git a/tmk_core/protocol/chibios/usb_driver.c b/tmk_core/protocol/chibios/usb_driver.c
index ad45f9b1daa..7c3ce446876 100644
--- a/tmk_core/protocol/chibios/usb_driver.c
+++ b/tmk_core/protocol/chibios/usb_driver.c
@@ -1,127 +1,51 @@
-/*
-    ChibiOS - Copyright (C) 2006..2016 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.
-*/
-
-/**
- * @file    hal_serial_usb.c
- * @brief   Serial over USB Driver code.
- *
- * @addtogroup SERIAL_USB
- * @{
- */
+// Copyright 2023 Stefan Kerkmann (@KarlK90)
+// Copyright 2021 Purdea Andrei
+// Copyright 2021 Michael Stapelberg
+// Copyright 2020 Ryan (@fauxpark)
+// Copyright 2016 Fredizzimo
+// Copyright 2016 Giovanni Di Sirio
+// SPDX-License-Identifier: GPL-3.0-or-later OR Apache-2.0
 
 #include <hal.h>
-#include "usb_driver.h"
 #include <string.h>
 
-/*===========================================================================*/
-/* Driver local definitions.                                                 */
-/*===========================================================================*/
-
-/*===========================================================================*/
-/* Driver exported variables.                                                */
-/*===========================================================================*/
-
-/*===========================================================================*/
-/* Driver local variables and types.                                         */
-/*===========================================================================*/
-
-/*
- * Current Line Coding.
- */
-static cdc_linecoding_t linecoding = {{0x00, 0x96, 0x00, 0x00}, /* 38400.                           */
-                                      LC_STOP_1,
-                                      LC_PARITY_NONE,
-                                      8};
+#include "usb_driver.h"
+#include "util.h"
 
 /*===========================================================================*/
 /* Driver local functions.                                                   */
 /*===========================================================================*/
 
-static bool qmkusb_start_receive(QMKUSBDriver *qmkusbp) {
-    uint8_t *buf;
-
+static void usb_start_receive(usb_endpoint_out_t *endpoint) {
     /* If the USB driver is not in the appropriate state then transactions
        must not be started.*/
-    if ((usbGetDriverStateI(qmkusbp->config->usbp) != USB_ACTIVE) || (qmkusbp->state != QMKUSB_READY)) {
-        return true;
+    if ((usbGetDriverStateI(endpoint->config.usbp) != USB_ACTIVE)) {
+        return;
     }
 
     /* Checking if there is already a transaction ongoing on the endpoint.*/
-    if (usbGetReceiveStatusI(qmkusbp->config->usbp, qmkusbp->config->bulk_out)) {
-        return true;
+    if (usbGetReceiveStatusI(endpoint->config.usbp, endpoint->config.ep)) {
+        return;
     }
 
     /* Checking if there is a buffer ready for incoming data.*/
-    buf = ibqGetEmptyBufferI(&qmkusbp->ibqueue);
-    if (buf == NULL) {
-        return true;
+    uint8_t *buffer = ibqGetEmptyBufferI(&endpoint->ibqueue);
+    if (buffer == NULL) {
+        return;
     }
 
     /* Buffer found, starting a new transaction.*/
-    usbStartReceiveI(qmkusbp->config->usbp, qmkusbp->config->bulk_out, buf, qmkusbp->ibqueue.bsize - sizeof(size_t));
-
-    return false;
+    usbStartReceiveI(endpoint->config.usbp, endpoint->config.ep, buffer, endpoint->ibqueue.bsize - sizeof(size_t));
 }
 
-/*
- * Interface implementation.
- */
-
-static size_t _write(void *ip, const uint8_t *bp, size_t n) {
-    return obqWriteTimeout(&((QMKUSBDriver *)ip)->obqueue, bp, n, TIME_INFINITE);
-}
-
-static size_t _read(void *ip, uint8_t *bp, size_t n) {
-    return ibqReadTimeout(&((QMKUSBDriver *)ip)->ibqueue, bp, n, TIME_INFINITE);
-}
-
-static msg_t _put(void *ip, uint8_t b) {
-    return obqPutTimeout(&((QMKUSBDriver *)ip)->obqueue, b, TIME_INFINITE);
-}
-
-static msg_t _get(void *ip) {
-    return ibqGetTimeout(&((QMKUSBDriver *)ip)->ibqueue, TIME_INFINITE);
-}
-
-static msg_t _putt(void *ip, uint8_t b, sysinterval_t timeout) {
-    return obqPutTimeout(&((QMKUSBDriver *)ip)->obqueue, b, timeout);
-}
-
-static msg_t _gett(void *ip, sysinterval_t timeout) {
-    return ibqGetTimeout(&((QMKUSBDriver *)ip)->ibqueue, timeout);
-}
-
-static size_t _writet(void *ip, const uint8_t *bp, size_t n, sysinterval_t timeout) {
-    return obqWriteTimeout(&((QMKUSBDriver *)ip)->obqueue, bp, n, timeout);
-}
-
-static size_t _readt(void *ip, uint8_t *bp, size_t n, sysinterval_t timeout) {
-    return ibqReadTimeout(&((QMKUSBDriver *)ip)->ibqueue, bp, n, timeout);
-}
-
-static const struct QMKUSBDriverVMT vmt = {0, _write, _read, _put, _get, _putt, _gett, _writet, _readt};
-
 /**
  * @brief   Notification of empty buffer released into the input buffers queue.
  *
  * @param[in] bqp       the buffers queue pointer.
  */
 static void ibnotify(io_buffers_queue_t *bqp) {
-    QMKUSBDriver *qmkusbp = bqGetLinkX(bqp);
-    (void)qmkusb_start_receive(qmkusbp);
+    usb_endpoint_out_t *endpoint = bqGetLinkX(bqp);
+    usb_start_receive(endpoint);
 }
 
 /**
@@ -130,22 +54,22 @@ static void ibnotify(io_buffers_queue_t *bqp) {
  * @param[in] bqp       the buffers queue pointer.
  */
 static void obnotify(io_buffers_queue_t *bqp) {
-    size_t        n;
-    QMKUSBDriver *qmkusbp = bqGetLinkX(bqp);
+    usb_endpoint_in_t *endpoint = bqGetLinkX(bqp);
 
-    /* If the USB driver is not in the appropriate state then transactions
+    /* If the USB endpoint is not in the appropriate state then transactions
        must not be started.*/
-    if ((usbGetDriverStateI(qmkusbp->config->usbp) != USB_ACTIVE) || (qmkusbp->state != QMKUSB_READY)) {
+    if ((usbGetDriverStateI(endpoint->config.usbp) != USB_ACTIVE)) {
         return;
     }
 
     /* Checking if there is already a transaction ongoing on the endpoint.*/
-    if (!usbGetTransmitStatusI(qmkusbp->config->usbp, qmkusbp->config->bulk_in)) {
+    if (!usbGetTransmitStatusI(endpoint->config.usbp, endpoint->config.ep)) {
         /* Trying to get a full buffer.*/
-        uint8_t *buf = obqGetFullBufferI(&qmkusbp->obqueue, &n);
-        if (buf != NULL) {
+        size_t   n;
+        uint8_t *buffer = obqGetFullBufferI(&endpoint->obqueue, &n);
+        if (buffer != NULL) {
             /* Buffer found, starting a new transaction.*/
-            usbStartTransmitI(qmkusbp->config->usbp, qmkusbp->config->bulk_in, buf, n);
+            usbStartTransmitI(endpoint->config.usbp, endpoint->config.ep, buffer, n);
         }
     }
 }
@@ -154,264 +78,149 @@ static void obnotify(io_buffers_queue_t *bqp) {
 /* Driver exported functions.                                                */
 /*===========================================================================*/
 
-/**
- * @brief   Serial Driver initialization.
- * @note    This function is implicitly invoked by @p halInit(), there is
- *          no need to explicitly initialize the driver.
- *
- * @init
- */
-void qmkusbInit(void) {}
+void usb_endpoint_in_init(usb_endpoint_in_t *endpoint) {
+    usb_endpoint_config_t *config = &endpoint->config;
+    endpoint->ep_config.in_state  = &endpoint->ep_in_state;
 
-/**
- * @brief   Initializes a generic full duplex driver object.
- * @details The HW dependent part of the initialization has to be performed
- *          outside, usually in the hardware initialization code.
- *
- * @param[out] qmkusbp     pointer to a @p QMKUSBDriver structure
- *
- * @init
- */
-void qmkusbObjectInit(QMKUSBDriver *qmkusbp, const QMKUSBConfig *config) {
-    qmkusbp->vmt = &vmt;
-    osalEventObjectInit(&qmkusbp->event);
-    qmkusbp->state = QMKUSB_STOP;
-    // Note that the config uses the USB direction naming
-    ibqObjectInit(&qmkusbp->ibqueue, true, config->ob, config->out_size, config->out_buffers, ibnotify, qmkusbp);
-    obqObjectInit(&qmkusbp->obqueue, true, config->ib, config->in_size, config->in_buffers, obnotify, qmkusbp);
+#if defined(USB_ENDPOINTS_ARE_REORDERABLE)
+    if (endpoint->is_shared) {
+        endpoint->ep_config.out_state = &endpoint->ep_out_state;
+    }
+#endif
+    obqObjectInit(&endpoint->obqueue, true, config->buffer, config->buffer_size, config->buffer_capacity, obnotify, endpoint);
 }
 
-/**
- * @brief   Configures and starts the driver.
- *
- * @param[in] qmkusbp      pointer to a @p QMKUSBDriver object
- * @param[in] config    the serial over USB driver configuration
- *
- * @api
- */
-void qmkusbStart(QMKUSBDriver *qmkusbp, const QMKUSBConfig *config) {
-    USBDriver *usbp = config->usbp;
+void usb_endpoint_out_init(usb_endpoint_out_t *endpoint) {
+    usb_endpoint_config_t *config = &endpoint->config;
+    endpoint->ep_config.out_state = &endpoint->ep_out_state;
+    ibqObjectInit(&endpoint->ibqueue, true, config->buffer, config->buffer_size, config->buffer_capacity, ibnotify, endpoint);
+}
 
-    osalDbgCheck(qmkusbp != NULL);
+void usb_endpoint_in_start(usb_endpoint_in_t *endpoint) {
+    osalDbgCheck(endpoint != NULL);
 
     osalSysLock();
-    osalDbgAssert((qmkusbp->state == QMKUSB_STOP) || (qmkusbp->state == QMKUSB_READY), "invalid state");
-    usbp->in_params[config->bulk_in - 1U]   = qmkusbp;
-    usbp->out_params[config->bulk_out - 1U] = qmkusbp;
-    if (config->int_in > 0U) {
-        usbp->in_params[config->int_in - 1U] = qmkusbp;
-    }
-    qmkusbp->config = config;
-    qmkusbp->state  = QMKUSB_READY;
+    osalDbgAssert((usbGetDriverStateI(endpoint->config.usbp) == USB_STOP) || (usbGetDriverStateI(endpoint->config.usbp) == USB_READY), "invalid state");
+    endpoint->config.usbp->in_params[endpoint->config.ep - 1U] = endpoint;
+    endpoint->timed_out                                        = false;
     osalSysUnlock();
 }
 
-/**
- * @brief   Stops the driver.
- * @details Any thread waiting on the driver's queues will be awakened with
- *          the message @p MSG_RESET.
- *
- * @param[in] qmkusbp      pointer to a @p QMKUSBDriver object
- *
- * @api
- */
-void qmkusbStop(QMKUSBDriver *qmkusbp) {
-    USBDriver *usbp = qmkusbp->config->usbp;
-
-    osalDbgCheck(qmkusbp != NULL);
+void usb_endpoint_out_start(usb_endpoint_out_t *endpoint) {
+    osalDbgCheck(endpoint != NULL);
 
     osalSysLock();
+    osalDbgAssert((usbGetDriverStateI(endpoint->config.usbp) == USB_STOP) || (usbGetDriverStateI(endpoint->config.usbp) == USB_READY), "invalid state");
+    endpoint->config.usbp->out_params[endpoint->config.ep - 1U] = endpoint;
+    endpoint->timed_out                                         = false;
+    osalSysUnlock();
+}
 
-    osalDbgAssert((qmkusbp->state == QMKUSB_STOP) || (qmkusbp->state == QMKUSB_READY), "invalid state");
+void usb_endpoint_in_stop(usb_endpoint_in_t *endpoint) {
+    osalDbgCheck(endpoint != NULL);
 
-    /* Driver in stopped state.*/
-    usbp->in_params[qmkusbp->config->bulk_in - 1U]   = NULL;
-    usbp->out_params[qmkusbp->config->bulk_out - 1U] = NULL;
-    if (qmkusbp->config->int_in > 0U) {
-        usbp->in_params[qmkusbp->config->int_in - 1U] = NULL;
+    osalSysLock();
+    endpoint->config.usbp->in_params[endpoint->config.ep - 1U] = NULL;
+
+    bqSuspendI(&endpoint->obqueue);
+    obqResetI(&endpoint->obqueue);
+    if (endpoint->report_storage != NULL) {
+        endpoint->report_storage->reset_report(endpoint->report_storage->reports);
     }
-    qmkusbp->config = NULL;
-    qmkusbp->state  = QMKUSB_STOP;
-
-    /* Enforces a disconnection.*/
-    chnAddFlagsI(qmkusbp, CHN_DISCONNECTED);
-    ibqResetI(&qmkusbp->ibqueue);
-    obqResetI(&qmkusbp->obqueue);
     osalOsRescheduleS();
-
     osalSysUnlock();
 }
 
-/**
- * @brief   USB device suspend handler.
- * @details Generates a @p CHN_DISCONNECT event and puts queues in
- *          non-blocking mode, this way the application cannot get stuck
- *          in the middle of an I/O operations.
- * @note    If this function is not called from an ISR then an explicit call
- *          to @p osalOsRescheduleS() in necessary afterward.
- *
- * @param[in] qmkusbp      pointer to a @p QMKUSBDriver object
- *
- * @iclass
- */
-void qmkusbSuspendHookI(QMKUSBDriver *qmkusbp) {
-    chnAddFlagsI(qmkusbp, CHN_DISCONNECTED);
-    bqSuspendI(&qmkusbp->ibqueue);
-    bqSuspendI(&qmkusbp->obqueue);
+void usb_endpoint_out_stop(usb_endpoint_out_t *endpoint) {
+    osalDbgCheck(endpoint != NULL);
+
+    osalSysLock();
+    osalDbgAssert((usbGetDriverStateI(endpoint->config.usbp) == USB_STOP) || (usbGetDriverStateI(endpoint->config.usbp) == USB_READY), "invalid state");
+
+    bqSuspendI(&endpoint->ibqueue);
+    ibqResetI(&endpoint->ibqueue);
+    osalOsRescheduleS();
+    osalSysUnlock();
 }
 
-/**
- * @brief   USB device wakeup handler.
- * @details Generates a @p CHN_CONNECT event and resumes normal queues
- *          operations.
- *
- * @note    If this function is not called from an ISR then an explicit call
- *          to @p osalOsRescheduleS() in necessary afterward.
- *
- * @param[in] qmkusbp      pointer to a @p QMKUSBDriver object
- *
- * @iclass
- */
-void qmkusbWakeupHookI(QMKUSBDriver *qmkusbp) {
-    chnAddFlagsI(qmkusbp, CHN_CONNECTED);
-    bqResumeX(&qmkusbp->ibqueue);
-    bqResumeX(&qmkusbp->obqueue);
-}
+void usb_endpoint_in_suspend_cb(usb_endpoint_in_t *endpoint) {
+    bqSuspendI(&endpoint->obqueue);
+    obqResetI(&endpoint->obqueue);
 
-/**
- * @brief   USB device configured handler.
- *
- * @param[in] qmkusbp      pointer to a @p QMKUSBDriver object
- *
- * @iclass
- */
-void qmkusbConfigureHookI(QMKUSBDriver *qmkusbp) {
-    ibqResetI(&qmkusbp->ibqueue);
-    bqResumeX(&qmkusbp->ibqueue);
-    obqResetI(&qmkusbp->obqueue);
-    bqResumeX(&qmkusbp->obqueue);
-    chnAddFlagsI(qmkusbp, CHN_CONNECTED);
-    (void)qmkusb_start_receive(qmkusbp);
-}
-
-/**
- * @brief   Default requests hook.
- * @details Applications wanting to use the Serial over USB driver can use
- *          this function as requests hook in the USB configuration.
- *          The following requests are emulated:
- *          - CDC_GET_LINE_CODING.
- *          - CDC_SET_LINE_CODING.
- *          - CDC_SET_CONTROL_LINE_STATE.
- *          .
- *
- * @param[in] usbp      pointer to the @p USBDriver object
- * @return              The hook status.
- * @retval true         Message handled internally.
- * @retval false        Message not handled.
- */
-bool qmkusbRequestsHook(USBDriver *usbp) {
-    if ((usbp->setup[0] & USB_RTYPE_TYPE_MASK) == USB_RTYPE_TYPE_CLASS) {
-        switch (usbp->setup[1]) {
-            case CDC_GET_LINE_CODING:
-                usbSetupTransfer(usbp, (uint8_t *)&linecoding, sizeof(linecoding), NULL);
-                return true;
-            case CDC_SET_LINE_CODING:
-                usbSetupTransfer(usbp, (uint8_t *)&linecoding, sizeof(linecoding), NULL);
-                return true;
-            case CDC_SET_CONTROL_LINE_STATE:
-                /* Nothing to do, there are no control lines.*/
-                usbSetupTransfer(usbp, NULL, 0, NULL);
-                return true;
-            default:
-                return false;
-        }
-    }
-    return false;
-}
-
-/**
- * @brief   SOF handler.
- * @details The SOF interrupt is used for automatic flushing of incomplete
- *          buffers pending in the output queue.
- *
- * @param[in] qmkusbp      pointer to a @p QMKUSBDriver object
- *
- * @iclass
- */
-void qmkusbSOFHookI(QMKUSBDriver *qmkusbp) {
-    /* If the USB driver is not in the appropriate state then transactions
-       must not be started.*/
-    if ((usbGetDriverStateI(qmkusbp->config->usbp) != USB_ACTIVE) || (qmkusbp->state != QMKUSB_READY)) {
-        return;
-    }
-
-    /* If there is already a transaction ongoing then another one cannot be
-       started.*/
-    if (usbGetTransmitStatusI(qmkusbp->config->usbp, qmkusbp->config->bulk_in)) {
-        return;
-    }
-
-    /* Checking if there only a buffer partially filled, if so then it is
-       enforced in the queue and transmitted.*/
-    if (obqTryFlushI(&qmkusbp->obqueue)) {
-        size_t   n;
-        uint8_t *buf = obqGetFullBufferI(&qmkusbp->obqueue, &n);
-
-        /* For fixed size drivers, fill the end with zeros */
-        if (qmkusbp->config->fixed_size) {
-            memset(buf + n, 0, qmkusbp->config->in_size - n);
-            n = qmkusbp->config->in_size;
-        }
-
-        osalDbgAssert(buf != NULL, "queue is empty");
-
-        usbStartTransmitI(qmkusbp->config->usbp, qmkusbp->config->bulk_in, buf, n);
+    if (endpoint->report_storage != NULL) {
+        endpoint->report_storage->reset_report(endpoint->report_storage->reports);
     }
 }
 
-/**
- * @brief   Default data transmitted callback.
- * @details The application must use this function as callback for the IN
- *          data endpoint.
- *
- * @param[in] usbp      pointer to the @p USBDriver object
- * @param[in] ep        IN endpoint number
- */
-void qmkusbDataTransmitted(USBDriver *usbp, usbep_t ep) {
-    uint8_t *     buf;
-    size_t        n;
-    QMKUSBDriver *qmkusbp = usbp->in_params[ep - 1U];
+void usb_endpoint_out_suspend_cb(usb_endpoint_out_t *endpoint) {
+    bqSuspendI(&endpoint->ibqueue);
+    ibqResetI(&endpoint->ibqueue);
+}
 
-    if (qmkusbp == NULL) {
+void usb_endpoint_in_wakeup_cb(usb_endpoint_in_t *endpoint) {
+    bqResumeX(&endpoint->obqueue);
+}
+
+void usb_endpoint_out_wakeup_cb(usb_endpoint_out_t *endpoint) {
+    bqResumeX(&endpoint->ibqueue);
+}
+
+void usb_endpoint_in_configure_cb(usb_endpoint_in_t *endpoint) {
+    usbInitEndpointI(endpoint->config.usbp, endpoint->config.ep, &endpoint->ep_config);
+    obqResetI(&endpoint->obqueue);
+    bqResumeX(&endpoint->obqueue);
+}
+
+void usb_endpoint_out_configure_cb(usb_endpoint_out_t *endpoint) {
+    /* The current assumption is that there are no standalone OUT endpoints,
+     * therefore if we share an endpoint with an IN endpoint, it is already
+     * initialized. */
+#if !defined(USB_ENDPOINTS_ARE_REORDERABLE)
+    usbInitEndpointI(endpoint->config.usbp, endpoint->config.ep, &endpoint->ep_config);
+#endif
+    ibqResetI(&endpoint->ibqueue);
+    bqResumeX(&endpoint->ibqueue);
+    (void)usb_start_receive(endpoint);
+}
+
+void usb_endpoint_in_tx_complete_cb(USBDriver *usbp, usbep_t ep) {
+    usb_endpoint_in_t *endpoint = usbp->in_params[ep - 1U];
+    size_t             n;
+    uint8_t *          buffer;
+
+    if (endpoint == NULL) {
         return;
     }
 
     osalSysLockFromISR();
 
-    /* Signaling that space is available in the output queue.*/
-    chnAddFlagsI(qmkusbp, CHN_OUTPUT_EMPTY);
+    /* Sending succeded, so we can reset the timed out state. */
+    endpoint->timed_out = false;
 
     /* Freeing the buffer just transmitted, if it was not a zero size packet.*/
-    if (usbp->epc[ep]->in_state->txsize > 0U) {
-        obqReleaseEmptyBufferI(&qmkusbp->obqueue);
+    if (!obqIsEmptyI(&endpoint->obqueue) && usbp->epc[ep]->in_state->txsize > 0U) {
+        /* Store the last send report in the endpoint to be retrieved by a
+         * GET_REPORT request or IDLE report handling. */
+        if (endpoint->report_storage != NULL) {
+            buffer = obqGetFullBufferI(&endpoint->obqueue, &n);
+            endpoint->report_storage->set_report(endpoint->report_storage->reports, buffer, n);
+        }
+        obqReleaseEmptyBufferI(&endpoint->obqueue);
     }
 
     /* Checking if there is a buffer ready for transmission.*/
-    buf = obqGetFullBufferI(&qmkusbp->obqueue, &n);
+    buffer = obqGetFullBufferI(&endpoint->obqueue, &n);
 
-    if (buf != NULL) {
+    if (buffer != NULL) {
         /* The endpoint cannot be busy, we are in the context of the callback,
            so it is safe to transmit without a check.*/
-        usbStartTransmitI(usbp, ep, buf, n);
-    } else if ((usbp->epc[ep]->in_state->txsize > 0U) && ((usbp->epc[ep]->in_state->txsize & ((size_t)usbp->epc[ep]->in_maxsize - 1U)) == 0U)) {
+        usbStartTransmitI(usbp, ep, buffer, n);
+    } else if ((usbp->epc[ep]->ep_mode == USB_EP_MODE_TYPE_BULK) && (usbp->epc[ep]->in_state->txsize > 0U) && ((usbp->epc[ep]->in_state->txsize & ((size_t)usbp->epc[ep]->in_maxsize - 1U)) == 0U)) {
         /* Transmit zero sized packet in case the last one has maximum allowed
-           size. Otherwise the recipient may expect more data coming soon and
-           not return buffered data to app. See section 5.8.3 Bulk Transfer
-           Packet Size Constraints of the USB Specification document.*/
-        if (!qmkusbp->config->fixed_size) {
-            usbStartTransmitI(usbp, ep, usbp->setup, 0);
-        }
-
+         * size. Otherwise the recipient may expect more data coming soon and
+         * not return buffered data to app. See section 5.8.3 Bulk Transfer
+         * Packet Size Constraints of the USB Specification document. */
+        usbStartTransmitI(usbp, ep, usbp->setup, 0);
     } else {
         /* Nothing to transmit.*/
     }
@@ -419,47 +228,114 @@ void qmkusbDataTransmitted(USBDriver *usbp, usbep_t ep) {
     osalSysUnlockFromISR();
 }
 
-/**
- * @brief   Default data received callback.
- * @details The application must use this function as callback for the OUT
- *          data endpoint.
- *
- * @param[in] usbp      pointer to the @p USBDriver object
- * @param[in] ep        OUT endpoint number
- */
-void qmkusbDataReceived(USBDriver *usbp, usbep_t ep) {
-    QMKUSBDriver *qmkusbp = usbp->out_params[ep - 1U];
-    if (qmkusbp == NULL) {
+void usb_endpoint_out_rx_complete_cb(USBDriver *usbp, usbep_t ep) {
+    usb_endpoint_out_t *endpoint = usbp->out_params[ep - 1U];
+    if (endpoint == NULL) {
         return;
     }
 
     osalSysLockFromISR();
 
-    /* Signaling that data is available in the input queue.*/
-    chnAddFlagsI(qmkusbp, CHN_INPUT_AVAILABLE);
+    size_t size = usbGetReceiveTransactionSizeX(usbp, ep);
+    if (size > 0) {
+        /* Posting the filled buffer in the queue.*/
+        ibqPostFullBufferI(&endpoint->ibqueue, usbGetReceiveTransactionSizeX(endpoint->config.usbp, endpoint->config.ep));
+    }
 
-    /* Posting the filled buffer in the queue.*/
-    ibqPostFullBufferI(&qmkusbp->ibqueue, usbGetReceiveTransactionSizeX(qmkusbp->config->usbp, qmkusbp->config->bulk_out));
-
-    /* The endpoint cannot be busy, we are in the context of the callback,
-       so a packet is in the buffer for sure. Trying to get a free buffer
-       for the next transaction.*/
-    (void)qmkusb_start_receive(qmkusbp);
+    /* The endpoint cannot be busy, we are in the context of the callback, so a
+     * packet is in the buffer for sure. Trying to get a free buffer for the
+     * next transaction.*/
+    usb_start_receive(endpoint);
 
     osalSysUnlockFromISR();
 }
 
-/**
- * @brief   Default data received callback.
- * @details The application must use this function as callback for the IN
- *          interrupt endpoint.
- *
- * @param[in] usbp      pointer to the @p USBDriver object
- * @param[in] ep        endpoint number
- */
-void qmkusbInterruptTransmitted(USBDriver *usbp, usbep_t ep) {
-    (void)usbp;
-    (void)ep;
+bool usb_endpoint_in_send(usb_endpoint_in_t *endpoint, const uint8_t *data, size_t size, sysinterval_t timeout, bool buffered) {
+    osalDbgCheck((endpoint != NULL) && (data != NULL) && (size > 0U) && (size <= endpoint->config.buffer_size));
+
+    osalSysLock();
+    if (usbGetDriverStateI(endpoint->config.usbp) != USB_ACTIVE) {
+        osalSysUnlock();
+        return false;
+    }
+
+    /* Short circuit the waiting if this endpoint timed out before, e.g. if
+     * nobody is listening on this endpoint (is disconnected) such as
+     * `hid_listen`/`qmk console` or we are in an environment with a very
+     * restricted USB stack. The reason is to not introduce micro lock-ups if
+     * the report is send periodically. */
+    if (endpoint->timed_out && timeout != TIME_INFINITE) {
+        timeout = TIME_IMMEDIATE;
+    }
+    osalSysUnlock();
+
+    while (true) {
+        size_t sent = obqWriteTimeout(&endpoint->obqueue, data, size, timeout);
+
+        if (sent < size) {
+            osalSysLock();
+            endpoint->timed_out |= sent == 0;
+            bqSuspendI(&endpoint->obqueue);
+            obqResetI(&endpoint->obqueue);
+            bqResumeX(&endpoint->obqueue);
+            osalOsRescheduleS();
+            osalSysUnlock();
+            continue;
+        }
+
+        if (!buffered) {
+            obqFlush(&endpoint->obqueue);
+        }
+
+        return true;
+    }
 }
 
-/** @} */
+void usb_endpoint_in_flush(usb_endpoint_in_t *endpoint, bool padded) {
+    osalDbgCheck(endpoint != NULL);
+
+    output_buffers_queue_t *obqp = &endpoint->obqueue;
+
+    if (padded && obqp->ptr != NULL) {
+        ptrdiff_t bytes_left = (size_t)obqp->top - (size_t)obqp->ptr;
+        while (bytes_left > 0) {
+            // Putting bytes into a buffer that has space left should never
+            // fail and be instant, therefore we don't check the return value
+            // for errors here.
+            obqPutTimeout(obqp, 0, TIME_IMMEDIATE);
+            bytes_left--;
+        }
+    }
+
+    obqFlush(obqp);
+}
+
+bool usb_endpoint_in_is_inactive(usb_endpoint_in_t *endpoint) {
+    osalDbgCheck(endpoint != NULL);
+
+    osalSysLock();
+    bool inactive = obqIsEmptyI(&endpoint->obqueue) && !usbGetTransmitStatusI(endpoint->config.usbp, endpoint->config.ep);
+    osalSysUnlock();
+
+    return inactive;
+}
+
+bool usb_endpoint_out_receive(usb_endpoint_out_t *endpoint, uint8_t *data, size_t size, sysinterval_t timeout) {
+    osalDbgCheck((endpoint != NULL) && (data != NULL) && (size > 0U));
+
+    osalSysLock();
+    if (usbGetDriverStateI(endpoint->config.usbp) != USB_ACTIVE) {
+        osalSysUnlock();
+        return false;
+    }
+
+    if (endpoint->timed_out && timeout != TIME_INFINITE) {
+        timeout = TIME_IMMEDIATE;
+    }
+    osalSysUnlock();
+
+    const size_t received = ibqReadTimeout(&endpoint->ibqueue, data, size, timeout);
+    endpoint->timed_out   = received == 0;
+
+    return received == size;
+}
diff --git a/tmk_core/protocol/chibios/usb_driver.h b/tmk_core/protocol/chibios/usb_driver.h
index f94387debdc..26787e1eba0 100644
--- a/tmk_core/protocol/chibios/usb_driver.h
+++ b/tmk_core/protocol/chibios/usb_driver.h
@@ -1,177 +1,209 @@
-/*
-    ChibiOS - Copyright (C) 2006..2016 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.
-*/
-
-/**
- * @file    usb_driver.h
- * @brief   Usb driver suitable for both packet and serial formats
- *
- * @addtogroup SERIAL_USB
- * @{
- */
+// Copyright 2023 Stefan Kerkmann (@KarlK90)
+// Copyright 2020 Ryan (@fauxpark)
+// Copyright 2016 Fredizzimo
+// Copyright 2016 Giovanni Di Sirio
+// SPDX-License-Identifier: GPL-3.0-or-later OR Apache-2.0
 
 #pragma once
 
-#include <hal_usb_cdc.h>
-
-/*===========================================================================*/
-/* Driver constants.                                                         */
-/*===========================================================================*/
-
-/*===========================================================================*/
-/* Derived constants and error checks.                                       */
-/*===========================================================================*/
+#include <hal_buffers.h>
+#include "usb_descriptor.h"
+#include "chibios_config.h"
+#include "usb_report_handling.h"
+#include "string.h"
+#include "timer.h"
 
 #if HAL_USE_USB == FALSE
 #    error "The USB Driver requires HAL_USE_USB"
 #endif
 
-/*===========================================================================*/
-/* Driver data structures and types.                                         */
-/*===========================================================================*/
+/* USB Low Level driver specific endpoint fields */
+#if !defined(usb_lld_endpoint_fields)
+#    define usb_lld_endpoint_fields   \
+        2,        /* IN multiplier */ \
+            NULL, /* SETUP buffer (not a SETUP endpoint) */
+#endif
 
-/**
- * @brief Driver state machine possible states.
+/*
+ * Implementation notes:
+ *
+ * USBEndpointConfig - Configured using explicit order instead of struct member name.
+ *   This is due to ChibiOS hal LLD differences, which is dependent on hardware,
+ *   "USBv1" devices have `ep_buffers` and "OTGv1" have `in_multiplier`.
+ *   Given `USBv1/hal_usb_lld.h` marks the field as "not currently used" this code file
+ *   makes the assumption this is safe to avoid littering with preprocessor directives.
  */
-typedef enum {
-    QMKUSB_UNINIT = 0, /**< Not initialized.                   */
-    QMKUSB_STOP   = 1, /**< Stopped.                           */
-    QMKUSB_READY  = 2  /**< Ready.                             */
-} qmkusbstate_t;
+#define QMK_USB_ENDPOINT_IN(mode, ep_size, ep_num, _buffer_capacity, _usb_requests_cb, _report_storage) \
+    {                                                                                                   \
+        .usb_requests_cb = _usb_requests_cb, .report_storage = _report_storage,                         \
+        .ep_config =                                                                                    \
+            {                                                                                           \
+                mode,                           /* EP Mode */                                           \
+                NULL,                           /* SETUP packet notification callback */                \
+                usb_endpoint_in_tx_complete_cb, /* IN notification callback */                          \
+                NULL,                           /* OUT notification callback */                         \
+                ep_size,                        /* IN maximum packet size */                            \
+                0,                              /* OUT maximum packet size */                           \
+                NULL,                           /* IN Endpoint state */                                 \
+                NULL,                           /* OUT endpoint state */                                \
+                usb_lld_endpoint_fields         /* USB driver specific endpoint fields */               \
+            },                                                                                          \
+        .config = {                                                                                     \
+            .usbp            = &USB_DRIVER,                                                             \
+            .ep              = ep_num,                                                                  \
+            .buffer_capacity = _buffer_capacity,                                                        \
+            .buffer_size     = ep_size,                                                                 \
+            .buffer          = (_Alignas(4) uint8_t[BQ_BUFFER_SIZE(_buffer_capacity, ep_size)]){0},     \
+        }                                                                                               \
+    }
 
-/**
- * @brief   Structure representing a serial over USB driver.
- */
-typedef struct QMKUSBDriver QMKUSBDriver;
+#if !defined(USB_ENDPOINTS_ARE_REORDERABLE)
+
+#    define QMK_USB_ENDPOINT_OUT(mode, ep_size, ep_num, _buffer_capacity)                              \
+        {                                                                                              \
+            .ep_config =                                                                               \
+                {                                                                                      \
+                    mode,                            /* EP Mode */                                     \
+                    NULL,                            /* SETUP packet notification callback */          \
+                    NULL,                            /* IN notification callback */                    \
+                    usb_endpoint_out_rx_complete_cb, /* OUT notification callback */                   \
+                    0,                               /* IN maximum packet size */                      \
+                    ep_size,                         /* OUT maximum packet size */                     \
+                    NULL,                            /* IN Endpoint state */                           \
+                    NULL,                            /* OUT endpoint state */                          \
+                    usb_lld_endpoint_fields          /* USB driver specific endpoint fields */         \
+                },                                                                                     \
+            .config = {                                                                                \
+                .usbp            = &USB_DRIVER,                                                        \
+                .ep              = ep_num,                                                             \
+                .buffer_capacity = _buffer_capacity,                                                   \
+                .buffer_size     = ep_size,                                                            \
+                .buffer          = (_Alignas(4) uint8_t[BQ_BUFFER_SIZE(_buffer_capacity, ep_size)]){0} \
+            }                                                                                          \
+        }
+
+#else
+
+#    define QMK_USB_ENDPOINT_IN_SHARED(mode, ep_size, ep_num, _buffer_capacity, _usb_requests_cb, _report_storage) \
+        {                                                                                                          \
+            .usb_requests_cb = _usb_requests_cb, .is_shared = true, .report_storage = _report_storage,             \
+            .ep_config =                                                                                           \
+                {                                                                                                  \
+                    mode,                            /* EP Mode */                                                 \
+                    NULL,                            /* SETUP packet notification callback */                      \
+                    usb_endpoint_in_tx_complete_cb,  /* IN notification callback */                                \
+                    usb_endpoint_out_rx_complete_cb, /* OUT notification callback */                               \
+                    ep_size,                         /* IN maximum packet size */                                  \
+                    ep_size,                         /* OUT maximum packet size */                                 \
+                    NULL,                            /* IN Endpoint state */                                       \
+                    NULL,                            /* OUT endpoint state */                                      \
+                    usb_lld_endpoint_fields          /* USB driver specific endpoint fields */                     \
+                },                                                                                                 \
+            .config = {                                                                                            \
+                .usbp            = &USB_DRIVER,                                                                    \
+                .ep              = ep_num,                                                                         \
+                .buffer_capacity = _buffer_capacity,                                                               \
+                .buffer_size     = ep_size,                                                                        \
+                .buffer          = (_Alignas(4) uint8_t[BQ_BUFFER_SIZE(_buffer_capacity, ep_size)]){0},            \
+            }                                                                                                      \
+        }
+
+/* The current assumption is that there are no standalone OUT endpoints, so the
+ * OUT endpoint is always initialized by the IN endpoint. */
+#    define QMK_USB_ENDPOINT_OUT(mode, ep_size, ep_num, _buffer_capacity)                              \
+        {                                                                                              \
+            .ep_config =                                                                               \
+                {                                                                                      \
+                    0 /* Already defined in the IN endpoint */                                         \
+                },                                                                                     \
+            .config = {                                                                                \
+                .usbp            = &USB_DRIVER,                                                        \
+                .ep              = ep_num,                                                             \
+                .buffer_capacity = _buffer_capacity,                                                   \
+                .buffer_size     = ep_size,                                                            \
+                .buffer          = (_Alignas(4) uint8_t[BQ_BUFFER_SIZE(_buffer_capacity, ep_size)]){0} \
+            }                                                                                          \
+        }
+
+#endif
 
-/**
- * @brief   Serial over USB Driver configuration structure.
- * @details An instance of this structure must be passed to @p sduStart()
- *          in order to configure and start the driver operations.
- */
 typedef struct {
     /**
      * @brief   USB driver to use.
      */
     USBDriver *usbp;
-    /**
-     * @brief   Bulk IN endpoint used for outgoing data transfer.
-     */
-    usbep_t bulk_in;
-    /**
-     * @brief   Bulk OUT endpoint used for incoming data transfer.
-     */
-    usbep_t bulk_out;
-    /**
-     * @brief   Interrupt IN endpoint used for notifications.
-     * @note    If set to zero then the INT endpoint is assumed to be not
-     *          present, USB descriptors must be changed accordingly.
-     */
-    usbep_t int_in;
 
     /**
-     * @brief The number of buffers in the queues
+     * @brief   Endpoint used for data transfer
      */
-    size_t in_buffers;
-    size_t out_buffers;
+    usbep_t ep;
 
     /**
-     * @brief The size of each buffer in the queue, typically the same as the endpoint size
+     * @brief The number of buffers in the queue
      */
-    size_t in_size;
-    size_t out_size;
+    size_t buffer_capacity;
 
     /**
-     * @brief Always send full buffers in_size (the rest is filled with zeroes)
+     * @brief The size of each buffer in the queue, same as the endpoint size
      */
-    bool fixed_size;
+    size_t buffer_size;
 
-    /* Input buffer
-     * @note needs to be initialized with a memory buffer of the right size
+    /**
+     * @brief Buffer backing storage
      */
-    uint8_t *ib;
-    /* Output buffer
-     * @note needs to be initialized with a memory buffer of the right size
-     */
-    uint8_t *ob;
-} QMKUSBConfig;
+    uint8_t *buffer;
+} usb_endpoint_config_t;
 
-/**
- * @brief   @p SerialDriver specific data.
- */
-#define _qmk_usb_driver_data                           \
-    _base_asynchronous_channel_data /* Driver state.*/ \
-        qmkusbstate_t state;                           \
-    /* Input buffers queue.*/                          \
-    input_buffers_queue_t ibqueue;                     \
-    /* Output queue.*/                                 \
-    output_buffers_queue_t obqueue;                    \
-    /* End of the mandatory fields.*/                  \
-    /* Current configuration data.*/                   \
-    const QMKUSBConfig *config;
+typedef struct {
+    output_buffers_queue_t obqueue;
+    USBEndpointConfig      ep_config;
+    USBInEndpointState     ep_in_state;
+#if defined(USB_ENDPOINTS_ARE_REORDERABLE)
+    USBOutEndpointState ep_out_state;
+    bool                is_shared;
+#endif
+    usb_endpoint_config_t config;
+    usbreqhandler_t       usb_requests_cb;
+    bool                  timed_out;
+    usb_report_storage_t *report_storage;
+} usb_endpoint_in_t;
 
-/**
- * @brief   @p SerialUSBDriver specific methods.
- */
-#define _qmk_usb_driver_methods _base_asynchronous_channel_methods
-
-/**
- * @extends BaseAsynchronousChannelVMT
- *
- * @brief   @p SerialDriver virtual methods table.
- */
-struct QMKUSBDriverVMT {
-    _qmk_usb_driver_methods
-};
-
-/**
- * @extends BaseAsynchronousChannel
- *
- * @brief   Full duplex serial driver class.
- * @details This class extends @p BaseAsynchronousChannel by adding physical
- *          I/O queues.
- */
-struct QMKUSBDriver {
-    /** @brief Virtual Methods Table.*/
-    const struct QMKUSBDriverVMT *vmt;
-    _qmk_usb_driver_data
-};
-
-/*===========================================================================*/
-/* Driver macros.                                                            */
-/*===========================================================================*/
-
-/*===========================================================================*/
-/* External declarations.                                                    */
-/*===========================================================================*/
+typedef struct {
+    input_buffers_queue_t ibqueue;
+    USBEndpointConfig     ep_config;
+    USBOutEndpointState   ep_out_state;
+    usb_endpoint_config_t config;
+    bool                  timed_out;
+} usb_endpoint_out_t;
 
 #ifdef __cplusplus
 extern "C" {
 #endif
-void qmkusbInit(void);
-void qmkusbObjectInit(QMKUSBDriver *qmkusbp, const QMKUSBConfig *config);
-void qmkusbStart(QMKUSBDriver *qmkusbp, const QMKUSBConfig *config);
-void qmkusbStop(QMKUSBDriver *qmkusbp);
-void qmkusbSuspendHookI(QMKUSBDriver *qmkusbp);
-void qmkusbWakeupHookI(QMKUSBDriver *qmkusbp);
-void qmkusbConfigureHookI(QMKUSBDriver *qmkusbp);
-bool qmkusbRequestsHook(USBDriver *usbp);
-void qmkusbSOFHookI(QMKUSBDriver *qmkusbp);
-void qmkusbDataTransmitted(USBDriver *usbp, usbep_t ep);
-void qmkusbDataReceived(USBDriver *usbp, usbep_t ep);
-void qmkusbInterruptTransmitted(USBDriver *usbp, usbep_t ep);
+
+void usb_endpoint_in_init(usb_endpoint_in_t *endpoint);
+void usb_endpoint_in_start(usb_endpoint_in_t *endpoint);
+void usb_endpoint_in_stop(usb_endpoint_in_t *endpoint);
+
+bool usb_endpoint_in_send(usb_endpoint_in_t *endpoint, const uint8_t *data, size_t size, sysinterval_t timeout, bool buffered);
+void usb_endpoint_in_flush(usb_endpoint_in_t *endpoint, bool padded);
+bool usb_endpoint_in_is_inactive(usb_endpoint_in_t *endpoint);
+
+void usb_endpoint_in_suspend_cb(usb_endpoint_in_t *endpoint);
+void usb_endpoint_in_wakeup_cb(usb_endpoint_in_t *endpoint);
+void usb_endpoint_in_configure_cb(usb_endpoint_in_t *endpoint);
+void usb_endpoint_in_tx_complete_cb(USBDriver *usbp, usbep_t ep);
+
+void usb_endpoint_out_init(usb_endpoint_out_t *endpoint);
+void usb_endpoint_out_start(usb_endpoint_out_t *endpoint);
+void usb_endpoint_out_stop(usb_endpoint_out_t *endpoint);
+
+bool usb_endpoint_out_receive(usb_endpoint_out_t *endpoint, uint8_t *data, size_t size, sysinterval_t timeout);
+
+void usb_endpoint_out_suspend_cb(usb_endpoint_out_t *endpoint);
+void usb_endpoint_out_wakeup_cb(usb_endpoint_out_t *endpoint);
+void usb_endpoint_out_configure_cb(usb_endpoint_out_t *endpoint);
+void usb_endpoint_out_rx_complete_cb(USBDriver *usbp, usbep_t ep);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/tmk_core/protocol/chibios/usb_endpoints.c b/tmk_core/protocol/chibios/usb_endpoints.c
new file mode 100644
index 00000000000..37ec3c722f6
--- /dev/null
+++ b/tmk_core/protocol/chibios/usb_endpoints.c
@@ -0,0 +1,152 @@
+// Copyright 2023 Stefan Kerkmann (@KarlK90)
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#include <ch.h>
+#include <hal.h>
+
+#include "usb_main.h"
+#include "usb_driver.h"
+#include "usb_endpoints.h"
+#include "report.h"
+
+usb_endpoint_in_t usb_endpoints_in[USB_ENDPOINT_IN_COUNT] = {
+// clang-format off
+#if defined(SHARED_EP_ENABLE)
+    [USB_ENDPOINT_IN_SHARED] = QMK_USB_ENDPOINT_IN(USB_EP_MODE_TYPE_INTR, SHARED_EPSIZE, SHARED_IN_EPNUM, SHARED_IN_CAPACITY, NULL,
+    QMK_USB_REPORT_STORAGE(
+        &usb_shared_get_report,
+        &usb_shared_set_report,
+        &usb_shared_reset_report,
+        &usb_shared_get_idle_rate,
+        &usb_shared_set_idle_rate,
+        &usb_shared_idle_timer_elapsed,
+        (REPORT_ID_COUNT + 1),
+#if defined(KEYBOARD_SHARED_EP)
+        QMK_USB_REPORT_STROAGE_ENTRY(REPORT_ID_KEYBOARD, sizeof(report_keyboard_t)),
+#endif
+#if defined(MOUSE_SHARED_EP)
+        QMK_USB_REPORT_STROAGE_ENTRY(REPORT_ID_MOUSE, sizeof(report_mouse_t)),
+#endif
+#if defined(EXTRAKEY_ENABLE)
+        QMK_USB_REPORT_STROAGE_ENTRY(REPORT_ID_SYSTEM, sizeof(report_extra_t)),
+        QMK_USB_REPORT_STROAGE_ENTRY(REPORT_ID_CONSUMER, sizeof(report_extra_t)),
+#endif
+#if defined(PROGRAMMABLE_BUTTON_ENABLE)
+        QMK_USB_REPORT_STROAGE_ENTRY(REPORT_ID_PROGRAMMABLE_BUTTON, sizeof(report_programmable_button_t)),
+#endif
+#if defined(NKRO_ENABLE)
+        QMK_USB_REPORT_STROAGE_ENTRY(REPORT_ID_NKRO, sizeof(report_nkro_t)),
+#endif
+#if defined(JOYSTICK_SHARED_EP)
+        QMK_USB_REPORT_STROAGE_ENTRY(REPORT_ID_JOYSTICK, sizeof(report_joystick_t)),
+#endif
+#if defined(DIGITIZER_SHARED_EP)
+        QMK_USB_REPORT_STROAGE_ENTRY(REPORT_ID_DIGITIZER, sizeof(report_digitizer_t)),
+#endif
+        )
+    ),
+#endif
+// clang-format on
+
+#if !defined(KEYBOARD_SHARED_EP)
+    [USB_ENDPOINT_IN_KEYBOARD] = QMK_USB_ENDPOINT_IN(USB_EP_MODE_TYPE_INTR, KEYBOARD_EPSIZE, KEYBOARD_IN_EPNUM, KEYBOARD_IN_CAPACITY, NULL, QMK_USB_REPORT_STORAGE_DEFAULT(sizeof(report_keyboard_t))),
+#endif
+
+#if defined(MOUSE_ENABLE) && !defined(MOUSE_SHARED_EP)
+    [USB_ENDPOINT_IN_MOUSE] = QMK_USB_ENDPOINT_IN(USB_EP_MODE_TYPE_INTR, MOUSE_EPSIZE, MOUSE_IN_EPNUM, MOUSE_IN_CAPACITY, NULL, QMK_USB_REPORT_STORAGE_DEFAULT(sizeof(report_mouse_t))),
+#endif
+
+#if defined(JOYSTICK_ENABLE) && !defined(JOYSTICK_SHARED_EP)
+    [USB_ENDPOINT_IN_JOYSTICK] = QMK_USB_ENDPOINT_IN(USB_EP_MODE_TYPE_INTR, JOYSTICK_EPSIZE, JOYSTICK_IN_EPNUM, JOYSTICK_IN_CAPACITY, QMK_USB_REPORT_STORAGE_DEFAULT(sizeof(report_joystick_t))),
+#endif
+
+#if defined(DIGITIZER_ENABLE) && !defined(DIGITIZER_SHARED_EP)
+    [USB_ENDPOINT_IN_JOYSTICK] = QMK_USB_ENDPOINT_IN(USB_EP_MODE_TYPE_INTR, DIGITIZER_EPSIZE, DIGITIZER_IN_EPNUM, DIGITIZER_IN_CAPACITY, QMK_USB_REPORT_STORAGE_DEFAULT(sizeof(report_digitizer_t))),
+#endif
+
+#if defined(CONSOLE_ENABLE)
+#    if defined(USB_ENDPOINTS_ARE_REORDERABLE)
+    [USB_ENDPOINT_IN_CONSOLE] = QMK_USB_ENDPOINT_IN_SHARED(USB_EP_MODE_TYPE_INTR, CONSOLE_EPSIZE, CONSOLE_IN_EPNUM, CONSOLE_IN_CAPACITY, NULL, QMK_USB_REPORT_STORAGE_DEFAULT(CONSOLE_EPSIZE)),
+#    else
+    [USB_ENDPOINT_IN_CONSOLE]  = QMK_USB_ENDPOINT_IN(USB_EP_MODE_TYPE_INTR, CONSOLE_EPSIZE, CONSOLE_IN_EPNUM, CONSOLE_IN_CAPACITY, NULL, QMK_USB_REPORT_STORAGE_DEFAULT(CONSOLE_EPSIZE)),
+#    endif
+#endif
+
+#if defined(RAW_ENABLE)
+#    if defined(USB_ENDPOINTS_ARE_REORDERABLE)
+    [USB_ENDPOINT_IN_RAW] = QMK_USB_ENDPOINT_IN_SHARED(USB_EP_MODE_TYPE_INTR, RAW_EPSIZE, RAW_IN_EPNUM, RAW_IN_CAPACITY, NULL, QMK_USB_REPORT_STORAGE_DEFAULT(RAW_EPSIZE)),
+#    else
+    [USB_ENDPOINT_IN_RAW]      = QMK_USB_ENDPOINT_IN(USB_EP_MODE_TYPE_INTR, RAW_EPSIZE, RAW_IN_EPNUM, RAW_IN_CAPACITY, NULL, QMK_USB_REPORT_STORAGE_DEFAULT(RAW_EPSIZE)),
+#    endif
+#endif
+
+#if defined(MIDI_ENABLE)
+#    if defined(USB_ENDPOINTS_ARE_REORDERABLE)
+    [USB_ENDPOINT_IN_MIDI] = QMK_USB_ENDPOINT_IN_SHARED(USB_EP_MODE_TYPE_BULK, MIDI_STREAM_EPSIZE, MIDI_STREAM_IN_EPNUM, MIDI_STREAM_IN_CAPACITY, NULL, NULL),
+#    else
+    [USB_ENDPOINT_IN_MIDI]     = QMK_USB_ENDPOINT_IN(USB_EP_MODE_TYPE_BULK, MIDI_STREAM_EPSIZE, MIDI_STREAM_IN_EPNUM, MIDI_STREAM_IN_CAPACITY, NULL, NULL),
+#    endif
+#endif
+
+#if defined(VIRTSER_ENABLE)
+#    if defined(USB_ENDPOINTS_ARE_REORDERABLE)
+    [USB_ENDPOINT_IN_CDC_DATA] = QMK_USB_ENDPOINT_IN_SHARED(USB_EP_MODE_TYPE_BULK, CDC_EPSIZE, CDC_IN_EPNUM, CDC_IN_CAPACITY, virtser_usb_request_cb, NULL),
+#    else
+    [USB_ENDPOINT_IN_CDC_DATA] = QMK_USB_ENDPOINT_IN(USB_EP_MODE_TYPE_BULK, CDC_EPSIZE, CDC_IN_EPNUM, CDC_IN_CAPACITY, virtser_usb_request_cb, NULL),
+#    endif
+    [USB_ENDPOINT_IN_CDC_SIGNALING] = QMK_USB_ENDPOINT_IN(USB_EP_MODE_TYPE_INTR, CDC_NOTIFICATION_EPSIZE, CDC_NOTIFICATION_EPNUM, CDC_SIGNALING_DUMMY_CAPACITY, NULL, NULL),
+#endif
+};
+
+usb_endpoint_in_lut_t usb_endpoint_interface_lut[TOTAL_INTERFACES] = {
+#if !defined(KEYBOARD_SHARED_EP)
+    [KEYBOARD_INTERFACE] = USB_ENDPOINT_IN_KEYBOARD,
+#endif
+
+#if defined(RAW_ENABLE)
+    [RAW_INTERFACE] = USB_ENDPOINT_IN_RAW,
+#endif
+
+#if defined(MOUSE_ENABLE) && !defined(MOUSE_SHARED_EP)
+    [MOUSE_INTERFACE] = USB_ENDPOINT_IN_MOUSE,
+#endif
+
+#if defined(SHARED_EP_ENABLE)
+    [SHARED_INTERFACE] = USB_ENDPOINT_IN_SHARED,
+#endif
+
+#if defined(CONSOLE_ENABLE)
+    [CONSOLE_INTERFACE] = USB_ENDPOINT_IN_CONSOLE,
+#endif
+
+#if defined(MIDI_ENABLE)
+    [AS_INTERFACE] = USB_ENDPOINT_IN_MIDI,
+#endif
+
+#if defined(VIRTSER_ENABLE)
+    [CCI_INTERFACE] = USB_ENDPOINT_IN_CDC_SIGNALING,
+    [CDI_INTERFACE] = USB_ENDPOINT_IN_CDC_DATA,
+#endif
+
+#if defined(JOYSTICK_ENABLE) && !defined(JOYSTICK_SHARED_EP)
+    [JOYSTICK_INTERFACE] = USB_ENDPOINT_IN_JOYSTICK,
+#endif
+
+#if defined(DIGITIZER_ENABLE) && !defined(DIGITIZER_SHARED_EP)
+    [DIGITIZER_INTERFACE] = USB_ENDPOINT_IN_DIGITIZER,
+#endif
+};
+
+usb_endpoint_out_t usb_endpoints_out[USB_ENDPOINT_OUT_COUNT] = {
+#if defined(RAW_ENABLE)
+    [USB_ENDPOINT_OUT_RAW] = QMK_USB_ENDPOINT_OUT(USB_EP_MODE_TYPE_INTR, RAW_EPSIZE, RAW_OUT_EPNUM, RAW_OUT_CAPACITY),
+#endif
+
+#if defined(MIDI_ENABLE)
+    [USB_ENDPOINT_OUT_MIDI] = QMK_USB_ENDPOINT_OUT(USB_EP_MODE_TYPE_BULK, MIDI_STREAM_EPSIZE, MIDI_STREAM_OUT_EPNUM, MIDI_STREAM_OUT_CAPACITY),
+#endif
+
+#if defined(VIRTSER_ENABLE)
+    [USB_ENDPOINT_OUT_CDC_DATA] = QMK_USB_ENDPOINT_OUT(USB_EP_MODE_TYPE_BULK, CDC_EPSIZE, CDC_OUT_EPNUM, CDC_OUT_CAPACITY),
+#endif
+};
diff --git a/tmk_core/protocol/chibios/usb_endpoints.h b/tmk_core/protocol/chibios/usb_endpoints.h
new file mode 100644
index 00000000000..a4e5ed88fce
--- /dev/null
+++ b/tmk_core/protocol/chibios/usb_endpoints.h
@@ -0,0 +1,137 @@
+// Copyright 2023 Stefan Kerkmann (@KarlK90)
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#pragma once
+
+#include "usb_descriptor.h"
+
+#if !defined(USB_DEFAULT_BUFFER_CAPACITY)
+#    define USB_DEFAULT_BUFFER_CAPACITY 4
+#endif
+
+#if !defined(KEYBOARD_IN_CAPACITY)
+#    define KEYBOARD_IN_CAPACITY USB_DEFAULT_BUFFER_CAPACITY
+#endif
+#if !defined(SHARED_IN_CAPACITY)
+#    define SHARED_IN_CAPACITY USB_DEFAULT_BUFFER_CAPACITY
+#endif
+#if !defined(MOUSE_IN_CAPACITY)
+#    define MOUSE_IN_CAPACITY USB_DEFAULT_BUFFER_CAPACITY
+#endif
+
+#if !defined(JOYSTICK_IN_CAPACITY)
+#    define JOYSTICK_IN_CAPACITY USB_DEFAULT_BUFFER_CAPACITY
+#endif
+
+#if !defined(DIGITIZER_IN_CAPACITY)
+#    define DIGITIZER_IN_CAPACITY USB_DEFAULT_BUFFER_CAPACITY
+#endif
+
+#if !defined(CONSOLE_IN_CAPACITY)
+#    define CONSOLE_IN_CAPACITY USB_DEFAULT_BUFFER_CAPACITY
+#endif
+
+#if !defined(CONSOLE_OUT_CAPACITY)
+#    define CONSOLE_OUT_CAPACITY USB_DEFAULT_BUFFER_CAPACITY
+#endif
+
+#if !defined(RAW_IN_CAPACITY)
+#    define RAW_IN_CAPACITY USB_DEFAULT_BUFFER_CAPACITY
+#endif
+
+#if !defined(RAW_OUT_CAPACITY)
+#    define RAW_OUT_CAPACITY USB_DEFAULT_BUFFER_CAPACITY
+#endif
+
+#if !defined(MIDI_STREAM_IN_CAPACITY)
+#    define MIDI_STREAM_IN_CAPACITY USB_DEFAULT_BUFFER_CAPACITY
+#endif
+
+#if !defined(MIDI_STREAM_OUT_CAPACITY)
+#    define MIDI_STREAM_OUT_CAPACITY USB_DEFAULT_BUFFER_CAPACITY
+#endif
+
+#if !defined(CDC_IN_CAPACITY)
+#    define CDC_IN_CAPACITY USB_DEFAULT_BUFFER_CAPACITY
+#endif
+
+#if !defined(CDC_OUT_CAPACITY)
+#    define CDC_OUT_CAPACITY USB_DEFAULT_BUFFER_CAPACITY
+#endif
+
+#define CDC_SIGNALING_DUMMY_CAPACITY 1
+
+typedef enum {
+#if defined(SHARED_EP_ENABLE)
+    USB_ENDPOINT_IN_SHARED,
+#endif
+
+#if !defined(KEYBOARD_SHARED_EP)
+    USB_ENDPOINT_IN_KEYBOARD,
+#endif
+
+#if defined(MOUSE_ENABLE) && !defined(MOUSE_SHARED_EP)
+    USB_ENDPOINT_IN_MOUSE,
+#endif
+
+#if defined(JOYSTICK_ENABLE) && !defined(JOYSTICK_SHARED_EP)
+    USB_ENDPOINT_IN_JOYSTICK,
+#endif
+
+#if defined(DIGITIZER_ENABLE) && !defined(DIGITIZER_SHARED_EP)
+    USB_ENDPOINT_IN_DIGITIZER,
+#endif
+
+#if defined(CONSOLE_ENABLE)
+    USB_ENDPOINT_IN_CONSOLE,
+#endif
+
+#if defined(RAW_ENABLE)
+    USB_ENDPOINT_IN_RAW,
+#endif
+
+#if defined(MIDI_ENABLE)
+    USB_ENDPOINT_IN_MIDI,
+#endif
+
+#if defined(VIRTSER_ENABLE)
+    USB_ENDPOINT_IN_CDC_DATA,
+    USB_ENDPOINT_IN_CDC_SIGNALING,
+#endif
+    USB_ENDPOINT_IN_COUNT,
+/* All non shared endpoints have to be consequtive numbers starting from 0, so
+ * that they can be used as array indices. The shared endpoints all point to
+ * the same endpoint so they have to be defined last to not reset the enum
+ * counter. */
+#if defined(SHARED_EP_ENABLE)
+#    if defined(KEYBOARD_SHARED_EP)
+    USB_ENDPOINT_IN_KEYBOARD = USB_ENDPOINT_IN_SHARED,
+#    endif
+#    if defined(MOUSE_SHARED_EP)
+    USB_ENDPOINT_IN_MOUSE = USB_ENDPOINT_IN_SHARED,
+#    endif
+#    if defined(JOYSTICK_SHARED_EP)
+    USB_ENDPOINT_IN_JOYSTICK = USB_ENDPOINT_IN_SHARED,
+#    endif
+#    if defined(DIGITIZER_SHARED_EP)
+    USB_ENDPOINT_IN_DIGITIZER = USB_ENDPOINT_IN_SHARED,
+#    endif
+#endif
+} usb_endpoint_in_lut_t;
+
+#define IS_VALID_USB_ENDPOINT_IN_LUT(i) ((i) >= 0 && (i) < USB_ENDPOINT_IN_COUNT)
+
+usb_endpoint_in_lut_t usb_endpoint_interface_lut[TOTAL_INTERFACES];
+
+typedef enum {
+#if defined(RAW_ENABLE)
+    USB_ENDPOINT_OUT_RAW,
+#endif
+#if defined(MIDI_ENABLE)
+    USB_ENDPOINT_OUT_MIDI,
+#endif
+#if defined(VIRTSER_ENABLE)
+    USB_ENDPOINT_OUT_CDC_DATA,
+#endif
+    USB_ENDPOINT_OUT_COUNT,
+} usb_endpoint_out_lut_t;
diff --git a/tmk_core/protocol/chibios/usb_main.c b/tmk_core/protocol/chibios/usb_main.c
index 7b1e6412131..ced5fd4fc27 100644
--- a/tmk_core/protocol/chibios/usb_main.c
+++ b/tmk_core/protocol/chibios/usb_main.c
@@ -1,45 +1,32 @@
-/*
- * (c) 2015 flabberast <s3+flabbergast@sdfeu.org>
- *
- * Based on the following work:
- *  - Guillaume Duc's raw hid example (MIT License)
- *    https://github.com/guiduc/usb-hid-chibios-example
- *  - PJRC Teensy examples (MIT License)
- *    https://www.pjrc.com/teensy/usb_keyboard.html
- *  - hasu's TMK keyboard code (GPL v2 and some code Modified BSD)
- *    https://github.com/tmk/tmk_keyboard/
- *  - ChibiOS demo code (Apache 2.0 License)
- *    http://www.chibios.org
- *
- * Since some GPL'd code is used, this work is licensed under
- * GPL v2 or later.
- */
-
-/*
- * Implementation notes:
- *
- * USBEndpointConfig - Configured using explicit order instead of struct member name.
- *   This is due to ChibiOS hal LLD differences, which is dependent on hardware,
- *   "USBv1" devices have `ep_buffers` and "OTGv1" have `in_multiplier`.
- *   Given `USBv1/hal_usb_lld.h` marks the field as "not currently used" this code file
- *   makes the assumption this is safe to avoid littering with preprocessor directives.
- */
+// Copyright 2023 Stefan Kerkmann
+// Copyright 2020-2021 Ryan (@fauxpark)
+// Copyright 2020 Nick Brassel (@tzarc)
+// Copyright 2020 a-chol
+// Copyright 2020 xyzz
+// Copyright 2020 Joel Challis (@zvecr)
+// Copyright 2020 George (@goshdarnharris)
+// Copyright 2018 James Laird-Wah
+// Copyright 2018 Drashna Jaelre (@drashna)
+// Copyright 2016 Fredizzimo
+// Copyright 2016 Giovanni Di Sirio
+// SPDX-License-Identifier: GPL-3.0-or-later OR Apache-2.0
 
 #include <ch.h>
 #include <hal.h>
 #include <string.h>
 
 #include "usb_main.h"
+#include "usb_report_handling.h"
 
 #include "host.h"
-#include "chibios_config.h"
-#include "debug.h"
 #include "suspend.h"
+#include "timer.h"
 #ifdef SLEEP_LED_ENABLE
 #    include "sleep_led.h"
 #    include "led.h"
 #endif
 #include "wait.h"
+#include "usb_endpoints.h"
 #include "usb_device_state.h"
 #include "usb_descriptor.h"
 #include "usb_driver.h"
@@ -51,11 +38,6 @@
 extern keymap_config_t keymap_config;
 #endif
 
-#if defined(CONSOLE_ENABLE)
-#    define RBUF_SIZE 256
-#    include "ring_buffer.h"
-#endif
-
 /* ---------------------------------------------------------
  *       Global interface variables and declarations
  * ---------------------------------------------------------
@@ -69,33 +51,16 @@ extern keymap_config_t keymap_config;
 #    define usb_lld_disconnect_bus(usbp)
 #endif
 
-uint8_t                keyboard_idle __attribute__((aligned(2)))     = 0;
-uint8_t                keyboard_protocol __attribute__((aligned(2))) = 1;
-uint8_t                keyboard_led_state                            = 0;
-volatile uint16_t      keyboard_idle_count                           = 0;
-static virtual_timer_t keyboard_idle_timer;
+extern usb_endpoint_in_t  usb_endpoints_in[USB_ENDPOINT_IN_COUNT];
+extern usb_endpoint_out_t usb_endpoints_out[USB_ENDPOINT_OUT_COUNT];
 
-static void keyboard_idle_timer_cb(struct ch_virtual_timer *, void *arg);
+uint8_t _Alignas(2) keyboard_idle     = 0;
+uint8_t _Alignas(2) keyboard_protocol = 1;
+uint8_t keyboard_led_state            = 0;
 
-report_keyboard_t keyboard_report_sent = {0};
-report_mouse_t    mouse_report_sent    = {0};
-
-union {
-    uint8_t           report_id;
-    report_keyboard_t keyboard;
-#ifdef EXTRAKEY_ENABLE
-    report_extra_t extra;
-#endif
-#ifdef MOUSE_ENABLE
-    report_mouse_t mouse;
-#endif
-#ifdef DIGITIZER_ENABLE
-    report_digitizer_t digitizer;
-#endif
-#ifdef JOYSTICK_ENABLE
-    report_joystick_t joystick;
-#endif
-} universal_report_blank = {0};
+static bool __attribute__((__unused__)) send_report_buffered(usb_endpoint_in_lut_t endpoint, void *report, size_t size);
+static void __attribute__((__unused__)) flush_report_buffered(usb_endpoint_in_lut_t endpoint, bool padded);
+static bool __attribute__((__unused__)) receive_report(usb_endpoint_out_lut_t endpoint, void *report, size_t size);
 
 /* ---------------------------------------------------------
  *            Descriptors and USB driver objects
@@ -109,6 +74,11 @@ union {
             NULL, /* SETUP buffer (not a SETUP endpoint) */
 #endif
 
+/*
+ * Handles the GET_DESCRIPTOR callback
+ *
+ * Returns the proper descriptor
+ */
 static const USBDescriptor *usb_get_descriptor_cb(USBDriver *usbp, uint8_t dtype, uint8_t dindex, uint16_t wIndex) {
     usb_control_request_t *setup = (usb_control_request_t *)usbp->setup;
 
@@ -123,299 +93,6 @@ static const USBDescriptor *usb_get_descriptor_cb(USBDriver *usbp, uint8_t dtype
     return &descriptor;
 }
 
-/*
- * USB notification callback that does nothing.  Needed to work around bugs in
- * some USB LLDs that fail to resume the waiting thread when the notification
- * callback pointer is NULL.
- */
-static void dummy_usb_cb(USBDriver *usbp, usbep_t ep) {
-    (void)usbp;
-    (void)ep;
-}
-
-#ifndef KEYBOARD_SHARED_EP
-/* keyboard endpoint state structure */
-static USBInEndpointState kbd_ep_state;
-/* keyboard endpoint initialization structure (IN) - see USBEndpointConfig comment at top of file */
-static const USBEndpointConfig kbd_ep_config = {
-    USB_EP_MODE_TYPE_INTR,  /* Interrupt EP */
-    NULL,                   /* SETUP packet notification callback */
-    dummy_usb_cb,           /* IN notification callback */
-    NULL,                   /* OUT notification callback */
-    KEYBOARD_EPSIZE,        /* IN maximum packet size */
-    0,                      /* OUT maximum packet size */
-    &kbd_ep_state,          /* IN Endpoint state */
-    NULL,                   /* OUT endpoint state */
-    usb_lld_endpoint_fields /* USB driver specific endpoint fields */
-};
-#endif
-
-#if defined(MOUSE_ENABLE) && !defined(MOUSE_SHARED_EP)
-/* mouse endpoint state structure */
-static USBInEndpointState mouse_ep_state;
-
-/* mouse endpoint initialization structure (IN) - see USBEndpointConfig comment at top of file */
-static const USBEndpointConfig mouse_ep_config = {
-    USB_EP_MODE_TYPE_INTR,  /* Interrupt EP */
-    NULL,                   /* SETUP packet notification callback */
-    dummy_usb_cb,           /* IN notification callback */
-    NULL,                   /* OUT notification callback */
-    MOUSE_EPSIZE,           /* IN maximum packet size */
-    0,                      /* OUT maximum packet size */
-    &mouse_ep_state,        /* IN Endpoint state */
-    NULL,                   /* OUT endpoint state */
-    usb_lld_endpoint_fields /* USB driver specific endpoint fields */
-};
-#endif
-
-#ifdef SHARED_EP_ENABLE
-/* shared endpoint state structure */
-static USBInEndpointState shared_ep_state;
-
-/* shared endpoint initialization structure (IN) - see USBEndpointConfig comment at top of file */
-static const USBEndpointConfig shared_ep_config = {
-    USB_EP_MODE_TYPE_INTR,  /* Interrupt EP */
-    NULL,                   /* SETUP packet notification callback */
-    dummy_usb_cb,           /* IN notification callback */
-    NULL,                   /* OUT notification callback */
-    SHARED_EPSIZE,          /* IN maximum packet size */
-    0,                      /* OUT maximum packet size */
-    &shared_ep_state,       /* IN Endpoint state */
-    NULL,                   /* OUT endpoint state */
-    usb_lld_endpoint_fields /* USB driver specific endpoint fields */
-};
-#endif
-
-#if defined(JOYSTICK_ENABLE) && !defined(JOYSTICK_SHARED_EP)
-/* joystick endpoint state structure */
-static USBInEndpointState joystick_ep_state;
-
-/* joystick endpoint initialization structure (IN) - see USBEndpointConfig comment at top of file */
-static const USBEndpointConfig joystick_ep_config = {
-    USB_EP_MODE_TYPE_INTR,  /* Interrupt EP */
-    NULL,                   /* SETUP packet notification callback */
-    dummy_usb_cb,           /* IN notification callback */
-    NULL,                   /* OUT notification callback */
-    JOYSTICK_EPSIZE,        /* IN maximum packet size */
-    0,                      /* OUT maximum packet size */
-    &joystick_ep_state,     /* IN Endpoint state */
-    NULL,                   /* OUT endpoint state */
-    usb_lld_endpoint_fields /* USB driver specific endpoint fields */
-};
-#endif
-
-#if defined(DIGITIZER_ENABLE) && !defined(DIGITIZER_SHARED_EP)
-/* digitizer endpoint state structure */
-static USBInEndpointState digitizer_ep_state;
-
-/* digitizer endpoint initialization structure (IN) - see USBEndpointConfig comment at top of file */
-static const USBEndpointConfig digitizer_ep_config = {
-    USB_EP_MODE_TYPE_INTR,  /* Interrupt EP */
-    NULL,                   /* SETUP packet notification callback */
-    dummy_usb_cb,           /* IN notification callback */
-    NULL,                   /* OUT notification callback */
-    DIGITIZER_EPSIZE,       /* IN maximum packet size */
-    0,                      /* OUT maximum packet size */
-    &digitizer_ep_state,    /* IN Endpoint state */
-    NULL,                   /* OUT endpoint state */
-    usb_lld_endpoint_fields /* USB driver specific endpoint fields */
-};
-#endif
-
-#ifdef CONSOLE_ENABLE
-/* Console endpoint state structure */
-static USBInEndpointState console_ep_state;
-
-/* Console endpoint initialization structure (IN) - see USBEndpointConfig comment at top of file */
-static const USBEndpointConfig console_ep_config = {
-    USB_EP_MODE_TYPE_INTR,  /* Interrupt EP */
-    NULL,                   /* SETUP packet notification callback */
-    dummy_usb_cb,           /* IN notification callback */
-    NULL,                   /* OUT notification callback */
-    CONSOLE_EPSIZE,         /* IN maximum packet size */
-    0,                      /* OUT maximum packet size */
-    &console_ep_state,      /* IN Endpoint state */
-    NULL,                   /* OUT endpoint state */
-    usb_lld_endpoint_fields /* USB driver specific endpoint fields */
-};
-#endif
-
-#ifdef USB_ENDPOINTS_ARE_REORDERABLE
-typedef struct {
-    size_t              queue_capacity_in;
-    size_t              queue_capacity_out;
-    USBInEndpointState  in_ep_state;
-    USBOutEndpointState out_ep_state;
-    USBInEndpointState  int_ep_state;
-    USBEndpointConfig   inout_ep_config;
-    USBEndpointConfig   int_ep_config;
-    const QMKUSBConfig  config;
-    QMKUSBDriver        driver;
-} usb_driver_config_t;
-#else
-typedef struct {
-    size_t              queue_capacity_in;
-    size_t              queue_capacity_out;
-    USBInEndpointState  in_ep_state;
-    USBOutEndpointState out_ep_state;
-    USBInEndpointState  int_ep_state;
-    USBEndpointConfig   in_ep_config;
-    USBEndpointConfig   out_ep_config;
-    USBEndpointConfig   int_ep_config;
-    const QMKUSBConfig  config;
-    QMKUSBDriver        driver;
-} usb_driver_config_t;
-#endif
-
-#ifdef USB_ENDPOINTS_ARE_REORDERABLE
-/* Reusable initialization structure - see USBEndpointConfig comment at top of file */
-#    define QMK_USB_DRIVER_CONFIG(stream, notification, fixedsize)                                                              \
-        {                                                                                                                       \
-            .queue_capacity_in = stream##_IN_CAPACITY, .queue_capacity_out = stream##_OUT_CAPACITY,                             \
-            .inout_ep_config =                                                                                                  \
-                {                                                                                                               \
-                    stream##_IN_MODE,       /* Interrupt EP */                                                                  \
-                    NULL,                   /* SETUP packet notification callback */                                            \
-                    qmkusbDataTransmitted,  /* IN notification callback */                                                      \
-                    qmkusbDataReceived,     /* OUT notification callback */                                                     \
-                    stream##_EPSIZE,        /* IN maximum packet size */                                                        \
-                    stream##_EPSIZE,        /* OUT maximum packet size */                                                       \
-                    NULL,                   /* IN Endpoint state */                                                             \
-                    NULL,                   /* OUT endpoint state */                                                            \
-                    usb_lld_endpoint_fields /* USB driver specific endpoint fields */                                           \
-                },                                                                                                              \
-            .int_ep_config =                                                                                                    \
-                {                                                                                                               \
-                    USB_EP_MODE_TYPE_INTR,      /* Interrupt EP */                                                              \
-                    NULL,                       /* SETUP packet notification callback */                                        \
-                    qmkusbInterruptTransmitted, /* IN notification callback */                                                  \
-                    NULL,                       /* OUT notification callback */                                                 \
-                    CDC_NOTIFICATION_EPSIZE,    /* IN maximum packet size */                                                    \
-                    0,                          /* OUT maximum packet size */                                                   \
-                    NULL,                       /* IN Endpoint state */                                                         \
-                    NULL,                       /* OUT endpoint state */                                                        \
-                    usb_lld_endpoint_fields     /* USB driver specific endpoint fields */                                       \
-                },                                                                                                              \
-            .config = {                                                                                                         \
-                .usbp        = &USB_DRIVER,                                                                                     \
-                .bulk_in     = stream##_IN_EPNUM,                                                                               \
-                .bulk_out    = stream##_OUT_EPNUM,                                                                              \
-                .int_in      = notification,                                                                                    \
-                .in_buffers  = stream##_IN_CAPACITY,                                                                            \
-                .out_buffers = stream##_OUT_CAPACITY,                                                                           \
-                .in_size     = stream##_EPSIZE,                                                                                 \
-                .out_size    = stream##_EPSIZE,                                                                                 \
-                .fixed_size  = fixedsize,                                                                                       \
-                .ib          = (__attribute__((aligned(4))) uint8_t[BQ_BUFFER_SIZE(stream##_IN_CAPACITY, stream##_EPSIZE)]){},  \
-                .ob          = (__attribute__((aligned(4))) uint8_t[BQ_BUFFER_SIZE(stream##_OUT_CAPACITY, stream##_EPSIZE)]){}, \
-            }                                                                                                                   \
-        }
-#else
-/* Reusable initialization structure - see USBEndpointConfig comment at top of file */
-#    define QMK_USB_DRIVER_CONFIG(stream, notification, fixedsize)                                                              \
-        {                                                                                                                       \
-            .queue_capacity_in = stream##_IN_CAPACITY, .queue_capacity_out = stream##_OUT_CAPACITY,                             \
-            .in_ep_config =                                                                                                     \
-                {                                                                                                               \
-                    stream##_IN_MODE,       /* Interrupt EP */                                                                  \
-                    NULL,                   /* SETUP packet notification callback */                                            \
-                    qmkusbDataTransmitted,  /* IN notification callback */                                                      \
-                    NULL,                   /* OUT notification callback */                                                     \
-                    stream##_EPSIZE,        /* IN maximum packet size */                                                        \
-                    0,                      /* OUT maximum packet size */                                                       \
-                    NULL,                   /* IN Endpoint state */                                                             \
-                    NULL,                   /* OUT endpoint state */                                                            \
-                    usb_lld_endpoint_fields /* USB driver specific endpoint fields */                                           \
-                },                                                                                                              \
-            .out_ep_config =                                                                                                    \
-                {                                                                                                               \
-                    stream##_OUT_MODE,      /* Interrupt EP */                                                                  \
-                    NULL,                   /* SETUP packet notification callback */                                            \
-                    NULL,                   /* IN notification callback */                                                      \
-                    qmkusbDataReceived,     /* OUT notification callback */                                                     \
-                    0,                      /* IN maximum packet size */                                                        \
-                    stream##_EPSIZE,        /* OUT maximum packet size */                                                       \
-                    NULL,                   /* IN Endpoint state */                                                             \
-                    NULL,                   /* OUT endpoint state */                                                            \
-                    usb_lld_endpoint_fields /* USB driver specific endpoint fields */                                           \
-                },                                                                                                              \
-            .int_ep_config =                                                                                                    \
-                {                                                                                                               \
-                    USB_EP_MODE_TYPE_INTR,      /* Interrupt EP */                                                              \
-                    NULL,                       /* SETUP packet notification callback */                                        \
-                    qmkusbInterruptTransmitted, /* IN notification callback */                                                  \
-                    NULL,                       /* OUT notification callback */                                                 \
-                    CDC_NOTIFICATION_EPSIZE,    /* IN maximum packet size */                                                    \
-                    0,                          /* OUT maximum packet size */                                                   \
-                    NULL,                       /* IN Endpoint state */                                                         \
-                    NULL,                       /* OUT endpoint state */                                                        \
-                    usb_lld_endpoint_fields     /* USB driver specific endpoint fields */                                       \
-                },                                                                                                              \
-            .config = {                                                                                                         \
-                .usbp        = &USB_DRIVER,                                                                                     \
-                .bulk_in     = stream##_IN_EPNUM,                                                                               \
-                .bulk_out    = stream##_OUT_EPNUM,                                                                              \
-                .int_in      = notification,                                                                                    \
-                .in_buffers  = stream##_IN_CAPACITY,                                                                            \
-                .out_buffers = stream##_OUT_CAPACITY,                                                                           \
-                .in_size     = stream##_EPSIZE,                                                                                 \
-                .out_size    = stream##_EPSIZE,                                                                                 \
-                .fixed_size  = fixedsize,                                                                                       \
-                .ib          = (__attribute__((aligned(4))) uint8_t[BQ_BUFFER_SIZE(stream##_IN_CAPACITY, stream##_EPSIZE)]){},  \
-                .ob          = (__attribute__((aligned(4))) uint8_t[BQ_BUFFER_SIZE(stream##_OUT_CAPACITY, stream##_EPSIZE)]){}, \
-            }                                                                                                                   \
-        }
-#endif
-
-typedef struct {
-    union {
-        struct {
-#ifdef RAW_ENABLE
-            usb_driver_config_t raw_driver;
-#endif
-#ifdef MIDI_ENABLE
-            usb_driver_config_t midi_driver;
-#endif
-#ifdef VIRTSER_ENABLE
-            usb_driver_config_t serial_driver;
-#endif
-        };
-        usb_driver_config_t array[0];
-    };
-} usb_driver_configs_t;
-
-static usb_driver_configs_t drivers = {
-#ifdef RAW_ENABLE
-#    ifndef RAW_IN_CAPACITY
-#        define RAW_IN_CAPACITY 4
-#    endif
-#    ifndef RAW_OUT_CAPACITY
-#        define RAW_OUT_CAPACITY 4
-#    endif
-#    define RAW_IN_MODE USB_EP_MODE_TYPE_INTR
-#    define RAW_OUT_MODE USB_EP_MODE_TYPE_INTR
-    .raw_driver = QMK_USB_DRIVER_CONFIG(RAW, 0, false),
-#endif
-
-#ifdef MIDI_ENABLE
-#    define MIDI_STREAM_IN_CAPACITY 4
-#    define MIDI_STREAM_OUT_CAPACITY 4
-#    define MIDI_STREAM_IN_MODE USB_EP_MODE_TYPE_BULK
-#    define MIDI_STREAM_OUT_MODE USB_EP_MODE_TYPE_BULK
-    .midi_driver = QMK_USB_DRIVER_CONFIG(MIDI_STREAM, 0, false),
-#endif
-
-#ifdef VIRTSER_ENABLE
-#    define CDC_IN_CAPACITY 4
-#    define CDC_OUT_CAPACITY 4
-#    define CDC_IN_MODE USB_EP_MODE_TYPE_BULK
-#    define CDC_OUT_MODE USB_EP_MODE_TYPE_BULK
-    .serial_driver = QMK_USB_DRIVER_CONFIG(CDC, CDC_NOTIFICATION_EPNUM, false),
-#endif
-};
-
-#define NUM_USB_DRIVERS (sizeof(drivers) / sizeof(usb_driver_config_t))
-
 /* ---------------------------------------------------------
  *                  USB driver functions
  * ---------------------------------------------------------
@@ -507,36 +184,11 @@ static void usb_event_cb(USBDriver *usbp, usbevent_t event) {
 
         case USB_EVENT_CONFIGURED:
             osalSysLockFromISR();
-            /* Enable the endpoints specified into the configuration. */
-#ifndef KEYBOARD_SHARED_EP
-            usbInitEndpointI(usbp, KEYBOARD_IN_EPNUM, &kbd_ep_config);
-#endif
-#if defined(MOUSE_ENABLE) && !defined(MOUSE_SHARED_EP)
-            usbInitEndpointI(usbp, MOUSE_IN_EPNUM, &mouse_ep_config);
-#endif
-#ifdef SHARED_EP_ENABLE
-            usbInitEndpointI(usbp, SHARED_IN_EPNUM, &shared_ep_config);
-#endif
-#if defined(JOYSTICK_ENABLE) && !defined(JOYSTICK_SHARED_EP)
-            usbInitEndpointI(usbp, JOYSTICK_IN_EPNUM, &joystick_ep_config);
-#endif
-#if defined(DIGITIZER_ENABLE) && !defined(DIGITIZER_SHARED_EP)
-            usbInitEndpointI(usbp, DIGITIZER_IN_EPNUM, &digitizer_ep_config);
-#endif
-#ifdef CONSOLE_ENABLE
-            usbInitEndpointI(usbp, CONSOLE_IN_EPNUM, &console_ep_config);
-#endif
-            for (int i = 0; i < NUM_USB_DRIVERS; i++) {
-#ifdef USB_ENDPOINTS_ARE_REORDERABLE
-                usbInitEndpointI(usbp, drivers.array[i].config.bulk_in, &drivers.array[i].inout_ep_config);
-#else
-                usbInitEndpointI(usbp, drivers.array[i].config.bulk_in, &drivers.array[i].in_ep_config);
-                usbInitEndpointI(usbp, drivers.array[i].config.bulk_out, &drivers.array[i].out_ep_config);
-#endif
-                if (drivers.array[i].config.int_in) {
-                    usbInitEndpointI(usbp, drivers.array[i].config.int_in, &drivers.array[i].int_ep_config);
-                }
-                qmkusbConfigureHookI(&drivers.array[i].driver);
+            for (int i = 0; i < USB_ENDPOINT_IN_COUNT; i++) {
+                usb_endpoint_in_configure_cb(&usb_endpoints_in[i]);
+            }
+            for (int i = 0; i < USB_ENDPOINT_OUT_COUNT; i++) {
+                usb_endpoint_out_configure_cb(&usb_endpoints_out[i]);
             }
             osalSysUnlockFromISR();
             if (last_suspend_state) {
@@ -550,22 +202,25 @@ static void usb_event_cb(USBDriver *usbp, usbevent_t event) {
             /* Falls into.*/
         case USB_EVENT_RESET:
             usb_event_queue_enqueue(event);
-            for (int i = 0; i < NUM_USB_DRIVERS; i++) {
-                chSysLockFromISR();
-                /* Disconnection event on suspend.*/
-                qmkusbSuspendHookI(&drivers.array[i].driver);
-                chSysUnlockFromISR();
+            chSysLockFromISR();
+            for (int i = 0; i < USB_ENDPOINT_IN_COUNT; i++) {
+                usb_endpoint_in_suspend_cb(&usb_endpoints_in[i]);
             }
+            for (int i = 0; i < USB_ENDPOINT_OUT_COUNT; i++) {
+                usb_endpoint_out_suspend_cb(&usb_endpoints_out[i]);
+            }
+            chSysUnlockFromISR();
             return;
 
         case USB_EVENT_WAKEUP:
-            // TODO: from ISR! print("[W]");
-            for (int i = 0; i < NUM_USB_DRIVERS; i++) {
-                chSysLockFromISR();
-                /* Disconnection event on suspend.*/
-                qmkusbWakeupHookI(&drivers.array[i].driver);
-                chSysUnlockFromISR();
+            chSysLockFromISR();
+            for (int i = 0; i < USB_ENDPOINT_IN_COUNT; i++) {
+                usb_endpoint_in_wakeup_cb(&usb_endpoints_in[i]);
             }
+            for (int i = 0; i < USB_ENDPOINT_OUT_COUNT; i++) {
+                usb_endpoint_out_wakeup_cb(&usb_endpoints_out[i]);
+            }
+            chSysUnlockFromISR();
             usb_event_queue_enqueue(USB_EVENT_WAKEUP);
             return;
 
@@ -587,7 +242,7 @@ static void usb_event_cb(USBDriver *usbp, usbevent_t event) {
  * Other Device    Required    Optional    Optional    Optional    Optional    Optional
  */
 
-static uint8_t set_report_buf[2] __attribute__((aligned(4)));
+static uint8_t _Alignas(4) set_report_buf[2];
 
 static void set_led_transfer_cb(USBDriver *usbp) {
     usb_control_request_t *setup = (usb_control_request_t *)usbp->setup;
@@ -611,41 +266,7 @@ static bool usb_requests_hook_cb(USBDriver *usbp) {
             case USB_RTYPE_DIR_DEV2HOST:
                 switch (setup->bRequest) {
                     case HID_REQ_GetReport:
-                        switch (setup->wIndex) {
-#ifndef KEYBOARD_SHARED_EP
-                            case KEYBOARD_INTERFACE:
-                                usbSetupTransfer(usbp, (uint8_t *)&keyboard_report_sent, KEYBOARD_REPORT_SIZE, NULL);
-                                return TRUE;
-                                break;
-#endif
-#if defined(MOUSE_ENABLE) && !defined(MOUSE_SHARED_EP)
-                            case MOUSE_INTERFACE:
-                                usbSetupTransfer(usbp, (uint8_t *)&mouse_report_sent, sizeof(mouse_report_sent), NULL);
-                                return TRUE;
-                                break;
-#endif
-#ifdef SHARED_EP_ENABLE
-                            case SHARED_INTERFACE:
-#    ifdef KEYBOARD_SHARED_EP
-                                if (setup->wValue.lbyte == REPORT_ID_KEYBOARD) {
-                                    usbSetupTransfer(usbp, (uint8_t *)&keyboard_report_sent, KEYBOARD_REPORT_SIZE, NULL);
-                                    return true;
-                                }
-#    endif
-#    ifdef MOUSE_SHARED_EP
-                                if (setup->wValue.lbyte == REPORT_ID_MOUSE) {
-                                    usbSetupTransfer(usbp, (uint8_t *)&mouse_report_sent, sizeof(mouse_report_sent), NULL);
-                                    return true;
-                                }
-#    endif
-#endif /* SHARED_EP_ENABLE */
-                            default:
-                                universal_report_blank.report_id = setup->wValue.lbyte;
-                                usbSetupTransfer(usbp, (uint8_t *)&universal_report_blank, setup->wLength, NULL);
-                                return true;
-                        }
-                        break;
-
+                        return usb_get_report_cb(usbp);
                     case HID_REQ_GetProtocol:
                         if (setup->wIndex == KEYBOARD_INTERFACE) {
                             usbSetupTransfer(usbp, &keyboard_protocol, sizeof(uint8_t), NULL);
@@ -654,10 +275,8 @@ static bool usb_requests_hook_cb(USBDriver *usbp) {
                         break;
 
                     case HID_REQ_GetIdle:
-                        usbSetupTransfer(usbp, &keyboard_idle, sizeof(uint8_t), NULL);
-                        return true;
+                        return usb_get_idle_cb(usbp);
                 }
-                break;
 
             case USB_RTYPE_DIR_HOST2DEV:
                 switch (setup->bRequest) {
@@ -671,38 +290,15 @@ static bool usb_requests_hook_cb(USBDriver *usbp) {
                                 return true;
                         }
                         break;
-
                     case HID_REQ_SetProtocol:
                         if (setup->wIndex == KEYBOARD_INTERFACE) {
                             keyboard_protocol = setup->wValue.word;
-#ifdef NKRO_ENABLE
-                            if (!keyboard_protocol && keyboard_idle) {
-#else  /* NKRO_ENABLE */
-                            if (keyboard_idle) {
-#endif /* NKRO_ENABLE */
-                                /* arm the idle timer if boot protocol & idle */
-                                osalSysLockFromISR();
-                                chVTSetI(&keyboard_idle_timer, 4 * TIME_MS2I(keyboard_idle), keyboard_idle_timer_cb, (void *)usbp);
-                                osalSysUnlockFromISR();
-                            }
                         }
                         usbSetupTransfer(usbp, NULL, 0, NULL);
                         return true;
-
                     case HID_REQ_SetIdle:
                         keyboard_idle = setup->wValue.hbyte;
-                        /* arm the timer */
-#ifdef NKRO_ENABLE
-                        if (!keymap_config.nkro && keyboard_idle) {
-#else  /* NKRO_ENABLE */
-                        if (keyboard_idle) {
-#endif /* NKRO_ENABLE */
-                            osalSysLockFromISR();
-                            chVTSetI(&keyboard_idle_timer, 4 * TIME_MS2I(keyboard_idle), keyboard_idle_timer_cb, (void *)usbp);
-                            osalSysUnlockFromISR();
-                        }
-                        usbSetupTransfer(usbp, NULL, 0, NULL);
-                        return true;
+                        return usb_set_idle_cb(usbp);
                 }
                 break;
         }
@@ -719,52 +315,40 @@ static bool usb_requests_hook_cb(USBDriver *usbp) {
         return true;
     }
 
-    for (int i = 0; i < NUM_USB_DRIVERS; i++) {
-        if (drivers.array[i].config.int_in) {
-            // NOTE: Assumes that we only have one serial driver
-            return qmkusbRequestsHook(usbp);
+    for (int i = 0; i < USB_ENDPOINT_IN_COUNT; i++) {
+        if (usb_endpoints_in[i].usb_requests_cb != NULL) {
+            if (usb_endpoints_in[i].usb_requests_cb(usbp)) {
+                return true;
+            }
         }
     }
 
     return false;
 }
 
-static void usb_sof_cb(USBDriver *usbp) {
-    osalSysLockFromISR();
-    for (int i = 0; i < NUM_USB_DRIVERS; i++) {
-        qmkusbSOFHookI(&drivers.array[i].driver);
-    }
-    osalSysUnlockFromISR();
+static __attribute__((unused)) void dummy_cb(USBDriver *usbp) {
+    (void)usbp;
 }
 
-/* USB driver configuration */
 static const USBConfig usbcfg = {
     usb_event_cb,          /* USB events callback */
     usb_get_descriptor_cb, /* Device GET_DESCRIPTOR request callback */
     usb_requests_hook_cb,  /* Requests hook callback */
-    usb_sof_cb             /* Start Of Frame callback */
+#if STM32_USB_USE_OTG1 == TRUE || STM32_USB_USE_OTG2 == TRUE
+    dummy_cb, /* Workaround for OTG Peripherals not servicing new interrupts
+    after resuming from suspend. */
+#endif
 };
 
-/*
- * Initialize the USB driver
- */
 void init_usb_driver(USBDriver *usbp) {
-    for (int i = 0; i < NUM_USB_DRIVERS; i++) {
-#ifdef USB_ENDPOINTS_ARE_REORDERABLE
-        QMKUSBDriver *driver                       = &drivers.array[i].driver;
-        drivers.array[i].inout_ep_config.in_state  = &drivers.array[i].in_ep_state;
-        drivers.array[i].inout_ep_config.out_state = &drivers.array[i].out_ep_state;
-        drivers.array[i].int_ep_config.in_state    = &drivers.array[i].int_ep_state;
-        qmkusbObjectInit(driver, &drivers.array[i].config);
-        qmkusbStart(driver, &drivers.array[i].config);
-#else
-        QMKUSBDriver *driver                     = &drivers.array[i].driver;
-        drivers.array[i].in_ep_config.in_state   = &drivers.array[i].in_ep_state;
-        drivers.array[i].out_ep_config.out_state = &drivers.array[i].out_ep_state;
-        drivers.array[i].int_ep_config.in_state  = &drivers.array[i].int_ep_state;
-        qmkusbObjectInit(driver, &drivers.array[i].config);
-        qmkusbStart(driver, &drivers.array[i].config);
-#endif
+    for (int i = 0; i < USB_ENDPOINT_IN_COUNT; i++) {
+        usb_endpoint_in_init(&usb_endpoints_in[i]);
+        usb_endpoint_in_start(&usb_endpoints_in[i]);
+    }
+
+    for (int i = 0; i < USB_ENDPOINT_OUT_COUNT; i++) {
+        usb_endpoint_out_init(&usb_endpoints_out[i]);
+        usb_endpoint_out_start(&usb_endpoints_out[i]);
     }
 
     /*
@@ -777,23 +361,31 @@ void init_usb_driver(USBDriver *usbp) {
     wait_ms(50);
     usbStart(usbp, &usbcfg);
     usbConnectBus(usbp);
-
-    chVTObjectInit(&keyboard_idle_timer);
 }
 
 __attribute__((weak)) void restart_usb_driver(USBDriver *usbp) {
     usbDisconnectBus(usbp);
     usbStop(usbp);
 
-#if USB_SUSPEND_WAKEUP_DELAY > 0
-    // Some hubs, kvm switches, and monitors do
-    // weird things, with USB device state bouncing
-    // around wildly on wakeup, yielding race
-    // conditions that can corrupt the keyboard state.
-    //
-    // Pause for a while to let things settle...
-    wait_ms(USB_SUSPEND_WAKEUP_DELAY);
-#endif
+    for (int i = 0; i < USB_ENDPOINT_IN_COUNT; i++) {
+        usb_endpoint_in_stop(&usb_endpoints_in[i]);
+    }
+
+    for (int i = 0; i < USB_ENDPOINT_OUT_COUNT; i++) {
+        usb_endpoint_out_stop(&usb_endpoints_out[i]);
+    }
+
+    wait_ms(50);
+
+    for (int i = 0; i < USB_ENDPOINT_IN_COUNT; i++) {
+        usb_endpoint_in_init(&usb_endpoints_in[i]);
+        usb_endpoint_in_start(&usb_endpoints_in[i]);
+    }
+
+    for (int i = 0; i < USB_ENDPOINT_OUT_COUNT; i++) {
+        usb_endpoint_out_init(&usb_endpoints_out[i]);
+        usb_endpoint_out_start(&usb_endpoints_out[i]);
+    }
 
     usbStart(usbp, &usbcfg);
     usbConnectBus(usbp);
@@ -804,81 +396,78 @@ __attribute__((weak)) void restart_usb_driver(USBDriver *usbp) {
  * ---------------------------------------------------------
  */
 
-/* Idle requests timer code
- * callback (called from ISR, unlocked state) */
-static void keyboard_idle_timer_cb(struct ch_virtual_timer *timer, void *arg) {
-    (void)timer;
-    USBDriver *usbp = (USBDriver *)arg;
-
-    osalSysLockFromISR();
-
-    /* check that the states of things are as they're supposed to */
-    if (usbGetDriverStateI(usbp) != USB_ACTIVE) {
-        /* do not rearm the timer, should be enabled on IDLE request */
-        osalSysUnlockFromISR();
-        return;
-    }
-
-#ifdef NKRO_ENABLE
-    if (!keymap_config.nkro && keyboard_idle && keyboard_protocol) {
-#else  /* NKRO_ENABLE */
-    if (keyboard_idle && keyboard_protocol) {
-#endif /* NKRO_ENABLE */
-        /* TODO: are we sure we want the KBD_ENDPOINT? */
-        if (!usbGetTransmitStatusI(usbp, KEYBOARD_IN_EPNUM)) {
-            usbStartTransmitI(usbp, KEYBOARD_IN_EPNUM, (uint8_t *)&keyboard_report_sent, KEYBOARD_EPSIZE);
-        }
-        /* rearm the timer */
-        chVTSetI(&keyboard_idle_timer, 4 * TIME_MS2I(keyboard_idle), keyboard_idle_timer_cb, (void *)usbp);
-    }
-
-    /* do not rearm the timer if the condition above fails
-     * it should be enabled again on either IDLE or SET_PROTOCOL requests */
-    osalSysUnlockFromISR();
-}
-
 /* LED status */
 uint8_t keyboard_leds(void) {
     return keyboard_led_state;
 }
 
-void send_report(uint8_t endpoint, void *report, size_t size) {
-    osalSysLock();
-    if (usbGetDriverStateI(&USB_DRIVER) != USB_ACTIVE) {
-        osalSysUnlock();
-        return;
-    }
-
-    if (usbGetTransmitStatusI(&USB_DRIVER, endpoint)) {
-        /* Need to either suspend, or loop and call unlock/lock during
-         * every iteration - otherwise the system will remain locked,
-         * no interrupts served, so USB not going through as well.
-         * Note: for suspend, need USB_USE_WAIT == TRUE in halconf.h */
-        if (osalThreadSuspendTimeoutS(&(&USB_DRIVER)->epc[endpoint]->in_state->thread, TIME_MS2I(10)) == MSG_TIMEOUT) {
-            osalSysUnlock();
-            return;
-        }
-    }
-    usbStartTransmitI(&USB_DRIVER, endpoint, report, size);
-    osalSysUnlock();
+/**
+ * @brief Send a report to the host, the report is enqueued into an output
+ * queue and send once the USB endpoint becomes empty.
+ *
+ * @param endpoint USB IN endpoint to send the report from
+ * @param report pointer to the report
+ * @param size size of the report
+ * @return true Success
+ * @return false Failure
+ */
+bool send_report(usb_endpoint_in_lut_t endpoint, void *report, size_t size) {
+    return usb_endpoint_in_send(&usb_endpoints_in[endpoint], (uint8_t *)report, size, TIME_MS2I(100), false);
+}
+
+/**
+ * @brief Send a report to the host, but delay the sending until the size of
+ * endpoint report is reached or the incompletely filled buffer is flushed with
+ * a call to `flush_report_buffered`. This is useful if the report is being
+ * updated frequently. The complete report is then enqueued into an output
+ * queue and send once the USB endpoint becomes empty.
+ *
+ * @param endpoint USB IN endpoint to send the report from
+ * @param report pointer to the report
+ * @param size size of the report
+ * @return true Success
+ * @return false Failure
+ */
+static bool send_report_buffered(usb_endpoint_in_lut_t endpoint, void *report, size_t size) {
+    return usb_endpoint_in_send(&usb_endpoints_in[endpoint], (uint8_t *)report, size, TIME_MS2I(100), true);
+}
+
+/** @brief Flush all buffered reports which were enqueued with a call to
+ * `send_report_buffered` that haven't been send. If necessary the buffered
+ * report can be padded with zeros up to the endpoints maximum size.
+ *
+ * @param endpoint USB IN endpoint to flush the reports from
+ * @param padded Pad the buffered report with zeros up to the endpoints maximum size
+ */
+static void flush_report_buffered(usb_endpoint_in_lut_t endpoint, bool padded) {
+    usb_endpoint_in_flush(&usb_endpoints_in[endpoint], padded);
+}
+
+/**
+ * @brief Receive a report from the host.
+ *
+ * @param endpoint USB OUT endpoint to receive the report from
+ * @param report pointer to the report
+ * @param size size of the report
+ * @return true Success
+ * @return false Failure
+ */
+static bool receive_report(usb_endpoint_out_lut_t endpoint, void *report, size_t size) {
+    return usb_endpoint_out_receive(&usb_endpoints_out[endpoint], (uint8_t *)report, size, TIME_IMMEDIATE);
 }
 
-/* prepare and start sending a report IN
- * not callable from ISR or locked state */
 void send_keyboard(report_keyboard_t *report) {
     /* If we're in Boot Protocol, don't send any report ID or other funky fields */
     if (!keyboard_protocol) {
-        send_report(KEYBOARD_IN_EPNUM, &report->mods, 8);
+        send_report(USB_ENDPOINT_IN_KEYBOARD, &report->mods, 8);
     } else {
-        send_report(KEYBOARD_IN_EPNUM, report, KEYBOARD_REPORT_SIZE);
+        send_report(USB_ENDPOINT_IN_KEYBOARD, report, KEYBOARD_REPORT_SIZE);
     }
-
-    keyboard_report_sent = *report;
 }
 
 void send_nkro(report_nkro_t *report) {
 #ifdef NKRO_ENABLE
-    send_report(SHARED_IN_EPNUM, report, sizeof(report_nkro_t));
+    send_report(USB_ENDPOINT_IN_SHARED, report, sizeof(report_nkro_t));
 #endif
 }
 
@@ -889,8 +478,7 @@ void send_nkro(report_nkro_t *report) {
 
 void send_mouse(report_mouse_t *report) {
 #ifdef MOUSE_ENABLE
-    send_report(MOUSE_IN_EPNUM, report, sizeof(report_mouse_t));
-    mouse_report_sent = *report;
+    send_report(USB_ENDPOINT_IN_MOUSE, report, sizeof(report_mouse_t));
 #endif
 }
 
@@ -901,25 +489,25 @@ void send_mouse(report_mouse_t *report) {
 
 void send_extra(report_extra_t *report) {
 #ifdef EXTRAKEY_ENABLE
-    send_report(SHARED_IN_EPNUM, report, sizeof(report_extra_t));
+    send_report(USB_ENDPOINT_IN_SHARED, report, sizeof(report_extra_t));
 #endif
 }
 
 void send_programmable_button(report_programmable_button_t *report) {
 #ifdef PROGRAMMABLE_BUTTON_ENABLE
-    send_report(SHARED_IN_EPNUM, report, sizeof(report_programmable_button_t));
+    send_report(USB_ENDPOINT_IN_SHARED, report, sizeof(report_programmable_button_t));
 #endif
 }
 
 void send_joystick(report_joystick_t *report) {
 #ifdef JOYSTICK_ENABLE
-    send_report(JOYSTICK_IN_EPNUM, report, sizeof(report_joystick_t));
+    send_report(USB_ENDPOINT_IN_JOYSTICK, report, sizeof(report_joystick_t));
 #endif
 }
 
 void send_digitizer(report_digitizer_t *report) {
 #ifdef DIGITIZER_ENABLE
-    send_report(DIGITIZER_IN_EPNUM, report, sizeof(report_digitizer_t));
+    send_report(USB_ENDPOINT_IN_DIGITIZER, report, sizeof(report_digitizer_t));
 #endif
 }
 
@@ -931,46 +519,21 @@ void send_digitizer(report_digitizer_t *report) {
 #ifdef CONSOLE_ENABLE
 
 int8_t sendchar(uint8_t c) {
-    rbuf_enqueue(c);
-    return 0;
+    return (int8_t)send_report_buffered(USB_ENDPOINT_IN_CONSOLE, &c, sizeof(uint8_t));
 }
 
 void console_task(void) {
-    if (!rbuf_has_data()) {
-        return;
-    }
-
-    osalSysLock();
-    if (usbGetDriverStateI(&USB_DRIVER) != USB_ACTIVE) {
-        osalSysUnlock();
-        return;
-    }
-
-    if (usbGetTransmitStatusI(&USB_DRIVER, CONSOLE_IN_EPNUM)) {
-        osalSysUnlock();
-        return;
-    }
-
-    // Send in chunks - padded with zeros to 32
-    char    send_buf[CONSOLE_EPSIZE] = {0};
-    uint8_t send_buf_count           = 0;
-    while (rbuf_has_data() && send_buf_count < CONSOLE_EPSIZE) {
-        send_buf[send_buf_count++] = rbuf_dequeue();
-    }
-
-    usbStartTransmitI(&USB_DRIVER, CONSOLE_IN_EPNUM, (const uint8_t *)send_buf, CONSOLE_EPSIZE);
-    osalSysUnlock();
+    flush_report_buffered(USB_ENDPOINT_IN_CONSOLE, true);
 }
 
 #endif /* CONSOLE_ENABLE */
 
 #ifdef RAW_ENABLE
 void raw_hid_send(uint8_t *data, uint8_t length) {
-    // TODO: implement variable size packet
     if (length != RAW_EPSIZE) {
         return;
     }
-    chnWrite(&drivers.raw_driver.driver, data, length);
+    send_report(USB_ENDPOINT_IN_RAW, data, length);
 }
 
 __attribute__((weak)) void raw_hid_receive(uint8_t *data, uint8_t length) {
@@ -981,13 +544,9 @@ __attribute__((weak)) void raw_hid_receive(uint8_t *data, uint8_t length) {
 
 void raw_hid_task(void) {
     uint8_t buffer[RAW_EPSIZE];
-    size_t  size = 0;
-    do {
-        size = chnReadTimeout(&drivers.raw_driver.driver, buffer, sizeof(buffer), TIME_IMMEDIATE);
-        if (size > 0) {
-            raw_hid_receive(buffer, size);
-        }
-    } while (size > 0);
+    while (receive_report(USB_ENDPOINT_OUT_RAW, buffer, sizeof(buffer))) {
+        raw_hid_receive(buffer, sizeof(buffer));
+    }
 }
 
 #endif
@@ -995,32 +554,59 @@ void raw_hid_task(void) {
 #ifdef MIDI_ENABLE
 
 void send_midi_packet(MIDI_EventPacket_t *event) {
-    chnWrite(&drivers.midi_driver.driver, (uint8_t *)event, sizeof(MIDI_EventPacket_t));
+    send_report(USB_ENDPOINT_IN_MIDI, (uint8_t *)event, sizeof(MIDI_EventPacket_t));
 }
 
 bool recv_midi_packet(MIDI_EventPacket_t *const event) {
-    size_t size = chnReadTimeout(&drivers.midi_driver.driver, (uint8_t *)event, sizeof(MIDI_EventPacket_t), TIME_IMMEDIATE);
-    return size == sizeof(MIDI_EventPacket_t);
+    return receive_report(USB_ENDPOINT_OUT_MIDI, (uint8_t *)event, sizeof(MIDI_EventPacket_t));
 }
+
 void midi_ep_task(void) {
     uint8_t buffer[MIDI_STREAM_EPSIZE];
-    size_t  size = 0;
-    do {
-        size = chnReadTimeout(&drivers.midi_driver.driver, buffer, sizeof(buffer), TIME_IMMEDIATE);
-        if (size > 0) {
-            MIDI_EventPacket_t event;
-            recv_midi_packet(&event);
-        }
-    } while (size > 0);
+    while (receive_report(USB_ENDPOINT_OUT_MIDI, buffer, sizeof(buffer))) {
+        MIDI_EventPacket_t event;
+        // TODO: this seems totally wrong? The midi task will never see any
+        // packets if we consume them here
+        recv_midi_packet(&event);
+    }
 }
 #endif
 
 #ifdef VIRTSER_ENABLE
 
+#    include "hal_usb_cdc.h"
+/**
+ * @brief CDC serial driver configuration structure. Set to 9600 baud, 1 stop bit, no parity, 8 data bits.
+ */
+static cdc_linecoding_t linecoding = {{0x00, 0x96, 0x00, 0x00}, LC_STOP_1, LC_PARITY_NONE, 8};
+
+bool virtser_usb_request_cb(USBDriver *usbp) {
+    if ((usbp->setup[0] & USB_RTYPE_TYPE_MASK) == USB_RTYPE_TYPE_CLASS) { /* bmRequestType */
+        if (usbp->setup[4] == CCI_INTERFACE) {                            /* wIndex (LSB) */
+            switch (usbp->setup[1]) {                                     /* bRequest */
+                case CDC_GET_LINE_CODING:
+                    usbSetupTransfer(usbp, (uint8_t *)&linecoding, sizeof(linecoding), NULL);
+                    return true;
+                case CDC_SET_LINE_CODING:
+                    usbSetupTransfer(usbp, (uint8_t *)&linecoding, sizeof(linecoding), NULL);
+                    return true;
+                case CDC_SET_CONTROL_LINE_STATE:
+                    /* Nothing to do, there are no control lines.*/
+                    usbSetupTransfer(usbp, NULL, 0, NULL);
+                    return true;
+                default:
+                    return false;
+            }
+        }
+    }
+
+    return false;
+}
+
 void virtser_init(void) {}
 
 void virtser_send(const uint8_t byte) {
-    chnWrite(&drivers.serial_driver.driver, &byte, 1);
+    send_report_buffered(USB_ENDPOINT_IN_CDC_DATA, (void *)&byte, sizeof(byte));
 }
 
 __attribute__((weak)) void virtser_recv(uint8_t c) {
@@ -1028,14 +614,14 @@ __attribute__((weak)) void virtser_recv(uint8_t c) {
 }
 
 void virtser_task(void) {
-    uint8_t numBytesReceived = 0;
-    uint8_t buffer[16];
-    do {
-        numBytesReceived = chnReadTimeout(&drivers.serial_driver.driver, buffer, sizeof(buffer), TIME_IMMEDIATE);
-        for (int i = 0; i < numBytesReceived; i++) {
+    uint8_t buffer[CDC_EPSIZE];
+    while (receive_report(USB_ENDPOINT_OUT_CDC_DATA, buffer, sizeof(buffer))) {
+        for (int i = 0; i < sizeof(buffer); i++) {
             virtser_recv(buffer[i]);
         }
-    } while (numBytesReceived > 0);
+    }
+
+    flush_report_buffered(USB_ENDPOINT_IN_CDC_DATA, false);
 }
 
 #endif
diff --git a/tmk_core/protocol/chibios/usb_main.h b/tmk_core/protocol/chibios/usb_main.h
index 3fd1e84fe84..5ba6fb1961e 100644
--- a/tmk_core/protocol/chibios/usb_main.h
+++ b/tmk_core/protocol/chibios/usb_main.h
@@ -1,25 +1,21 @@
-/*
- * (c) 2015 flabberast <s3+flabbergast@sdfeu.org>
- *
- * Based on the following work:
- *  - Guillaume Duc's raw hid example (MIT License)
- *    https://github.com/guiduc/usb-hid-chibios-example
- *  - PJRC Teensy examples (MIT License)
- *    https://www.pjrc.com/teensy/usb_keyboard.html
- *  - hasu's TMK keyboard code (GPL v2 and some code Modified BSD)
- *    https://github.com/tmk/tmk_keyboard/
- *  - ChibiOS demo code (Apache 2.0 License)
- *    http://www.chibios.org
- *
- * Since some GPL'd code is used, this work is licensed under
- * GPL v2 or later.
- */
+// Copyright 2023 Stefan Kerkmann (@KarlK90)
+// Copyright 2020 Ryan (@fauxpark)
+// Copyright 2020 Joel Challis (@zvecr)
+// Copyright 2018 James Laird-Wah
+// Copyright 2016 Fredizzimo
+// Copyright 2016 Giovanni Di Sirio
+// SPDX-License-Identifier: GPL-3.0-or-later OR Apache-2.0
 
 #pragma once
 
 #include <ch.h>
 #include <hal.h>
 
+#include "usb_device_state.h"
+#include "usb_descriptor.h"
+#include "usb_driver.h"
+#include "usb_endpoints.h"
+
 /* -------------------------
  * General USB driver header
  * -------------------------
@@ -36,6 +32,8 @@ void init_usb_driver(USBDriver *usbp);
 /* Restart the USB driver and bus */
 void restart_usb_driver(USBDriver *usbp);
 
+bool send_report(usb_endpoint_in_lut_t endpoint, void *report, size_t size);
+
 /* ---------------
  * USB Event queue
  * ---------------
@@ -58,3 +56,14 @@ void usb_event_queue_task(void);
 int8_t sendchar(uint8_t c);
 
 #endif /* CONSOLE_ENABLE */
+
+/* --------------
+ * Virtser header
+ * --------------
+ */
+
+#if defined(VIRTSER_ENABLE)
+
+bool virtser_usb_request_cb(USBDriver *usbp);
+
+#endif
diff --git a/tmk_core/protocol/chibios/usb_report_handling.c b/tmk_core/protocol/chibios/usb_report_handling.c
new file mode 100644
index 00000000000..64074b21642
--- /dev/null
+++ b/tmk_core/protocol/chibios/usb_report_handling.c
@@ -0,0 +1,296 @@
+// Copyright 2023 Stefan Kerkmann (@KarlK90)
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#include <string.h>
+#include <stdint.h>
+#include <stdbool.h>
+
+#include "usb_report_handling.h"
+#include "usb_endpoints.h"
+#include "usb_main.h"
+#include "usb_types.h"
+#include "usb_driver.h"
+#include "report.h"
+
+extern usb_endpoint_in_t     usb_endpoints_in[USB_ENDPOINT_IN_COUNT];
+extern usb_endpoint_in_lut_t usb_endpoint_interface_lut[TOTAL_INTERFACES];
+
+void usb_set_report(usb_fs_report_t **reports, const uint8_t *data, size_t length) {
+    if (*reports == NULL) {
+        return;
+    }
+
+    (*reports)->last_report = chVTGetSystemTimeX();
+    (*reports)->length      = length;
+    memcpy(&(*reports)->data, data, length);
+}
+
+void usb_get_report(usb_fs_report_t **reports, uint8_t report_id, usb_fs_report_t *report) {
+    (void)report_id;
+    if (*reports == NULL) {
+        return;
+    }
+
+    report->length = (*reports)->length;
+    memcpy(&report->data, &(*reports)->data, report->length);
+}
+
+void usb_reset_report(usb_fs_report_t **reports) {
+    if (*reports == NULL) {
+        return;
+    }
+
+    memset(&(*reports)->data, 0, (*reports)->length);
+    (*reports)->idle_rate   = 0;
+    (*reports)->last_report = 0;
+}
+
+void usb_shared_set_report(usb_fs_report_t **reports, const uint8_t *data, size_t length) {
+    uint8_t report_id = data[0];
+
+    if (report_id > REPORT_ID_COUNT || reports[report_id] == NULL) {
+        return;
+    }
+
+    reports[report_id]->last_report = chVTGetSystemTimeX();
+    reports[report_id]->length      = length;
+    memcpy(&reports[report_id]->data, data, length);
+}
+
+void usb_shared_get_report(usb_fs_report_t **reports, uint8_t report_id, usb_fs_report_t *report) {
+    if (report_id > REPORT_ID_COUNT || reports[report_id] == NULL) {
+        return;
+    }
+
+    report->length = reports[report_id]->length;
+    memcpy(&report->data, &reports[report_id]->data, report->length);
+}
+
+void usb_shared_reset_report(usb_fs_report_t **reports) {
+    for (int i = 0; i <= REPORT_ID_COUNT; i++) {
+        if (reports[i] == NULL) {
+            continue;
+        }
+        memset(&reports[i]->data, 0, reports[i]->length);
+        reports[i]->idle_rate   = 0;
+        reports[i]->last_report = 0;
+    }
+}
+
+bool usb_get_report_cb(USBDriver *driver) {
+    usb_control_request_t *setup     = (usb_control_request_t *)driver->setup;
+    uint8_t                interface = setup->wIndex;
+    uint8_t                report_id = setup->wValue.lbyte;
+
+    static usb_fs_report_t report;
+
+    if (!IS_VALID_INTERFACE(interface) || !IS_VALID_REPORT_ID(report_id)) {
+        return false;
+    }
+
+    usb_endpoint_in_lut_t ep = usb_endpoint_interface_lut[interface];
+
+    if (!IS_VALID_USB_ENDPOINT_IN_LUT(ep)) {
+        return false;
+    }
+
+    usb_report_storage_t *report_storage = usb_endpoints_in[ep].report_storage;
+
+    if (report_storage == NULL) {
+        return false;
+    }
+
+    report_storage->get_report(report_storage->reports, report_id, &report);
+
+    usbSetupTransfer(driver, (uint8_t *)report.data, report.length, NULL);
+
+    return true;
+}
+
+static bool run_idle_task = false;
+
+void usb_set_idle_rate(usb_fs_report_t **reports, uint8_t report_id, uint8_t idle_rate) {
+    (void)report_id;
+
+    if (*reports == NULL) {
+        return;
+    }
+
+    (*reports)->idle_rate = idle_rate * 4;
+
+    run_idle_task |= idle_rate != 0;
+}
+
+uint8_t usb_get_idle_rate(usb_fs_report_t **reports, uint8_t report_id) {
+    (void)report_id;
+
+    if (*reports == NULL) {
+        return 0;
+    }
+
+    return (*reports)->idle_rate / 4;
+}
+
+bool usb_idle_timer_elapsed(usb_fs_report_t **reports, uint8_t report_id) {
+    (void)report_id;
+
+    if (*reports == NULL) {
+        return false;
+    }
+
+    osalSysLock();
+    time_msecs_t idle_rate   = (*reports)->idle_rate;
+    systime_t    last_report = (*reports)->last_report;
+    osalSysUnlock();
+
+    if (idle_rate == 0) {
+        return false;
+    }
+
+    return chTimeI2MS(chVTTimeElapsedSinceX(last_report)) >= idle_rate;
+}
+
+void usb_shared_set_idle_rate(usb_fs_report_t **reports, uint8_t report_id, uint8_t idle_rate) {
+    // USB spec demands that a report_id of 0 would set the idle rate for all
+    // reports of that endpoint, but this can easily lead to resource
+    // exhaustion, therefore we deliberalty break the spec at this point.
+    if (report_id == 0 || report_id > REPORT_ID_COUNT || reports[report_id] == NULL) {
+        return;
+    }
+
+    reports[report_id]->idle_rate = idle_rate * 4;
+
+    run_idle_task |= idle_rate != 0;
+}
+
+uint8_t usb_shared_get_idle_rate(usb_fs_report_t **reports, uint8_t report_id) {
+    if (report_id > REPORT_ID_COUNT || reports[report_id] == NULL) {
+        return 0;
+    }
+
+    return reports[report_id]->idle_rate / 4;
+}
+
+bool usb_shared_idle_timer_elapsed(usb_fs_report_t **reports, uint8_t report_id) {
+    if (report_id > REPORT_ID_COUNT || reports[report_id] == NULL) {
+        return false;
+    }
+
+    osalSysLock();
+    time_msecs_t idle_rate   = reports[report_id]->idle_rate;
+    systime_t    last_report = reports[report_id]->last_report;
+    osalSysUnlock();
+
+    if (idle_rate == 0) {
+        return false;
+    }
+
+    return chTimeI2MS(chVTTimeElapsedSinceX(last_report)) >= idle_rate;
+}
+
+void usb_idle_task(void) {
+    if (!run_idle_task) {
+        return;
+    }
+
+    static usb_fs_report_t report;
+    bool                   non_zero_idle_rate_found = false;
+
+    for (int ep = 0; ep < USB_ENDPOINT_IN_COUNT; ep++) {
+        usb_report_storage_t *report_storage = usb_endpoints_in[ep].report_storage;
+
+        if (report_storage == NULL) {
+            continue;
+        }
+
+#if defined(SHARED_EP_ENABLE)
+        if (ep == USB_ENDPOINT_IN_SHARED) {
+            for (int report_id = 1; report_id <= REPORT_ID_COUNT; report_id++) {
+                osalSysLock();
+                non_zero_idle_rate_found |= report_storage->get_idle(report_storage->reports, report_id) != 0;
+                osalSysUnlock();
+
+                if (usb_endpoint_in_is_inactive(&usb_endpoints_in[ep]) && report_storage->idle_timer_elasped(report_storage->reports, report_id)) {
+                    osalSysLock();
+                    report_storage->get_report(report_storage->reports, report_id, &report);
+                    osalSysUnlock();
+                    send_report(ep, &report.data, report.length);
+                }
+            }
+            continue;
+        }
+#endif
+
+        osalSysLock();
+        non_zero_idle_rate_found |= report_storage->get_idle(report_storage->reports, 0) != 0;
+        osalSysUnlock();
+
+        if (usb_endpoint_in_is_inactive(&usb_endpoints_in[ep]) && report_storage->idle_timer_elasped(report_storage->reports, 0)) {
+            osalSysLock();
+            report_storage->get_report(report_storage->reports, 0, &report);
+            osalSysUnlock();
+            send_report(ep, &report.data, report.length);
+        }
+    }
+
+    run_idle_task = non_zero_idle_rate_found;
+}
+
+bool usb_get_idle_cb(USBDriver *driver) {
+    usb_control_request_t *setup     = (usb_control_request_t *)driver->setup;
+    uint8_t                interface = setup->wIndex;
+    uint8_t                report_id = setup->wValue.lbyte;
+
+    static uint8_t _Alignas(4) idle_rate;
+
+    if (!IS_VALID_INTERFACE(interface) || !IS_VALID_REPORT_ID(report_id)) {
+        return false;
+    }
+
+    usb_endpoint_in_lut_t ep = usb_endpoint_interface_lut[interface];
+
+    if (!IS_VALID_USB_ENDPOINT_IN_LUT(ep)) {
+        return false;
+    }
+
+    usb_report_storage_t *report_storage = usb_endpoints_in[ep].report_storage;
+
+    if (report_storage == NULL) {
+        return false;
+    }
+
+    idle_rate = report_storage->get_idle(report_storage->reports, report_id);
+
+    usbSetupTransfer(driver, &idle_rate, 1, NULL);
+
+    return true;
+}
+
+bool usb_set_idle_cb(USBDriver *driver) {
+    usb_control_request_t *setup     = (usb_control_request_t *)driver->setup;
+    uint8_t                interface = setup->wIndex;
+    uint8_t                report_id = setup->wValue.lbyte;
+    uint8_t                idle_rate = setup->wValue.hbyte;
+
+    if (!IS_VALID_INTERFACE(interface) || !IS_VALID_REPORT_ID(report_id)) {
+        return false;
+    }
+
+    usb_endpoint_in_lut_t ep = usb_endpoint_interface_lut[interface];
+
+    if (!IS_VALID_USB_ENDPOINT_IN_LUT(ep)) {
+        return false;
+    }
+
+    usb_report_storage_t *report_storage = usb_endpoints_in[ep].report_storage;
+
+    if (report_storage == NULL) {
+        return false;
+    }
+
+    report_storage->set_idle(report_storage->reports, report_id, idle_rate);
+
+    usbSetupTransfer(driver, NULL, 0, NULL);
+
+    return true;
+}
diff --git a/tmk_core/protocol/chibios/usb_report_handling.h b/tmk_core/protocol/chibios/usb_report_handling.h
new file mode 100644
index 00000000000..18b4ce5e263
--- /dev/null
+++ b/tmk_core/protocol/chibios/usb_report_handling.h
@@ -0,0 +1,77 @@
+// Copyright 2023 Stefan Kerkmann (@KarlK90)
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#pragma once
+
+#include <ch.h>
+#include <hal.h>
+#include <stdint.h>
+
+#include "timer.h"
+
+typedef struct {
+    time_msecs_t idle_rate;
+    systime_t    last_report;
+    uint8_t      data[64];
+    size_t       length;
+} usb_fs_report_t;
+
+typedef struct {
+    usb_fs_report_t **reports;
+    const void (*get_report)(usb_fs_report_t **, uint8_t, usb_fs_report_t *);
+    const void (*set_report)(usb_fs_report_t **, const uint8_t *, size_t);
+    const void (*reset_report)(usb_fs_report_t **);
+    const void (*set_idle)(usb_fs_report_t **, uint8_t, uint8_t);
+    const uint8_t (*get_idle)(usb_fs_report_t **, uint8_t);
+    const bool (*idle_timer_elasped)(usb_fs_report_t **, uint8_t);
+} usb_report_storage_t;
+
+#define QMK_USB_REPORT_STROAGE_ENTRY(_report_id, _report_size) [_report_id] = &((usb_fs_report_t){.data = {[0] = _report_id}, .length = _report_size})
+
+#define QMK_USB_REPORT_STORAGE(_get_report, _set_report, _reset_report, _get_idle, _set_idle, _idle_timer_elasped, _report_count, _reports...) \
+    &((usb_report_storage_t){                                                                                                                  \
+        .reports            = (_Alignas(4) usb_fs_report_t *[_report_count]){_reports},                                                        \
+        .get_report         = _get_report,                                                                                                     \
+        .set_report         = _set_report,                                                                                                     \
+        .reset_report       = _reset_report,                                                                                                   \
+        .get_idle           = _get_idle,                                                                                                       \
+        .set_idle           = _set_idle,                                                                                                       \
+        .idle_timer_elasped = _idle_timer_elasped,                                                                                             \
+    })
+
+#define QMK_USB_REPORT_STORAGE_DEFAULT(_report_length)                        \
+    QMK_USB_REPORT_STORAGE(&usb_get_report,         /* _get_report */         \
+                           &usb_set_report,         /* _set_report */         \
+                           &usb_reset_report,       /* _reset_report */       \
+                           &usb_get_idle_rate,      /* _get_idle */           \
+                           &usb_set_idle_rate,      /* _set_idle */           \
+                           &usb_idle_timer_elapsed, /* _idle_timer_elasped */ \
+                           1,                       /* _report_count */       \
+                           QMK_USB_REPORT_STROAGE_ENTRY(0, _report_length))
+
+// USB HID SET_REPORT and GET_REPORT  handling functions
+void usb_set_report(usb_fs_report_t **reports, const uint8_t *data, size_t length);
+void usb_shared_set_report(usb_fs_report_t **reports, const uint8_t *data, size_t length);
+
+void usb_get_report(usb_fs_report_t **reports, uint8_t report_id, usb_fs_report_t *report);
+void usb_shared_get_report(usb_fs_report_t **reports, uint8_t report_id, usb_fs_report_t *report);
+
+void usb_reset_report(usb_fs_report_t **reports);
+void usb_shared_reset_report(usb_fs_report_t **reports);
+
+bool usb_get_report_cb(USBDriver *driver);
+
+// USB HID SET_IDLE and GET_IDLE handling functions
+void usb_idle_task(void);
+
+void usb_set_idle_rate(usb_fs_report_t **timers, uint8_t report_id, uint8_t idle_rate);
+void usb_shared_set_idle_rate(usb_fs_report_t **timers, uint8_t report_id, uint8_t idle_rate);
+
+uint8_t usb_get_idle_rate(usb_fs_report_t **timers, uint8_t report_id);
+uint8_t usb_shared_get_idle_rate(usb_fs_report_t **timers, uint8_t report_id);
+
+bool usb_idle_timer_elapsed(usb_fs_report_t **timers, uint8_t report_id);
+bool usb_shared_idle_timer_elapsed(usb_fs_report_t **timers, uint8_t report_id);
+
+bool usb_get_idle_cb(USBDriver *driver);
+bool usb_set_idle_cb(USBDriver *driver);
diff --git a/tmk_core/protocol/report.h b/tmk_core/protocol/report.h
index 47bc4f2f2bb..0e4f6e9defa 100644
--- a/tmk_core/protocol/report.h
+++ b/tmk_core/protocol/report.h
@@ -29,7 +29,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // clang-format off
 
 /* HID report IDs */
-enum hid_report_ids {
+enum hid_report_ids { 
+    REPORT_ID_ALL = 0,
     REPORT_ID_KEYBOARD = 1,
     REPORT_ID_MOUSE,
     REPORT_ID_SYSTEM,
@@ -37,9 +38,12 @@ enum hid_report_ids {
     REPORT_ID_PROGRAMMABLE_BUTTON,
     REPORT_ID_NKRO,
     REPORT_ID_JOYSTICK,
-    REPORT_ID_DIGITIZER
+    REPORT_ID_DIGITIZER,
+    REPORT_ID_COUNT = REPORT_ID_DIGITIZER
 };
 
+#define IS_VALID_REPORT_ID(id) ((id) >= REPORT_ID_ALL && (id) <= REPORT_ID_COUNT)
+
 /* Mouse buttons */
 #define MOUSE_BTN_MASK(n) (1 << (n))
 enum mouse_buttons {
diff --git a/tmk_core/protocol/usb_descriptor.h b/tmk_core/protocol/usb_descriptor.h
index 2469990f4d8..ecfb022702b 100644
--- a/tmk_core/protocol/usb_descriptor.h
+++ b/tmk_core/protocol/usb_descriptor.h
@@ -196,6 +196,8 @@ enum usb_interfaces {
     TOTAL_INTERFACES
 };
 
+#define IS_VALID_INTERFACE(i) ((i) >= 0 && (i) < TOTAL_INTERFACES)
+
 #define NEXT_EPNUM __COUNTER__
 
 /*
diff --git a/tmk_core/protocol/usb_util.c b/tmk_core/protocol/usb_util.c
index 3b3be4a7675..a130e8b5e34 100644
--- a/tmk_core/protocol/usb_util.c
+++ b/tmk_core/protocol/usb_util.c
@@ -26,9 +26,9 @@ __attribute__((weak)) bool usb_connected_state(void) {
 
 __attribute__((weak)) bool usb_vbus_state(void) {
 #ifdef USB_VBUS_PIN
-    setPinInput(USB_VBUS_PIN);
+    gpio_set_pin_input(USB_VBUS_PIN);
     wait_us(5);
-    return readPin(USB_VBUS_PIN);
+    return gpio_read_pin(USB_VBUS_PIN);
 #else
     return true;
 #endif
diff --git a/util/drivers.txt b/util/drivers.txt
index 1f6c67c4c5f..e8ed7bdb0b1 100644
--- a/util/drivers.txt
+++ b/util/drivers.txt
@@ -8,10 +8,10 @@ winusb,APM32 Bootloader,314B,0106,9ff3cc31-6772-4a3f-a492-a80d91f7a853
 winusb,STM32duino Bootloader,1EAF,0003,746915ec-99d8-4a90-a722-3c85ba31e4fe
 libusbk,USBaspLoader,16C0,05DC,e69affdc-0ef0-427c-aefb-4e593c9d2724
 winusb,Kiibohd DFU Bootloader,1C11,B007,aa5a3f86-b81e-4416-89ad-0c1ea1ed63af
-libusb,ATmega16U2,03EB,2FEF,007274da-b75f-492e-a288-8fc0aff8339f
-libusb,ATmega32U2,03EB,2FF0,ddc2c572-cb6e-4f61-a6cc-1a5de941f063
-libusb,ATmega16U4,03EB,2FF3,3180d426-bf93-4578-a693-2efbc337da8e
-libusb,ATmega32U4,03EB,2FF4,5f9726fd-f9de-487a-9fbd-8b3524a7a56a
-libusb,AT90USB64,03EB,2FF9,c6a708ad-e97d-43cd-b04a-3180d737a71b
-libusb,AT90USB162,03EB,2FFA,ef8546f0-ef09-4e7c-8fc2-ffbae1dcd84a
-libusb,AT90USB128,03EB,2FFB,fd217df3-59d0-440a-a8f3-4c0c8c84daa3
+winusb,ATmega16U2,03EB,2FEF,007274da-b75f-492e-a288-8fc0aff8339f
+winusb,ATmega32U2,03EB,2FF0,ddc2c572-cb6e-4f61-a6cc-1a5de941f063
+winusb,ATmega16U4,03EB,2FF3,3180d426-bf93-4578-a693-2efbc337da8e
+winusb,ATmega32U4,03EB,2FF4,5f9726fd-f9de-487a-9fbd-8b3524a7a56a
+winusb,AT90USB64,03EB,2FF9,c6a708ad-e97d-43cd-b04a-3180d737a71b
+winusb,AT90USB162,03EB,2FFA,ef8546f0-ef09-4e7c-8fc2-ffbae1dcd84a
+winusb,AT90USB128,03EB,2FFB,fd217df3-59d0-440a-a8f3-4c0c8c84daa3
diff --git a/util/nix/poetry.lock b/util/nix/poetry.lock
index dc1b38be843..e9ac9147022 100644
--- a/util/nix/poetry.lock
+++ b/util/nix/poetry.lock
@@ -1,96 +1,97 @@
+# This file is automatically @generated by Poetry 1.7.1 and should not be changed by hand.
+
 [[package]]
 name = "appdirs"
 version = "1.4.4"
 description = "A small Python module for determining appropriate platform-specific dirs, e.g. a \"user data dir\"."
-category = "main"
 optional = false
 python-versions = "*"
+files = [
+    {file = "appdirs-1.4.4-py2.py3-none-any.whl", hash = "sha256:a841dacd6b99318a741b166adb07e19ee71a274450e68237b4650ca1055ab128"},
+    {file = "appdirs-1.4.4.tar.gz", hash = "sha256:7d5d0167b2b1ba821647616af46a749d1c653740dd0d2415100fe26e27afdf41"},
+]
 
 [[package]]
 name = "argcomplete"
-version = "2.0.0"
+version = "3.2.2"
 description = "Bash tab completion for argparse"
-category = "main"
 optional = false
-python-versions = ">=3.6"
+python-versions = ">=3.8"
+files = [
+    {file = "argcomplete-3.2.2-py3-none-any.whl", hash = "sha256:e44f4e7985883ab3e73a103ef0acd27299dbfe2dfed00142c35d4ddd3005901d"},
+    {file = "argcomplete-3.2.2.tar.gz", hash = "sha256:f3e49e8ea59b4026ee29548e24488af46e30c9de57d48638e24f54a1ea1000a2"},
+]
 
 [package.extras]
-test = ["wheel", "pexpect", "flake8", "coverage"]
-
-[[package]]
-name = "atomicwrites"
-version = "1.4.1"
-description = "Atomic file writes."
-category = "dev"
-optional = false
-python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+test = ["coverage", "mypy", "pexpect", "ruff", "wheel"]
 
 [[package]]
 name = "attrs"
-version = "22.1.0"
+version = "23.2.0"
 description = "Classes Without Boilerplate"
-category = "main"
 optional = false
-python-versions = ">=3.5"
+python-versions = ">=3.7"
+files = [
+    {file = "attrs-23.2.0-py3-none-any.whl", hash = "sha256:99b87a485a5820b23b879f04c2305b44b951b502fd64be915879d77a7e8fc6f1"},
+    {file = "attrs-23.2.0.tar.gz", hash = "sha256:935dc3b529c262f6cf76e50877d35a4bd3c1de194fd41f47a2b7ae8f19971f30"},
+]
 
 [package.extras]
-tests_no_zope = ["cloudpickle", "pytest-mypy-plugins", "mypy (>=0.900,!=0.940)", "pytest (>=4.3.0)", "pympler", "hypothesis", "coverage[toml] (>=5.0.2)"]
-tests = ["cloudpickle", "zope.interface", "pytest-mypy-plugins", "mypy (>=0.900,!=0.940)", "pytest (>=4.3.0)", "pympler", "hypothesis", "coverage[toml] (>=5.0.2)"]
-docs = ["sphinx-notfound-page", "zope.interface", "sphinx", "furo"]
-dev = ["cloudpickle", "pre-commit", "sphinx-notfound-page", "sphinx", "furo", "zope.interface", "pytest-mypy-plugins", "mypy (>=0.900,!=0.940)", "pytest (>=4.3.0)", "pympler", "hypothesis", "coverage[toml] (>=5.0.2)"]
+cov = ["attrs[tests]", "coverage[toml] (>=5.3)"]
+dev = ["attrs[tests]", "pre-commit"]
+docs = ["furo", "myst-parser", "sphinx", "sphinx-notfound-page", "sphinxcontrib-towncrier", "towncrier", "zope-interface"]
+tests = ["attrs[tests-no-zope]", "zope-interface"]
+tests-mypy = ["mypy (>=1.6)", "pytest-mypy-plugins"]
+tests-no-zope = ["attrs[tests-mypy]", "cloudpickle", "hypothesis", "pympler", "pytest (>=4.3.0)", "pytest-xdist[psutil]"]
 
 [[package]]
 name = "colorama"
-version = "0.4.5"
+version = "0.4.6"
 description = "Cross-platform colored terminal text."
-category = "main"
 optional = false
-python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
+python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*,>=2.7"
+files = [
+    {file = "colorama-0.4.6-py2.py3-none-any.whl", hash = "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6"},
+    {file = "colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44"},
+]
 
 [[package]]
 name = "dotty-dict"
 version = "1.3.1"
 description = "Dictionary wrapper for quick access to deeply nested keys."
-category = "main"
 optional = false
 python-versions = ">=3.5,<4.0"
-
-[[package]]
-name = "editables"
-version = "0.3"
-description = "Editable installations"
-category = "dev"
-optional = false
-python-versions = ">=3.7"
+files = [
+    {file = "dotty_dict-1.3.1-py3-none-any.whl", hash = "sha256:5022d234d9922f13aa711b4950372a06a6d64cb6d6db9ba43d0ba133ebfce31f"},
+    {file = "dotty_dict-1.3.1.tar.gz", hash = "sha256:4b016e03b8ae265539757a53eba24b9bfda506fb94fbce0bee843c6f05541a15"},
+]
 
 [[package]]
 name = "flake8"
-version = "5.0.4"
+version = "7.0.0"
 description = "the modular source code checker: pep8 pyflakes and co"
-category = "dev"
 optional = false
-python-versions = ">=3.6.1"
+python-versions = ">=3.8.1"
+files = [
+    {file = "flake8-7.0.0-py2.py3-none-any.whl", hash = "sha256:a6dfbb75e03252917f2473ea9653f7cd799c3064e54d4c8140044c5c065f53c3"},
+    {file = "flake8-7.0.0.tar.gz", hash = "sha256:33f96621059e65eec474169085dc92bf26e7b2d47366b70be2f67ab80dc25132"},
+]
 
 [package.dependencies]
 mccabe = ">=0.7.0,<0.8.0"
-pycodestyle = ">=2.9.0,<2.10.0"
-pyflakes = ">=2.5.0,<2.6.0"
-
-[[package]]
-name = "flit-core"
-version = "3.7.1"
-description = "Distribution-building parts of Flit. See flit package for more information"
-category = "dev"
-optional = false
-python-versions = ">=3.6"
+pycodestyle = ">=2.11.0,<2.12.0"
+pyflakes = ">=3.2.0,<3.3.0"
 
 [[package]]
 name = "halo"
 version = "0.0.31"
 description = "Beautiful terminal spinners in Python"
-category = "main"
 optional = false
 python-versions = ">=3.4"
+files = [
+    {file = "halo-0.0.31-py2-none-any.whl", hash = "sha256:5350488fb7d2aa7c31a1344120cee67a872901ce8858f60da7946cef96c208ab"},
+    {file = "halo-0.0.31.tar.gz", hash = "sha256:7b67a3521ee91d53b7152d4ee3452811e1d2a6321975137762eb3d70063cc9d6"},
+]
 
 [package.dependencies]
 colorama = ">=0.3.9"
@@ -100,115 +101,94 @@ spinners = ">=0.0.24"
 termcolor = ">=1.1.0"
 
 [package.extras]
-ipython = ["ipywidgets (==7.1.0)", "IPython (==5.7.0)"]
-
-[[package]]
-name = "hatch-fancy-pypi-readme"
-version = "22.3.0"
-description = "Fancy PyPI READMEs with Hatch"
-category = "dev"
-optional = false
-python-versions = ">=3.7"
-
-[package.dependencies]
-hatchling = "*"
-tomli = {version = "*", markers = "python_version < \"3.11\""}
-
-[package.extras]
-tests = ["wheel", "pytest-icdiff", "pytest", "coverage", "build"]
-dev = ["mypy", "hatch-fancy-pypi-readme"]
-
-[[package]]
-name = "hatch-vcs"
-version = "0.2.0"
-description = "Hatch plugin for versioning with your preferred VCS"
-category = "dev"
-optional = false
-python-versions = "*"
-
-[package.dependencies]
-hatchling = ">=0.21.0"
-setuptools-scm = {version = ">=6.4.0", markers = "python_version > \"3\""}
-
-[[package]]
-name = "hatchling"
-version = "1.8.0"
-description = "Modern, extensible Python build backend"
-category = "dev"
-optional = false
-python-versions = ">=3.7"
-
-[package.dependencies]
-editables = ">=0.3"
-packaging = ">=21.3"
-pathspec = ">=0.9"
-pluggy = ">=1.0.0"
-tomli = {version = ">=1.2.2", markers = "python_version < \"3.11\""}
+ipython = ["IPython (==5.7.0)", "ipywidgets (==7.1.0)"]
 
 [[package]]
 name = "hid"
-version = "1.0.5"
+version = "1.0.6"
 description = "ctypes bindings for hidapi"
-category = "main"
 optional = false
 python-versions = "*"
+files = [
+    {file = "hid-1.0.6-py3-none-any.whl", hash = "sha256:60446054aec54a767d9a4e97920761f41809a055c6d51c54879e37a706dcb588"},
+    {file = "hid-1.0.6.tar.gz", hash = "sha256:48d764d7ae9746ba123b96dbf457893ca80268b7791c4b1d2e051310eeb83860"},
+]
 
 [[package]]
 name = "hjson"
 version = "3.1.0"
 description = "Hjson, a user interface for JSON."
-category = "main"
 optional = false
 python-versions = "*"
+files = [
+    {file = "hjson-3.1.0-py3-none-any.whl", hash = "sha256:65713cdcf13214fb554eb8b4ef803419733f4f5e551047c9b711098ab7186b89"},
+    {file = "hjson-3.1.0.tar.gz", hash = "sha256:55af475a27cf83a7969c808399d7bccdec8fb836a07ddbd574587593b9cdcf75"},
+]
 
 [[package]]
-name = "importlib-resources"
-version = "5.9.0"
-description = "Read resources from Python packages"
-category = "main"
+name = "importlib-metadata"
+version = "7.0.1"
+description = "Read metadata from Python packages"
 optional = false
-python-versions = ">=3.7"
+python-versions = ">=3.8"
+files = [
+    {file = "importlib_metadata-7.0.1-py3-none-any.whl", hash = "sha256:4805911c3a4ec7c3966410053e9ec6a1fecd629117df5adee56dfc9432a1081e"},
+    {file = "importlib_metadata-7.0.1.tar.gz", hash = "sha256:f238736bb06590ae52ac1fab06a3a9ef1d8dce2b7a35b5ab329371d6c8f5d2cc"},
+]
 
 [package.dependencies]
-zipp = {version = ">=3.1.0", markers = "python_version < \"3.10\""}
+zipp = ">=0.5"
 
 [package.extras]
-testing = ["pytest-mypy (>=0.9.1)", "pytest-black (>=0.3.7)", "pytest-enabler (>=1.3)", "pytest-cov", "pytest-flake8", "pytest-checkdocs (>=2.4)", "pytest (>=6)"]
-docs = ["jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "jaraco.packaging (>=9)", "sphinx"]
-
-[[package]]
-name = "iniconfig"
-version = "1.1.1"
-description = "iniconfig: brain-dead simple config-ini parsing"
-category = "dev"
-optional = false
-python-versions = "*"
+docs = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (<7.2.5)", "sphinx (>=3.5)", "sphinx-lint"]
+perf = ["ipython"]
+testing = ["flufl.flake8", "importlib-resources (>=1.3)", "packaging", "pyfakefs", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-mypy (>=0.9.1)", "pytest-perf (>=0.9.2)", "pytest-ruff"]
 
 [[package]]
 name = "jsonschema"
-version = "4.14.0"
+version = "4.21.1"
 description = "An implementation of JSON Schema validation for Python"
-category = "main"
 optional = false
-python-versions = ">=3.7"
+python-versions = ">=3.8"
+files = [
+    {file = "jsonschema-4.21.1-py3-none-any.whl", hash = "sha256:7996507afae316306f9e2290407761157c6f78002dcf7419acb99822143d1c6f"},
+    {file = "jsonschema-4.21.1.tar.gz", hash = "sha256:85727c00279f5fa6bedbe6238d2aa6403bedd8b4864ab11207d07df3cc1b2ee5"},
+]
 
 [package.dependencies]
-attrs = ">=17.4.0"
-importlib-resources = {version = ">=1.4.0", markers = "python_version < \"3.9\""}
-pkgutil-resolve-name = {version = ">=1.3.10", markers = "python_version < \"3.9\""}
-pyrsistent = ">=0.14.0,<0.17.0 || >0.17.0,<0.17.1 || >0.17.1,<0.17.2 || >0.17.2"
+attrs = ">=22.2.0"
+jsonschema-specifications = ">=2023.03.6"
+referencing = ">=0.28.4"
+rpds-py = ">=0.7.1"
 
 [package.extras]
-format-nongpl = ["webcolors (>=1.11)", "uri-template", "rfc3986-validator (>0.1.0)", "rfc3339-validator", "jsonpointer (>1.13)", "isoduration", "idna", "fqdn"]
-format = ["webcolors (>=1.11)", "uri-template", "rfc3987", "rfc3339-validator", "jsonpointer (>1.13)", "isoduration", "idna", "fqdn"]
+format = ["fqdn", "idna", "isoduration", "jsonpointer (>1.13)", "rfc3339-validator", "rfc3987", "uri-template", "webcolors (>=1.11)"]
+format-nongpl = ["fqdn", "idna", "isoduration", "jsonpointer (>1.13)", "rfc3339-validator", "rfc3986-validator (>0.1.0)", "uri-template", "webcolors (>=1.11)"]
+
+[[package]]
+name = "jsonschema-specifications"
+version = "2023.12.1"
+description = "The JSON Schema meta-schemas and vocabularies, exposed as a Registry"
+optional = false
+python-versions = ">=3.8"
+files = [
+    {file = "jsonschema_specifications-2023.12.1-py3-none-any.whl", hash = "sha256:87e4fdf3a94858b8a2ba2778d9ba57d8a9cafca7c7489c46ba0d30a8bc6a9c3c"},
+    {file = "jsonschema_specifications-2023.12.1.tar.gz", hash = "sha256:48a76787b3e70f5ed53f1160d2b81f586e4ca6d1548c5de7085d1682674764cc"},
+]
+
+[package.dependencies]
+referencing = ">=0.31.0"
 
 [[package]]
 name = "log-symbols"
 version = "0.0.14"
 description = "Colored symbols for various log levels for Python"
-category = "main"
 optional = false
 python-versions = "*"
+files = [
+    {file = "log_symbols-0.0.14-py3-none-any.whl", hash = "sha256:4952106ff8b605ab7d5081dd2c7e6ca7374584eff7086f499c06edd1ce56dcca"},
+    {file = "log_symbols-0.0.14.tar.gz", hash = "sha256:cf0bbc6fe1a8e53f0d174a716bc625c4f87043cc21eb55dd8a740cfe22680556"},
+]
 
 [package.dependencies]
 colorama = ">=0.3.9"
@@ -217,17 +197,23 @@ colorama = ">=0.3.9"
 name = "mccabe"
 version = "0.7.0"
 description = "McCabe checker, plugin for flake8"
-category = "dev"
 optional = false
 python-versions = ">=3.6"
+files = [
+    {file = "mccabe-0.7.0-py2.py3-none-any.whl", hash = "sha256:6c2d30ab6be0e4a46919781807b4f0d834ebdd6c6e3dca0bda5a15f863427b6e"},
+    {file = "mccabe-0.7.0.tar.gz", hash = "sha256:348e0240c33b60bbdf4e523192ef919f28cb2c3d7d5c7794f74009290f236325"},
+]
 
 [[package]]
 name = "milc"
-version = "1.6.6"
+version = "1.8.0"
 description = "Opinionated Batteries-Included Python 3 CLI Framework."
-category = "main"
 optional = false
-python-versions = "*"
+python-versions = ">=3.7"
+files = [
+    {file = "milc-1.8.0-py2.py3-none-any.whl", hash = "sha256:faee16fe92ce13eb1b0b4e24ac5b5003d7234880a8d21e4210016d70512bc921"},
+    {file = "milc-1.8.0.tar.gz", hash = "sha256:cabe658de07ab97f937c7672b8a604cc825174c28d66d3afd047a9b4b2770bbe"},
+]
 
 [package.dependencies]
 appdirs = "*"
@@ -235,543 +221,451 @@ argcomplete = "*"
 colorama = "*"
 halo = "*"
 spinners = "*"
+types-colorama = "*"
 
 [[package]]
 name = "nose2"
-version = "0.12.0"
-description = "unittest2 with plugins, the successor to nose"
-category = "dev"
+version = "0.14.1"
+description = "unittest with plugins"
 optional = false
-python-versions = "*"
+python-versions = ">=3.8"
+files = [
+    {file = "nose2-0.14.1-py3-none-any.whl", hash = "sha256:dfbf0d90c98b8d7bbf47d7721c7554ffcca86828ec074c985bb6ecc83c445a4e"},
+    {file = "nose2-0.14.1.tar.gz", hash = "sha256:7f8f03a21c9de2c33015933afcef72bf8e4a2d5dfec3b40092287de6e41b093a"},
+]
 
 [package.extras]
-dev = ["sphinx-issues", "mock", "sphinx-rtd-theme", "sphinx"]
-coverage_plugin = ["coverage"]
-
-[[package]]
-name = "packaging"
-version = "21.3"
-description = "Core utilities for Python packages"
-category = "dev"
-optional = false
-python-versions = ">=3.6"
-
-[package.dependencies]
-pyparsing = ">=2.0.2,<3.0.5 || >3.0.5"
-
-[[package]]
-name = "pathspec"
-version = "0.9.0"
-description = "Utility library for gitignore style pattern matching of file paths."
-category = "dev"
-optional = false
-python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7"
+coverage-plugin = ["coverage"]
+dev = ["Sphinx", "sphinx-issues", "sphinx-rtd-theme"]
 
 [[package]]
 name = "pep8-naming"
-version = "0.13.2"
+version = "0.13.3"
 description = "Check PEP-8 naming conventions, plugin for flake8"
-category = "dev"
 optional = false
 python-versions = ">=3.7"
+files = [
+    {file = "pep8-naming-0.13.3.tar.gz", hash = "sha256:1705f046dfcd851378aac3be1cd1551c7c1e5ff363bacad707d43007877fa971"},
+    {file = "pep8_naming-0.13.3-py3-none-any.whl", hash = "sha256:1a86b8c71a03337c97181917e2b472f0f5e4ccb06844a0d6f0a33522549e7a80"},
+]
 
 [package.dependencies]
-flake8 = ">=3.9.1"
+flake8 = ">=5.0.0"
 
 [[package]]
 name = "pillow"
-version = "9.2.0"
+version = "10.2.0"
 description = "Python Imaging Library (Fork)"
-category = "main"
 optional = false
-python-versions = ">=3.7"
+python-versions = ">=3.8"
+files = [
+    {file = "pillow-10.2.0-cp310-cp310-macosx_10_10_x86_64.whl", hash = "sha256:7823bdd049099efa16e4246bdf15e5a13dbb18a51b68fa06d6c1d4d8b99a796e"},
+    {file = "pillow-10.2.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:83b2021f2ade7d1ed556bc50a399127d7fb245e725aa0113ebd05cfe88aaf588"},
+    {file = "pillow-10.2.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6fad5ff2f13d69b7e74ce5b4ecd12cc0ec530fcee76356cac6742785ff71c452"},
+    {file = "pillow-10.2.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:da2b52b37dad6d9ec64e653637a096905b258d2fc2b984c41ae7d08b938a67e4"},
+    {file = "pillow-10.2.0-cp310-cp310-manylinux_2_28_aarch64.whl", hash = "sha256:47c0995fc4e7f79b5cfcab1fc437ff2890b770440f7696a3ba065ee0fd496563"},
+    {file = "pillow-10.2.0-cp310-cp310-manylinux_2_28_x86_64.whl", hash = "sha256:322bdf3c9b556e9ffb18f93462e5f749d3444ce081290352c6070d014c93feb2"},
+    {file = "pillow-10.2.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:51f1a1bffc50e2e9492e87d8e09a17c5eea8409cda8d3f277eb6edc82813c17c"},
+    {file = "pillow-10.2.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:69ffdd6120a4737710a9eee73e1d2e37db89b620f702754b8f6e62594471dee0"},
+    {file = "pillow-10.2.0-cp310-cp310-win32.whl", hash = "sha256:c6dafac9e0f2b3c78df97e79af707cdc5ef8e88208d686a4847bab8266870023"},
+    {file = "pillow-10.2.0-cp310-cp310-win_amd64.whl", hash = "sha256:aebb6044806f2e16ecc07b2a2637ee1ef67a11840a66752751714a0d924adf72"},
+    {file = "pillow-10.2.0-cp310-cp310-win_arm64.whl", hash = "sha256:7049e301399273a0136ff39b84c3678e314f2158f50f517bc50285fb5ec847ad"},
+    {file = "pillow-10.2.0-cp311-cp311-macosx_10_10_x86_64.whl", hash = "sha256:35bb52c37f256f662abdfa49d2dfa6ce5d93281d323a9af377a120e89a9eafb5"},
+    {file = "pillow-10.2.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:9c23f307202661071d94b5e384e1e1dc7dfb972a28a2310e4ee16103e66ddb67"},
+    {file = "pillow-10.2.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:773efe0603db30c281521a7c0214cad7836c03b8ccff897beae9b47c0b657d61"},
+    {file = "pillow-10.2.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:11fa2e5984b949b0dd6d7a94d967743d87c577ff0b83392f17cb3990d0d2fd6e"},
+    {file = "pillow-10.2.0-cp311-cp311-manylinux_2_28_aarch64.whl", hash = "sha256:716d30ed977be8b37d3ef185fecb9e5a1d62d110dfbdcd1e2a122ab46fddb03f"},
+    {file = "pillow-10.2.0-cp311-cp311-manylinux_2_28_x86_64.whl", hash = "sha256:a086c2af425c5f62a65e12fbf385f7c9fcb8f107d0849dba5839461a129cf311"},
+    {file = "pillow-10.2.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:c8de2789052ed501dd829e9cae8d3dcce7acb4777ea4a479c14521c942d395b1"},
+    {file = "pillow-10.2.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:609448742444d9290fd687940ac0b57fb35e6fd92bdb65386e08e99af60bf757"},
+    {file = "pillow-10.2.0-cp311-cp311-win32.whl", hash = "sha256:823ef7a27cf86df6597fa0671066c1b596f69eba53efa3d1e1cb8b30f3533068"},
+    {file = "pillow-10.2.0-cp311-cp311-win_amd64.whl", hash = "sha256:1da3b2703afd040cf65ec97efea81cfba59cdbed9c11d8efc5ab09df9509fc56"},
+    {file = "pillow-10.2.0-cp311-cp311-win_arm64.whl", hash = "sha256:edca80cbfb2b68d7b56930b84a0e45ae1694aeba0541f798e908a49d66b837f1"},
+    {file = "pillow-10.2.0-cp312-cp312-macosx_10_10_x86_64.whl", hash = "sha256:1b5e1b74d1bd1b78bc3477528919414874748dd363e6272efd5abf7654e68bef"},
+    {file = "pillow-10.2.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:0eae2073305f451d8ecacb5474997c08569fb4eb4ac231ffa4ad7d342fdc25ac"},
+    {file = "pillow-10.2.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b7c2286c23cd350b80d2fc9d424fc797575fb16f854b831d16fd47ceec078f2c"},
+    {file = "pillow-10.2.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1e23412b5c41e58cec602f1135c57dfcf15482013ce6e5f093a86db69646a5aa"},
+    {file = "pillow-10.2.0-cp312-cp312-manylinux_2_28_aarch64.whl", hash = "sha256:52a50aa3fb3acb9cf7213573ef55d31d6eca37f5709c69e6858fe3bc04a5c2a2"},
+    {file = "pillow-10.2.0-cp312-cp312-manylinux_2_28_x86_64.whl", hash = "sha256:127cee571038f252a552760076407f9cff79761c3d436a12af6000cd182a9d04"},
+    {file = "pillow-10.2.0-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:8d12251f02d69d8310b046e82572ed486685c38f02176bd08baf216746eb947f"},
+    {file = "pillow-10.2.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:54f1852cd531aa981bc0965b7d609f5f6cc8ce8c41b1139f6ed6b3c54ab82bfb"},
+    {file = "pillow-10.2.0-cp312-cp312-win32.whl", hash = "sha256:257d8788df5ca62c980314053197f4d46eefedf4e6175bc9412f14412ec4ea2f"},
+    {file = "pillow-10.2.0-cp312-cp312-win_amd64.whl", hash = "sha256:154e939c5f0053a383de4fd3d3da48d9427a7e985f58af8e94d0b3c9fcfcf4f9"},
+    {file = "pillow-10.2.0-cp312-cp312-win_arm64.whl", hash = "sha256:f379abd2f1e3dddb2b61bc67977a6b5a0a3f7485538bcc6f39ec76163891ee48"},
+    {file = "pillow-10.2.0-cp38-cp38-macosx_10_10_x86_64.whl", hash = "sha256:8373c6c251f7ef8bda6675dd6d2b3a0fcc31edf1201266b5cf608b62a37407f9"},
+    {file = "pillow-10.2.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:870ea1ada0899fd0b79643990809323b389d4d1d46c192f97342eeb6ee0b8483"},
+    {file = "pillow-10.2.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b4b6b1e20608493548b1f32bce8cca185bf0480983890403d3b8753e44077129"},
+    {file = "pillow-10.2.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3031709084b6e7852d00479fd1d310b07d0ba82765f973b543c8af5061cf990e"},
+    {file = "pillow-10.2.0-cp38-cp38-manylinux_2_28_aarch64.whl", hash = "sha256:3ff074fc97dd4e80543a3e91f69d58889baf2002b6be64347ea8cf5533188213"},
+    {file = "pillow-10.2.0-cp38-cp38-manylinux_2_28_x86_64.whl", hash = "sha256:cb4c38abeef13c61d6916f264d4845fab99d7b711be96c326b84df9e3e0ff62d"},
+    {file = "pillow-10.2.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:b1b3020d90c2d8e1dae29cf3ce54f8094f7938460fb5ce8bc5c01450b01fbaf6"},
+    {file = "pillow-10.2.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:170aeb00224ab3dc54230c797f8404507240dd868cf52066f66a41b33169bdbe"},
+    {file = "pillow-10.2.0-cp38-cp38-win32.whl", hash = "sha256:c4225f5220f46b2fde568c74fca27ae9771536c2e29d7c04f4fb62c83275ac4e"},
+    {file = "pillow-10.2.0-cp38-cp38-win_amd64.whl", hash = "sha256:0689b5a8c5288bc0504d9fcee48f61a6a586b9b98514d7d29b840143d6734f39"},
+    {file = "pillow-10.2.0-cp39-cp39-macosx_10_10_x86_64.whl", hash = "sha256:b792a349405fbc0163190fde0dc7b3fef3c9268292586cf5645598b48e63dc67"},
+    {file = "pillow-10.2.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:c570f24be1e468e3f0ce7ef56a89a60f0e05b30a3669a459e419c6eac2c35364"},
+    {file = "pillow-10.2.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d8ecd059fdaf60c1963c58ceb8997b32e9dc1b911f5da5307aab614f1ce5c2fb"},
+    {file = "pillow-10.2.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c365fd1703040de1ec284b176d6af5abe21b427cb3a5ff68e0759e1e313a5e7e"},
+    {file = "pillow-10.2.0-cp39-cp39-manylinux_2_28_aarch64.whl", hash = "sha256:70c61d4c475835a19b3a5aa42492409878bbca7438554a1f89d20d58a7c75c01"},
+    {file = "pillow-10.2.0-cp39-cp39-manylinux_2_28_x86_64.whl", hash = "sha256:b6f491cdf80ae540738859d9766783e3b3c8e5bd37f5dfa0b76abdecc5081f13"},
+    {file = "pillow-10.2.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:9d189550615b4948f45252d7f005e53c2040cea1af5b60d6f79491a6e147eef7"},
+    {file = "pillow-10.2.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:49d9ba1ed0ef3e061088cd1e7538a0759aab559e2e0a80a36f9fd9d8c0c21591"},
+    {file = "pillow-10.2.0-cp39-cp39-win32.whl", hash = "sha256:babf5acfede515f176833ed6028754cbcd0d206f7f614ea3447d67c33be12516"},
+    {file = "pillow-10.2.0-cp39-cp39-win_amd64.whl", hash = "sha256:0304004f8067386b477d20a518b50f3fa658a28d44e4116970abfcd94fac34a8"},
+    {file = "pillow-10.2.0-cp39-cp39-win_arm64.whl", hash = "sha256:0fb3e7fc88a14eacd303e90481ad983fd5b69c761e9e6ef94c983f91025da869"},
+    {file = "pillow-10.2.0-pp310-pypy310_pp73-macosx_10_10_x86_64.whl", hash = "sha256:322209c642aabdd6207517e9739c704dc9f9db943015535783239022002f054a"},
+    {file = "pillow-10.2.0-pp310-pypy310_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3eedd52442c0a5ff4f887fab0c1c0bb164d8635b32c894bc1faf4c618dd89df2"},
+    {file = "pillow-10.2.0-pp310-pypy310_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:cb28c753fd5eb3dd859b4ee95de66cc62af91bcff5db5f2571d32a520baf1f04"},
+    {file = "pillow-10.2.0-pp310-pypy310_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:33870dc4653c5017bf4c8873e5488d8f8d5f8935e2f1fb9a2208c47cdd66efd2"},
+    {file = "pillow-10.2.0-pp310-pypy310_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:3c31822339516fb3c82d03f30e22b1d038da87ef27b6a78c9549888f8ceda39a"},
+    {file = "pillow-10.2.0-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:a2b56ba36e05f973d450582fb015594aaa78834fefe8dfb8fcd79b93e64ba4c6"},
+    {file = "pillow-10.2.0-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:d8e6aeb9201e655354b3ad049cb77d19813ad4ece0df1249d3c793de3774f8c7"},
+    {file = "pillow-10.2.0-pp39-pypy39_pp73-macosx_10_10_x86_64.whl", hash = "sha256:2247178effb34a77c11c0e8ac355c7a741ceca0a732b27bf11e747bbc950722f"},
+    {file = "pillow-10.2.0-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:15587643b9e5eb26c48e49a7b33659790d28f190fc514a322d55da2fb5c2950e"},
+    {file = "pillow-10.2.0-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:753cd8f2086b2b80180d9b3010dd4ed147efc167c90d3bf593fe2af21265e5a5"},
+    {file = "pillow-10.2.0-pp39-pypy39_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:7c8f97e8e7a9009bcacbe3766a36175056c12f9a44e6e6f2d5caad06dcfbf03b"},
+    {file = "pillow-10.2.0-pp39-pypy39_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:d1b35bcd6c5543b9cb547dee3150c93008f8dd0f1fef78fc0cd2b141c5baf58a"},
+    {file = "pillow-10.2.0-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:fe4c15f6c9285dc54ce6553a3ce908ed37c8f3825b5a51a15c91442bb955b868"},
+    {file = "pillow-10.2.0.tar.gz", hash = "sha256:e87f0b2c78157e12d7686b27d63c070fd65d994e8ddae6f328e0dcf4a0cd007e"},
+]
 
 [package.extras]
-tests = ["pytest-timeout", "pytest-cov", "pytest", "pyroma", "packaging", "olefile", "markdown2", "defusedxml", "coverage", "check-manifest"]
-docs = ["sphinxext-opengraph", "sphinx-removed-in", "sphinx-issues (>=3.0.1)", "sphinx-copybutton", "sphinx (>=2.4)", "olefile", "furo"]
+docs = ["furo", "olefile", "sphinx (>=2.4)", "sphinx-copybutton", "sphinx-inline-tabs", "sphinx-removed-in", "sphinxext-opengraph"]
+fpx = ["olefile"]
+mic = ["olefile"]
+tests = ["check-manifest", "coverage", "defusedxml", "markdown2", "olefile", "packaging", "pyroma", "pytest", "pytest-cov", "pytest-timeout"]
+typing = ["typing-extensions"]
+xmp = ["defusedxml"]
 
 [[package]]
-name = "pkgutil-resolve-name"
-version = "1.3.10"
-description = "Resolve a name to an object."
-category = "main"
+name = "platformdirs"
+version = "4.2.0"
+description = "A small Python package for determining appropriate platform-specific dirs, e.g. a \"user data dir\"."
 optional = false
-python-versions = ">=3.6"
-
-[[package]]
-name = "pluggy"
-version = "1.0.0"
-description = "plugin and hook calling mechanisms for python"
-category = "dev"
-optional = false
-python-versions = ">=3.6"
+python-versions = ">=3.8"
+files = [
+    {file = "platformdirs-4.2.0-py3-none-any.whl", hash = "sha256:0614df2a2f37e1a662acbd8e2b25b92ccf8632929bc6d43467e17fe89c75e068"},
+    {file = "platformdirs-4.2.0.tar.gz", hash = "sha256:ef0cc731df711022c174543cb70a9b5bd22e5a9337c8624ef2c2ceb8ddad8768"},
+]
 
 [package.extras]
-testing = ["pytest-benchmark", "pytest"]
-dev = ["tox", "pre-commit"]
-
-[[package]]
-name = "poetry-core"
-version = "1.0.8"
-description = "Poetry PEP 517 Build Backend"
-category = "dev"
-optional = false
-python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
-
-[[package]]
-name = "py"
-version = "1.11.0"
-description = "library with cross-python path, ini-parsing, io, code, log facilities"
-category = "dev"
-optional = false
-python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
+docs = ["furo (>=2023.9.10)", "proselint (>=0.13)", "sphinx (>=7.2.6)", "sphinx-autodoc-typehints (>=1.25.2)"]
+test = ["appdirs (==1.4.4)", "covdefaults (>=2.3)", "pytest (>=7.4.3)", "pytest-cov (>=4.1)", "pytest-mock (>=3.12)"]
 
 [[package]]
 name = "pycodestyle"
-version = "2.9.1"
+version = "2.11.1"
 description = "Python style guide checker"
-category = "dev"
 optional = false
-python-versions = ">=3.6"
+python-versions = ">=3.8"
+files = [
+    {file = "pycodestyle-2.11.1-py2.py3-none-any.whl", hash = "sha256:44fe31000b2d866f2e41841b18528a505fbd7fef9017b04eff4e2648a0fadc67"},
+    {file = "pycodestyle-2.11.1.tar.gz", hash = "sha256:41ba0e7afc9752dfb53ced5489e89f8186be00e599e712660695b7a75ff2663f"},
+]
 
 [[package]]
 name = "pyflakes"
-version = "2.5.0"
+version = "3.2.0"
 description = "passive checker of Python programs"
-category = "dev"
 optional = false
-python-versions = ">=3.6"
+python-versions = ">=3.8"
+files = [
+    {file = "pyflakes-3.2.0-py2.py3-none-any.whl", hash = "sha256:84b5be138a2dfbb40689ca07e2152deb896a65c3a3e24c251c5c62489568074a"},
+    {file = "pyflakes-3.2.0.tar.gz", hash = "sha256:1c61603ff154621fb2a9172037d84dca3500def8c8b630657d1701f026f8af3f"},
+]
 
 [[package]]
 name = "pygments"
-version = "2.13.0"
+version = "2.17.2"
 description = "Pygments is a syntax highlighting package written in Python."
-category = "main"
 optional = false
-python-versions = ">=3.6"
+python-versions = ">=3.7"
+files = [
+    {file = "pygments-2.17.2-py3-none-any.whl", hash = "sha256:b27c2826c47d0f3219f29554824c30c5e8945175d888647acd804ddd04af846c"},
+    {file = "pygments-2.17.2.tar.gz", hash = "sha256:da46cec9fd2de5be3a8a784f434e4c4ab670b4ff54d605c4c2717e9d49c4c367"},
+]
 
 [package.extras]
 plugins = ["importlib-metadata"]
-
-[[package]]
-name = "pyparsing"
-version = "3.0.9"
-description = "pyparsing module - Classes and methods to define and execute parsing grammars"
-category = "dev"
-optional = false
-python-versions = ">=3.6.8"
-
-[package.extras]
-diagrams = ["jinja2", "railroad-diagrams"]
-
-[[package]]
-name = "pyrsistent"
-version = "0.18.1"
-description = "Persistent/Functional/Immutable data structures"
-category = "main"
-optional = false
-python-versions = ">=3.7"
+windows-terminal = ["colorama (>=0.4.6)"]
 
 [[package]]
 name = "pyserial"
 version = "3.5"
 description = "Python Serial Port Extension"
-category = "main"
 optional = false
 python-versions = "*"
+files = [
+    {file = "pyserial-3.5-py2.py3-none-any.whl", hash = "sha256:c4451db6ba391ca6ca299fb3ec7bae67a5c55dde170964c7a14ceefec02f2cf0"},
+    {file = "pyserial-3.5.tar.gz", hash = "sha256:3c77e014170dfffbd816e6ffc205e9842efb10be9f58ec16d3e8675b4925cddb"},
+]
 
 [package.extras]
 cp2110 = ["hidapi"]
 
-[[package]]
-name = "pytest"
-version = "7.1.2"
-description = "pytest: simple powerful testing with Python"
-category = "dev"
-optional = false
-python-versions = ">=3.7"
-
-[package.dependencies]
-atomicwrites = {version = ">=1.0", markers = "sys_platform == \"win32\""}
-attrs = ">=19.2.0"
-colorama = {version = "*", markers = "sys_platform == \"win32\""}
-iniconfig = "*"
-packaging = "*"
-pluggy = ">=0.12,<2.0"
-py = ">=1.8.2"
-tomli = ">=1.0.0"
-
-[package.extras]
-testing = ["xmlschema", "requests", "pygments (>=2.7.2)", "nose", "mock", "hypothesis (>=3.56)", "argcomplete"]
-
 [[package]]
 name = "pyusb"
 version = "1.2.1"
 description = "Python USB access module"
-category = "main"
 optional = false
 python-versions = ">=3.6.0"
+files = [
+    {file = "pyusb-1.2.1-py3-none-any.whl", hash = "sha256:2b4c7cb86dbadf044dfb9d3a4ff69fd217013dbe78a792177a3feb172449ea36"},
+    {file = "pyusb-1.2.1.tar.gz", hash = "sha256:a4cc7404a203144754164b8b40994e2849fde1cfff06b08492f12fff9d9de7b9"},
+]
 
 [[package]]
 name = "qmk"
-version = "1.1.1"
+version = "1.1.5"
 description = "A program to help users work with QMK Firmware."
-category = "main"
 optional = false
 python-versions = ">=3.7"
+files = [
+    {file = "qmk-1.1.5-py2.py3-none-any.whl", hash = "sha256:9c16fa2ad9b279ce9cc121a5462f02637611c6f54c49f9f2cac8ba2898f35b94"},
+    {file = "qmk-1.1.5.tar.gz", hash = "sha256:2efe3c752230c6ba24b8719c3b6e85a5644bf8f7d0dd237757eda9b7b7e60b11"},
+]
 
 [package.dependencies]
 dotty-dict = "*"
 hid = "*"
 hjson = "*"
 jsonschema = ">=4"
-milc = ">=1.4.2"
+milc = ">=1.6.8"
 pillow = "*"
 pygments = "*"
 pyserial = "*"
 pyusb = "*"
+setuptools = ">=45"
 
 [[package]]
-name = "setuptools-scm"
-version = "7.0.5"
-description = "the blessed package to manage your versions by scm tags"
-category = "dev"
+name = "referencing"
+version = "0.33.0"
+description = "JSON Referencing + Python"
 optional = false
-python-versions = ">=3.7"
+python-versions = ">=3.8"
+files = [
+    {file = "referencing-0.33.0-py3-none-any.whl", hash = "sha256:39240f2ecc770258f28b642dd47fd74bc8b02484de54e1882b74b35ebd779bd5"},
+    {file = "referencing-0.33.0.tar.gz", hash = "sha256:c775fedf74bc0f9189c2a3be1c12fd03e8c23f4d371dce795df44e06c5b412f7"},
+]
 
 [package.dependencies]
-packaging = ">=20.0"
-tomli = ">=1.0.0"
-typing-extensions = "*"
+attrs = ">=22.2.0"
+rpds-py = ">=0.7.0"
+
+[[package]]
+name = "rpds-py"
+version = "0.18.0"
+description = "Python bindings to Rust's persistent data structures (rpds)"
+optional = false
+python-versions = ">=3.8"
+files = [
+    {file = "rpds_py-0.18.0-cp310-cp310-macosx_10_12_x86_64.whl", hash = "sha256:5b4e7d8d6c9b2e8ee2d55c90b59c707ca59bc30058269b3db7b1f8df5763557e"},
+    {file = "rpds_py-0.18.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:c463ed05f9dfb9baebef68048aed8dcdc94411e4bf3d33a39ba97e271624f8f7"},
+    {file = "rpds_py-0.18.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:01e36a39af54a30f28b73096dd39b6802eddd04c90dbe161c1b8dbe22353189f"},
+    {file = "rpds_py-0.18.0-cp310-cp310-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:d62dec4976954a23d7f91f2f4530852b0c7608116c257833922a896101336c51"},
+    {file = "rpds_py-0.18.0-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:dd18772815d5f008fa03d2b9a681ae38d5ae9f0e599f7dda233c439fcaa00d40"},
+    {file = "rpds_py-0.18.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:923d39efa3cfb7279a0327e337a7958bff00cc447fd07a25cddb0a1cc9a6d2da"},
+    {file = "rpds_py-0.18.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:39514da80f971362f9267c600b6d459bfbbc549cffc2cef8e47474fddc9b45b1"},
+    {file = "rpds_py-0.18.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:a34d557a42aa28bd5c48a023c570219ba2593bcbbb8dc1b98d8cf5d529ab1434"},
+    {file = "rpds_py-0.18.0-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:93df1de2f7f7239dc9cc5a4a12408ee1598725036bd2dedadc14d94525192fc3"},
+    {file = "rpds_py-0.18.0-cp310-cp310-musllinux_1_2_i686.whl", hash = "sha256:34b18ba135c687f4dac449aa5157d36e2cbb7c03cbea4ddbd88604e076aa836e"},
+    {file = "rpds_py-0.18.0-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:c0b5dcf9193625afd8ecc92312d6ed78781c46ecbf39af9ad4681fc9f464af88"},
+    {file = "rpds_py-0.18.0-cp310-none-win32.whl", hash = "sha256:c4325ff0442a12113a6379af66978c3fe562f846763287ef66bdc1d57925d337"},
+    {file = "rpds_py-0.18.0-cp310-none-win_amd64.whl", hash = "sha256:7223a2a5fe0d217e60a60cdae28d6949140dde9c3bcc714063c5b463065e3d66"},
+    {file = "rpds_py-0.18.0-cp311-cp311-macosx_10_12_x86_64.whl", hash = "sha256:3a96e0c6a41dcdba3a0a581bbf6c44bb863f27c541547fb4b9711fd8cf0ffad4"},
+    {file = "rpds_py-0.18.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:30f43887bbae0d49113cbaab729a112251a940e9b274536613097ab8b4899cf6"},
+    {file = "rpds_py-0.18.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:fcb25daa9219b4cf3a0ab24b0eb9a5cc8949ed4dc72acb8fa16b7e1681aa3c58"},
+    {file = "rpds_py-0.18.0-cp311-cp311-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:d68c93e381010662ab873fea609bf6c0f428b6d0bb00f2c6939782e0818d37bf"},
+    {file = "rpds_py-0.18.0-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:b34b7aa8b261c1dbf7720b5d6f01f38243e9b9daf7e6b8bc1fd4657000062f2c"},
+    {file = "rpds_py-0.18.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2e6d75ab12b0bbab7215e5d40f1e5b738aa539598db27ef83b2ec46747df90e1"},
+    {file = "rpds_py-0.18.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0b8612cd233543a3781bc659c731b9d607de65890085098986dfd573fc2befe5"},
+    {file = "rpds_py-0.18.0-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:aec493917dd45e3c69d00a8874e7cbed844efd935595ef78a0f25f14312e33c6"},
+    {file = "rpds_py-0.18.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:661d25cbffaf8cc42e971dd570d87cb29a665f49f4abe1f9e76be9a5182c4688"},
+    {file = "rpds_py-0.18.0-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:1df3659d26f539ac74fb3b0c481cdf9d725386e3552c6fa2974f4d33d78e544b"},
+    {file = "rpds_py-0.18.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:a1ce3ba137ed54f83e56fb983a5859a27d43a40188ba798993812fed73c70836"},
+    {file = "rpds_py-0.18.0-cp311-none-win32.whl", hash = "sha256:69e64831e22a6b377772e7fb337533c365085b31619005802a79242fee620bc1"},
+    {file = "rpds_py-0.18.0-cp311-none-win_amd64.whl", hash = "sha256:998e33ad22dc7ec7e030b3df701c43630b5bc0d8fbc2267653577e3fec279afa"},
+    {file = "rpds_py-0.18.0-cp312-cp312-macosx_10_12_x86_64.whl", hash = "sha256:7f2facbd386dd60cbbf1a794181e6aa0bd429bd78bfdf775436020172e2a23f0"},
+    {file = "rpds_py-0.18.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:1d9a5be316c15ffb2b3c405c4ff14448c36b4435be062a7f578ccd8b01f0c4d8"},
+    {file = "rpds_py-0.18.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cd5bf1af8efe569654bbef5a3e0a56eca45f87cfcffab31dd8dde70da5982475"},
+    {file = "rpds_py-0.18.0-cp312-cp312-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:5417558f6887e9b6b65b4527232553c139b57ec42c64570569b155262ac0754f"},
+    {file = "rpds_py-0.18.0-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:56a737287efecafc16f6d067c2ea0117abadcd078d58721f967952db329a3e5c"},
+    {file = "rpds_py-0.18.0-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:8f03bccbd8586e9dd37219bce4d4e0d3ab492e6b3b533e973fa08a112cb2ffc9"},
+    {file = "rpds_py-0.18.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4457a94da0d5c53dc4b3e4de1158bdab077db23c53232f37a3cb7afdb053a4e3"},
+    {file = "rpds_py-0.18.0-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:0ab39c1ba9023914297dd88ec3b3b3c3f33671baeb6acf82ad7ce883f6e8e157"},
+    {file = "rpds_py-0.18.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:9d54553c1136b50fd12cc17e5b11ad07374c316df307e4cfd6441bea5fb68496"},
+    {file = "rpds_py-0.18.0-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:0af039631b6de0397ab2ba16eaf2872e9f8fca391b44d3d8cac317860a700a3f"},
+    {file = "rpds_py-0.18.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:84ffab12db93b5f6bad84c712c92060a2d321b35c3c9960b43d08d0f639d60d7"},
+    {file = "rpds_py-0.18.0-cp312-none-win32.whl", hash = "sha256:685537e07897f173abcf67258bee3c05c374fa6fff89d4c7e42fb391b0605e98"},
+    {file = "rpds_py-0.18.0-cp312-none-win_amd64.whl", hash = "sha256:e003b002ec72c8d5a3e3da2989c7d6065b47d9eaa70cd8808b5384fbb970f4ec"},
+    {file = "rpds_py-0.18.0-cp38-cp38-macosx_10_12_x86_64.whl", hash = "sha256:08f9ad53c3f31dfb4baa00da22f1e862900f45908383c062c27628754af2e88e"},
+    {file = "rpds_py-0.18.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:c0013fe6b46aa496a6749c77e00a3eb07952832ad6166bd481c74bda0dcb6d58"},
+    {file = "rpds_py-0.18.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e32a92116d4f2a80b629778280103d2a510a5b3f6314ceccd6e38006b5e92dcb"},
+    {file = "rpds_py-0.18.0-cp38-cp38-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:e541ec6f2ec456934fd279a3120f856cd0aedd209fc3852eca563f81738f6861"},
+    {file = "rpds_py-0.18.0-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:bed88b9a458e354014d662d47e7a5baafd7ff81c780fd91584a10d6ec842cb73"},
+    {file = "rpds_py-0.18.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2644e47de560eb7bd55c20fc59f6daa04682655c58d08185a9b95c1970fa1e07"},
+    {file = "rpds_py-0.18.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8e8916ae4c720529e18afa0b879473049e95949bf97042e938530e072fde061d"},
+    {file = "rpds_py-0.18.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:465a3eb5659338cf2a9243e50ad9b2296fa15061736d6e26240e713522b6235c"},
+    {file = "rpds_py-0.18.0-cp38-cp38-musllinux_1_2_aarch64.whl", hash = "sha256:ea7d4a99f3b38c37eac212dbd6ec42b7a5ec51e2c74b5d3223e43c811609e65f"},
+    {file = "rpds_py-0.18.0-cp38-cp38-musllinux_1_2_i686.whl", hash = "sha256:67071a6171e92b6da534b8ae326505f7c18022c6f19072a81dcf40db2638767c"},
+    {file = "rpds_py-0.18.0-cp38-cp38-musllinux_1_2_x86_64.whl", hash = "sha256:41ef53e7c58aa4ef281da975f62c258950f54b76ec8e45941e93a3d1d8580594"},
+    {file = "rpds_py-0.18.0-cp38-none-win32.whl", hash = "sha256:fdea4952db2793c4ad0bdccd27c1d8fdd1423a92f04598bc39425bcc2b8ee46e"},
+    {file = "rpds_py-0.18.0-cp38-none-win_amd64.whl", hash = "sha256:7cd863afe7336c62ec78d7d1349a2f34c007a3cc6c2369d667c65aeec412a5b1"},
+    {file = "rpds_py-0.18.0-cp39-cp39-macosx_10_12_x86_64.whl", hash = "sha256:5307def11a35f5ae4581a0b658b0af8178c65c530e94893345bebf41cc139d33"},
+    {file = "rpds_py-0.18.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:77f195baa60a54ef9d2de16fbbfd3ff8b04edc0c0140a761b56c267ac11aa467"},
+    {file = "rpds_py-0.18.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:39f5441553f1c2aed4de4377178ad8ff8f9d733723d6c66d983d75341de265ab"},
+    {file = "rpds_py-0.18.0-cp39-cp39-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:9a00312dea9310d4cb7dbd7787e722d2e86a95c2db92fbd7d0155f97127bcb40"},
+    {file = "rpds_py-0.18.0-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:8f2fc11e8fe034ee3c34d316d0ad8808f45bc3b9ce5857ff29d513f3ff2923a1"},
+    {file = "rpds_py-0.18.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:586f8204935b9ec884500498ccc91aa869fc652c40c093bd9e1471fbcc25c022"},
+    {file = "rpds_py-0.18.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ddc2f4dfd396c7bfa18e6ce371cba60e4cf9d2e5cdb71376aa2da264605b60b9"},
+    {file = "rpds_py-0.18.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:5ddcba87675b6d509139d1b521e0c8250e967e63b5909a7e8f8944d0f90ff36f"},
+    {file = "rpds_py-0.18.0-cp39-cp39-musllinux_1_2_aarch64.whl", hash = "sha256:7bd339195d84439cbe5771546fe8a4e8a7a045417d8f9de9a368c434e42a721e"},
+    {file = "rpds_py-0.18.0-cp39-cp39-musllinux_1_2_i686.whl", hash = "sha256:d7c36232a90d4755b720fbd76739d8891732b18cf240a9c645d75f00639a9024"},
+    {file = "rpds_py-0.18.0-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:6b0817e34942b2ca527b0e9298373e7cc75f429e8da2055607f4931fded23e20"},
+    {file = "rpds_py-0.18.0-cp39-none-win32.whl", hash = "sha256:99f70b740dc04d09e6b2699b675874367885217a2e9f782bdf5395632ac663b7"},
+    {file = "rpds_py-0.18.0-cp39-none-win_amd64.whl", hash = "sha256:6ef687afab047554a2d366e112dd187b62d261d49eb79b77e386f94644363294"},
+    {file = "rpds_py-0.18.0-pp310-pypy310_pp73-macosx_10_12_x86_64.whl", hash = "sha256:ad36cfb355e24f1bd37cac88c112cd7730873f20fb0bdaf8ba59eedf8216079f"},
+    {file = "rpds_py-0.18.0-pp310-pypy310_pp73-macosx_11_0_arm64.whl", hash = "sha256:36b3ee798c58ace201289024b52788161e1ea133e4ac93fba7d49da5fec0ef9e"},
+    {file = "rpds_py-0.18.0-pp310-pypy310_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f8a2f084546cc59ea99fda8e070be2fd140c3092dc11524a71aa8f0f3d5a55ca"},
+    {file = "rpds_py-0.18.0-pp310-pypy310_pp73-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:e4461d0f003a0aa9be2bdd1b798a041f177189c1a0f7619fe8c95ad08d9a45d7"},
+    {file = "rpds_py-0.18.0-pp310-pypy310_pp73-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:8db715ebe3bb7d86d77ac1826f7d67ec11a70dbd2376b7cc214199360517b641"},
+    {file = "rpds_py-0.18.0-pp310-pypy310_pp73-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:793968759cd0d96cac1e367afd70c235867831983f876a53389ad869b043c948"},
+    {file = "rpds_py-0.18.0-pp310-pypy310_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:66e6a3af5a75363d2c9a48b07cb27c4ea542938b1a2e93b15a503cdfa8490795"},
+    {file = "rpds_py-0.18.0-pp310-pypy310_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:6ef0befbb5d79cf32d0266f5cff01545602344eda89480e1dd88aca964260b18"},
+    {file = "rpds_py-0.18.0-pp310-pypy310_pp73-musllinux_1_2_aarch64.whl", hash = "sha256:1d4acf42190d449d5e89654d5c1ed3a4f17925eec71f05e2a41414689cda02d1"},
+    {file = "rpds_py-0.18.0-pp310-pypy310_pp73-musllinux_1_2_i686.whl", hash = "sha256:a5f446dd5055667aabaee78487f2b5ab72e244f9bc0b2ffebfeec79051679984"},
+    {file = "rpds_py-0.18.0-pp310-pypy310_pp73-musllinux_1_2_x86_64.whl", hash = "sha256:9dbbeb27f4e70bfd9eec1be5477517365afe05a9b2c441a0b21929ee61048124"},
+    {file = "rpds_py-0.18.0-pp38-pypy38_pp73-macosx_10_12_x86_64.whl", hash = "sha256:22806714311a69fd0af9b35b7be97c18a0fc2826e6827dbb3a8c94eac6cf7eeb"},
+    {file = "rpds_py-0.18.0-pp38-pypy38_pp73-macosx_11_0_arm64.whl", hash = "sha256:b34ae4636dfc4e76a438ab826a0d1eed2589ca7d9a1b2d5bb546978ac6485461"},
+    {file = "rpds_py-0.18.0-pp38-pypy38_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8c8370641f1a7f0e0669ddccca22f1da893cef7628396431eb445d46d893e5cd"},
+    {file = "rpds_py-0.18.0-pp38-pypy38_pp73-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:c8362467a0fdeccd47935f22c256bec5e6abe543bf0d66e3d3d57a8fb5731863"},
+    {file = "rpds_py-0.18.0-pp38-pypy38_pp73-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:11a8c85ef4a07a7638180bf04fe189d12757c696eb41f310d2426895356dcf05"},
+    {file = "rpds_py-0.18.0-pp38-pypy38_pp73-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b316144e85316da2723f9d8dc75bada12fa58489a527091fa1d5a612643d1a0e"},
+    {file = "rpds_py-0.18.0-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:cf1ea2e34868f6fbf070e1af291c8180480310173de0b0c43fc38a02929fc0e3"},
+    {file = "rpds_py-0.18.0-pp38-pypy38_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:e546e768d08ad55b20b11dbb78a745151acbd938f8f00d0cfbabe8b0199b9880"},
+    {file = "rpds_py-0.18.0-pp38-pypy38_pp73-musllinux_1_2_aarch64.whl", hash = "sha256:4901165d170a5fde6f589acb90a6b33629ad1ec976d4529e769c6f3d885e3e80"},
+    {file = "rpds_py-0.18.0-pp38-pypy38_pp73-musllinux_1_2_i686.whl", hash = "sha256:618a3d6cae6ef8ec88bb76dd80b83cfe415ad4f1d942ca2a903bf6b6ff97a2da"},
+    {file = "rpds_py-0.18.0-pp38-pypy38_pp73-musllinux_1_2_x86_64.whl", hash = "sha256:ed4eb745efbff0a8e9587d22a84be94a5eb7d2d99c02dacf7bd0911713ed14dd"},
+    {file = "rpds_py-0.18.0-pp39-pypy39_pp73-macosx_10_12_x86_64.whl", hash = "sha256:6c81e5f372cd0dc5dc4809553d34f832f60a46034a5f187756d9b90586c2c307"},
+    {file = "rpds_py-0.18.0-pp39-pypy39_pp73-macosx_11_0_arm64.whl", hash = "sha256:43fbac5f22e25bee1d482c97474f930a353542855f05c1161fd804c9dc74a09d"},
+    {file = "rpds_py-0.18.0-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6d7faa6f14017c0b1e69f5e2c357b998731ea75a442ab3841c0dbbbfe902d2c4"},
+    {file = "rpds_py-0.18.0-pp39-pypy39_pp73-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:08231ac30a842bd04daabc4d71fddd7e6d26189406d5a69535638e4dcb88fe76"},
+    {file = "rpds_py-0.18.0-pp39-pypy39_pp73-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:044a3e61a7c2dafacae99d1e722cc2d4c05280790ec5a05031b3876809d89a5c"},
+    {file = "rpds_py-0.18.0-pp39-pypy39_pp73-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:3f26b5bd1079acdb0c7a5645e350fe54d16b17bfc5e71f371c449383d3342e17"},
+    {file = "rpds_py-0.18.0-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:482103aed1dfe2f3b71a58eff35ba105289b8d862551ea576bd15479aba01f66"},
+    {file = "rpds_py-0.18.0-pp39-pypy39_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:1374f4129f9bcca53a1bba0bb86bf78325a0374577cf7e9e4cd046b1e6f20e24"},
+    {file = "rpds_py-0.18.0-pp39-pypy39_pp73-musllinux_1_2_aarch64.whl", hash = "sha256:635dc434ff724b178cb192c70016cc0ad25a275228f749ee0daf0eddbc8183b1"},
+    {file = "rpds_py-0.18.0-pp39-pypy39_pp73-musllinux_1_2_i686.whl", hash = "sha256:bc362ee4e314870a70f4ae88772d72d877246537d9f8cb8f7eacf10884862432"},
+    {file = "rpds_py-0.18.0-pp39-pypy39_pp73-musllinux_1_2_x86_64.whl", hash = "sha256:4832d7d380477521a8c1644bbab6588dfedea5e30a7d967b5fb75977c45fd77f"},
+    {file = "rpds_py-0.18.0.tar.gz", hash = "sha256:42821446ee7a76f5d9f71f9e33a4fb2ffd724bb3e7f93386150b61a43115788d"},
+]
+
+[[package]]
+name = "setuptools"
+version = "69.1.1"
+description = "Easily download, build, install, upgrade, and uninstall Python packages"
+optional = false
+python-versions = ">=3.8"
+files = [
+    {file = "setuptools-69.1.1-py3-none-any.whl", hash = "sha256:02fa291a0471b3a18b2b2481ed902af520c69e8ae0919c13da936542754b4c56"},
+    {file = "setuptools-69.1.1.tar.gz", hash = "sha256:5c0806c7d9af348e6dd3777b4f4dbb42c7ad85b190104837488eab9a7c945cf8"},
+]
 
 [package.extras]
-toml = ["setuptools (>=42)"]
-test = ["virtualenv (>20)", "pytest (>=6.2)"]
+docs = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "pygments-github-lexers (==0.0.5)", "rst.linker (>=1.9)", "sphinx (<7.2.5)", "sphinx (>=3.5)", "sphinx-favicon", "sphinx-inline-tabs", "sphinx-lint", "sphinx-notfound-page (>=1,<2)", "sphinx-reredirects", "sphinxcontrib-towncrier"]
+testing = ["build[virtualenv]", "filelock (>=3.4.0)", "flake8-2020", "ini2toml[lite] (>=0.9)", "jaraco.develop (>=7.21)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "packaging (>=23.2)", "pip (>=19.1)", "pytest (>=6)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-home (>=0.5)", "pytest-mypy (>=0.9.1)", "pytest-perf", "pytest-ruff (>=0.2.1)", "pytest-timeout", "pytest-xdist", "tomli-w (>=1.0.0)", "virtualenv (>=13.0.0)", "wheel"]
+testing-integration = ["build[virtualenv] (>=1.0.3)", "filelock (>=3.4.0)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "packaging (>=23.2)", "pytest", "pytest-enabler", "pytest-xdist", "tomli", "virtualenv (>=13.0.0)", "wheel"]
 
 [[package]]
 name = "six"
 version = "1.16.0"
 description = "Python 2 and 3 compatibility utilities"
-category = "main"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*"
+files = [
+    {file = "six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"},
+    {file = "six-1.16.0.tar.gz", hash = "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"},
+]
 
 [[package]]
 name = "spinners"
 version = "0.0.24"
 description = "Spinners for terminals"
-category = "main"
 optional = false
 python-versions = "*"
+files = [
+    {file = "spinners-0.0.24-py3-none-any.whl", hash = "sha256:2fa30d0b72c9650ad12bbe031c9943b8d441e41b4f5602b0ec977a19f3290e98"},
+    {file = "spinners-0.0.24.tar.gz", hash = "sha256:1eb6aeb4781d72ab42ed8a01dcf20f3002bf50740d7154d12fb8c9769bf9e27f"},
+]
 
 [[package]]
 name = "termcolor"
-version = "1.1.0"
-description = "ANSII Color formatting for output in terminal."
-category = "main"
+version = "2.4.0"
+description = "ANSI color formatting for output in terminal"
 optional = false
-python-versions = "*"
+python-versions = ">=3.8"
+files = [
+    {file = "termcolor-2.4.0-py3-none-any.whl", hash = "sha256:9297c0df9c99445c2412e832e882a7884038a25617c60cea2ad69488d4040d63"},
+    {file = "termcolor-2.4.0.tar.gz", hash = "sha256:aab9e56047c8ac41ed798fa36d892a37aca6b3e9159f3e0c24bc64a9b3ac7b7a"},
+]
+
+[package.extras]
+tests = ["pytest", "pytest-cov"]
 
 [[package]]
 name = "tomli"
 version = "2.0.1"
 description = "A lil' TOML parser"
-category = "dev"
 optional = false
 python-versions = ">=3.7"
-
-[[package]]
-name = "typing-extensions"
-version = "4.3.0"
-description = "Backported and Experimental Type Hints for Python 3.7+"
-category = "dev"
-optional = false
-python-versions = ">=3.7"
-
-[[package]]
-name = "yapf"
-version = "0.32.0"
-description = "A formatter for Python code."
-category = "dev"
-optional = false
-python-versions = "*"
-
-[[package]]
-name = "zipp"
-version = "3.8.1"
-description = "Backport of pathlib-compatible object wrapper for zip files"
-category = "main"
-optional = false
-python-versions = ">=3.7"
-
-[package.extras]
-testing = ["pytest-mypy (>=0.9.1)", "pytest-black (>=0.3.7)", "func-timeout", "jaraco.itertools", "pytest-enabler (>=1.3)", "pytest-cov", "pytest-flake8", "pytest-checkdocs (>=2.4)", "pytest (>=6)"]
-docs = ["jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "jaraco.packaging (>=9)", "sphinx"]
-
-[metadata]
-lock-version = "1.1"
-python-versions = "^3.8"
-content-hash = "71855d16c0f315ff383322272ddfca2b4917dbba9fa5ca1863b3bd537e35fee1"
-
-[metadata.files]
-appdirs = [
-    {file = "appdirs-1.4.4-py2.py3-none-any.whl", hash = "sha256:a841dacd6b99318a741b166adb07e19ee71a274450e68237b4650ca1055ab128"},
-    {file = "appdirs-1.4.4.tar.gz", hash = "sha256:7d5d0167b2b1ba821647616af46a749d1c653740dd0d2415100fe26e27afdf41"},
-]
-argcomplete = [
-    {file = "argcomplete-2.0.0-py2.py3-none-any.whl", hash = "sha256:cffa11ea77999bb0dd27bb25ff6dc142a6796142f68d45b1a26b11f58724561e"},
-    {file = "argcomplete-2.0.0.tar.gz", hash = "sha256:6372ad78c89d662035101418ae253668445b391755cfe94ea52f1b9d22425b20"},
-]
-atomicwrites = [
-    {file = "atomicwrites-1.4.1.tar.gz", hash = "sha256:81b2c9071a49367a7f770170e5eec8cb66567cfbbc8c73d20ce5ca4a8d71cf11"},
-]
-attrs = [
-    {file = "attrs-22.1.0-py2.py3-none-any.whl", hash = "sha256:86efa402f67bf2df34f51a335487cf46b1ec130d02b8d39fd248abfd30da551c"},
-    {file = "attrs-22.1.0.tar.gz", hash = "sha256:29adc2665447e5191d0e7c568fde78b21f9672d344281d0c6e1ab085429b22b6"},
-]
-colorama = [
-    {file = "colorama-0.4.5-py2.py3-none-any.whl", hash = "sha256:854bf444933e37f5824ae7bfc1e98d5bce2ebe4160d46b5edf346a89358e99da"},
-    {file = "colorama-0.4.5.tar.gz", hash = "sha256:e6c6b4334fc50988a639d9b98aa429a0b57da6e17b9a44f0451f930b6967b7a4"},
-]
-dotty-dict = [
-    {file = "dotty_dict-1.3.1-py3-none-any.whl", hash = "sha256:5022d234d9922f13aa711b4950372a06a6d64cb6d6db9ba43d0ba133ebfce31f"},
-    {file = "dotty_dict-1.3.1.tar.gz", hash = "sha256:4b016e03b8ae265539757a53eba24b9bfda506fb94fbce0bee843c6f05541a15"},
-]
-editables = [
-    {file = "editables-0.3-py3-none-any.whl", hash = "sha256:ee686a8db9f5d91da39849f175ffeef094dd0e9c36d6a59a2e8c7f92a3b80020"},
-    {file = "editables-0.3.tar.gz", hash = "sha256:167524e377358ed1f1374e61c268f0d7a4bf7dbd046c656f7b410cde16161b1a"},
-]
-flake8 = [
-    {file = "flake8-5.0.4-py2.py3-none-any.whl", hash = "sha256:7a1cf6b73744f5806ab95e526f6f0d8c01c66d7bbe349562d22dfca20610b248"},
-    {file = "flake8-5.0.4.tar.gz", hash = "sha256:6fbe320aad8d6b95cec8b8e47bc933004678dc63095be98528b7bdd2a9f510db"},
-]
-flit-core = [
-    {file = "flit_core-3.7.1-py3-none-any.whl", hash = "sha256:e454fdbf68c7036e1c7435ec7479383f9d9a1650ca5b304feb184eba1efcdcef"},
-    {file = "flit_core-3.7.1.tar.gz", hash = "sha256:14955af340c43035dbfa96b5ee47407e377ee337f69e70f73064940d27d0a44f"},
-]
-halo = [
-    {file = "halo-0.0.31-py2-none-any.whl", hash = "sha256:5350488fb7d2aa7c31a1344120cee67a872901ce8858f60da7946cef96c208ab"},
-    {file = "halo-0.0.31.tar.gz", hash = "sha256:7b67a3521ee91d53b7152d4ee3452811e1d2a6321975137762eb3d70063cc9d6"},
-]
-hatch-fancy-pypi-readme = [
-    {file = "hatch_fancy_pypi_readme-22.3.0-py3-none-any.whl", hash = "sha256:97c7ea026fe0d305163f5380c5df1dde51051e63d0dd4a47811214a5cd4e39b4"},
-    {file = "hatch_fancy_pypi_readme-22.3.0.tar.gz", hash = "sha256:7d4651f8f07825931c92873cb51137214a938badb7a759b85c1d95bf74f86efa"},
-]
-hatch-vcs = [
-    {file = "hatch_vcs-0.2.0-py2.py3-none-any.whl", hash = "sha256:86432a0dd49acae0e69e14f285667693fcd31d9869ca21634520acc30d482f07"},
-    {file = "hatch_vcs-0.2.0.tar.gz", hash = "sha256:9913d733b34eec9bb0345d0626ca32165a4ad2de15d1ce643c36d09ca908abff"},
-]
-hatchling = [
-    {file = "hatchling-1.8.0-py3-none-any.whl", hash = "sha256:1f7d920b1478221c8709841eb2aa6069856038463816d3a27b84ca5e99000e06"},
-    {file = "hatchling-1.8.0.tar.gz", hash = "sha256:a4f982fdca0717d8c46bfe7b501302f90aaf2a5302845d550b49c8739681feb2"},
-]
-hid = [
-    {file = "hid-1.0.5-py2-none-any.whl", hash = "sha256:11836b877e81ab68cdd3abc44f2e230f0e6146c7e17ac45c185b72e0159fc9c7"},
-    {file = "hid-1.0.5.tar.gz", hash = "sha256:1e954e7f7ab9b7c9dfc78db59504692c17db3b71249492b976b1525b97dbb0e8"},
-]
-hjson = [
-    {file = "hjson-3.1.0-py3-none-any.whl", hash = "sha256:65713cdcf13214fb554eb8b4ef803419733f4f5e551047c9b711098ab7186b89"},
-    {file = "hjson-3.1.0.tar.gz", hash = "sha256:55af475a27cf83a7969c808399d7bccdec8fb836a07ddbd574587593b9cdcf75"},
-]
-importlib-resources = [
-    {file = "importlib_resources-5.9.0-py3-none-any.whl", hash = "sha256:f78a8df21a79bcc30cfd400bdc38f314333de7c0fb619763f6b9dabab8268bb7"},
-    {file = "importlib_resources-5.9.0.tar.gz", hash = "sha256:5481e97fb45af8dcf2f798952625591c58fe599d0735d86b10f54de086a61681"},
-]
-iniconfig = [
-    {file = "iniconfig-1.1.1-py2.py3-none-any.whl", hash = "sha256:011e24c64b7f47f6ebd835bb12a743f2fbe9a26d4cecaa7f53bc4f35ee9da8b3"},
-    {file = "iniconfig-1.1.1.tar.gz", hash = "sha256:bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32"},
-]
-jsonschema = [
-    {file = "jsonschema-4.14.0-py3-none-any.whl", hash = "sha256:9892b8d630a82990521a9ca630d3446bd316b5ad54dbe981338802787f3e0d2d"},
-    {file = "jsonschema-4.14.0.tar.gz", hash = "sha256:15062f4cc6f591400cd528d2c355f2cfa6a57e44c820dc783aee5e23d36a831f"},
-]
-log-symbols = [
-    {file = "log_symbols-0.0.14-py3-none-any.whl", hash = "sha256:4952106ff8b605ab7d5081dd2c7e6ca7374584eff7086f499c06edd1ce56dcca"},
-    {file = "log_symbols-0.0.14.tar.gz", hash = "sha256:cf0bbc6fe1a8e53f0d174a716bc625c4f87043cc21eb55dd8a740cfe22680556"},
-]
-mccabe = [
-    {file = "mccabe-0.7.0-py2.py3-none-any.whl", hash = "sha256:6c2d30ab6be0e4a46919781807b4f0d834ebdd6c6e3dca0bda5a15f863427b6e"},
-    {file = "mccabe-0.7.0.tar.gz", hash = "sha256:348e0240c33b60bbdf4e523192ef919f28cb2c3d7d5c7794f74009290f236325"},
-]
-milc = [
-    {file = "milc-1.6.6-py2.py3-none-any.whl", hash = "sha256:5735022d25bc7aa259139ae680efa2867ce91bab769aa3b2482c63a3158120a5"},
-    {file = "milc-1.6.6.tar.gz", hash = "sha256:a4a1673718aaceefeb62c1799e48825bc6f4e56bfd8ad4a8e341a7622e6ff000"},
-]
-nose2 = [
-    {file = "nose2-0.12.0-py2.py3-none-any.whl", hash = "sha256:da7eb5e3cbe2abb693a053e17b4fbefca98ea9ea79fc729b0b0f41e8b4196304"},
-    {file = "nose2-0.12.0.tar.gz", hash = "sha256:956e79b9bd558ee08b6200c05ad2c76465b7e3860c0c0537686089285c320113"},
-]
-packaging = [
-    {file = "packaging-21.3-py3-none-any.whl", hash = "sha256:ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522"},
-    {file = "packaging-21.3.tar.gz", hash = "sha256:dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb"},
-]
-pathspec = [
-    {file = "pathspec-0.9.0-py2.py3-none-any.whl", hash = "sha256:7d15c4ddb0b5c802d161efc417ec1a2558ea2653c2e8ad9c19098201dc1c993a"},
-    {file = "pathspec-0.9.0.tar.gz", hash = "sha256:e564499435a2673d586f6b2130bb5b95f04a3ba06f81b8f895b651a3c76aabb1"},
-]
-pep8-naming = [
-    {file = "pep8-naming-0.13.2.tar.gz", hash = "sha256:93eef62f525fd12a6f8c98f4dcc17fa70baae2f37fa1f73bec00e3e44392fa48"},
-    {file = "pep8_naming-0.13.2-py3-none-any.whl", hash = "sha256:59e29e55c478db69cffbe14ab24b5bd2cd615c0413edf790d47d3fb7ba9a4e23"},
-]
-pillow = [
-    {file = "Pillow-9.2.0-cp310-cp310-macosx_10_10_x86_64.whl", hash = "sha256:a9c9bc489f8ab30906d7a85afac4b4944a572a7432e00698a7239f44a44e6efb"},
-    {file = "Pillow-9.2.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:510cef4a3f401c246cfd8227b300828715dd055463cdca6176c2e4036df8bd4f"},
-    {file = "Pillow-9.2.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7888310f6214f19ab2b6df90f3f06afa3df7ef7355fc025e78a3044737fab1f5"},
-    {file = "Pillow-9.2.0-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:831e648102c82f152e14c1a0938689dbb22480c548c8d4b8b248b3e50967b88c"},
-    {file = "Pillow-9.2.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1cc1d2451e8a3b4bfdb9caf745b58e6c7a77d2e469159b0d527a4554d73694d1"},
-    {file = "Pillow-9.2.0-cp310-cp310-manylinux_2_28_aarch64.whl", hash = "sha256:136659638f61a251e8ed3b331fc6ccd124590eeff539de57c5f80ef3a9594e58"},
-    {file = "Pillow-9.2.0-cp310-cp310-manylinux_2_28_x86_64.whl", hash = "sha256:6e8c66f70fb539301e064f6478d7453e820d8a2c631da948a23384865cd95544"},
-    {file = "Pillow-9.2.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:37ff6b522a26d0538b753f0b4e8e164fdada12db6c6f00f62145d732d8a3152e"},
-    {file = "Pillow-9.2.0-cp310-cp310-win32.whl", hash = "sha256:c79698d4cd9318d9481d89a77e2d3fcaeff5486be641e60a4b49f3d2ecca4e28"},
-    {file = "Pillow-9.2.0-cp310-cp310-win_amd64.whl", hash = "sha256:254164c57bab4b459f14c64e93df11eff5ded575192c294a0c49270f22c5d93d"},
-    {file = "Pillow-9.2.0-cp311-cp311-macosx_10_10_universal2.whl", hash = "sha256:408673ed75594933714482501fe97e055a42996087eeca7e5d06e33218d05aa8"},
-    {file = "Pillow-9.2.0-cp311-cp311-macosx_11_0_universal2.whl", hash = "sha256:727dd1389bc5cb9827cbd1f9d40d2c2a1a0c9b32dd2261db522d22a604a6eec9"},
-    {file = "Pillow-9.2.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:50dff9cc21826d2977ef2d2a205504034e3a4563ca6f5db739b0d1026658e004"},
-    {file = "Pillow-9.2.0-cp311-cp311-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:cb6259196a589123d755380b65127ddc60f4c64b21fc3bb46ce3a6ea663659b0"},
-    {file = "Pillow-9.2.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7b0554af24df2bf96618dac71ddada02420f946be943b181108cac55a7a2dcd4"},
-    {file = "Pillow-9.2.0-cp311-cp311-manylinux_2_28_aarch64.whl", hash = "sha256:15928f824870535c85dbf949c09d6ae7d3d6ac2d6efec80f3227f73eefba741c"},
-    {file = "Pillow-9.2.0-cp311-cp311-manylinux_2_28_x86_64.whl", hash = "sha256:bdd0de2d64688ecae88dd8935012c4a72681e5df632af903a1dca8c5e7aa871a"},
-    {file = "Pillow-9.2.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:d5b87da55a08acb586bad5c3aa3b86505f559b84f39035b233d5bf844b0834b1"},
-    {file = "Pillow-9.2.0-cp311-cp311-win32.whl", hash = "sha256:b6d5e92df2b77665e07ddb2e4dbd6d644b78e4c0d2e9272a852627cdba0d75cf"},
-    {file = "Pillow-9.2.0-cp311-cp311-win_amd64.whl", hash = "sha256:6bf088c1ce160f50ea40764f825ec9b72ed9da25346216b91361eef8ad1b8f8c"},
-    {file = "Pillow-9.2.0-cp37-cp37m-macosx_10_10_x86_64.whl", hash = "sha256:2c58b24e3a63efd22554c676d81b0e57f80e0a7d3a5874a7e14ce90ec40d3069"},
-    {file = "Pillow-9.2.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:eef7592281f7c174d3d6cbfbb7ee5984a671fcd77e3fc78e973d492e9bf0eb3f"},
-    {file = "Pillow-9.2.0-cp37-cp37m-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:dcd7b9c7139dc8258d164b55696ecd16c04607f1cc33ba7af86613881ffe4ac8"},
-    {file = "Pillow-9.2.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a138441e95562b3c078746a22f8fca8ff1c22c014f856278bdbdd89ca36cff1b"},
-    {file = "Pillow-9.2.0-cp37-cp37m-manylinux_2_28_aarch64.whl", hash = "sha256:93689632949aff41199090eff5474f3990b6823404e45d66a5d44304e9cdc467"},
-    {file = "Pillow-9.2.0-cp37-cp37m-manylinux_2_28_x86_64.whl", hash = "sha256:f3fac744f9b540148fa7715a435d2283b71f68bfb6d4aae24482a890aed18b59"},
-    {file = "Pillow-9.2.0-cp37-cp37m-win32.whl", hash = "sha256:fa768eff5f9f958270b081bb33581b4b569faabf8774726b283edb06617101dc"},
-    {file = "Pillow-9.2.0-cp37-cp37m-win_amd64.whl", hash = "sha256:69bd1a15d7ba3694631e00df8de65a8cb031911ca11f44929c97fe05eb9b6c1d"},
-    {file = "Pillow-9.2.0-cp38-cp38-macosx_10_10_x86_64.whl", hash = "sha256:030e3460861488e249731c3e7ab59b07c7853838ff3b8e16aac9561bb345da14"},
-    {file = "Pillow-9.2.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:74a04183e6e64930b667d321524e3c5361094bb4af9083db5c301db64cd341f3"},
-    {file = "Pillow-9.2.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2d33a11f601213dcd5718109c09a52c2a1c893e7461f0be2d6febc2879ec2402"},
-    {file = "Pillow-9.2.0-cp38-cp38-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1fd6f5e3c0e4697fa7eb45b6e93996299f3feee73a3175fa451f49a74d092b9f"},
-    {file = "Pillow-9.2.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a647c0d4478b995c5e54615a2e5360ccedd2f85e70ab57fbe817ca613d5e63b8"},
-    {file = "Pillow-9.2.0-cp38-cp38-manylinux_2_28_aarch64.whl", hash = "sha256:4134d3f1ba5f15027ff5c04296f13328fecd46921424084516bdb1b2548e66ff"},
-    {file = "Pillow-9.2.0-cp38-cp38-manylinux_2_28_x86_64.whl", hash = "sha256:bc431b065722a5ad1dfb4df354fb9333b7a582a5ee39a90e6ffff688d72f27a1"},
-    {file = "Pillow-9.2.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:1536ad017a9f789430fb6b8be8bf99d2f214c76502becc196c6f2d9a75b01b76"},
-    {file = "Pillow-9.2.0-cp38-cp38-win32.whl", hash = "sha256:2ad0d4df0f5ef2247e27fc790d5c9b5a0af8ade9ba340db4a73bb1a4a3e5fb4f"},
-    {file = "Pillow-9.2.0-cp38-cp38-win_amd64.whl", hash = "sha256:ec52c351b35ca269cb1f8069d610fc45c5bd38c3e91f9ab4cbbf0aebc136d9c8"},
-    {file = "Pillow-9.2.0-cp39-cp39-macosx_10_10_x86_64.whl", hash = "sha256:0ed2c4ef2451de908c90436d6e8092e13a43992f1860275b4d8082667fbb2ffc"},
-    {file = "Pillow-9.2.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:4ad2f835e0ad81d1689f1b7e3fbac7b01bb8777d5a985c8962bedee0cc6d43da"},
-    {file = "Pillow-9.2.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ea98f633d45f7e815db648fd7ff0f19e328302ac36427343e4432c84432e7ff4"},
-    {file = "Pillow-9.2.0-cp39-cp39-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7761afe0126d046974a01e030ae7529ed0ca6a196de3ec6937c11df0df1bc91c"},
-    {file = "Pillow-9.2.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9a54614049a18a2d6fe156e68e188da02a046a4a93cf24f373bffd977e943421"},
-    {file = "Pillow-9.2.0-cp39-cp39-manylinux_2_28_aarch64.whl", hash = "sha256:5aed7dde98403cd91d86a1115c78d8145c83078e864c1de1064f52e6feb61b20"},
-    {file = "Pillow-9.2.0-cp39-cp39-manylinux_2_28_x86_64.whl", hash = "sha256:13b725463f32df1bfeacbf3dd197fb358ae8ebcd8c5548faa75126ea425ccb60"},
-    {file = "Pillow-9.2.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:808add66ea764ed97d44dda1ac4f2cfec4c1867d9efb16a33d158be79f32b8a4"},
-    {file = "Pillow-9.2.0-cp39-cp39-win32.whl", hash = "sha256:337a74fd2f291c607d220c793a8135273c4c2ab001b03e601c36766005f36885"},
-    {file = "Pillow-9.2.0-cp39-cp39-win_amd64.whl", hash = "sha256:fac2d65901fb0fdf20363fbd345c01958a742f2dc62a8dd4495af66e3ff502a4"},
-    {file = "Pillow-9.2.0-pp37-pypy37_pp73-macosx_10_10_x86_64.whl", hash = "sha256:ad2277b185ebce47a63f4dc6302e30f05762b688f8dc3de55dbae4651872cdf3"},
-    {file = "Pillow-9.2.0-pp37-pypy37_pp73-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7c7b502bc34f6e32ba022b4a209638f9e097d7a9098104ae420eb8186217ebbb"},
-    {file = "Pillow-9.2.0-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3d1f14f5f691f55e1b47f824ca4fdcb4b19b4323fe43cc7bb105988cad7496be"},
-    {file = "Pillow-9.2.0-pp37-pypy37_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:dfe4c1fedfde4e2fbc009d5ad420647f7730d719786388b7de0999bf32c0d9fd"},
-    {file = "Pillow-9.2.0-pp38-pypy38_pp73-macosx_10_10_x86_64.whl", hash = "sha256:f07f1f00e22b231dd3d9b9208692042e29792d6bd4f6639415d2f23158a80013"},
-    {file = "Pillow-9.2.0-pp38-pypy38_pp73-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1802f34298f5ba11d55e5bb09c31997dc0c6aed919658dfdf0198a2fe75d5490"},
-    {file = "Pillow-9.2.0-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:17d4cafe22f050b46d983b71c707162d63d796a1235cdf8b9d7a112e97b15bac"},
-    {file = "Pillow-9.2.0-pp38-pypy38_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:96b5e6874431df16aee0c1ba237574cb6dff1dcb173798faa6a9d8b399a05d0e"},
-    {file = "Pillow-9.2.0-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:0030fdbd926fb85844b8b92e2f9449ba89607231d3dd597a21ae72dc7fe26927"},
-    {file = "Pillow-9.2.0.tar.gz", hash = "sha256:75e636fd3e0fb872693f23ccb8a5ff2cd578801251f3a4f6854c6a5d437d3c04"},
-]
-pkgutil-resolve-name = [
-    {file = "pkgutil_resolve_name-1.3.10-py3-none-any.whl", hash = "sha256:ca27cc078d25c5ad71a9de0a7a330146c4e014c2462d9af19c6b828280649c5e"},
-    {file = "pkgutil_resolve_name-1.3.10.tar.gz", hash = "sha256:357d6c9e6a755653cfd78893817c0853af365dd51ec97f3d358a819373bbd174"},
-]
-pluggy = [
-    {file = "pluggy-1.0.0-py2.py3-none-any.whl", hash = "sha256:74134bbf457f031a36d68416e1509f34bd5ccc019f0bcc952c7b909d06b37bd3"},
-    {file = "pluggy-1.0.0.tar.gz", hash = "sha256:4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159"},
-]
-poetry-core = [
-    {file = "poetry-core-1.0.8.tar.gz", hash = "sha256:951fc7c1f8d710a94cb49019ee3742125039fc659675912ea614ac2aa405b118"},
-    {file = "poetry_core-1.0.8-py2.py3-none-any.whl", hash = "sha256:54b0fab6f7b313886e547a52f8bf52b8cf43e65b2633c65117f8755289061924"},
-]
-py = [
-    {file = "py-1.11.0-py2.py3-none-any.whl", hash = "sha256:607c53218732647dff4acdfcd50cb62615cedf612e72d1724fb1a0cc6405b378"},
-    {file = "py-1.11.0.tar.gz", hash = "sha256:51c75c4126074b472f746a24399ad32f6053d1b34b68d2fa41e558e6f4a98719"},
-]
-pycodestyle = [
-    {file = "pycodestyle-2.9.1-py2.py3-none-any.whl", hash = "sha256:d1735fc58b418fd7c5f658d28d943854f8a849b01a5d0a1e6f3f3fdd0166804b"},
-    {file = "pycodestyle-2.9.1.tar.gz", hash = "sha256:2c9607871d58c76354b697b42f5d57e1ada7d261c261efac224b664affdc5785"},
-]
-pyflakes = [
-    {file = "pyflakes-2.5.0-py2.py3-none-any.whl", hash = "sha256:4579f67d887f804e67edb544428f264b7b24f435b263c4614f384135cea553d2"},
-    {file = "pyflakes-2.5.0.tar.gz", hash = "sha256:491feb020dca48ccc562a8c0cbe8df07ee13078df59813b83959cbdada312ea3"},
-]
-pygments = [
-    {file = "Pygments-2.13.0-py3-none-any.whl", hash = "sha256:f643f331ab57ba3c9d89212ee4a2dabc6e94f117cf4eefde99a0574720d14c42"},
-    {file = "Pygments-2.13.0.tar.gz", hash = "sha256:56a8508ae95f98e2b9bdf93a6be5ae3f7d8af858b43e02c5a2ff083726be40c1"},
-]
-pyparsing = [
-    {file = "pyparsing-3.0.9-py3-none-any.whl", hash = "sha256:5026bae9a10eeaefb61dab2f09052b9f4307d44aee4eda64b309723d8d206bbc"},
-    {file = "pyparsing-3.0.9.tar.gz", hash = "sha256:2b020ecf7d21b687f219b71ecad3631f644a47f01403fa1d1036b0c6416d70fb"},
-]
-pyrsistent = [
-    {file = "pyrsistent-0.18.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:df46c854f490f81210870e509818b729db4488e1f30f2a1ce1698b2295a878d1"},
-    {file = "pyrsistent-0.18.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5d45866ececf4a5fff8742c25722da6d4c9e180daa7b405dc0a2a2790d668c26"},
-    {file = "pyrsistent-0.18.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:4ed6784ceac462a7d6fcb7e9b663e93b9a6fb373b7f43594f9ff68875788e01e"},
-    {file = "pyrsistent-0.18.1-cp310-cp310-win32.whl", hash = "sha256:e4f3149fd5eb9b285d6bfb54d2e5173f6a116fe19172686797c056672689daf6"},
-    {file = "pyrsistent-0.18.1-cp310-cp310-win_amd64.whl", hash = "sha256:636ce2dc235046ccd3d8c56a7ad54e99d5c1cd0ef07d9ae847306c91d11b5fec"},
-    {file = "pyrsistent-0.18.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:e92a52c166426efbe0d1ec1332ee9119b6d32fc1f0bbfd55d5c1088070e7fc1b"},
-    {file = "pyrsistent-0.18.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d7a096646eab884bf8bed965bad63ea327e0d0c38989fc83c5ea7b8a87037bfc"},
-    {file = "pyrsistent-0.18.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:cdfd2c361b8a8e5d9499b9082b501c452ade8bbf42aef97ea04854f4a3f43b22"},
-    {file = "pyrsistent-0.18.1-cp37-cp37m-win32.whl", hash = "sha256:7ec335fc998faa4febe75cc5268a9eac0478b3f681602c1f27befaf2a1abe1d8"},
-    {file = "pyrsistent-0.18.1-cp37-cp37m-win_amd64.whl", hash = "sha256:6455fc599df93d1f60e1c5c4fe471499f08d190d57eca040c0ea182301321286"},
-    {file = "pyrsistent-0.18.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:fd8da6d0124efa2f67d86fa70c851022f87c98e205f0594e1fae044e7119a5a6"},
-    {file = "pyrsistent-0.18.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7bfe2388663fd18bd8ce7db2c91c7400bf3e1a9e8bd7d63bf7e77d39051b85ec"},
-    {file = "pyrsistent-0.18.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:0e3e1fcc45199df76053026a51cc59ab2ea3fc7c094c6627e93b7b44cdae2c8c"},
-    {file = "pyrsistent-0.18.1-cp38-cp38-win32.whl", hash = "sha256:b568f35ad53a7b07ed9b1b2bae09eb15cdd671a5ba5d2c66caee40dbf91c68ca"},
-    {file = "pyrsistent-0.18.1-cp38-cp38-win_amd64.whl", hash = "sha256:d1b96547410f76078eaf66d282ddca2e4baae8964364abb4f4dcdde855cd123a"},
-    {file = "pyrsistent-0.18.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:f87cc2863ef33c709e237d4b5f4502a62a00fab450c9e020892e8e2ede5847f5"},
-    {file = "pyrsistent-0.18.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6bc66318fb7ee012071b2792024564973ecc80e9522842eb4e17743604b5e045"},
-    {file = "pyrsistent-0.18.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:914474c9f1d93080338ace89cb2acee74f4f666fb0424896fcfb8d86058bf17c"},
-    {file = "pyrsistent-0.18.1-cp39-cp39-win32.whl", hash = "sha256:1b34eedd6812bf4d33814fca1b66005805d3640ce53140ab8bbb1e2651b0d9bc"},
-    {file = "pyrsistent-0.18.1-cp39-cp39-win_amd64.whl", hash = "sha256:e24a828f57e0c337c8d8bb9f6b12f09dfdf0273da25fda9e314f0b684b415a07"},
-    {file = "pyrsistent-0.18.1.tar.gz", hash = "sha256:d4d61f8b993a7255ba714df3aca52700f8125289f84f704cf80916517c46eb96"},
-]
-pyserial = [
-    {file = "pyserial-3.5-py2.py3-none-any.whl", hash = "sha256:c4451db6ba391ca6ca299fb3ec7bae67a5c55dde170964c7a14ceefec02f2cf0"},
-    {file = "pyserial-3.5.tar.gz", hash = "sha256:3c77e014170dfffbd816e6ffc205e9842efb10be9f58ec16d3e8675b4925cddb"},
-]
-pytest = [
-    {file = "pytest-7.1.2-py3-none-any.whl", hash = "sha256:13d0e3ccfc2b6e26be000cb6568c832ba67ba32e719443bfe725814d3c42433c"},
-    {file = "pytest-7.1.2.tar.gz", hash = "sha256:a06a0425453864a270bc45e71f783330a7428defb4230fb5e6a731fde06ecd45"},
-]
-pyusb = [
-    {file = "pyusb-1.2.1-py3-none-any.whl", hash = "sha256:2b4c7cb86dbadf044dfb9d3a4ff69fd217013dbe78a792177a3feb172449ea36"},
-    {file = "pyusb-1.2.1.tar.gz", hash = "sha256:a4cc7404a203144754164b8b40994e2849fde1cfff06b08492f12fff9d9de7b9"},
-]
-qmk = [
-    {file = "qmk-1.1.1-py2.py3-none-any.whl", hash = "sha256:8694300678d9be1e594a500e82bfc9fb08a8ac0983b25fcb663ddd72b4861d97"},
-    {file = "qmk-1.1.1.tar.gz", hash = "sha256:dd028e09ebcd61f8bdf8cb82929dfafc0e007d97a5a3803b45819b4641773269"},
-]
-setuptools-scm = [
-    {file = "setuptools_scm-7.0.5-py3-none-any.whl", hash = "sha256:7930f720905e03ccd1e1d821db521bff7ec2ac9cf0ceb6552dd73d24a45d3b02"},
-    {file = "setuptools_scm-7.0.5.tar.gz", hash = "sha256:031e13af771d6f892b941adb6ea04545bbf91ebc5ce68c78aaf3fff6e1fb4844"},
-]
-six = [
-    {file = "six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"},
-    {file = "six-1.16.0.tar.gz", hash = "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"},
-]
-spinners = [
-    {file = "spinners-0.0.24-py3-none-any.whl", hash = "sha256:2fa30d0b72c9650ad12bbe031c9943b8d441e41b4f5602b0ec977a19f3290e98"},
-    {file = "spinners-0.0.24.tar.gz", hash = "sha256:1eb6aeb4781d72ab42ed8a01dcf20f3002bf50740d7154d12fb8c9769bf9e27f"},
-]
-termcolor = [
-    {file = "termcolor-1.1.0.tar.gz", hash = "sha256:1d6d69ce66211143803fbc56652b41d73b4a400a2891d7bf7a1cdf4c02de613b"},
-]
-tomli = [
+files = [
     {file = "tomli-2.0.1-py3-none-any.whl", hash = "sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc"},
     {file = "tomli-2.0.1.tar.gz", hash = "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"},
 ]
-typing-extensions = [
-    {file = "typing_extensions-4.3.0-py3-none-any.whl", hash = "sha256:25642c956049920a5aa49edcdd6ab1e06d7e5d467fc00e0506c44ac86fbfca02"},
-    {file = "typing_extensions-4.3.0.tar.gz", hash = "sha256:e6d2677a32f47fc7eb2795db1dd15c1f34eff616bcaf2cfb5e997f854fa1c4a6"},
+
+[[package]]
+name = "types-colorama"
+version = "0.4.15.20240205"
+description = "Typing stubs for colorama"
+optional = false
+python-versions = ">=3.8"
+files = [
+    {file = "types-colorama-0.4.15.20240205.tar.gz", hash = "sha256:7ae4f58d407d387f4f98b24d81e1b7657ec754ea1dc4619ae5bd27f0c367637e"},
+    {file = "types_colorama-0.4.15.20240205-py3-none-any.whl", hash = "sha256:3ab26dcd76d2f13b1b795ed5c87a1a1a29331ea64cf614bb6ae958a3cebc3a53"},
 ]
-yapf = [
-    {file = "yapf-0.32.0-py2.py3-none-any.whl", hash = "sha256:8fea849025584e486fd06d6ba2bed717f396080fd3cc236ba10cb97c4c51cf32"},
-    {file = "yapf-0.32.0.tar.gz", hash = "sha256:a3f5085d37ef7e3e004c4ba9f9b3e40c54ff1901cd111f05145ae313a7c67d1b"},
+
+[[package]]
+name = "yapf"
+version = "0.40.2"
+description = "A formatter for Python code"
+optional = false
+python-versions = ">=3.7"
+files = [
+    {file = "yapf-0.40.2-py3-none-any.whl", hash = "sha256:adc8b5dd02c0143108878c499284205adb258aad6db6634e5b869e7ee2bd548b"},
+    {file = "yapf-0.40.2.tar.gz", hash = "sha256:4dab8a5ed7134e26d57c1647c7483afb3f136878b579062b786c9ba16b94637b"},
 ]
-zipp = [
-    {file = "zipp-3.8.1-py3-none-any.whl", hash = "sha256:47c40d7fe183a6f21403a199b3e4192cca5774656965b0a4988ad2f8feb5f009"},
-    {file = "zipp-3.8.1.tar.gz", hash = "sha256:05b45f1ee8f807d0cc928485ca40a07cb491cf092ff587c0df9cb1fd154848d2"},
+
+[package.dependencies]
+importlib-metadata = ">=6.6.0"
+platformdirs = ">=3.5.1"
+tomli = ">=2.0.1"
+
+[[package]]
+name = "zipp"
+version = "3.17.0"
+description = "Backport of pathlib-compatible object wrapper for zip files"
+optional = false
+python-versions = ">=3.8"
+files = [
+    {file = "zipp-3.17.0-py3-none-any.whl", hash = "sha256:0e923e726174922dce09c53c59ad483ff7bbb8e572e00c7f7c46b88556409f31"},
+    {file = "zipp-3.17.0.tar.gz", hash = "sha256:84e64a1c28cf7e91ed2078bb8cc8c259cb19b76942096c8d7b84947690cabaf0"},
 ]
+
+[package.extras]
+docs = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (<7.2.5)", "sphinx (>=3.5)", "sphinx-lint"]
+testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-ignore-flaky", "pytest-mypy (>=0.9.1)", "pytest-ruff"]
+
+[metadata]
+lock-version = "2.0"
+python-versions = "^3.11"
+content-hash = "6146ea1571def62c4f7ff33173e0144bcfd206c178936365bff8b4e1669b90ff"
diff --git a/util/nix/pyproject.toml b/util/nix/pyproject.toml
index ff484dbe799..fa62eb96c01 100644
--- a/util/nix/pyproject.toml
+++ b/util/nix/pyproject.toml
@@ -8,7 +8,7 @@ description = ""
 authors = []
 
 [tool.poetry.dependencies]
-python = "^3.8"
+python = "^3.11"
 appdirs = "*"
 argcomplete = "*"
 colorama = "*"
@@ -34,28 +34,6 @@ pep8-naming = "*"
 pyflakes = "*"
 yapf = "*"
 
-# These dependencies are required by the jsonschema >= 4.11.0 build system, but
-# are not detected automatically; they are also not present in the used Nixpkgs
-# snapshot, so need to be obtained through Poetry.
-hatchling = "*"
-hatch-vcs = "*"
-hatch-fancy-pypi-readme = "*"
-
-# The `pytest` module in the used Nixpkgs snapshot has an upper bound on the
-# `pluggy` dependency, which conflicts with the dependency of the `hatchling`
-# module; upgrading the `pytest` module fixes the conflict.
-pytest = "*"
-
-# Building the `tomli` module, which is in the dependency tree of `hatchling`,
-# requires a newer `flit-core` module than found in the used Nixpkgs snapshot.
-flit-core = "*"
-
-# Building `dotty-dict` >= 1.3.1 requires the `poetry-core` module, and the
-# version of that module provided by the used Nixpkgs snapshot cannot be built
-# on Darwin due to the regex compatibility issue in the old Nixpkgs code
-# (https://github.com/NixOS/nix/issues/4758).
-poetry-core = "*"
-
 [build-system]
 requires = ["poetry-core>=1.0.0"]
 build-backend = "poetry.core.masonry.api"
diff --git a/util/nix/sources.json b/util/nix/sources.json
index 8cdb9e49968..3985f75e033 100644
--- a/util/nix/sources.json
+++ b/util/nix/sources.json
@@ -17,10 +17,10 @@
         "homepage": "",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c0e881852006b132236cbf0301bd1939bb50867e",
-        "sha256": "0fy7z7yxk5n7yslsvx5cyc6h21qwi4bhxf3awhirniszlbvaazy2",
+        "rev": "98b00b6947a9214381112bdb6f89c25498db4959",
+        "sha256": "1m6dm144mbm56n9293m26f46bjrklknyr4q4kzvxkiv036ijma98",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/c0e881852006b132236cbf0301bd1939bb50867e.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs/archive/98b00b6947a9214381112bdb6f89c25498db4959.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "poetry2nix": {
@@ -29,10 +29,10 @@
         "homepage": "",
         "owner": "nix-community",
         "repo": "poetry2nix",
-        "rev": "11c0df8e348c0f169cd73a2e3d63f65c92baf666",
-        "sha256": "0i3wbp2p0x6bpj07sqpvkbx4lvjm0irvpmv2bjqx8k02mpjm7dg2",
+        "rev": "3c92540611f42d3fb2d0d084a6c694cd6544b609",
+        "sha256": "1jfrangw0xb5b8sdkimc550p3m98zhpb1fayahnr7crg74as4qyq",
         "type": "tarball",
-        "url": "https://github.com/nix-community/poetry2nix/archive/11c0df8e348c0f169cd73a2e3d63f65c92baf666.tar.gz",
+        "url": "https://github.com/nix-community/poetry2nix/archive/3c92540611f42d3fb2d0d084a6c694cd6544b609.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     }
 }
diff --git a/util/nix/sources.nix b/util/nix/sources.nix
index 1938409dddb..fe3dadf7ebb 100644
--- a/util/nix/sources.nix
+++ b/util/nix/sources.nix
@@ -10,29 +10,50 @@ let
     let
       name' = sanitizeName name + "-src";
     in
-      if spec.builtin or true then
-        builtins_fetchurl { inherit (spec) url sha256; name = name'; }
-      else
-        pkgs.fetchurl { inherit (spec) url sha256; name = name'; };
+    if spec.builtin or true then
+      builtins_fetchurl { inherit (spec) url sha256; name = name'; }
+    else
+      pkgs.fetchurl { inherit (spec) url sha256; name = name'; };
 
   fetch_tarball = pkgs: name: spec:
     let
       name' = sanitizeName name + "-src";
     in
-      if spec.builtin or true then
-        builtins_fetchTarball { name = name'; inherit (spec) url sha256; }
-      else
-        pkgs.fetchzip { name = name'; inherit (spec) url sha256; };
+    if spec.builtin or true then
+      builtins_fetchTarball { name = name'; inherit (spec) url sha256; }
+    else
+      pkgs.fetchzip { name = name'; inherit (spec) url sha256; };
 
   fetch_git = name: spec:
     let
       ref =
-        if spec ? ref then spec.ref else
+        spec.ref or (
           if spec ? branch then "refs/heads/${spec.branch}" else
-            if spec ? tag then "refs/tags/${spec.tag}" else
-              abort "In git source '${name}': Please specify `ref`, `tag` or `branch`!";
+          if spec ? tag then "refs/tags/${spec.tag}" else
+          abort "In git source '${name}': Please specify `ref`, `tag` or `branch`!"
+        );
+      submodules = spec.submodules or false;
+      submoduleArg =
+        let
+          nixSupportsSubmodules = builtins.compareVersions builtins.nixVersion "2.4" >= 0;
+          emptyArgWithWarning =
+            if submodules
+            then
+              builtins.trace
+                (
+                  "The niv input \"${name}\" uses submodules "
+                  + "but your nix's (${builtins.nixVersion}) builtins.fetchGit "
+                  + "does not support them"
+                )
+                { }
+            else { };
+        in
+        if nixSupportsSubmodules
+        then { inherit submodules; }
+        else emptyArgWithWarning;
     in
-      builtins.fetchGit { url = spec.repo; inherit (spec) rev; inherit ref; };
+    builtins.fetchGit
+      ({ url = spec.repo; inherit (spec) rev; inherit ref; } // submoduleArg);
 
   fetch_local = spec: spec.path;
 
@@ -66,16 +87,16 @@ let
       hasNixpkgsPath = builtins.any (x: x.prefix == "nixpkgs") builtins.nixPath;
       hasThisAsNixpkgsPath = <nixpkgs> == ./.;
     in
-      if builtins.hasAttr "nixpkgs" sources
-      then sourcesNixpkgs
-      else if hasNixpkgsPath && ! hasThisAsNixpkgsPath then
-        import <nixpkgs> {}
-      else
-        abort
-          ''
-            Please specify either <nixpkgs> (through -I or NIX_PATH=nixpkgs=...) or
-            add a package called "nixpkgs" to your sources.json.
-          '';
+    if builtins.hasAttr "nixpkgs" sources
+    then sourcesNixpkgs
+    else if hasNixpkgsPath && ! hasThisAsNixpkgsPath then
+      import <nixpkgs> { }
+    else
+      abort
+        ''
+          Please specify either <nixpkgs> (through -I or NIX_PATH=nixpkgs=...) or
+          add a package called "nixpkgs" to your sources.json.
+        '';
 
   # The actual fetching function.
   fetch = pkgs: name: spec:
@@ -95,13 +116,13 @@ let
   # the path directly as opposed to the fetched source.
   replace = name: drv:
     let
-      saneName = stringAsChars (c: if isNull (builtins.match "[a-zA-Z0-9]" c) then "_" else c) name;
+      saneName = stringAsChars (c: if (builtins.match "[a-zA-Z0-9]" c) == null then "_" else c) name;
       ersatz = builtins.getEnv "NIV_OVERRIDE_${saneName}";
     in
-      if ersatz == "" then drv else
-        # this turns the string into an actual Nix path (for both absolute and
-        # relative paths)
-        if builtins.substring 0 1 ersatz == "/" then /. + ersatz else /. + builtins.getEnv "PWD" + "/${ersatz}";
+    if ersatz == "" then drv else
+      # this turns the string into an actual Nix path (for both absolute and
+      # relative paths)
+    if builtins.substring 0 1 ersatz == "/" then /. + ersatz else /. + builtins.getEnv "PWD" + "/${ersatz}";
 
   # Ports of functions for older nix versions
 
@@ -112,7 +133,7 @@ let
   );
 
   # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/lists.nix#L295
-  range = first: last: if first > last then [] else builtins.genList (n: first + n) (last - first + 1);
+  range = first: last: if first > last then [ ] else builtins.genList (n: first + n) (last - first + 1);
 
   # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/strings.nix#L257
   stringToCharacters = s: map (p: builtins.substring p 1 s) (range 0 (builtins.stringLength s - 1));
@@ -123,43 +144,46 @@ let
   concatStrings = builtins.concatStringsSep "";
 
   # https://github.com/NixOS/nixpkgs/blob/8a9f58a375c401b96da862d969f66429def1d118/lib/attrsets.nix#L331
-  optionalAttrs = cond: as: if cond then as else {};
+  optionalAttrs = cond: as: if cond then as else { };
 
   # fetchTarball version that is compatible between all the versions of Nix
   builtins_fetchTarball = { url, name ? null, sha256 }@attrs:
     let
       inherit (builtins) lessThan nixVersion fetchTarball;
     in
-      if lessThan nixVersion "1.12" then
-        fetchTarball ({ inherit url; } // (optionalAttrs (!isNull name) { inherit name; }))
-      else
-        fetchTarball attrs;
+    if lessThan nixVersion "1.12" then
+      fetchTarball ({ inherit url; } // (optionalAttrs (name != null) { inherit name; }))
+    else
+      fetchTarball attrs;
 
   # fetchurl version that is compatible between all the versions of Nix
   builtins_fetchurl = { url, name ? null, sha256 }@attrs:
     let
       inherit (builtins) lessThan nixVersion fetchurl;
     in
-      if lessThan nixVersion "1.12" then
-        fetchurl ({ inherit url; } // (optionalAttrs (!isNull name) { inherit name; }))
-      else
-        fetchurl attrs;
+    if lessThan nixVersion "1.12" then
+      fetchurl ({ inherit url; } // (optionalAttrs (name != null) { inherit name; }))
+    else
+      fetchurl attrs;
 
   # Create the final "sources" from the config
   mkSources = config:
-    mapAttrs (
-      name: spec:
-        if builtins.hasAttr "outPath" spec
-        then abort
-          "The values in sources.json should not have an 'outPath' attribute"
-        else
-          spec // { outPath = replace name (fetch config.pkgs name spec); }
-    ) config.sources;
+    mapAttrs
+      (
+        name: spec:
+          if builtins.hasAttr "outPath" spec
+          then
+            abort
+              "The values in sources.json should not have an 'outPath' attribute"
+          else
+            spec // { outPath = replace name (fetch config.pkgs name spec); }
+      )
+      config.sources;
 
   # The "config" used by the fetchers
   mkConfig =
     { sourcesFile ? if builtins.pathExists ./sources.json then ./sources.json else null
-    , sources ? if isNull sourcesFile then {} else builtins.fromJSON (builtins.readFile sourcesFile)
+    , sources ? if sourcesFile == null then { } else builtins.fromJSON (builtins.readFile sourcesFile)
     , system ? builtins.currentSystem
     , pkgs ? mkPkgs sources system
     }: rec {
@@ -171,4 +195,4 @@ let
     };
 
 in
-mkSources (mkConfig {}) // { __functor = _: settings: mkSources (mkConfig settings); }
+mkSources (mkConfig { }) // { __functor = _: settings: mkSources (mkConfig settings); }
diff --git a/util/uf2conv.py b/util/uf2conv.py
index 84271cee4f6..67cf92f1691 100755
--- a/util/uf2conv.py
+++ b/util/uf2conv.py
@@ -30,7 +30,7 @@ def is_hex(buf):
         w = buf[0:30].decode("utf-8")
     except UnicodeDecodeError:
         return False
-    if w[0] == ':' and re.match(b"^[:0-9a-fA-F\r\n]+$", buf):
+    if w[0] == ':' and re.match(rb"^[:0-9a-fA-F\r\n]+$", buf):
         return True
     return False
 
@@ -214,7 +214,7 @@ def get_drives():
                                      "get", "DeviceID,", "VolumeName,",
                                      "FileSystem,", "DriveType"])
         for line in to_str(r).split('\n'):
-            words = re.split('\s+', line)
+            words = re.split(r'\s+', line)
             if len(words) >= 3 and words[1] == "2" and words[2] == "FAT":
                 drives.append(words[0])
     else:
@@ -243,7 +243,7 @@ def get_drives():
 def board_id(path):
     with open(path + INFO_FILE, mode='r') as file:
         file_content = file.read()
-    return re.search("Board-ID: ([^\r\n]*)", file_content).group(1)
+    return re.search(r"Board-ID: ([^\r\n]*)", file_content).group(1)
 
 
 def list_drives():